From 663640f5b30ddd620e07d53b863520b65bb0839b Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Thu, 19 Jan 2017 16:20:27 +0800 Subject: [PATCH] MDL-40759 icons: convert uses of pix_url to pix_icon Also change filepicker to use scaled svgs instead of sets of custom pngs. The svgs are taken from font-awesome. --- admin/blocks.php | 8 +-- admin/filters.php | 2 +- admin/mnet/access_control.php | 2 +- admin/modules.php | 6 +- admin/renderer.php | 2 +- admin/repository.php | 4 +- .../classes/capability_table_with_risks.php | 3 +- admin/roles/classes/permissions_table.php | 10 +-- admin/roles/manage.php | 4 +- admin/roles/usersroles.php | 6 +- admin/tool/availabilityconditions/index.php | 15 +--- .../tool/log/classes/setting_managestores.php | 14 ++-- admin/tool/lp/templates/comment_area.mustache | 2 +- .../user_evidence_list_page.mustache | 2 +- .../lp/templates/user_evidence_page.mustache | 2 +- admin/tool/recyclebin/index.php | 2 +- admin/tool/unsuproles/index.php | 6 +- admin/tool/usertours/classes/manager.php | 4 +- admin/user.php | 17 +++-- admin/user/user_bulk_cohortadd.php | 8 ++- admin/user/user_bulk_display.php | 8 ++- .../block_activity_modules.php | 2 +- blocks/community/block_community.php | 7 +- blocks/course_list/block_course_list.php | 4 +- blocks/course_overview/renderer.php | 15 +--- blocks/feedback/block_feedback.php | 3 +- blocks/messages/block_messages.php | 2 +- blocks/mnet_hosts/block_mnet_hosts.php | 3 +- blocks/online_users/block_online_users.php | 2 +- blocks/participants/block_participants.php | 2 +- .../site_main_menu/block_site_main_menu.php | 6 +- .../block_social_activities.php | 6 +- calendar/lib.php | 20 +++--- calendar/renderer.php | 6 +- cohort/index.php | 10 +-- .../external/comment_area_exporter.php | 6 +- comment/comment.js | 6 +- comment/lib.php | 2 +- course/format/renderer.php | 7 +- course/format/social/format.php | 3 +- course/renderer.php | 10 +-- enrol/instances.php | 6 +- enrol/renderer.php | 15 ++-- .../classes/external/stored_file_exporter.php | 2 - files/renderer.php | 38 +++++----- ...moodle-filter_glossary-autolinker-debug.js | 8 ++- .../moodle-filter_glossary-autolinker-min.js | 2 +- .../moodle-filter_glossary-autolinker.js | 8 ++- .../yui/src/autolinker/js/autolinker.js | 8 ++- grade/grading/renderer.php | 4 +- grade/report/grader/lib.php | 4 +- index.php | 6 +- lib/adminlib.php | 66 ++++++++---------- lib/deprecatedlib.php | 8 +-- lib/editor/tinymce/adminlib.php | 4 +- lib/filelib.php | 27 +++---- lib/formslib.php | 4 +- lib/googleapi.php | 2 +- lib/listlib.php | 6 +- lib/modinfolib.php | 16 ++--- lib/outputcomponents.php | 6 +- lib/outputlib.php | 2 +- lib/outputrenderers.php | 10 ++- lib/outputrequirementslib.php | 1 - lib/portfoliolib.php | 2 +- lib/rsslib.php | 5 +- lib/tablelib.php | 12 ++-- lib/templates/permissionmanager_role.mustache | 4 +- lib/weblib.php | 5 +- .../classes/output/popup_notification.php | 4 +- message/renderer.php | 16 +---- mnet/service/enrol/course.php | 2 +- mnet/service/enrol/host.php | 2 +- mod/assign/gradingtable.php | 3 +- mod/assign/lib.php | 3 +- mod/assign/overrides.php | 21 +++--- mod/assign/renderer.php | 3 +- mod/data/field/checkbox/field.class.php | 3 +- mod/data/field/file/field.class.php | 3 +- mod/data/field/latlong/field.class.php | 6 +- mod/data/field/menu/field.class.php | 3 +- mod/data/field/multimenu/field.class.php | 3 +- mod/data/field/picture/field.class.php | 3 +- mod/data/field/radiobutton/field.class.php | 3 +- mod/data/field/textarea/field.class.php | 3 +- mod/data/field/url/field.class.php | 3 +- mod/data/lib.php | 17 +++-- mod/data/preset.php | 4 +- mod/feedback/classes/complete_form.php | 5 +- mod/feedback/lib.php | 3 +- mod/forum/index.php | 8 ++- mod/forum/lib.php | 6 +- mod/glossary/editcategories.php | 6 +- mod/glossary/lib.php | 24 +++---- mod/glossary/settings.php | 9 ++- mod/lesson/overrides.php | 9 +-- mod/lesson/renderer.php | 10 +-- mod/lti/locallib.php | 4 +- mod/lti/mod_form.php | 12 ++-- mod/quiz/classes/output/edit_renderer.php | 4 +- mod/quiz/lib.php | 3 +- mod/quiz/locallib.php | 8 +-- mod/quiz/overrides.php | 9 +-- mod/quiz/renderer.php | 3 +- mod/resource/index.php | 2 +- mod/scorm/lib.php | 10 +-- mod/scorm/loadSCO.php | 2 +- mod/scorm/locallib.php | 19 ++--- mod/scorm/report/basic/classes/report.php | 6 +- .../report/interactions/classes/report.php | 6 +- .../report/objectives/classes/report.php | 6 +- mod/scorm/report/userreport.php | 3 +- mod/url/index.php | 2 +- .../allocation/scheduled/settings_form.php | 26 +++---- mod/workshop/lib.php | 4 +- mod/workshop/view.php | 6 +- pix/f/FileTypesIcons-LICENSE.txt | 15 ---- pix/f/Oxygen-LICENSE.txt | 15 ---- pix/f/archive-128.png | Bin 9446 -> 0 bytes pix/f/archive-24.png | Bin 1257 -> 0 bytes pix/f/archive-256.png | Bin 16938 -> 0 bytes pix/f/archive-32.png | Bin 1777 -> 0 bytes pix/f/archive-48.png | Bin 2980 -> 0 bytes pix/f/archive-64.png | Bin 3914 -> 0 bytes pix/f/archive-72.png | Bin 4578 -> 0 bytes pix/f/archive-80.png | Bin 5297 -> 0 bytes pix/f/archive-96.png | Bin 6729 -> 0 bytes pix/f/archive.png | Bin 567 -> 0 bytes pix/f/archive.svg | 1 + pix/f/audio-128.png | Bin 11089 -> 0 bytes pix/f/audio-24.png | Bin 1388 -> 0 bytes pix/f/audio-256.png | Bin 20737 -> 0 bytes pix/f/audio-32.png | Bin 2008 -> 0 bytes pix/f/audio-48.png | Bin 3440 -> 0 bytes pix/f/audio-64.png | Bin 4609 -> 0 bytes pix/f/audio-72.png | Bin 5533 -> 0 bytes pix/f/audio-80.png | Bin 6341 -> 0 bytes pix/f/audio-96.png | Bin 7954 -> 0 bytes pix/f/audio.png | Bin 793 -> 0 bytes pix/f/audio.svg | 1 + pix/f/avi-128.png | Bin 10901 -> 0 bytes pix/f/avi-24.png | Bin 1370 -> 0 bytes pix/f/avi-256.png | Bin 18883 -> 0 bytes pix/f/avi-32.png | Bin 2016 -> 0 bytes pix/f/avi-48.png | Bin 3415 -> 0 bytes pix/f/avi-64.png | Bin 4698 -> 0 bytes pix/f/avi-72.png | Bin 5518 -> 0 bytes pix/f/avi-80.png | Bin 6334 -> 0 bytes pix/f/avi-96.png | Bin 7879 -> 0 bytes pix/f/avi.png | Bin 706 -> 0 bytes pix/f/avi.svg | 1 + pix/f/base-128.png | Bin 9486 -> 0 bytes pix/f/base-24.png | Bin 1261 -> 0 bytes pix/f/base-32.png | Bin 1803 -> 0 bytes pix/f/base-48.png | Bin 3066 -> 0 bytes pix/f/base-64.png | Bin 4069 -> 0 bytes pix/f/base-72.png | Bin 5089 -> 0 bytes pix/f/base-80.png | Bin 5792 -> 0 bytes pix/f/base-96.png | Bin 7357 -> 0 bytes pix/f/base.png | Bin 1018 -> 0 bytes pix/f/base.svg | 1 + pix/f/bmp-128.png | Bin 10234 -> 0 bytes pix/f/bmp-24.png | Bin 1322 -> 0 bytes pix/f/bmp-256.png | Bin 18429 -> 0 bytes pix/f/bmp-32.png | Bin 1925 -> 0 bytes pix/f/bmp-48.png | Bin 3211 -> 0 bytes pix/f/bmp-64.png | Bin 4270 -> 0 bytes pix/f/bmp-72.png | Bin 5055 -> 0 bytes pix/f/bmp-80.png | Bin 5809 -> 0 bytes pix/f/bmp-96.png | Bin 7105 -> 0 bytes pix/f/bmp.png | Bin 475 -> 0 bytes pix/f/bmp.svg | 1 + pix/f/calc-128.png | Bin 6593 -> 0 bytes pix/f/calc-24.png | Bin 1200 -> 0 bytes pix/f/calc-32.png | Bin 1751 -> 0 bytes pix/f/calc-48.png | Bin 2929 -> 0 bytes pix/f/calc-64.png | Bin 3438 -> 0 bytes pix/f/calc-72.png | Bin 4589 -> 0 bytes pix/f/calc-80.png | Bin 5151 -> 0 bytes pix/f/calc-96.png | Bin 6159 -> 0 bytes pix/f/calc.png | Bin 667 -> 0 bytes pix/f/calc.svg | 1 + pix/f/chart-128.png | Bin 6784 -> 0 bytes pix/f/chart-24.png | Bin 1145 -> 0 bytes pix/f/chart-32.png | Bin 1597 -> 0 bytes pix/f/chart-48.png | Bin 2614 -> 0 bytes pix/f/chart-64.png | Bin 3359 -> 0 bytes pix/f/chart-72.png | Bin 4181 -> 0 bytes pix/f/chart-80.png | Bin 4700 -> 0 bytes pix/f/chart-96.png | Bin 5845 -> 0 bytes pix/f/chart.png | Bin 458 -> 0 bytes pix/f/chart.svg | 1 + pix/f/database-128.png | Bin 12182 -> 0 bytes pix/f/database-24.png | Bin 1416 -> 0 bytes pix/f/database-256.png | Bin 29278 -> 0 bytes pix/f/database-32.png | Bin 2067 -> 0 bytes pix/f/database-48.png | Bin 3620 -> 0 bytes pix/f/database-64.png | Bin 4949 -> 0 bytes pix/f/database-72.png | Bin 5918 -> 0 bytes pix/f/database-80.png | Bin 6703 -> 0 bytes pix/f/database-96.png | Bin 8487 -> 0 bytes pix/f/database.png | Bin 769 -> 0 bytes pix/f/database.svg | 1 + pix/f/dmg-32.png | Bin 1443 -> 0 bytes pix/f/dmg.gif | Bin 222 -> 0 bytes pix/f/dmg.svg | 1 + pix/f/document-128.png | Bin 11667 -> 0 bytes pix/f/document-24.png | Bin 1409 -> 0 bytes pix/f/document-256.png | Bin 27207 -> 0 bytes pix/f/document-32.png | Bin 2061 -> 0 bytes pix/f/document-48.png | Bin 3557 -> 0 bytes pix/f/document-64.png | Bin 4876 -> 0 bytes pix/f/document-72.png | Bin 5820 -> 0 bytes pix/f/document-80.png | Bin 6630 -> 0 bytes pix/f/document-96.png | Bin 8380 -> 0 bytes pix/f/document.png | Bin 779 -> 0 bytes pix/f/document.svg | 1 + pix/f/draw-128.png | Bin 7902 -> 0 bytes pix/f/draw-24.png | Bin 1097 -> 0 bytes pix/f/draw-32.png | Bin 1535 -> 0 bytes pix/f/draw-48.png | Bin 2549 -> 0 bytes pix/f/draw-64.png | Bin 3441 -> 0 bytes pix/f/draw-72.png | Bin 4352 -> 0 bytes pix/f/draw-80.png | Bin 5001 -> 0 bytes pix/f/draw-96.png | Bin 6285 -> 0 bytes pix/f/draw.png | Bin 652 -> 0 bytes pix/f/draw.svg | 1 + pix/f/edit-32.png | Bin 1475 -> 0 bytes pix/f/edit.gif | Bin 262 -> 0 bytes pix/f/env.gif | Bin 249 -> 0 bytes pix/f/eps-128.png | Bin 8545 -> 0 bytes pix/f/eps-24.png | Bin 1242 -> 0 bytes pix/f/eps-256.png | Bin 14946 -> 0 bytes pix/f/eps-32.png | Bin 1733 -> 0 bytes pix/f/eps-48.png | Bin 2834 -> 0 bytes pix/f/eps-64.png | Bin 3679 -> 0 bytes pix/f/eps-72.png | Bin 4359 -> 0 bytes pix/f/eps-80.png | Bin 4942 -> 0 bytes pix/f/eps-96.png | Bin 6114 -> 0 bytes pix/f/eps.png | Bin 464 -> 0 bytes pix/f/eps.svg | 1 + pix/f/epub-128.png | Bin 8122 -> 0 bytes pix/f/epub-24.png | Bin 1344 -> 0 bytes pix/f/epub-256.png | Bin 16311 -> 0 bytes pix/f/epub-32.png | Bin 1847 -> 0 bytes pix/f/epub-48.png | Bin 2866 -> 0 bytes pix/f/epub-64.png | Bin 3839 -> 0 bytes pix/f/epub-72.png | Bin 4422 -> 0 bytes pix/f/epub-80.png | Bin 4811 -> 0 bytes pix/f/epub-96.png | Bin 5786 -> 0 bytes pix/f/epub.png | Bin 894 -> 0 bytes pix/f/epub.svg | 1 + pix/f/explore-32.png | Bin 1258 -> 0 bytes pix/f/explore.gif | Bin 239 -> 0 bytes pix/f/flash-128.png | Bin 8546 -> 0 bytes pix/f/flash-24.png | Bin 1264 -> 0 bytes pix/f/flash-256.png | Bin 15302 -> 0 bytes pix/f/flash-32.png | Bin 1758 -> 0 bytes pix/f/flash-48.png | Bin 2869 -> 0 bytes pix/f/flash-64.png | Bin 3752 -> 0 bytes pix/f/flash-72.png | Bin 4367 -> 0 bytes pix/f/flash-80.png | Bin 4953 -> 0 bytes pix/f/flash-96.png | Bin 6143 -> 0 bytes pix/f/flash.png | Bin 501 -> 0 bytes pix/f/flash.svg | 1 + pix/f/folder-128.png | Bin 2251 -> 0 bytes pix/f/folder-24.png | Bin 543 -> 0 bytes pix/f/folder-32.png | Bin 568 -> 0 bytes pix/f/folder-48.png | Bin 857 -> 0 bytes pix/f/folder-64.png | Bin 1102 -> 0 bytes pix/f/folder-open-128.png | Bin 2297 -> 0 bytes pix/f/folder-open-24.png | Bin 539 -> 0 bytes pix/f/folder-open-32.png | Bin 623 -> 0 bytes pix/f/folder-open-48.png | Bin 965 -> 0 bytes pix/f/folder-open-64.png | Bin 1255 -> 0 bytes pix/f/folder-open.png | Bin 331 -> 0 bytes pix/f/folder-open.svg | 1 + pix/f/folder.png | Bin 373 -> 0 bytes pix/f/folder.svg | 1 + pix/f/gif-128.png | Bin 10176 -> 0 bytes pix/f/gif-24.png | Bin 1473 -> 0 bytes pix/f/gif-256.png | Bin 15111 -> 0 bytes pix/f/gif-32.png | Bin 1948 -> 0 bytes pix/f/gif-48.png | Bin 3900 -> 0 bytes pix/f/gif-64.png | Bin 4540 -> 0 bytes pix/f/gif-72.png | Bin 6663 -> 0 bytes pix/f/gif-80.png | Bin 7268 -> 0 bytes pix/f/gif-96.png | Bin 8333 -> 0 bytes pix/f/gif.png | Bin 475 -> 0 bytes pix/f/gif.svg | 1 + pix/f/help-32.png | Bin 2081 -> 0 bytes pix/f/help.gif | Bin 237 -> 0 bytes pix/f/html-128.png | Bin 4660 -> 0 bytes pix/f/html-24.png | Bin 888 -> 0 bytes pix/f/html-256.png | Bin 9309 -> 0 bytes pix/f/html-32.png | Bin 1170 -> 0 bytes pix/f/html-48.png | Bin 1910 -> 0 bytes pix/f/html-64.png | Bin 2150 -> 0 bytes pix/f/html-72.png | Bin 2668 -> 0 bytes pix/f/html-80.png | Bin 2898 -> 0 bytes pix/f/html-96.png | Bin 3539 -> 0 bytes pix/f/html.gif | Bin 128 -> 0 bytes pix/f/html.svg | 1 + pix/f/image-128.png | Bin 18385 -> 0 bytes pix/f/image-24.png | Bin 1222 -> 0 bytes pix/f/image-256.png | Bin 61862 -> 0 bytes pix/f/image-32.png | Bin 1947 -> 0 bytes pix/f/image-48.png | Bin 3636 -> 0 bytes pix/f/image-64.png | Bin 5800 -> 0 bytes pix/f/image-72.png | Bin 7085 -> 0 bytes pix/f/image-80.png | Bin 8292 -> 0 bytes pix/f/image-96.png | Bin 11393 -> 0 bytes pix/f/image.png | Bin 475 -> 0 bytes pix/f/image.svg | 1 + pix/f/impress-128.png | Bin 7047 -> 0 bytes pix/f/impress-24.png | Bin 1157 -> 0 bytes pix/f/impress-32.png | Bin 1567 -> 0 bytes pix/f/impress-48.png | Bin 2522 -> 0 bytes pix/f/impress-64.png | Bin 3321 -> 0 bytes pix/f/impress-72.png | Bin 4171 -> 0 bytes pix/f/impress-80.png | Bin 4740 -> 0 bytes pix/f/impress-96.png | Bin 5795 -> 0 bytes pix/f/impress.png | Bin 507 -> 0 bytes pix/f/impress.svg | 1 + pix/f/isf-128.png | Bin 8432 -> 0 bytes pix/f/isf-24.png | Bin 1213 -> 0 bytes pix/f/isf-256.png | Bin 16870 -> 0 bytes pix/f/isf-32.png | Bin 1693 -> 0 bytes pix/f/isf-48.png | Bin 2828 -> 0 bytes pix/f/isf-64.png | Bin 3509 -> 0 bytes pix/f/isf-72.png | Bin 4241 -> 0 bytes pix/f/isf-80.png | Bin 4761 -> 0 bytes pix/f/isf-96.png | Bin 5916 -> 0 bytes pix/f/isf.png | Bin 667 -> 0 bytes pix/f/isf.svg | 1 + pix/f/jpeg-128.png | Bin 10933 -> 0 bytes pix/f/jpeg-24.png | Bin 1336 -> 0 bytes pix/f/jpeg-256.png | Bin 20692 -> 0 bytes pix/f/jpeg-32.png | Bin 1907 -> 0 bytes pix/f/jpeg-48.png | Bin 3255 -> 0 bytes pix/f/jpeg-64.png | Bin 4459 -> 0 bytes pix/f/jpeg-72.png | Bin 5285 -> 0 bytes pix/f/jpeg-80.png | Bin 6028 -> 0 bytes pix/f/jpeg-96.png | Bin 7602 -> 0 bytes pix/f/jpeg.png | Bin 475 -> 0 bytes pix/f/jpeg.svg | 1 + pix/f/markup-128.png | Bin 9787 -> 0 bytes pix/f/markup-24.png | Bin 1296 -> 0 bytes pix/f/markup-256.png | Bin 16899 -> 0 bytes pix/f/markup-32.png | Bin 1867 -> 0 bytes pix/f/markup-48.png | Bin 3162 -> 0 bytes pix/f/markup-64.png | Bin 4171 -> 0 bytes pix/f/markup-72.png | Bin 5026 -> 0 bytes pix/f/markup-80.png | Bin 5729 -> 0 bytes pix/f/markup-96.png | Bin 7072 -> 0 bytes pix/f/markup.png | Bin 576 -> 0 bytes pix/f/markup.svg | 1 + pix/f/math-128.png | Bin 7019 -> 0 bytes pix/f/math-24.png | Bin 1094 -> 0 bytes pix/f/math-32.png | Bin 1484 -> 0 bytes pix/f/math-48.png | Bin 2440 -> 0 bytes pix/f/math-64.png | Bin 3170 -> 0 bytes pix/f/math-72.png | Bin 3974 -> 0 bytes pix/f/math-80.png | Bin 4555 -> 0 bytes pix/f/math-96.png | Bin 5772 -> 0 bytes pix/f/math.png | Bin 502 -> 0 bytes pix/f/math.svg | 1 + pix/f/moodle-128.png | Bin 8166 -> 0 bytes pix/f/moodle-24.png | Bin 1212 -> 0 bytes pix/f/moodle-256.png | Bin 17346 -> 0 bytes pix/f/moodle-32.png | Bin 1703 -> 0 bytes pix/f/moodle-48.png | Bin 2791 -> 0 bytes pix/f/moodle-64.png | Bin 3578 -> 0 bytes pix/f/moodle-72.png | Bin 4372 -> 0 bytes pix/f/moodle-80.png | Bin 4937 -> 0 bytes pix/f/moodle-96.png | Bin 6160 -> 0 bytes pix/f/moodle.png | Bin 542 -> 0 bytes pix/f/moodle.svg | 1 + pix/f/mov.png | Bin 702 -> 0 bytes pix/f/mov.svg | 1 + pix/f/move.gif | Bin 128 -> 0 bytes pix/f/mp3-128.png | Bin 10037 -> 0 bytes pix/f/mp3-24.png | Bin 1369 -> 0 bytes pix/f/mp3-256.png | Bin 18704 -> 0 bytes pix/f/mp3-32.png | Bin 1960 -> 0 bytes pix/f/mp3-48.png | Bin 3267 -> 0 bytes pix/f/mp3-64.png | Bin 4301 -> 0 bytes pix/f/mp3-72.png | Bin 5146 -> 0 bytes pix/f/mp3-80.png | Bin 5856 -> 0 bytes pix/f/mp3-96.png | Bin 7228 -> 0 bytes pix/f/mp3.png | Bin 781 -> 0 bytes pix/f/mp3.svg | 1 + pix/f/mpeg-128.png | Bin 13248 -> 0 bytes pix/f/mpeg-24.png | Bin 1467 -> 0 bytes pix/f/mpeg-256.png | Bin 24973 -> 0 bytes pix/f/mpeg-32.png | Bin 2204 -> 0 bytes pix/f/mpeg-48.png | Bin 3769 -> 0 bytes pix/f/mpeg-64.png | Bin 5308 -> 0 bytes pix/f/mpeg-72.png | Bin 6400 -> 0 bytes pix/f/mpeg-80.png | Bin 7332 -> 0 bytes pix/f/mpeg-96.png | Bin 9317 -> 0 bytes pix/f/mpeg.png | Bin 712 -> 0 bytes pix/f/mpeg.svg | 1 + pix/f/oth-128.png | Bin 8708 -> 0 bytes pix/f/oth-24.png | Bin 1098 -> 0 bytes pix/f/oth-32.png | Bin 1585 -> 0 bytes pix/f/oth-48.png | Bin 2753 -> 0 bytes pix/f/oth-64.png | Bin 3724 -> 0 bytes pix/f/oth-72.png | Bin 4649 -> 0 bytes pix/f/oth-80.png | Bin 5224 -> 0 bytes pix/f/oth-96.png | Bin 6704 -> 0 bytes pix/f/oth.png | Bin 841 -> 0 bytes pix/f/oth.svg | 1 + pix/f/parent-32.png | Bin 1096 -> 0 bytes pix/f/parent.gif | Bin 138 -> 0 bytes pix/f/pdf-128.png | Bin 10489 -> 0 bytes pix/f/pdf-24.png | Bin 1319 -> 0 bytes pix/f/pdf-256.png | Bin 19207 -> 0 bytes pix/f/pdf-32.png | Bin 1868 -> 0 bytes pix/f/pdf-48.png | Bin 3170 -> 0 bytes pix/f/pdf-64.png | Bin 4231 -> 0 bytes pix/f/pdf-72.png | Bin 4984 -> 0 bytes pix/f/pdf-80.png | Bin 5706 -> 0 bytes pix/f/pdf-96.png | Bin 7247 -> 0 bytes pix/f/pdf.png | Bin 589 -> 0 bytes pix/f/pdf.svg | 1 + pix/f/png-128.png | Bin 8954 -> 0 bytes pix/f/png-24.png | Bin 1279 -> 0 bytes pix/f/png-256.png | Bin 13682 -> 0 bytes pix/f/png-32.png | Bin 1835 -> 0 bytes pix/f/png-48.png | Bin 3421 -> 0 bytes pix/f/png-64.png | Bin 4528 -> 0 bytes pix/f/png-72.png | Bin 5986 -> 0 bytes pix/f/png-80.png | Bin 6659 -> 0 bytes pix/f/png-96.png | Bin 7659 -> 0 bytes pix/f/png.png | Bin 475 -> 0 bytes pix/f/png.svg | 1 + pix/f/powerpoint-128.png | Bin 11232 -> 0 bytes pix/f/powerpoint-24.png | Bin 1371 -> 0 bytes pix/f/powerpoint-256.png | Bin 27027 -> 0 bytes pix/f/powerpoint-32.png | Bin 2022 -> 0 bytes pix/f/powerpoint-48.png | Bin 3437 -> 0 bytes pix/f/powerpoint-64.png | Bin 4634 -> 0 bytes pix/f/powerpoint-72.png | Bin 5607 -> 0 bytes pix/f/powerpoint-80.png | Bin 6352 -> 0 bytes pix/f/powerpoint-96.png | Bin 8053 -> 0 bytes pix/f/powerpoint.png | Bin 726 -> 0 bytes pix/f/powerpoint.svg | 1 + pix/f/psd-128.png | Bin 9448 -> 0 bytes pix/f/psd-24.png | Bin 1320 -> 0 bytes pix/f/psd-256.png | Bin 18192 -> 0 bytes pix/f/psd-32.png | Bin 1749 -> 0 bytes pix/f/psd-48.png | Bin 3522 -> 0 bytes pix/f/psd-64.png | Bin 3944 -> 0 bytes pix/f/psd-72.png | Bin 6151 -> 0 bytes pix/f/psd-80.png | Bin 6287 -> 0 bytes pix/f/psd-96.png | Bin 9267 -> 0 bytes pix/f/psd.png | Bin 551 -> 0 bytes pix/f/psd.svg | 1 + pix/f/publisher-128.png | Bin 12148 -> 0 bytes pix/f/publisher-24.png | Bin 1424 -> 0 bytes pix/f/publisher-256.png | Bin 28285 -> 0 bytes pix/f/publisher-32.png | Bin 2087 -> 0 bytes pix/f/publisher-48.png | Bin 3640 -> 0 bytes pix/f/publisher-64.png | Bin 4973 -> 0 bytes pix/f/publisher-72.png | Bin 5989 -> 0 bytes pix/f/publisher-80.png | Bin 6767 -> 0 bytes pix/f/publisher-96.png | Bin 8471 -> 0 bytes pix/f/publisher.png | Bin 835 -> 0 bytes pix/f/publisher.svg | 1 + pix/f/quicktime-128.png | Bin 10823 -> 0 bytes pix/f/quicktime-24.png | Bin 1399 -> 0 bytes pix/f/quicktime-256.png | Bin 19873 -> 0 bytes pix/f/quicktime-32.png | Bin 2059 -> 0 bytes pix/f/quicktime-48.png | Bin 3527 -> 0 bytes pix/f/quicktime-64.png | Bin 4664 -> 0 bytes pix/f/quicktime-72.png | Bin 5617 -> 0 bytes pix/f/quicktime-80.png | Bin 6377 -> 0 bytes pix/f/quicktime-96.png | Bin 7941 -> 0 bytes pix/f/quicktime.png | Bin 702 -> 0 bytes pix/f/quicktime.svg | 1 + pix/f/sourcecode-128.png | Bin 9596 -> 0 bytes pix/f/sourcecode-24.png | Bin 1308 -> 0 bytes pix/f/sourcecode-256.png | Bin 16999 -> 0 bytes pix/f/sourcecode-32.png | Bin 1909 -> 0 bytes pix/f/sourcecode-48.png | Bin 3194 -> 0 bytes pix/f/sourcecode-64.png | Bin 4297 -> 0 bytes pix/f/sourcecode-72.png | Bin 5078 -> 0 bytes pix/f/sourcecode-80.png | Bin 5705 -> 0 bytes pix/f/sourcecode-96.png | Bin 7057 -> 0 bytes pix/f/sourcecode.png | Bin 502 -> 0 bytes pix/f/sourcecode.svg | 1 + pix/f/spreadsheet-128.png | Bin 13238 -> 0 bytes pix/f/spreadsheet-24.png | Bin 1444 -> 0 bytes pix/f/spreadsheet-256.png | Bin 31092 -> 0 bytes pix/f/spreadsheet-32.png | Bin 2166 -> 0 bytes pix/f/spreadsheet-48.png | Bin 3806 -> 0 bytes pix/f/spreadsheet-64.png | Bin 5317 -> 0 bytes pix/f/spreadsheet-72.png | Bin 6402 -> 0 bytes pix/f/spreadsheet-80.png | Bin 7314 -> 0 bytes pix/f/spreadsheet-96.png | Bin 9266 -> 0 bytes pix/f/spreadsheet.png | Bin 847 -> 0 bytes pix/f/spreadsheet.svg | 1 + pix/f/text-128.png | Bin 7852 -> 0 bytes pix/f/text-24.png | Bin 1117 -> 0 bytes pix/f/text-256.png | Bin 12884 -> 0 bytes pix/f/text-32.png | Bin 1642 -> 0 bytes pix/f/text-48.png | Bin 2849 -> 0 bytes pix/f/text-64.png | Bin 3692 -> 0 bytes pix/f/text-72.png | Bin 4533 -> 0 bytes pix/f/text-80.png | Bin 5240 -> 0 bytes pix/f/text-96.png | Bin 6257 -> 0 bytes pix/f/text.png | Bin 343 -> 0 bytes pix/f/text.svg | 1 + pix/f/tiff-128.png | Bin 10968 -> 0 bytes pix/f/tiff-24.png | Bin 1404 -> 0 bytes pix/f/tiff-256.png | Bin 19988 -> 0 bytes pix/f/tiff-32.png | Bin 2059 -> 0 bytes pix/f/tiff-48.png | Bin 3477 -> 0 bytes pix/f/tiff-64.png | Bin 4684 -> 0 bytes pix/f/tiff-72.png | Bin 5496 -> 0 bytes pix/f/tiff-80.png | Bin 6306 -> 0 bytes pix/f/tiff-96.png | Bin 7874 -> 0 bytes pix/f/tiff.png | Bin 803 -> 0 bytes pix/f/tiff.svg | 1 + pix/f/unknown-128.png | Bin 4660 -> 0 bytes pix/f/unknown-24.png | Bin 888 -> 0 bytes pix/f/unknown-256.png | Bin 9309 -> 0 bytes pix/f/unknown-32.png | Bin 1170 -> 0 bytes pix/f/unknown-48.png | Bin 1910 -> 0 bytes pix/f/unknown-64.png | Bin 2150 -> 0 bytes pix/f/unknown-72.png | Bin 2668 -> 0 bytes pix/f/unknown-80.png | Bin 2898 -> 0 bytes pix/f/unknown-96.png | Bin 3539 -> 0 bytes pix/f/unknown.png | Bin 551 -> 0 bytes pix/f/unknown.svg | 1 + pix/f/video-128.png | Bin 9426 -> 0 bytes pix/f/video-24.png | Bin 1261 -> 0 bytes pix/f/video-256.png | Bin 17691 -> 0 bytes pix/f/video-32.png | Bin 1873 -> 0 bytes pix/f/video-48.png | Bin 3148 -> 0 bytes pix/f/video-64.png | Bin 4211 -> 0 bytes pix/f/video-72.png | Bin 4982 -> 0 bytes pix/f/video-80.png | Bin 5678 -> 0 bytes pix/f/video-96.png | Bin 7067 -> 0 bytes pix/f/video.png | Bin 703 -> 0 bytes pix/f/video.svg | 1 + pix/f/wav-128.png | Bin 13963 -> 0 bytes pix/f/wav-24.png | Bin 1417 -> 0 bytes pix/f/wav-256.png | Bin 30404 -> 0 bytes pix/f/wav-32.png | Bin 2146 -> 0 bytes pix/f/wav-48.png | Bin 3818 -> 0 bytes pix/f/wav-64.png | Bin 5410 -> 0 bytes pix/f/wav-72.png | Bin 6499 -> 0 bytes pix/f/wav-80.png | Bin 7523 -> 0 bytes pix/f/wav-96.png | Bin 9615 -> 0 bytes pix/f/wav.png | Bin 795 -> 0 bytes pix/f/wav.svg | 1 + pix/f/wmv-128.png | Bin 9426 -> 0 bytes pix/f/wmv-24.png | Bin 1261 -> 0 bytes pix/f/wmv-256.png | Bin 17691 -> 0 bytes pix/f/wmv-32.png | Bin 1873 -> 0 bytes pix/f/wmv-48.png | Bin 3148 -> 0 bytes pix/f/wmv-64.png | Bin 4211 -> 0 bytes pix/f/wmv-72.png | Bin 4982 -> 0 bytes pix/f/wmv-80.png | Bin 5678 -> 0 bytes pix/f/wmv-96.png | Bin 7067 -> 0 bytes pix/f/wmv.png | Bin 703 -> 0 bytes pix/f/wmv.svg | 1 + pix/f/writer-128.png | Bin 5708 -> 0 bytes pix/f/writer-24.png | Bin 1113 -> 0 bytes pix/f/writer-32.png | Bin 1423 -> 0 bytes pix/f/writer-48.png | Bin 2330 -> 0 bytes pix/f/writer-64.png | Bin 2836 -> 0 bytes pix/f/writer-72.png | Bin 3653 -> 0 bytes pix/f/writer-80.png | Bin 4111 -> 0 bytes pix/f/writer-96.png | Bin 5012 -> 0 bytes pix/f/writer.png | Bin 319 -> 0 bytes pix/f/writer.svg | 1 + question/category_class.php | 3 +- question/classes/bank/action_column_base.php | 3 +- question/engine/lib.php | 4 +- question/engine/renderer.php | 2 +- question/type/rendererbase.php | 8 +-- report/completion/index.php | 14 ++-- report/configlog/index.php | 2 +- report/outline/locallib.php | 2 +- report/performance/locallib.php | 3 +- report/progress/index.php | 11 ++- repository/areafiles/lib.php | 10 +-- repository/boxnet/lib.php | 4 +- repository/coursefiles/lib.php | 4 +- repository/draftfiles_manager.php | 2 +- repository/dropbox/lib.php | 4 +- repository/filesystem/lib.php | 8 +-- repository/googledocs/lib.php | 4 +- repository/lib.php | 16 ++--- repository/local/lib.php | 6 +- repository/merlot/lib.php | 2 +- repository/recent/lib.php | 4 +- repository/repository_ajax.php | 2 +- repository/s3/lib.php | 6 +- repository/skydrive/microsoftliveapi.php | 10 +-- repository/user/lib.php | 6 +- repository/webdav/lib.php | 4 +- repository/wikimedia/wikimedia.php | 4 +- user/message.html | 2 +- user/pix.php | 2 +- user/pixgroup.php | 34 --------- user/portfolio.php | 6 +- user/profile/index.php | 41 +++++++---- version.php | 2 +- 612 files changed, 535 insertions(+), 624 deletions(-) delete mode 100644 pix/f/FileTypesIcons-LICENSE.txt delete mode 100644 pix/f/Oxygen-LICENSE.txt delete mode 100644 pix/f/archive-128.png delete mode 100644 pix/f/archive-24.png delete mode 100644 pix/f/archive-256.png delete mode 100644 pix/f/archive-32.png delete mode 100644 pix/f/archive-48.png delete mode 100644 pix/f/archive-64.png delete mode 100644 pix/f/archive-72.png delete mode 100644 pix/f/archive-80.png delete mode 100644 pix/f/archive-96.png delete mode 100644 pix/f/archive.png create mode 100644 pix/f/archive.svg delete mode 100644 pix/f/audio-128.png delete mode 100644 pix/f/audio-24.png delete mode 100644 pix/f/audio-256.png delete mode 100644 pix/f/audio-32.png delete mode 100644 pix/f/audio-48.png delete mode 100644 pix/f/audio-64.png delete mode 100644 pix/f/audio-72.png delete mode 100644 pix/f/audio-80.png delete mode 100644 pix/f/audio-96.png delete mode 100644 pix/f/audio.png create mode 100644 pix/f/audio.svg delete mode 100644 pix/f/avi-128.png delete mode 100644 pix/f/avi-24.png delete mode 100644 pix/f/avi-256.png delete mode 100644 pix/f/avi-32.png delete mode 100644 pix/f/avi-48.png delete mode 100644 pix/f/avi-64.png delete mode 100644 pix/f/avi-72.png delete mode 100644 pix/f/avi-80.png delete mode 100644 pix/f/avi-96.png delete mode 100644 pix/f/avi.png create mode 100644 pix/f/avi.svg delete mode 100644 pix/f/base-128.png delete mode 100644 pix/f/base-24.png delete mode 100644 pix/f/base-32.png delete mode 100644 pix/f/base-48.png delete mode 100644 pix/f/base-64.png delete mode 100644 pix/f/base-72.png delete mode 100644 pix/f/base-80.png delete mode 100644 pix/f/base-96.png delete mode 100644 pix/f/base.png create mode 100644 pix/f/base.svg delete mode 100644 pix/f/bmp-128.png delete mode 100644 pix/f/bmp-24.png delete mode 100644 pix/f/bmp-256.png delete mode 100644 pix/f/bmp-32.png delete mode 100644 pix/f/bmp-48.png delete mode 100644 pix/f/bmp-64.png delete mode 100644 pix/f/bmp-72.png delete mode 100644 pix/f/bmp-80.png delete mode 100644 pix/f/bmp-96.png delete mode 100644 pix/f/bmp.png create mode 100644 pix/f/bmp.svg delete mode 100644 pix/f/calc-128.png delete mode 100644 pix/f/calc-24.png delete mode 100644 pix/f/calc-32.png delete mode 100644 pix/f/calc-48.png delete mode 100644 pix/f/calc-64.png delete mode 100644 pix/f/calc-72.png delete mode 100644 pix/f/calc-80.png delete mode 100644 pix/f/calc-96.png delete mode 100644 pix/f/calc.png create mode 100644 pix/f/calc.svg delete mode 100644 pix/f/chart-128.png delete mode 100644 pix/f/chart-24.png delete mode 100644 pix/f/chart-32.png delete mode 100644 pix/f/chart-48.png delete mode 100644 pix/f/chart-64.png delete mode 100644 pix/f/chart-72.png delete mode 100644 pix/f/chart-80.png delete mode 100644 pix/f/chart-96.png delete mode 100644 pix/f/chart.png create mode 100644 pix/f/chart.svg delete mode 100644 pix/f/database-128.png delete mode 100644 pix/f/database-24.png delete mode 100644 pix/f/database-256.png delete mode 100644 pix/f/database-32.png delete mode 100644 pix/f/database-48.png delete mode 100644 pix/f/database-64.png delete mode 100644 pix/f/database-72.png delete mode 100644 pix/f/database-80.png delete mode 100644 pix/f/database-96.png delete mode 100644 pix/f/database.png create mode 100644 pix/f/database.svg delete mode 100644 pix/f/dmg-32.png delete mode 100644 pix/f/dmg.gif create mode 100644 pix/f/dmg.svg delete mode 100644 pix/f/document-128.png delete mode 100644 pix/f/document-24.png delete mode 100644 pix/f/document-256.png delete mode 100644 pix/f/document-32.png delete mode 100644 pix/f/document-48.png delete mode 100644 pix/f/document-64.png delete mode 100644 pix/f/document-72.png delete mode 100644 pix/f/document-80.png delete mode 100644 pix/f/document-96.png delete mode 100644 pix/f/document.png create mode 100644 pix/f/document.svg delete mode 100644 pix/f/draw-128.png delete mode 100644 pix/f/draw-24.png delete mode 100644 pix/f/draw-32.png delete mode 100644 pix/f/draw-48.png delete mode 100644 pix/f/draw-64.png delete mode 100644 pix/f/draw-72.png delete mode 100644 pix/f/draw-80.png delete mode 100644 pix/f/draw-96.png delete mode 100644 pix/f/draw.png create mode 100644 pix/f/draw.svg delete mode 100644 pix/f/edit-32.png delete mode 100644 pix/f/edit.gif delete mode 100644 pix/f/env.gif delete mode 100644 pix/f/eps-128.png delete mode 100644 pix/f/eps-24.png delete mode 100644 pix/f/eps-256.png delete mode 100644 pix/f/eps-32.png delete mode 100644 pix/f/eps-48.png delete mode 100644 pix/f/eps-64.png delete mode 100644 pix/f/eps-72.png delete mode 100644 pix/f/eps-80.png delete mode 100644 pix/f/eps-96.png delete mode 100644 pix/f/eps.png create mode 100644 pix/f/eps.svg delete mode 100644 pix/f/epub-128.png delete mode 100644 pix/f/epub-24.png delete mode 100644 pix/f/epub-256.png delete mode 100644 pix/f/epub-32.png delete mode 100644 pix/f/epub-48.png delete mode 100644 pix/f/epub-64.png delete mode 100644 pix/f/epub-72.png delete mode 100644 pix/f/epub-80.png delete mode 100644 pix/f/epub-96.png delete mode 100644 pix/f/epub.png create mode 100644 pix/f/epub.svg delete mode 100644 pix/f/explore-32.png delete mode 100644 pix/f/explore.gif delete mode 100644 pix/f/flash-128.png delete mode 100644 pix/f/flash-24.png delete mode 100644 pix/f/flash-256.png delete mode 100644 pix/f/flash-32.png delete mode 100644 pix/f/flash-48.png delete mode 100644 pix/f/flash-64.png delete mode 100644 pix/f/flash-72.png delete mode 100644 pix/f/flash-80.png delete mode 100644 pix/f/flash-96.png delete mode 100644 pix/f/flash.png create mode 100644 pix/f/flash.svg delete mode 100644 pix/f/folder-128.png delete mode 100644 pix/f/folder-24.png delete mode 100644 pix/f/folder-32.png delete mode 100644 pix/f/folder-48.png delete mode 100644 pix/f/folder-64.png delete mode 100644 pix/f/folder-open-128.png delete mode 100644 pix/f/folder-open-24.png delete mode 100644 pix/f/folder-open-32.png delete mode 100644 pix/f/folder-open-48.png delete mode 100644 pix/f/folder-open-64.png delete mode 100644 pix/f/folder-open.png create mode 100644 pix/f/folder-open.svg delete mode 100644 pix/f/folder.png create mode 100644 pix/f/folder.svg delete mode 100644 pix/f/gif-128.png delete mode 100644 pix/f/gif-24.png delete mode 100644 pix/f/gif-256.png delete mode 100644 pix/f/gif-32.png delete mode 100644 pix/f/gif-48.png delete mode 100644 pix/f/gif-64.png delete mode 100644 pix/f/gif-72.png delete mode 100644 pix/f/gif-80.png delete mode 100644 pix/f/gif-96.png delete mode 100644 pix/f/gif.png create mode 100644 pix/f/gif.svg delete mode 100644 pix/f/help-32.png delete mode 100644 pix/f/help.gif delete mode 100644 pix/f/html-128.png delete mode 100644 pix/f/html-24.png delete mode 100644 pix/f/html-256.png delete mode 100644 pix/f/html-32.png delete mode 100644 pix/f/html-48.png delete mode 100644 pix/f/html-64.png delete mode 100644 pix/f/html-72.png delete mode 100644 pix/f/html-80.png delete mode 100644 pix/f/html-96.png delete mode 100644 pix/f/html.gif create mode 100644 pix/f/html.svg delete mode 100644 pix/f/image-128.png delete mode 100644 pix/f/image-24.png delete mode 100644 pix/f/image-256.png delete mode 100644 pix/f/image-32.png delete mode 100644 pix/f/image-48.png delete mode 100644 pix/f/image-64.png delete mode 100644 pix/f/image-72.png delete mode 100644 pix/f/image-80.png delete mode 100644 pix/f/image-96.png delete mode 100644 pix/f/image.png create mode 100644 pix/f/image.svg delete mode 100644 pix/f/impress-128.png delete mode 100644 pix/f/impress-24.png delete mode 100644 pix/f/impress-32.png delete mode 100644 pix/f/impress-48.png delete mode 100644 pix/f/impress-64.png delete mode 100644 pix/f/impress-72.png delete mode 100644 pix/f/impress-80.png delete mode 100644 pix/f/impress-96.png delete mode 100644 pix/f/impress.png create mode 100644 pix/f/impress.svg delete mode 100644 pix/f/isf-128.png delete mode 100644 pix/f/isf-24.png delete mode 100644 pix/f/isf-256.png delete mode 100644 pix/f/isf-32.png delete mode 100644 pix/f/isf-48.png delete mode 100644 pix/f/isf-64.png delete mode 100644 pix/f/isf-72.png delete mode 100644 pix/f/isf-80.png delete mode 100644 pix/f/isf-96.png delete mode 100644 pix/f/isf.png create mode 100644 pix/f/isf.svg delete mode 100644 pix/f/jpeg-128.png delete mode 100644 pix/f/jpeg-24.png delete mode 100644 pix/f/jpeg-256.png delete mode 100644 pix/f/jpeg-32.png delete mode 100644 pix/f/jpeg-48.png delete mode 100644 pix/f/jpeg-64.png delete mode 100644 pix/f/jpeg-72.png delete mode 100644 pix/f/jpeg-80.png delete mode 100644 pix/f/jpeg-96.png delete mode 100644 pix/f/jpeg.png create mode 100644 pix/f/jpeg.svg delete mode 100644 pix/f/markup-128.png delete mode 100644 pix/f/markup-24.png delete mode 100644 pix/f/markup-256.png delete mode 100644 pix/f/markup-32.png delete mode 100644 pix/f/markup-48.png delete mode 100644 pix/f/markup-64.png delete mode 100644 pix/f/markup-72.png delete mode 100644 pix/f/markup-80.png delete mode 100644 pix/f/markup-96.png delete mode 100644 pix/f/markup.png create mode 100644 pix/f/markup.svg delete mode 100644 pix/f/math-128.png delete mode 100644 pix/f/math-24.png delete mode 100644 pix/f/math-32.png delete mode 100644 pix/f/math-48.png delete mode 100644 pix/f/math-64.png delete mode 100644 pix/f/math-72.png delete mode 100644 pix/f/math-80.png delete mode 100644 pix/f/math-96.png delete mode 100644 pix/f/math.png create mode 100644 pix/f/math.svg delete mode 100644 pix/f/moodle-128.png delete mode 100644 pix/f/moodle-24.png delete mode 100644 pix/f/moodle-256.png delete mode 100644 pix/f/moodle-32.png delete mode 100644 pix/f/moodle-48.png delete mode 100644 pix/f/moodle-64.png delete mode 100644 pix/f/moodle-72.png delete mode 100644 pix/f/moodle-80.png delete mode 100644 pix/f/moodle-96.png delete mode 100644 pix/f/moodle.png create mode 100644 pix/f/moodle.svg delete mode 100644 pix/f/mov.png create mode 100644 pix/f/mov.svg delete mode 100644 pix/f/move.gif delete mode 100644 pix/f/mp3-128.png delete mode 100644 pix/f/mp3-24.png delete mode 100644 pix/f/mp3-256.png delete mode 100644 pix/f/mp3-32.png delete mode 100644 pix/f/mp3-48.png delete mode 100644 pix/f/mp3-64.png delete mode 100644 pix/f/mp3-72.png delete mode 100644 pix/f/mp3-80.png delete mode 100644 pix/f/mp3-96.png delete mode 100644 pix/f/mp3.png create mode 100644 pix/f/mp3.svg delete mode 100644 pix/f/mpeg-128.png delete mode 100644 pix/f/mpeg-24.png delete mode 100644 pix/f/mpeg-256.png delete mode 100644 pix/f/mpeg-32.png delete mode 100644 pix/f/mpeg-48.png delete mode 100644 pix/f/mpeg-64.png delete mode 100644 pix/f/mpeg-72.png delete mode 100644 pix/f/mpeg-80.png delete mode 100644 pix/f/mpeg-96.png delete mode 100644 pix/f/mpeg.png create mode 100644 pix/f/mpeg.svg delete mode 100644 pix/f/oth-128.png delete mode 100644 pix/f/oth-24.png delete mode 100644 pix/f/oth-32.png delete mode 100644 pix/f/oth-48.png delete mode 100644 pix/f/oth-64.png delete mode 100644 pix/f/oth-72.png delete mode 100644 pix/f/oth-80.png delete mode 100644 pix/f/oth-96.png delete mode 100644 pix/f/oth.png create mode 100644 pix/f/oth.svg delete mode 100644 pix/f/parent-32.png delete mode 100644 pix/f/parent.gif delete mode 100644 pix/f/pdf-128.png delete mode 100644 pix/f/pdf-24.png delete mode 100644 pix/f/pdf-256.png delete mode 100644 pix/f/pdf-32.png delete mode 100644 pix/f/pdf-48.png delete mode 100644 pix/f/pdf-64.png delete mode 100644 pix/f/pdf-72.png delete mode 100644 pix/f/pdf-80.png delete mode 100644 pix/f/pdf-96.png delete mode 100644 pix/f/pdf.png create mode 100644 pix/f/pdf.svg delete mode 100644 pix/f/png-128.png delete mode 100644 pix/f/png-24.png delete mode 100644 pix/f/png-256.png delete mode 100644 pix/f/png-32.png delete mode 100644 pix/f/png-48.png delete mode 100644 pix/f/png-64.png delete mode 100644 pix/f/png-72.png delete mode 100644 pix/f/png-80.png delete mode 100644 pix/f/png-96.png delete mode 100644 pix/f/png.png create mode 100644 pix/f/png.svg delete mode 100644 pix/f/powerpoint-128.png delete mode 100644 pix/f/powerpoint-24.png delete mode 100644 pix/f/powerpoint-256.png delete mode 100644 pix/f/powerpoint-32.png delete mode 100644 pix/f/powerpoint-48.png delete mode 100644 pix/f/powerpoint-64.png delete mode 100644 pix/f/powerpoint-72.png delete mode 100644 pix/f/powerpoint-80.png delete mode 100644 pix/f/powerpoint-96.png delete mode 100644 pix/f/powerpoint.png create mode 100644 pix/f/powerpoint.svg delete mode 100644 pix/f/psd-128.png delete mode 100644 pix/f/psd-24.png delete mode 100644 pix/f/psd-256.png delete mode 100644 pix/f/psd-32.png delete mode 100644 pix/f/psd-48.png delete mode 100644 pix/f/psd-64.png delete mode 100644 pix/f/psd-72.png delete mode 100644 pix/f/psd-80.png delete mode 100644 pix/f/psd-96.png delete mode 100644 pix/f/psd.png create mode 100644 pix/f/psd.svg delete mode 100644 pix/f/publisher-128.png delete mode 100644 pix/f/publisher-24.png delete mode 100644 pix/f/publisher-256.png delete mode 100644 pix/f/publisher-32.png delete mode 100644 pix/f/publisher-48.png delete mode 100644 pix/f/publisher-64.png delete mode 100644 pix/f/publisher-72.png delete mode 100644 pix/f/publisher-80.png delete mode 100644 pix/f/publisher-96.png delete mode 100644 pix/f/publisher.png create mode 100644 pix/f/publisher.svg delete mode 100644 pix/f/quicktime-128.png delete mode 100644 pix/f/quicktime-24.png delete mode 100644 pix/f/quicktime-256.png delete mode 100644 pix/f/quicktime-32.png delete mode 100644 pix/f/quicktime-48.png delete mode 100644 pix/f/quicktime-64.png delete mode 100644 pix/f/quicktime-72.png delete mode 100644 pix/f/quicktime-80.png delete mode 100644 pix/f/quicktime-96.png delete mode 100644 pix/f/quicktime.png create mode 100644 pix/f/quicktime.svg delete mode 100644 pix/f/sourcecode-128.png delete mode 100644 pix/f/sourcecode-24.png delete mode 100644 pix/f/sourcecode-256.png delete mode 100644 pix/f/sourcecode-32.png delete mode 100644 pix/f/sourcecode-48.png delete mode 100644 pix/f/sourcecode-64.png delete mode 100644 pix/f/sourcecode-72.png delete mode 100644 pix/f/sourcecode-80.png delete mode 100644 pix/f/sourcecode-96.png delete mode 100644 pix/f/sourcecode.png create mode 100644 pix/f/sourcecode.svg delete mode 100644 pix/f/spreadsheet-128.png delete mode 100644 pix/f/spreadsheet-24.png delete mode 100644 pix/f/spreadsheet-256.png delete mode 100644 pix/f/spreadsheet-32.png delete mode 100644 pix/f/spreadsheet-48.png delete mode 100644 pix/f/spreadsheet-64.png delete mode 100644 pix/f/spreadsheet-72.png delete mode 100644 pix/f/spreadsheet-80.png delete mode 100644 pix/f/spreadsheet-96.png delete mode 100644 pix/f/spreadsheet.png create mode 100644 pix/f/spreadsheet.svg delete mode 100644 pix/f/text-128.png delete mode 100644 pix/f/text-24.png delete mode 100644 pix/f/text-256.png delete mode 100644 pix/f/text-32.png delete mode 100644 pix/f/text-48.png delete mode 100644 pix/f/text-64.png delete mode 100644 pix/f/text-72.png delete mode 100644 pix/f/text-80.png delete mode 100644 pix/f/text-96.png delete mode 100644 pix/f/text.png create mode 100644 pix/f/text.svg delete mode 100644 pix/f/tiff-128.png delete mode 100644 pix/f/tiff-24.png delete mode 100644 pix/f/tiff-256.png delete mode 100644 pix/f/tiff-32.png delete mode 100644 pix/f/tiff-48.png delete mode 100644 pix/f/tiff-64.png delete mode 100644 pix/f/tiff-72.png delete mode 100644 pix/f/tiff-80.png delete mode 100644 pix/f/tiff-96.png delete mode 100644 pix/f/tiff.png create mode 100644 pix/f/tiff.svg delete mode 100644 pix/f/unknown-128.png delete mode 100644 pix/f/unknown-24.png delete mode 100644 pix/f/unknown-256.png delete mode 100644 pix/f/unknown-32.png delete mode 100644 pix/f/unknown-48.png delete mode 100644 pix/f/unknown-64.png delete mode 100644 pix/f/unknown-72.png delete mode 100644 pix/f/unknown-80.png delete mode 100644 pix/f/unknown-96.png delete mode 100644 pix/f/unknown.png create mode 100644 pix/f/unknown.svg delete mode 100644 pix/f/video-128.png delete mode 100644 pix/f/video-24.png delete mode 100644 pix/f/video-256.png delete mode 100644 pix/f/video-32.png delete mode 100644 pix/f/video-48.png delete mode 100644 pix/f/video-64.png delete mode 100644 pix/f/video-72.png delete mode 100644 pix/f/video-80.png delete mode 100644 pix/f/video-96.png delete mode 100644 pix/f/video.png create mode 100644 pix/f/video.svg delete mode 100644 pix/f/wav-128.png delete mode 100644 pix/f/wav-24.png delete mode 100644 pix/f/wav-256.png delete mode 100644 pix/f/wav-32.png delete mode 100644 pix/f/wav-48.png delete mode 100644 pix/f/wav-64.png delete mode 100644 pix/f/wav-72.png delete mode 100644 pix/f/wav-80.png delete mode 100644 pix/f/wav-96.png delete mode 100644 pix/f/wav.png create mode 100644 pix/f/wav.svg delete mode 100644 pix/f/wmv-128.png delete mode 100644 pix/f/wmv-24.png delete mode 100644 pix/f/wmv-256.png delete mode 100644 pix/f/wmv-32.png delete mode 100644 pix/f/wmv-48.png delete mode 100644 pix/f/wmv-64.png delete mode 100644 pix/f/wmv-72.png delete mode 100644 pix/f/wmv-80.png delete mode 100644 pix/f/wmv-96.png delete mode 100644 pix/f/wmv.png create mode 100644 pix/f/wmv.svg delete mode 100644 pix/f/writer-128.png delete mode 100644 pix/f/writer-24.png delete mode 100644 pix/f/writer-32.png delete mode 100644 pix/f/writer-48.png delete mode 100644 pix/f/writer-64.png delete mode 100644 pix/f/writer-72.png delete mode 100644 pix/f/writer-80.png delete mode 100644 pix/f/writer-96.png delete mode 100644 pix/f/writer.png create mode 100644 pix/f/writer.svg delete mode 100644 user/pixgroup.php diff --git a/admin/blocks.php b/admin/blocks.php index f3faf4d144505..7b168ffde3a37 100644 --- a/admin/blocks.php +++ b/admin/blocks.php @@ -168,10 +168,10 @@ $visible = ''; } else if ($blocks[$blockid]->visible) { $visible = ''. - ''.$strhide.''; + $OUTPUT->pix_icon('t/hide', $strhide) . ''; } else { $visible = ''. - ''.$strshow.''; + $OUTPUT->pix_icon('t/show', $strshow) . ''; $class = 'dimmed_text'; } @@ -186,10 +186,10 @@ $undeletable = ''; } else if (in_array($blockname, $undeletableblocktypes)) { $undeletable = ''. - ''.$strunprotect.''; + $OUTPUT->pix_icon('t/unlock', $strunprotect) . ''; } else { $undeletable = ''. - ''.$strprotect.''; + $OUTPUT->pix_icon('t/lock', $strprotect) . ''; } $row = array( diff --git a/admin/filters.php b/admin/filters.php index b1127678d18de..9ae73f31c3727 100644 --- a/admin/filters.php +++ b/admin/filters.php @@ -218,7 +218,7 @@ function get_table_row(\core\plugininfo\filter $plugininfo, $state, $isfirstrow, // Re-order. $updown = ''; - $spacer = ''; + $spacer = $OUTPUT->spacer(); if ($state->active != TEXTFILTER_DISABLED) { if (!$isfirstrow) { $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'), new pix_icon('t/up', get_string('up'), '', array('class' => 'iconsmall'))); diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php index 6b1cebcdea5a9..88abd77dcfcba 100644 --- a/admin/mnet/access_control.php +++ b/admin/mnet/access_control.php @@ -150,7 +150,7 @@ } else { $columndir = $dir == "ASC" ? "DESC" : "ASC"; $columnicon = $dir == "ASC" ? "down" : "up"; - $columnicon = " pix_url('t/' . $columnicon) . "\" alt=\"\" />"; + $columnicon = " " . $OUTPUT->pix_icon('t/' . $columnicon, get_string('sort')); } $headings[$column] = "".$string[$column]."$columnicon"; } diff --git a/admin/modules.php b/admin/modules.php index 4cca56908202d..fb112e7afc3ac 100644 --- a/admin/modules.php +++ b/admin/modules.php @@ -94,7 +94,7 @@ $missing = true; } else { // took out hspace="\10\", because it does not validate. don't know what to replace with. - $icon = "pix_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />"; + $icon = "image_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />"; $strmodulename = $icon.' '.get_string('modulename', $module->name); $missing = false; } @@ -130,11 +130,11 @@ $class = ''; } else if ($module->visible) { $visible = "name&sesskey=".sesskey()."\" title=\"$strhide\">". - "pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strhide\" />"; + $OUTPUT->pix_icon('t/hide', $strhide) . ''; $class = ''; } else { $visible = "name&sesskey=".sesskey()."\" title=\"$strshow\">". - "pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strshow\" />"; + $OUTPUT->pix_icon('t/show', $strshow) . ''; $class = 'dimmed_text'; } if ($module->name == "forum") { diff --git a/admin/renderer.php b/admin/renderer.php index 32d28fd57e14c..613c8e1c7cc5e 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -1615,7 +1615,7 @@ public function plugins_control_panel(core_plugin_manager $pluginman, array $opt if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name)) { $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'icon pluginicon')); } else { - $icon = $this->output->pix_icon('spacer', '', 'moodle', array('class' => 'icon pluginicon noicon')); + $icon = $this->output->spacer('spacer'); } $status = $plugin->get_status(); $row->attributes['class'] .= ' status-'.$status; diff --git a/admin/repository.php b/admin/repository.php index bf10f510c4ec8..6984da60f274e 100644 --- a/admin/repository.php +++ b/admin/repository.php @@ -370,14 +370,14 @@ function repository_action_url($repository) { if ($updowncount > 1) { $updown .= ""; - $updown .= "pix_url('t/up') . "\" alt=\"up\" /> "; + $updown .= $OUTPUT->pix_icon('t/up', get_string('moveup')) . " "; } else { $updown .= $spacer; } if ($updowncount < $totalrepositorytypes) { $updown .= ""; - $updown .= "pix_url('t/down') . "\" alt=\"down\" />"; + $updown .= $OUTPUT->pix_icon('t/down', get_string('movedown')) . " "; } else { $updown .= $spacer; diff --git a/admin/roles/classes/capability_table_with_risks.php b/admin/roles/classes/capability_table_with_risks.php index 96addb533d973..b62ad19c4091d 100644 --- a/admin/roles/classes/capability_table_with_risks.php +++ b/admin/roles/classes/capability_table_with_risks.php @@ -183,8 +183,7 @@ protected function add_row_cells($capability) { public function get_risk_icon($type) { global $OUTPUT; - $iconurl = $OUTPUT->pix_url('i/' . str_replace('risk', 'risk_', $type)); - $text = '' . get_string($type . 'short', 'admin') . ''; + $text = $OUTPUT->pix_icon('i/' . str_replace('risk', 'risk_', $type), get_string($type . 'short', 'admin')); $action = new popup_action('click', $this->risksurl, 'docspopup'); $riskicon = $OUTPUT->action_link($this->risksurl, $text, $action, array('title'=>get_string($type, 'admin'))); diff --git a/admin/roles/classes/permissions_table.php b/admin/roles/classes/permissions_table.php index 76260c7402012..80e4b2067cea7 100644 --- a/admin/roles/classes/permissions_table.php +++ b/admin/roles/classes/permissions_table.php @@ -93,9 +93,10 @@ protected function add_row_cells($capability) { foreach ($roles as $id => $name) { if (isset($needed[$id])) { $templatecontext = array("rolename" => $name, "roleid" => $id, "action" => "prevent", "spanclass" => "allowed", - "linkclass" => "preventlink", "adminurl" => $adminurl->out(), "imageurl" => ""); + "linkclass" => "preventlink", "adminurl" => $adminurl->out(), "icon" => "", "iconalt" => ""); if (isset($overridableroles[$id]) and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) { - $templatecontext['imageurl'] = $renderer->pix_url('t/delete'); + $templatecontext['icon'] = 't/delete'; + $templatecontext['iconalt'] = get_string('delete'); } $neededroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext); } @@ -105,9 +106,10 @@ protected function add_row_cells($capability) { if (isset($forbidden[$id]) and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) { $templatecontext = array("rolename" => $name, "roleid" => $id, "action" => "unprohibit", "spanclass" => "forbidden", "linkclass" => "unprohibitlink", "adminurl" => $adminurl->out(), - "imageurl" => ""); + "icon" => "", "iconalt" => ""); if (isset($overridableroles[$id]) and prohibit_is_removable($id, $context, $capability->name)) { - $templatecontext['imageurl'] = $renderer->pix_url('t/delete'); + $templatecontext['icon'] = 't/delete'; + $templatecontext['iconalt'] = get_string('delete'); } $forbiddenroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext); } diff --git a/admin/roles/manage.php b/admin/roles/manage.php index d5a95320c3c65..fb390eae1c4d1 100644 --- a/admin/roles/manage.php +++ b/admin/roles/manage.php @@ -216,9 +216,9 @@ function get_action_icon($url, $icon, $alt, $tooltip) { global $OUTPUT; return '' . - '' . $alt . ' '; + $OUTPUT->pix_icon('t/' . $icon, $alt) . ' '; } function get_spacer() { global $OUTPUT; - return ' '; + return $OUTPUT->spacer(); } diff --git a/admin/roles/usersroles.php b/admin/roles/usersroles.php index 4a301b1a582d0..5e871e6198b3b 100644 --- a/admin/roles/usersroles.php +++ b/admin/roles/usersroles.php @@ -193,10 +193,8 @@ function print_report_tree($contextid, $contexts, $systemcontext, $fullname, $al $strgoto = get_string('gotoassignroles', 'core_role', $a); $strcheck = get_string('checkuserspermissionshere', 'core_role', $a); } - echo ' ' . $stredit . ' '; - echo ' ' . $strcheckpermissions . ' '; + echo ' ' . $OUTPUT->pix_icon('t/edit', 'core', $stredit) . ' '; + echo ' ' . $OUTPUT->pix_icon('t/preview', 'core', $strcheckpermissions) . ' '; echo "

\n"; } } diff --git a/admin/tool/availabilityconditions/index.php b/admin/tool/availabilityconditions/index.php index 485fc23f6efd1..f76754ea95d4d 100644 --- a/admin/tool/availabilityconditions/index.php +++ b/admin/tool/availabilityconditions/index.php @@ -103,18 +103,9 @@ // Make enable control. This is a POST request (using a form control rather // than just a link) because it makes a database change. - $enablecontrol = html_writer::tag('form', html_writer::div( - html_writer::empty_tag('input', array('type' => 'hidden', - 'name' => 'sesskey', 'value' => sesskey())) . - html_writer::empty_tag('input', array('type' => 'hidden', - 'name' => 'plugin', 'value' => $plugin)) . - html_writer::empty_tag('input', array('type' => 'hidden', - 'name' => 'action', 'value' => $enabledaction)) . - html_writer::empty_tag('input', array('type' => 'image', - 'src' => $OUTPUT->pix_url('t/' . $enabledaction), 'alt' => $enabledstr, - 'title' => $enabledstr)) - ), array( - 'method' => 'post', 'action' => './')); + $params = array('sesskey' => sesskey(), 'plugin' => $plugin, 'action' => $enabledaction); + $url = new moodle_url('/' . $CFG->admin . '/tool/availabilityconditions/', $params); + $enablecontrol = html_writer::link($url, $OUTPUT->pix_icon('t/' . $enabledaction, $enabledstr)); $table->add_data(array($namespan, $version, $enablecontrol)); } diff --git a/admin/tool/log/classes/setting_managestores.php b/admin/tool/log/classes/setting_managestores.php index 4161a5770cd39..bc38e6379cc89 100644 --- a/admin/tool/log/classes/setting_managestores.php +++ b/admin/tool/log/classes/setting_managestores.php @@ -169,14 +169,14 @@ public function output_html($data, $query = '') { if (isset($enabled[$store])) { $aurl = new moodle_url($url, array('action' => 'disable', 'store' => $store)); $hideshow = ""; - $hideshow .= "pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strdisable\" />"; + $hideshow .= $OUTPUT->pix_icon('t/hide', $strdisable) . ''; $isenabled = true; $displayname = "$name"; } else { if (isset($available[$store])) { $aurl = new moodle_url($url, array('action' => 'enable', 'store' => $store)); $hideshow = ""; - $hideshow .= "pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strenable\" />"; + $hideshow .= $OUTPUT->pix_icon('t/show', $strenable) . ''; $isenabled = false; $displayname = "$name"; } else { @@ -188,7 +188,7 @@ public function output_html($data, $query = '') { if ($PAGE->theme->resolve_image_location('icon', $store, false)) { $icon = $OUTPUT->pix_icon('icon', '', $store, array('class' => 'icon pluginicon')); } else { - $icon = $OUTPUT->pix_icon('spacer', '', 'moodle', array('class' => 'icon pluginicon noicon')); + $icon = $OUTPUT->spacer(); } // Up/down link (only if store is enabled). @@ -197,16 +197,16 @@ public function output_html($data, $query = '') { if ($updowncount > 1) { $aurl = new moodle_url($url, array('action' => 'up', 'store' => $store)); $updown .= ""; - $updown .= "pix_url('t/up') . "\" alt=\"$strup\" class=\"iconsmall\" /> "; + $updown .= $OUTPUT->pix_icon('t/up', $strup) . ' '; } else { - $updown .= "pix_url('spacer') . "\" class=\"iconsmall\" alt=\"\" /> "; + $updown .= $OUTPUT->spacer(); } if ($updowncount < $storecount) { $aurl = new moodle_url($url, array('action' => 'down', 'store' => $store)); $updown .= ""; - $updown .= "pix_url('t/down') . "\" alt=\"$strdown\" class=\"iconsmall\" />"; + $updown .= $OUTPUT->pix_icon('t/down', $strdown) . ' '; } else { - $updown .= "pix_url('spacer') . "\" class=\"iconsmall\" alt=\"\" />"; + $updown .= $OUTPUT->spacer(); } ++$updowncount; } diff --git a/admin/tool/lp/templates/comment_area.mustache b/admin/tool/lp/templates/comment_area.mustache index 19f8fdb3a650d..dbe63e528e355 100644 --- a/admin/tool/lp/templates/comment_area.mustache +++ b/admin/tool/lp/templates/comment_area.mustache @@ -55,7 +55,7 @@
{{^notoggle}} - {{linktext}}{{linktext}} + {{#pix}}{{collapsediconkey}}, {{linktext}}{{/pix}}{{linktext}} {{#displaytotalcount}} ({{count}}) {{/displaytotalcount}} diff --git a/admin/tool/lp/templates/user_evidence_list_page.mustache b/admin/tool/lp/templates/user_evidence_list_page.mustache index 16ae1b7721189..61af55ac6489e 100644 --- a/admin/tool/lp/templates/user_evidence_list_page.mustache +++ b/admin/tool/lp/templates/user_evidence_list_page.mustache @@ -64,7 +64,7 @@
  • {{#pix}}url, tool_lp{{/pix}} {{urlshort}}
    • {{/url}} {{#files}} -
  • {{filenameshort}}
    • +
  • {{#pix}}{{icon}}{{/pix}} {{filenameshort}}
    • {{/files}} {{/hasurlorfiles}} diff --git a/admin/tool/lp/templates/user_evidence_page.mustache b/admin/tool/lp/templates/user_evidence_page.mustache index fca3723333249..4843cad18bb58 100644 --- a/admin/tool/lp/templates/user_evidence_page.mustache +++ b/admin/tool/lp/templates/user_evidence_page.mustache @@ -57,7 +57,7 @@
  • {{#pix}}url, tool_lp{{/pix}} {{urlshort}}
    • {{/url}} {{#files}} -
  • {{filename}}
    • +
  • {{#pix}}{{icon}}{{/pix}} {{filename}}
    • {{/files}}
    diff --git a/admin/tool/recyclebin/index.php b/admin/tool/recyclebin/index.php index 42a3f5a18c806..ce2cc0a8a89e0 100644 --- a/admin/tool/recyclebin/index.php +++ b/admin/tool/recyclebin/index.php @@ -187,7 +187,7 @@ if (isset($modules[$item->module])) { $mod = $modules[$item->module]; $modname = get_string('modulename', $mod->name); - $name = '' . $modname . ' ' . $name; + $name = $OUTPUT->activity_icon('icon', $modname, $mod->name) . $name; } } diff --git a/admin/tool/unsuproles/index.php b/admin/tool/unsuproles/index.php index 8248e27a8af84..93e3bbd7792cb 100644 --- a/admin/tool/unsuproles/index.php +++ b/admin/tool/unsuproles/index.php @@ -102,9 +102,9 @@ $count = $problem->racount; $edit = array(); $aurl = new moodle_url('/admin/roles/define.php', array('roleid'=>$problem->roleid, 'action'=>'edit')); - $edit[] = html_writer::link($aurl, html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/edit'), 'alt'=>get_string('edit'), 'class'=>'smallicon'))); + $edit[] = html_writer::link($aurl, $OUTPUT->pix_icon('t/edit', 'core', get_string('edit'))); $aurl = new moodle_url($PAGE->url, array('roleid'=>$problem->roleid, 'contextlevel'=>$problem->contextlevel, 'action'=>'delete')); - $edit[] = html_writer::link($aurl, html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/delete'), 'alt'=>get_string('delete'), 'class'=>'smallicon'))); + $edit[] = html_writer::link($aurl, $OUTPUT->pix_icon('t/delete', 'core', get_string('delete'))); $data[] = array($levelname, $rolename, $count, implode(' ', $edit)); } $table = new html_table(); @@ -116,4 +116,4 @@ echo html_writer::table($table); } -echo $OUTPUT->footer(); \ No newline at end of file +echo $OUTPUT->footer(); diff --git a/admin/tool/usertours/classes/manager.php b/admin/tool/usertours/classes/manager.php index 2a9c8ce39bcd3..b481d2bbce616 100644 --- a/admin/tool/usertours/classes/manager.php +++ b/admin/tool/usertours/classes/manager.php @@ -276,9 +276,7 @@ protected function print_tour_list() { $linkproperties = $config->linkproperties; $linkproperties['href'] = $config->link; $action .= \html_writer::start_tag('a', $linkproperties); - $action .= \html_writer::img( - $OUTPUT->pix_url($config->img, 'tool_usertours'), - $config->title); + $action .= $OUTPUT->pix_icon($config->img, $config->title, 'tool_usertours'); $action .= \html_writer::div($config->title); $action .= \html_writer::end_tag('a'); $action .= \html_writer::end_tag('li'); diff --git a/admin/user.php b/admin/user.php index 42665249adc61..b4e14ca4fce50 100644 --- a/admin/user.php +++ b/admin/user.php @@ -187,7 +187,7 @@ } else { $columnicon = ($dir == "ASC") ? "sort_asc" : "sort_desc"; } - $columnicon = "pix_url('t/' . $columnicon) . "\" alt=\"\" />"; + $columnicon = $OUTPUT->pix_icon('t/' . $columnicon, '', 'core', ['class' => 'iconsort']); } $$column = "".$string[$column]."$columnicon"; @@ -298,7 +298,8 @@ if (is_mnet_remote_user($user) or $user->id == $USER->id or is_siteadmin($user)) { // no deleting of self, mnet accounts or admins allowed } else { - $buttons[] = html_writer::link(new moodle_url($returnurl, array('delete'=>$user->id, 'sesskey'=>sesskey())), html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/delete'), 'alt'=>$strdelete, 'class'=>'iconsmall')), array('title'=>$strdelete)); + $url = new moodle_url($returnurl, array('delete'=>$user->id, 'sesskey'=>sesskey())); + $buttons[] = html_writer::link($url, $OUTPUT->pix_icon('t/delete', $strdelete)); } } @@ -315,17 +316,20 @@ } else { if ($user->suspended) { - $buttons[] = html_writer::link(new moodle_url($returnurl, array('unsuspend'=>$user->id, 'sesskey'=>sesskey())), html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/show'), 'alt'=>$strunsuspend, 'class'=>'iconsmall')), array('title'=>$strunsuspend)); + $url = new moodle_url($returnurl, array('unsuspend'=>$user->id, 'sesskey'=>sesskey())); + $buttons[] = html_writer::link($url, $OUTPUT->pix_icon('t/show', $strunsuspend)); } else { if ($user->id == $USER->id or is_siteadmin($user)) { // no suspending of admins or self! } else { - $buttons[] = html_writer::link(new moodle_url($returnurl, array('suspend'=>$user->id, 'sesskey'=>sesskey())), html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/hide'), 'alt'=>$strsuspend, 'class'=>'iconsmall')), array('title'=>$strsuspend)); + $url = new moodle_url($returnurl, array('suspend'=>$user->id, 'sesskey'=>sesskey())); + $buttons[] = html_writer::link($url, $OUTPUT->pix_icon('t/hide', $strsuspend)); } } if (login_is_lockedout($user)) { - $buttons[] = html_writer::link(new moodle_url($returnurl, array('unlock'=>$user->id, 'sesskey'=>sesskey())), html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/unlock'), 'alt'=>$strunlock, 'class'=>'iconsmall')), array('title'=>$strunlock)); + $url = new moodle_url($returnurl, array('unlock'=>$user->id, 'sesskey'=>sesskey())); + $buttons[] = html_writer::link($url, $OUTPUT->pix_icon('t/unlock', $strunlock)); } } } @@ -334,7 +338,8 @@ if (has_capability('moodle/user:update', $sitecontext)) { // prevent editing of admins by non-admins if (is_siteadmin($USER) or !is_siteadmin($user)) { - $buttons[] = html_writer::link(new moodle_url($securewwwroot.'/user/editadvanced.php', array('id'=>$user->id, 'course'=>$site->id)), html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/edit'), 'alt'=>$stredit, 'class'=>'iconsmall')), array('title'=>$stredit)); + $url = new moodle_url($securewwwroot.'/user/editadvanced.php', array('id'=>$user->id, 'course'=>$site->id)); + $buttons[] = html_writer::link($url, $OUTPUT->pix_icon('t/edit', $stredit)); } } diff --git a/admin/user/user_bulk_cohortadd.php b/admin/user/user_bulk_cohortadd.php index 7e2d4c5336576..c2bbd7aea9b13 100644 --- a/admin/user/user_bulk_cohortadd.php +++ b/admin/user/user_bulk_cohortadd.php @@ -113,7 +113,13 @@ function sort_compare($a, $b) { $columndir = 'asc'; } else { $columndir = ($dir == 'asc') ? 'desc' : 'asc'; - $columnicon = ' '; + $icon = 't/down'; + $iconstr = 'movedown'; + if ($dir != 'asc') { + $icon = 't/up'; + $iconstr = 'moveup'; + } + $columnicon = ' ' . $OUTPUT->pix_icon($icon, get_string($iconstr)); } $table->head[] = ''.$strtitle.''.$columnicon; $table->align[] = 'left'; diff --git a/admin/user/user_bulk_display.php b/admin/user/user_bulk_display.php index 44259dfd07964..3ca89227db2f1 100644 --- a/admin/user/user_bulk_display.php +++ b/admin/user/user_bulk_display.php @@ -57,7 +57,13 @@ function sort_compare($a, $b) { $columndir = 'asc'; } else { $columndir = $dir == 'asc' ? 'desc' : 'asc'; - $columnicon = ' '; + $icon = 't/down'; + $iconstr = 'movedown'; + if ($dir != 'asc') { + $icon = 't/up'; + $iconstr = 'moveup'; + } + $columnicon = ' ' . $OUTPUT->pix_icon($icon, get_string($iconstr)); } $table->head[] = ''.$strtitle.''.$columnicon; $table->align[] = 'left'; diff --git a/blocks/activity_modules/block_activity_modules.php b/blocks/activity_modules/block_activity_modules.php index 37736a5eda94b..3b8268c4285ae 100644 --- a/blocks/activity_modules/block_activity_modules.php +++ b/blocks/activity_modules/block_activity_modules.php @@ -78,7 +78,7 @@ function get_content() { $icon = $OUTPUT->pix_icon('icon', '', 'mod_page', array('class' => 'icon')); $this->content->items[] = ''.$icon.$modfullname.''; } else { - $icon = ''; + $icon = $OUTPUT->activity_icon('icon', get_string('pluginname', $modname), $modname); $this->content->items[] = ''.$icon.$modfullname.''; } } diff --git a/blocks/community/block_community.php b/blocks/community/block_community.php index ecfa3b9a0d7e9..fc345caa52115 100644 --- a/blocks/community/block_community.php +++ b/blocks/community/block_community.php @@ -66,8 +66,7 @@ function get_content() { return $this->content; } - $icon = html_writer::empty_tag('img', array('src' => $OUTPUT->pix_url('i/group'), - 'class' => 'icon', 'alt' => "")); + $icon = $OUTPUT->pix_icon('i/group', get_string('group')); $addcourseurl = new moodle_url('/blocks/community/communitycourse.php', array('add' => true, 'courseid' => $this->page->course->id)); $searchlink = html_writer::tag('a', $icon . get_string('addcourse', 'block_community'), @@ -84,9 +83,7 @@ function get_content() { $this->content->icons[] = ''; foreach ($courses as $course) { //delete link - $deleteicon = html_writer::empty_tag('img', - array('src' => $OUTPUT->pix_url('t/delete'), - 'alt' => get_string('removecommunitycourse', 'block_community'))); + $deleteicon = $OUTPUT->pix_icon('t/delete', get_string('removecommunitycourse', 'block_community')); $deleteurl = new moodle_url('/blocks/community/communitycourse.php', array('remove' => true, 'courseid' => $this->page->course->id, diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php index df725de084878..36003f7f3af4e 100644 --- a/blocks/course_list/block_course_list.php +++ b/blocks/course_list/block_course_list.php @@ -46,7 +46,7 @@ function get_content() { $this->content->icons = array(); $this->content->footer = ''; - $icon = ''; + $icon = $OUTPUT->pix_icon('i/course', get_string('course')); $adminseesall = true; if (isset($CFG->block_course_list_adminview)) { @@ -139,7 +139,7 @@ function get_remote_courses() { return; } - $icon = ''; + $icon = $OUTPUT->pix_icon('i/mnethost', get_string('host', 'mnet')); // shortcut - the rest is only for logged in users! if (!isloggedin() || isguestuser()) { diff --git a/blocks/course_overview/renderer.php b/blocks/course_overview/renderer.php index 206f575fc9532..14f5e17bf00cb 100644 --- a/blocks/course_overview/renderer.php +++ b/blocks/course_overview/renderer.php @@ -75,10 +75,7 @@ public function course_overview($courses, $overviews) { $moveurl = new moodle_url('/blocks/course_overview/move.php', array('sesskey' => sesskey(), 'moveto' => 0, 'courseid' => $movingcourseid)); // Create move icon, so it can be used. - $movetofirsticon = html_writer::empty_tag('img', - array('src' => $this->output->pix_url('movehere'), - 'alt' => get_string('movetofirst', 'block_course_overview', $courses[$movingcourseid]->fullname), - 'title' => get_string('movehere'))); + $movetofirsticon = $this->output->pix_icon('movehere', get_string('movetofirst', 'block_course_overview', $courses[$movingcourseid]->fullname)); $moveurl = html_writer::link($moveurl, $movetofirsticon); $html .= html_writer::tag('div', $moveurl, array('class' => 'movehere')); } @@ -92,10 +89,7 @@ public function course_overview($courses, $overviews) { $html .= html_writer::start_tag('div', array('class' => 'course_title')); // If user is editing, then add move icons. if ($userediting && !$ismovingcourse) { - $moveicon = html_writer::empty_tag('img', - array('src' => $this->pix_url('t/move')->out(false), - 'alt' => get_string('movecourse', 'block_course_overview', $course->fullname), - 'title' => get_string('move'))); + $moveicon = $this->output->pix_icon('t/move', get_string('movecourse', 'block_course_overview', $course->fullname)); $moveurl = new moodle_url($this->page->url, array('sesskey' => sesskey(), 'movecourse' => 1, 'courseid' => $course->id)); $moveurl = html_writer::link($moveurl, $moveicon); $html .= html_writer::tag('div', $moveurl, array('class' => 'move')); @@ -159,10 +153,7 @@ public function course_overview($courses, $overviews) { $a = new stdClass(); $a->movingcoursename = $courses[$movingcourseid]->fullname; $a->currentcoursename = $course->fullname; - $movehereicon = html_writer::empty_tag('img', - array('src' => $this->output->pix_url('movehere'), - 'alt' => get_string('moveafterhere', 'block_course_overview', $a), - 'title' => get_string('movehere'))); + $movehereicon = $this->output->pix_icon('movehere', get_string('moveafterhere', 'block_course_overview', $a)); $moveurl = html_writer::link($moveurl, $movehereicon); $html .= html_writer::tag('div', $moveurl, array('class' => 'movehere')); } diff --git a/blocks/feedback/block_feedback.php b/blocks/feedback/block_feedback.php index add5034ef2433..52cc19a8fd604 100644 --- a/blocks/feedback/block_feedback.php +++ b/blocks/feedback/block_feedback.php @@ -53,8 +53,7 @@ function get_content() { $courseid = SITEID; } - $icon = ''; - + $icon = $OUTPUT->activity_icon('icon', get_string('pluginname', 'mod_feedback'), 'mod_feedback'); if (empty($this->instance->pageid)) { $this->instance->pageid = SITEID; diff --git a/blocks/messages/block_messages.php b/blocks/messages/block_messages.php index f0ed9b2d1f4eb..79d74b87648d3 100644 --- a/blocks/messages/block_messages.php +++ b/blocks/messages/block_messages.php @@ -74,7 +74,7 @@ function get_content() { $this->content->text .= fullname($user).''; $link = '/message/index.php?usergroup=unread&id='.$user->id; - $anchortagcontents = ' '.$user->count; + $anchortagcontents = $OUTPUT->pix_icon('t/message', fullname($user)) . ' ' . $user->count; $action = null; // popup is gone now $anchortag = $OUTPUT->action_link($link, $anchortagcontents, $action); diff --git a/blocks/mnet_hosts/block_mnet_hosts.php b/blocks/mnet_hosts/block_mnet_hosts.php index 4932b919bd642..4d0431b8087dc 100644 --- a/blocks/mnet_hosts/block_mnet_hosts.php +++ b/blocks/mnet_hosts/block_mnet_hosts.php @@ -139,8 +139,7 @@ function get_content() { if ($hosts) { foreach ($hosts as $host) { - $icon = ''.get_string('server', 'block_mnet_hosts').' '; + $icon = $OUTPUT->pix_icon('i/'.$host->application.'_host', get_string('server', 'block_mnet_hosts')) . ' '; if ($host->id == $USER->mnethostid) { $this->content->items[]="name). diff --git a/blocks/online_users/block_online_users.php b/blocks/online_users/block_online_users.php index 9b2e19e374903..1a41395f1edf5 100644 --- a/blocks/online_users/block_online_users.php +++ b/blocks/online_users/block_online_users.php @@ -123,7 +123,7 @@ function get_content() { $this->content->text .= $OUTPUT->user_picture($user, array('size'=>16, 'alttext'=>false, 'link'=>false)) .$user->fullname.''; } if ($canshowicon and ($USER->id != $user->id) and !isguestuser($user)) { // Only when logged in and messaging active etc - $anchortagcontents = ''. get_string('messageselectadd') .''; + $anchortagcontents = $OUTPUT->pix_icon('t/message', get_string('messageselectadd')); $anchorurl = new moodle_url('/message/index.php', array('id' => $user->id)); $anchortag = html_writer::link($anchorurl, $anchortagcontents, array('title' => get_string('messageselectadd'))); diff --git a/blocks/participants/block_participants.php b/blocks/participants/block_participants.php index 3cc6a8b9db51d..f8214df459210 100644 --- a/blocks/participants/block_participants.php +++ b/blocks/participants/block_participants.php @@ -59,7 +59,7 @@ function get_content() { } } - $icon = ''; + $icon = $OUTPUT->pix_icon('i/users', ''); $this->content->items[] = ''.$icon.get_string('participants').''; diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php index 60b20a3f0bf70..c5a692fa468dc 100644 --- a/blocks/site_main_menu/block_site_main_menu.php +++ b/blocks/site_main_menu/block_site_main_menu.php @@ -96,7 +96,7 @@ function get_content() { } if ($ismoving) { - $this->content->icons[] = ''; + $this->content->icons[] = $OUTPUT->pix_icon('t/move', get_string('move')); $this->content->items[] = $USER->activitycopyname.' ('.$strcancel.')'; } @@ -129,7 +129,7 @@ function get_content() { continue; } $this->content->items[] = ''. - ''.$strmovehere.''; + ''.$strmovehere.''; $this->content->icons[] = ''; } if ($mod->indent > 0) { @@ -149,7 +149,7 @@ function get_content() { if ($ismoving) { $this->content->items[] = ''. - ''.$strmovehere.''; + ''.$strmovehere.''; $this->content->icons[] = ''; } diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php index 63e9cbbc374f1..2e5ec902fd973 100644 --- a/blocks/social_activities/block_social_activities.php +++ b/blocks/social_activities/block_social_activities.php @@ -91,7 +91,7 @@ function get_content() { } if ($ismoving) { - $this->content->icons[] = ' '; + $this->content->icons[] = ' ' . $OUTPUT->pix_icon('t/move', get_string('move')); $this->content->items[] = $USER->activitycopyname.' ('.$strcancel.')'; } @@ -124,7 +124,7 @@ function get_content() { continue; } $this->content->items[] = ''. - ''.$strmovehere.''; + ''.$strmovehere.''; $this->content->icons[] = ''; } if (!$mod->url) { @@ -141,7 +141,7 @@ function get_content() { if ($ismoving) { $this->content->items[] = ''. - ''.$strmovehere.''; + ''.$strmovehere.''; $this->content->icons[] = ''; } diff --git a/calendar/lib.php b/calendar/lib.php index 018ffd79ef7f6..583419da92289 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -394,7 +394,11 @@ function calendar_get_mini($courses, $groups, $users, $calmonth = false, $calyea $dayhref->set_anchor('event_'.$event->id); $popupcontent .= html_writer::start_tag('div'); - $popupcontent .= $OUTPUT->pix_icon($popupicon, $popupalt, $component); + if ($component == 'moodle') { + $popupcontent .= $OUTPUT->pix_icon($popupicon, $popupalt, $component); + } else { + $popupcontent .= $OUTPUT->activity_icon($popupicon, $popupalt, $component); + } // Show ical source if needed. if (!empty($event->subscription) && $CFG->calendar_showicalsource) { $a = new stdClass(); @@ -689,18 +693,17 @@ function calendar_add_event_metadata($event) { } else { $eventtype = ''; } - $icon = $OUTPUT->pix_url('icon', $event->modulename) . ''; + $event->icon = $OUTPUT->activity_icon('icon', $event->modulename, $eventtype); - $event->icon = ''.$eventtype.''; $event->referer = ''.$event->name.''; $event->courselink = calendar_get_courselink($module->course); $event->cmid = $module->id; } else if($event->courseid == SITEID) { // Site event - $event->icon = ''.get_string('globalevent', 'calendar').''; + $event->icon = $OUTPUT->pix_icon('i/siteevent', get_string('globalevent', 'calendar')); $event->cssclass = 'calendar_event_global'; } else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { // Course event - $event->icon = ''.get_string('courseevent', 'calendar').''; + $event->icon = $OUTPUT->pix_icon('i/courseevent', get_string('courseevent', 'calendar')); $event->courselink = calendar_get_courselink($event->courseid); $event->cssclass = 'calendar_event_course'; } else if ($event->groupid) { // Group event @@ -709,12 +712,11 @@ function calendar_add_event_metadata($event) { } else { $groupname = ''; } - $event->icon = html_writer::empty_tag('image', array('src' => $OUTPUT->pix_url('i/groupevent'), - 'alt' => get_string('groupevent', 'calendar'), 'title' => $groupname, 'class' => 'icon')); + $event->icon = $OUTPUT->pix_icon('i/groupevent', get_string('groupevent', 'calendar')); $event->courselink = calendar_get_courselink($event->courseid) . ', ' . $groupname; $event->cssclass = 'calendar_event_group'; } else if($event->userid) { // User event - $event->icon = ''.get_string('userevent', 'calendar').''; + $event->icon = $OUTPUT->pix_icon('i/userevent', get_string('userevent', 'calendar')); $event->cssclass = 'calendar_event_user'; } return $event; @@ -3473,4 +3475,4 @@ function core_calendar_user_preferences() { $preferences['calendar_persistflt'] = array('type' => PARAM_INT, 'null' => NULL_NOT_ALLOWED, 'default' => 0, 'choices' => array(0, 1)); return $preferences; -} \ No newline at end of file +} diff --git a/calendar/renderer.php b/calendar/renderer.php index 40530a167498b..c68ca73608b56 100644 --- a/calendar/renderer.php +++ b/calendar/renderer.php @@ -240,15 +240,13 @@ public function event(calendar_event $event, $showactions=true) { $commands = html_writer::start_tag('div', array('class' => 'commands pull-xs-right')); $commands .= html_writer::start_tag('a', array('href' => $editlink)); - $url = $this->output->pix_url('t/edit'); $str = get_string('tt_editevent', 'calendar'); - $commands .= html_writer::empty_tag('img', array('src' => $url, 'alt' => $str, 'title' => $str, 'class' => 'icon')); + $commands .= $this->output->pix_icon('t/edit', $str); $commands .= html_writer::end_tag('a'); if ($deletelink != null) { $commands .= html_writer::start_tag('a', array('href' => $deletelink)); - $url = $this->output->pix_url('t/delete'); $str = get_string('tt_deleteevent', 'calendar'); - $commands .= html_writer::empty_tag('img', array('src' => $url, 'alt' => $str, 'title' => $str, 'class' => 'icon')); + $commands .= $this->output->pix_icon('t/delete', $str); $commands .= html_writer::end_tag('a'); } $commands .= html_writer::end_tag('div'); diff --git a/cohort/index.php b/cohort/index.php index da05664868c0f..42db1288bd360 100644 --- a/cohort/index.php +++ b/cohort/index.php @@ -159,24 +159,24 @@ if ($cohortmanager) { if ($cohort->visible) { $showhideurl->param('hide', 1); - $visibleimg = html_writer::empty_tag('img', array('src' => $OUTPUT->pix_url('t/hide'), 'alt' => get_string('hide'), 'class' => 'iconsmall')); + $visibleimg = $OUTPUT->pix_icon('t/hide', get_string('hide')); $buttons[] = html_writer::link($showhideurl, $visibleimg, array('title' => get_string('hide'))); } else { $showhideurl->param('show', 1); - $visibleimg = html_writer::empty_tag('img', array('src' => $OUTPUT->pix_url('t/show'), 'alt' => get_string('show'), 'class' => 'iconsmall')); + $visibleimg = $OUTPUT->pix_icon('t/show', get_string('show')); $buttons[] = html_writer::link($showhideurl, $visibleimg, array('title' => get_string('show'))); } $buttons[] = html_writer::link(new moodle_url('/cohort/edit.php', $urlparams + array('delete' => 1)), - html_writer::empty_tag('img', array('src' => $OUTPUT->pix_url('t/delete'), 'alt' => get_string('delete'), 'class' => 'iconsmall')), + $OUTPUT->pix_icon('t/delete', get_string('delete')), array('title' => get_string('delete'))); $buttons[] = html_writer::link(new moodle_url('/cohort/edit.php', $urlparams), - html_writer::empty_tag('img', array('src' => $OUTPUT->pix_url('t/edit'), 'alt' => get_string('edit'), 'class' => 'iconsmall')), + $OUTPUT->pix_icon('t/edit', get_string('edit')), array('title' => get_string('edit'))); $editcolumnisempty = false; } if ($cohortcanassign) { $buttons[] = html_writer::link(new moodle_url('/cohort/assign.php', $urlparams), - html_writer::empty_tag('img', array('src' => $OUTPUT->pix_url('i/users'), 'alt' => get_string('assign', 'core_cohort'), 'class' => 'iconsmall')), + $OUTPUT->pix_icon('i/users', get_string('assign', 'core_cohort')), array('title' => get_string('assign', 'core_cohort'))); $editcolumnisempty = false; } diff --git a/comment/classes/external/comment_area_exporter.php b/comment/classes/external/comment_area_exporter.php index 9a5e106c36210..1b14fcab7c747 100644 --- a/comment/classes/external/comment_area_exporter.php +++ b/comment/classes/external/comment_area_exporter.php @@ -94,8 +94,8 @@ protected static function define_other_properties() { 'count' => array( 'type' => PARAM_INT, ), - 'collapsediconurl' => array( - 'type' => PARAM_URL, + 'collapsediconkey' => array( + 'type' => PARAM_RAW, ), 'displaytotalcount' => array( 'type' => PARAM_BOOL, @@ -126,7 +126,7 @@ public function get_other_values(renderer_base $output) { $values['autostart'] = $this->comment->get_autostart(); $values['canpost'] = $this->comment->can_post(); $values['canview'] = $this->comment->can_view(); - $values['collapsediconurl'] = $output->pix_url(right_to_left() ? 't/collapsed_rtl' : 't/collapsed')->out(false); + $values['collapsediconkey'] = right_to_left() ? 't/collapsed_rtl' : 't/collapsed'; $values['count'] = $this->comment->count(); $values['displaycancel'] = $this->comment->get_displaycancel(); $values['displaytotalcount'] = $this->comment->get_displaytotalcount(); diff --git a/comment/comment.js b/comment/comment.js index d93a357245a8c..eda542f3536e7 100644 --- a/comment/comment.js +++ b/comment/comment.js @@ -200,7 +200,7 @@ M.core_comment = { list[i].content = '
    ' + '' + - '' + deleteStr + '' + + '' + '' + '
    ' + list[i].content; } @@ -380,7 +380,9 @@ M.core_comment = { } else { collapsedimage = 't/collapsed'; } - img.set('src', M.util.image_url(collapsedimage, 'core')); + if (img) { + img.set('src', M.util.image_url(collapsedimage, 'core')); + } if (ta) { ta.set('value',''); } diff --git a/comment/lib.php b/comment/lib.php index 1a770f8b450c5..fef135bf1036c 100644 --- a/comment/lib.php +++ b/comment/lib.php @@ -467,7 +467,7 @@ public function output($return = true) { 'role' => 'button', 'aria-expanded' => 'false') ); - $html .= html_writer::empty_tag('img', array('id' => 'comment-img-'.$this->cid, 'src' => $OUTPUT->pix_url($collapsedimage), 'alt' => $this->linktext, 'title' => $this->linktext)); + $html .= $OUTPUT->pix_icon($collapsedimage, $this->linktext); $html .= html_writer::tag('span', $this->linktext.' '.$countstring, array('id' => 'comment-link-text-'.$this->cid)); $html .= html_writer::end_tag('a'); } diff --git a/course/format/renderer.php b/course/format/renderer.php index c9237eb6df646..b9b06417e1ead 100644 --- a/course/format/renderer.php +++ b/course/format/renderer.php @@ -277,12 +277,7 @@ protected function section_edit_controls($course, $section, $onsectionpage = fal $class = empty($item['pixattr']['class']) ? '' : $item['pixattr']['class']; $alt = empty($item['pixattr']['alt']) ? '' : $item['pixattr']['alt']; $controls[$key] = html_writer::link( - new moodle_url($url), - html_writer::empty_tag('img', array( - 'src' => $this->output->pix_url($icon), - 'class' => "icon " . $class, - 'alt' => $alt - )), + new moodle_url($url), $this->output->pix_icon($icon, $alt), $attr); } diff --git a/course/format/social/format.php b/course/format/social/format.php index f9cb7228c0179..4fcd31398d4b6 100644 --- a/course/format/social/format.php +++ b/course/format/social/format.php @@ -23,8 +23,7 @@ $streditsummary = get_string('editsummary'); $introcontent .= '
    '. - ''.$streditsummary.'
    '; + $OUTPUT->pix_icon('t/edit', $streditsummary) . ''; } echo $OUTPUT->box($introcontent, 'generalbox', 'intro'); } diff --git a/course/renderer.php b/course/renderer.php index 6a6c10047e29e..dd5307073d718 100644 --- a/course/renderer.php +++ b/course/renderer.php @@ -531,11 +531,8 @@ public function course_section_cm_completion($course, &$completioninfo, cm_info 'type' => 'hidden', 'name' => 'modulename', 'value' => $mod->name)); $output .= html_writer::empty_tag('input', array( 'type' => 'hidden', 'name' => 'completionstate', 'value' => $newstate)); - $output .= html_writer::empty_tag('input', array( - 'type' => 'image', - 'src' => $this->output->pix_url('i/completion-'.$completionicon), - 'alt' => $imgalt, 'title' => $imgtitle, - 'aria-live' => 'polite')); + $output .= html_writer::tag('button', + $this->output->pix_icon('i/completion-' . $completionicon, $imgalt)); $output .= html_writer::end_tag('div'); $output .= html_writer::end_tag('form'); } else { @@ -1107,8 +1104,7 @@ protected function coursecat_coursebox(coursecat_helper $chelper, $course, $addi if ($chelper->get_show_courses() < self::COURSECAT_SHOW_COURSES_EXPANDED) { if ($course->has_summary() || $course->has_course_contacts() || $course->has_course_overviewfiles()) { $url = new moodle_url('/course/info.php', array('id' => $course->id)); - $image = html_writer::empty_tag('img', array('src' => $this->output->pix_url('i/info'), - 'alt' => $this->strings->summary)); + $image = $this->output->pix_icon('i/info', $this->strings->summary); $content .= html_writer::link($url, $image, array('title' => $this->strings->summary)); // Make sure JS file to expand course content is included. $this->coursecat_include_js(); diff --git a/enrol/instances.php b/enrol/instances.php index 546da9d3d4db3..2c11f49376cfc 100644 --- a/enrol/instances.php +++ b/enrol/instances.php @@ -229,13 +229,13 @@ $aurl = new moodle_url($url, array('action'=>'up', 'instance'=>$instance->id)); $updown[] = $OUTPUT->action_icon($aurl, new pix_icon('t/up', $strup, 'core', array('class' => 'iconsmall'))); } else { - $updown[] = html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('spacer'), 'alt'=>'', 'class'=>'iconsmall')); + $updown[] = $OUTPUT->spacer(); } if ($updowncount < $icount) { $aurl = new moodle_url($url, array('action'=>'down', 'instance'=>$instance->id)); $updown[] = $OUTPUT->action_icon($aurl, new pix_icon('t/down', $strdown, 'core', array('class' => 'iconsmall'))); } else { - $updown[] = html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('spacer'), 'alt'=>'', 'class'=>'iconsmall')); + $updown[] = $OUTPUT->spacer(); } ++$updowncount; @@ -253,7 +253,7 @@ $edit[] = $OUTPUT->action_icon($aurl, new pix_icon('t/show', $strenable, 'core', array('class' => 'iconsmall'))); } else { // plugin specific state - do not mess with it! - $edit[] = html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/show'), 'alt'=>'', 'class'=>'iconsmall')); + $edit[] = $OUTPUT->pix_icon('t/show', get_string('show')); } } diff --git a/enrol/renderer.php b/enrol/renderer.php index 2e867ab99fcb5..a283de891f1c0 100644 --- a/enrol/renderer.php +++ b/enrol/renderer.php @@ -187,16 +187,13 @@ protected function render_course_enrolment_other_users_table(course_enrolment_ot * @return string */ public function user_roles_and_actions($userid, $roles, $assignableroles, $canassign, $pageurl) { - $iconenrolremove = $this->output->pix_url('t/delete'); - - // Get list of roles. $rolesoutput = ''; foreach ($roles as $roleid=>$role) { if ($canassign and (is_siteadmin() or isset($assignableroles[$roleid])) and !$role['unchangeable']) { $strunassign = get_string('unassignarole', 'role', $role['text']); - $icon = html_writer::empty_tag('img', array('alt'=>$strunassign, 'src'=>$iconenrolremove)); + $icon = $this->output->pix_icon('t/delete', $strunassign); $url = new moodle_url($pageurl, array('action'=>'unassign', 'roleid'=>$roleid, 'user'=>$userid)); $rolesoutput .= html_writer::tag('div', $role['text'] . html_writer::link($url, $icon, array('class'=>'unassignrolelink', 'rel'=>$roleid, 'title'=>$strunassign)), array('class'=>'role role_'.$roleid)); } else { @@ -235,14 +232,12 @@ public function user_roles_and_actions($userid, $roles, $assignableroles, $canas * @return string */ public function user_groups_and_actions($userid, $groups, $allgroups, $canmanagegroups, $pageurl) { - $iconenrolremove = $this->output->pix_url('t/delete'); - $groupicon = $this->output->pix_icon('i/group', get_string('addgroup', 'group')); $groupoutput = ''; foreach($groups as $groupid=>$name) { if ($canmanagegroups and groups_remove_member_allowed($groupid, $userid)) { - $icon = html_writer::empty_tag('img', array('alt'=>get_string('removefromgroup', 'group', $name), 'src'=>$iconenrolremove)); + $icon = $this->output->pix_icon('t/delete', get_string('removefromgroup', 'group', $name)); $url = new moodle_url($pageurl, array('action'=>'removemember', 'group'=>$groupid, 'user'=>$userid)); $groupoutput .= html_writer::tag('div', $name . html_writer::link($url, $icon), array('class'=>'group', 'rel'=>$groupid)); } else { @@ -641,11 +636,9 @@ protected function get_direction_icon($output, $field) { $direction = $this->sortdirection; } if ($direction === 'ASC') { - return html_writer::empty_tag('img', array('alt' => '', 'class' => 'iconsort', - 'src' => $output->pix_url('t/sort_asc'))); + return $output->pix_icon('t/sort_asc', get_string('sort')); } else { - return html_writer::empty_tag('img', array('alt' => '', 'class' => 'iconsort', - 'src' => $output->pix_url('t/sort_desc'))); + return $output->pix_icon('t/sort_desc', get_string('sort')); } } diff --git a/files/classes/external/stored_file_exporter.php b/files/classes/external/stored_file_exporter.php index 5e88fd6838b5d..93fce21ede680 100644 --- a/files/classes/external/stored_file_exporter.php +++ b/files/classes/external/stored_file_exporter.php @@ -147,7 +147,6 @@ protected function get_other_values(renderer_base $output) { } $icon = $this->file->is_directory() ? file_folder_icon() : file_file_icon($this->file); - $iconurl = $output->pix_url($icon, 'core'); $url = moodle_url::make_pluginfile_url( $this->file->get_contextid(), @@ -163,7 +162,6 @@ protected function get_other_values(renderer_base $output) { 'filenameshort' => $filenameshort, 'filesizeformatted' => display_size((int) $this->file->get_filesize()), 'icon' => $icon, - 'iconurl' => $iconurl->out(false), 'url' => $url->out(false), 'timecreatedformatted' => userdate($this->file->get_timecreated()), 'timemodifiedformatted' => userdate($this->file->get_timemodified()), diff --git a/files/renderer.php b/files/renderer.php index 46324fcd64efb..020c24d0baab1 100644 --- a/files/renderer.php +++ b/files/renderer.php @@ -204,30 +204,32 @@ protected function fm_print_generallayout($fm) {
    - ' . $straddfiletext . ' + ' . $this->pix_icon('a/add_file', $straddfiletext) . '
    - ' . $strcreatefolder . ' + ' . $this->pix_icon('a/create_folder', $strcreatefolder) . '
    - ' . $strdownloadallfiles . ' + ' . $this->pix_icon('a/download_all', $strdownloadallfiles) . '
    - + + ' . $this->pix_icon('i/loading_small', '') . ' +
    - '. get_string('displayasicons', 'repository') .' + ' . $this->pix_icon('fp/view_icon_active', get_string('displayasicons', 'repository'), 'theme') . ' - '. get_string('displayasdetails', 'repository') .' + ' . $this->pix_icon('fp/view_list_active', get_string('displayasdetails', 'repository'), 'theme') . ' - '. get_string('displayastree', 'repository') .' + ' . $this->pix_icon('fp/view_tree_active', get_string('displayastree', 'repository'), 'theme') . '
    @@ -393,7 +395,7 @@ protected function fm_js_template_fileselectlayout() { $rv = '
    - + ' . $this->pix_icon('i/loading_small', '') . '
    @@ -590,35 +592,35 @@ protected function fp_js_template_generallayout() {
    - + ' . $this->pix_icon('a/refresh', '') . '
    - + ' . $this->pix_icon('a/logout', '') . '
    - + ' . $this->pix_icon('a/setting', '') . '
    - + ' . $this->pix_icon('a/help', '') . '
    - + ' . $this->pix_icon('fp/view_icon_active', '', 'theme') . ' - + ' . $this->pix_icon('fp/view_list_active', '', 'theme') . ' - + ' . $this->pix_icon('fp/view_tree_active', '', 'theme') . '
    @@ -710,7 +712,7 @@ protected function fp_js_template_nextpage() {
    '.get_string('more').'
    - + ' . $this->pix_icon('i/loading_small', '') . '
    '; return $rv; @@ -748,7 +750,7 @@ protected function fp_js_template_selectlayout() { $rv = '
    - + ' . $this->pix_icon('i/loading_small', '') . '
    @@ -877,7 +879,7 @@ protected function fp_js_template_loading() { return '
    - + ' . $this->pix_icon('i/loading_small', '') . '
    '; } diff --git a/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js b/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js index 1f36fe30e5f07..81f03933b08b4 100644 --- a/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js +++ b/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js @@ -29,7 +29,6 @@ Y.extend(AUTOLINKER, Y.Base, { // display a progress indicator var title = '', content = Y.Node.create('
    ' + - '' + '
    '), o = new Y.Overlay({ headerContent: title, @@ -37,6 +36,13 @@ Y.extend(AUTOLINKER, Y.Base, { }), fullurl, cfg; + + window.require(['core/templates'], function(Templates) { + Templates.renderPix('i/loading', 'core').then(function(html) { + content.append(html); + }); + }); + self.overlay = o; o.render(Y.one(document.body)); diff --git a/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js b/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js index c2fdc14318e8d..c0608af5ced6f 100644 --- a/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js +++ b/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js @@ -1 +1 @@ -YUI.add("moodle-filter_glossary-autolinker",function(e,t){var n="Glossary filter autolinker",r="width",i="height",s="menubar",o="location",u="scrollbars",a="resizable",f="toolbar",l="status",c="directories",h="fullscreen",p="dependent",d;d=function(){d.superclass.constructor.apply(this,arguments)},e.extend(d,e.Base,{overlay:null,alertpanels:{},initializer:function(){var t=this;require(["core/event"],function(n){e.delegate("click",function(r){r.preventDefault();var i="",s=e.Node.create('
    '+"
    "),o=new e.Overlay({headerContent:i,bodyContent:s}),u,a;t.overlay=o,o.render(e.one(document.body)),u=this.getAttribute("href").replace("showentry.php","showentry_ajax.php"),a={method:"get",context:t,on:{success:function(e,t){this.display_callback(t.responseText,n)},failure:function(e,t){var n=t.statusText;M.cfg.developerdebug&&(t.statusText+=" ("+u+")"),new M.core.exception({message:n})}}},e.io(u,a)},e.one(document.body),"a.glossary.autolink.concept")})},display_callback:function(t,n){var r,i,s,o,u,a;try{r=e.JSON.parse(t);if(r.success){this.overlay.hide();for(i in r.entries)u=r.entries[i].definition+r.entries[i].attachments,s=new M.core.alert({title:r.entries[i].concept,draggable:!0,message:u,modal:!1,yesLabel:M.util.get_string("ok","moodle")}),n.notifyFilterContentUpdated(s.get("boundingBox").getDOMNode()),e.Node.one("#id_yuialertconfirm-"+s.get("COUNT")).focus(),o="#moodle-dialogue-"+s.get("COUNT"),s.on("complete",this._deletealertpanel,this,o),e.Object.isEmpty(this.alertpanels)||(a=this._getLatestWindowPosition(),e.Node.one(o).setXY([a[0]+10,a[1]+10])),this.alertpanels[o]=e.Node.one(o).getXY();return!0}r.error&&new M.core.ajaxException(r)}catch(f){new M.core.exception(f)}return!1},_getLatestWindowPosition:function(){var t=[0,0];return e.Object.each(this.alertpanels,function(e){e[0]>t[0]&&(t=e)}),t},_deletealertpanel:function(e,t){delete this.alertpanels[t]}},{NAME:n,ATTRS:{url:{validator:e.Lang.isString,value:M.cfg.wwwroot+"/mod/glossary/showentry.php"},name:{validator:e.Lang.isString,value:"glossaryconcept"},options:{getter:function(){return{width:this.get(r),height:this.get(i),menubar:this.get(s),location:this.get(o),scrollbars:this.get(u),resizable:this.get(a),toolbar:this.get(f),status:this.get(l),directories:this.get(c),fullscreen:this.get(h),dependent:this.get(p)}},readOnly:!0},width:{value:600},height:{value:450},menubar:{value:!1},location:{value:!1},scrollbars:{value:!0},resizable:{value:!0},toolbar:{value:!0},status:{value:!0},directories:{value:!1},fullscreen:{value:!1},dependent:{value:!0}}}),M.filter_glossary=M.filter_glossary||{},M.filter_glossary.init_filter_autolinking=function(e){return new d(e)}},"@VERSION@",{requires:["base","node","io-base","json-parse","event-delegate","overlay","moodle-core-event","moodle-core-notification-alert","moodle-core-notification-exception","moodle-core-notification-ajaxexception"]}); +YUI.add("moodle-filter_glossary-autolinker",function(e,t){var n="Glossary filter autolinker",r="width",i="height",s="menubar",o="location",u="scrollbars",a="resizable",f="toolbar",l="status",c="directories",h="fullscreen",p="dependent",d;d=function(){d.superclass.constructor.apply(this,arguments)},e.extend(d,e.Base,{overlay:null,alertpanels:{},initializer:function(){var t=this;require(["core/event"],function(n){e.delegate("click",function(r){r.preventDefault();var i="",s=e.Node.create('
    '),o=new e.Overlay({headerContent:i,bodyContent:s}),u,a;window.require(["core/templates"],function(e){e.renderPix("i/loading","core").then(function(e){s.append(e)})}),t.overlay=o,o.render(e.one(document.body)),u=this.getAttribute("href").replace("showentry.php","showentry_ajax.php"),a={method:"get",context:t,on:{success:function(e,t){this.display_callback(t.responseText,n)},failure:function(e,t){var n=t.statusText;M.cfg.developerdebug&&(t.statusText+=" ("+u+")"),new M.core.exception({message:n})}}},e.io(u,a)},e.one(document.body),"a.glossary.autolink.concept")})},display_callback:function(t,n){var r,i,s,o,u,a;try{r=e.JSON.parse(t);if(r.success){this.overlay.hide();for(i in r.entries)u=r.entries[i].definition+r.entries[i].attachments,s=new M.core.alert({title:r.entries[i].concept,draggable:!0,message:u,modal:!1,yesLabel:M.util.get_string("ok","moodle")}),n.notifyFilterContentUpdated(s.get("boundingBox").getDOMNode()),e.Node.one("#id_yuialertconfirm-"+s.get("COUNT")).focus(),o="#moodle-dialogue-"+s.get("COUNT"),s.on("complete",this._deletealertpanel,this,o),e.Object.isEmpty(this.alertpanels)||(a=this._getLatestWindowPosition(),e.Node.one(o).setXY([a[0]+10,a[1]+10])),this.alertpanels[o]=e.Node.one(o).getXY();return!0}r.error&&new M.core.ajaxException(r)}catch(f){new M.core.exception(f)}return!1},_getLatestWindowPosition:function(){var t=[0,0];return e.Object.each(this.alertpanels,function(e){e[0]>t[0]&&(t=e)}),t},_deletealertpanel:function(e,t){delete this.alertpanels[t]}},{NAME:n,ATTRS:{url:{validator:e.Lang.isString,value:M.cfg.wwwroot+"/mod/glossary/showentry.php"},name:{validator:e.Lang.isString,value:"glossaryconcept"},options:{getter:function(){return{width:this.get(r),height:this.get(i),menubar:this.get(s),location:this.get(o),scrollbars:this.get(u),resizable:this.get(a),toolbar:this.get(f),status:this.get(l),directories:this.get(c),fullscreen:this.get(h),dependent:this.get(p)}},readOnly:!0},width:{value:600},height:{value:450},menubar:{value:!1},location:{value:!1},scrollbars:{value:!0},resizable:{value:!0},toolbar:{value:!0},status:{value:!0},directories:{value:!1},fullscreen:{value:!1},dependent:{value:!0}}}),M.filter_glossary=M.filter_glossary||{},M.filter_glossary.init_filter_autolinking=function(e){return new d(e)}},"@VERSION@",{requires:["base","node","io-base","json-parse","event-delegate","overlay","moodle-core-event","moodle-core-notification-alert","moodle-core-notification-exception","moodle-core-notification-ajaxexception"]}); diff --git a/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js b/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js index 1f36fe30e5f07..81f03933b08b4 100644 --- a/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js +++ b/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js @@ -29,7 +29,6 @@ Y.extend(AUTOLINKER, Y.Base, { // display a progress indicator var title = '', content = Y.Node.create('
    ' + - '' + '
    '), o = new Y.Overlay({ headerContent: title, @@ -37,6 +36,13 @@ Y.extend(AUTOLINKER, Y.Base, { }), fullurl, cfg; + + window.require(['core/templates'], function(Templates) { + Templates.renderPix('i/loading', 'core').then(function(html) { + content.append(html); + }); + }); + self.overlay = o; o.render(Y.one(document.body)); diff --git a/filter/glossary/yui/src/autolinker/js/autolinker.js b/filter/glossary/yui/src/autolinker/js/autolinker.js index 564c6ee3b43c4..8aea8fdfa41a8 100644 --- a/filter/glossary/yui/src/autolinker/js/autolinker.js +++ b/filter/glossary/yui/src/autolinker/js/autolinker.js @@ -27,7 +27,6 @@ Y.extend(AUTOLINKER, Y.Base, { // display a progress indicator var title = '', content = Y.Node.create('
    ' + - '' + '
    '), o = new Y.Overlay({ headerContent: title, @@ -35,6 +34,13 @@ Y.extend(AUTOLINKER, Y.Base, { }), fullurl, cfg; + + window.require(['core/templates'], function(Templates) { + Templates.renderPix('i/loading', 'core').then(function(html) { + content.append(html); + }); + }); + self.overlay = o; o.render(Y.one(document.body)); diff --git a/grade/grading/renderer.php b/grade/grading/renderer.php index 562406141abdc..de6adabc6a645 100644 --- a/grade/grading/renderer.php +++ b/grade/grading/renderer.php @@ -64,7 +64,7 @@ public function management_method_selector(grading_manager $manager, moodle_url */ public function management_action_icon(moodle_url $url, $text, $icon) { - $img = html_writer::empty_tag('img', array('src' => $this->output->pix_url($icon), 'class' => 'action-icon')); + $img = $this->output->pix_icon($icon, ''); $txt = html_writer::tag('div', $text, array('class' => 'action-text')); return html_writer::link($url, $img . $txt, array('class' => 'action')); } @@ -93,7 +93,7 @@ public function management_message($message) { */ public function pick_action_icon(moodle_url $url, $text, $icon = '', $class = '') { - $img = html_writer::empty_tag('img', array('src' => $this->output->pix_url($icon), 'class' => 'action-icon')); + $img = $this->output->pix_icon($icon, ''); $txt = html_writer::tag('div', $text, array('class' => 'action-text')); return html_writer::link($url, $img . $txt, array('class' => 'action '.$class)); } diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index 8d7eb1391ce80..b69e31022acd2 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -736,8 +736,8 @@ public function get_left_rows($displayaverages) { if (empty($suspendedstring)) { $suspendedstring = get_string('userenrolmentsuspended', 'grades'); } - $usercell->text .= html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('i/enrolmentsuspended'), 'title'=>$suspendedstring, - 'alt'=>$suspendedstring, 'class'=>'usersuspendedicon')); + $icon = $OUTPUT->pix_icon('i/enrolmentsuspended', $suspendedstring); + $usercell->text .= html_writer::tag('span', $icon, array('class'=>'usersuspendedicon')); } $userrow->cells[] = $usercell; diff --git a/index.php b/index.php index 0c9e490d2ac35..a07a735b74271 100644 --- a/index.php +++ b/index.php @@ -169,9 +169,9 @@ if ($editing && has_capability('moodle/course:update', $context)) { $streditsummary = get_string('editsummary'); - echo "id\">pix_url('t/edit') . "\" ". - " class=\"iconsmall\" alt=\"$streditsummary\" />

    "; + echo "id\">" . $OUTPUT->pix_icon('t/edit', $streditsummary) . + "

    "; } $courserenderer = $PAGE->get_renderer('core', 'course'); diff --git a/lib/adminlib.php b/lib/adminlib.php index 28aafd6ce96ff..81d6d2b16b58c 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -5947,13 +5947,13 @@ public function output_html($data, $query='') { if (isset($active_enrols[$enrol])) { $aurl = new moodle_url($url, array('action'=>'disable', 'enrol'=>$enrol)); $hideshow = ""; - $hideshow .= "pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strdisable\" />"; + $hideshow .= $OUTPUT->pix_icon('t/hide', $strdisable) . ''; $enabled = true; $displayname = $name; } else if (isset($enrols_available[$enrol])) { $aurl = new moodle_url($url, array('action'=>'enable', 'enrol'=>$enrol)); $hideshow = ""; - $hideshow .= "pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strenable\" />"; + $hideshow .= $OUTPUT->pix_icon('t/show', $strenable) . ''; $enabled = false; $displayname = $name; $class = 'dimmed_text'; @@ -5974,16 +5974,16 @@ public function output_html($data, $query='') { if ($updowncount > 1) { $aurl = new moodle_url($url, array('action'=>'up', 'enrol'=>$enrol)); $updown .= ""; - $updown .= "pix_url('t/up') . "\" alt=\"$strup\" class=\"iconsmall\" /> "; + $updown .= $OUTPUT->pix_icon('t/up', $strup) . ' '; } else { - $updown .= "pix_url('spacer') . "\" class=\"iconsmall\" alt=\"\" /> "; + $updown .= $OUTPUT->spacer() . ' '; } if ($updowncount < $enrolcount) { $aurl = new moodle_url($url, array('action'=>'down', 'enrol'=>$enrol)); $updown .= ""; - $updown .= "pix_url('t/down') . "\" alt=\"$strdown\" class=\"iconsmall\" />"; + $updown .= $OUTPUT->pix_icon('t/down', $strdown) . ' '; } else { - $updown .= "pix_url('spacer') . "\" class=\"iconsmall\" alt=\"\" />"; + $updown .= $OUTPUT->spacer() . ' '; } ++$updowncount; } @@ -6508,15 +6508,13 @@ public function output_html($data, $query='') { // hide/show link if (in_array($auth, $authsenabled)) { $hideshow = ""; - $hideshow .= "pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"disable\" />"; - // $hideshow = ""; + $hideshow .= $OUTPUT->pix_icon('t/hide', get_string('disable')) . ''; $enabled = true; $displayname = $name; } else { $hideshow = ""; - $hideshow .= "pix_url('t/show') . "\" class=\"iconsmall\" alt=\"enable\" />"; - // $hideshow = ""; + $hideshow .= $OUTPUT->pix_icon('t/show', get_string('enable')) . ''; $enabled = false; $displayname = $name; $class = 'dimmed_text'; @@ -6529,17 +6527,17 @@ public function output_html($data, $query='') { if ($enabled) { if ($updowncount > 1) { $updown .= ""; - $updown .= "pix_url('t/up') . "\" alt=\"up\" class=\"iconsmall\" /> "; + $updown .= $OUTPUT->pix_icon('t/up', get_string('moveup')) . ' '; } else { - $updown .= "pix_url('spacer') . "\" class=\"iconsmall\" alt=\"\" /> "; + $updown .= $OUTPUT->spacer() . ' '; } if ($updowncount < $authcount) { $updown .= ""; - $updown .= "pix_url('t/down') . "\" alt=\"down\" class=\"iconsmall\" />"; + $updown .= $OUTPUT->pix_icon('t/down', get_string('movedown')) . ' '; } else { - $updown .= "pix_url('spacer') . "\" class=\"iconsmall\" alt=\"\" />"; + $updown .= $OUTPUT->spacer() . ' '; } ++ $updowncount; } @@ -6696,15 +6694,13 @@ public function output_html($data, $query='') { $class = ''; if (in_array($editor, $active_editors)) { $hideshow = ""; - $hideshow .= "pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"disable\" />"; - // $hideshow = ""; + $hideshow .= $OUTPUT->pix_icon('t/hide', get_string('disable')) . ''; $enabled = true; $displayname = $name; } else { $hideshow = ""; - $hideshow .= "pix_url('t/show') . "\" class=\"iconsmall\" alt=\"enable\" />"; - // $hideshow = ""; + $hideshow .= $OUTPUT->pix_icon('t/show', get_string('enable')) . ''; $enabled = false; $displayname = $name; $class = 'dimmed_text'; @@ -6715,17 +6711,17 @@ public function output_html($data, $query='') { if ($enabled) { if ($updowncount > 1) { $updown .= ""; - $updown .= "pix_url('t/up') . "\" alt=\"up\" class=\"iconsmall\" /> "; + $updown .= $OUTPUT->pix_icon('t/up', get_string('moveup')) . ' '; } else { - $updown .= "pix_url('spacer') . "\" class=\"iconsmall\" alt=\"\" /> "; + $updown .= $OUTPUT->spacer() . ' '; } if ($updowncount < $editorcount) { $updown .= ""; - $updown .= "pix_url('t/down') . "\" alt=\"down\" class=\"iconsmall\" />"; + $updown .= $OUTPUT->pix_icon('t/down', get_string('movedown')) . ' '; } else { - $updown .= "pix_url('spacer') . "\" class=\"iconsmall\" alt=\"\" />"; + $updown .= $OUTPUT->spacer() . ' '; } ++ $updowncount; } @@ -6875,14 +6871,14 @@ public function output_html($data, $query='') { if (in_array($antivirus, $activeantiviruses)) { $hideshowurl = $baseurl; $hideshowurl->params(array('action' => 'disable', 'antivirus' => $antivirus)); - $hideshowimg = html_writer::img($OUTPUT->pix_url('t/hide'), 'disable', array('class' => 'iconsmall')); + $hideshowimg = $OUTPUT->pix_icon('t/hide', get_string('disable')); $hideshow = html_writer::link($hideshowurl, $hideshowimg); $enabled = true; $displayname = $name; } else { $hideshowurl = $baseurl; $hideshowurl->params(array('action' => 'enable', 'antivirus' => $antivirus)); - $hideshowimg = html_writer::img($OUTPUT->pix_url('t/show'), 'enable', array('class' => 'iconsmall')); + $hideshowimg = $OUTPUT->pix_icon('t/show', get_string('enable')); $hideshow = html_writer::link($hideshowurl, $hideshowimg); $enabled = false; $displayname = $name; @@ -6895,18 +6891,18 @@ public function output_html($data, $query='') { if ($updowncount > 1) { $updownurl = $baseurl; $updownurl->params(array('action' => 'up', 'antivirus' => $antivirus)); - $updownimg = html_writer::img($OUTPUT->pix_url('t/up'), 'up', array('class' => 'iconsmall')); + $updownimg = $OUTPUT->pix_icon('t/up', get_string('moveup')); $updown = html_writer::link($updownurl, $updownimg); } else { - $updown .= html_writer::img($OUTPUT->pix_url('spacer'), '', array('class' => 'iconsmall')); + $updownimg = $OUTPUT->spacer(); } if ($updowncount < $antiviruscount) { $updownurl = $baseurl; $updownurl->params(array('action' => 'down', 'antivirus' => $antivirus)); - $updownimg = html_writer::img($OUTPUT->pix_url('t/down'), 'down', array('class' => 'iconsmall')); + $updownimg = $OUTPUT->pix_icon('t/down', get_string('movedown')); $updown = html_writer::link($updownurl, $updownimg); } else { - $updown .= html_writer::img($OUTPUT->pix_url('spacer'), '', array('class' => 'iconsmall')); + $updownimg = $OUTPUT->spacer(); } ++ $updowncount; } @@ -7012,14 +7008,14 @@ public function output_html($data, $query='') { if ($value->enabled == 1) { $hideshow = html_writer::link($url.'&action=disable&license='.$value->shortname, - html_writer::tag('img', '', array('src'=>$OUTPUT->pix_url('t/hide'), 'class'=>'iconsmall', 'alt'=>'disable'))); + $OUTPUT->pix_icon('t/hide', get_string('disable'))); } else { $hideshow = html_writer::link($url.'&action=enable&license='.$value->shortname, - html_writer::tag('img', '', array('src'=>$OUTPUT->pix_url('t/show'), 'class'=>'iconsmall', 'alt'=>'enable'))); + $OUTPUT->pix_icon('t/show', get_string('enable'))); } if ($value->shortname == $CFG->sitedefaultlicense) { - $displayname .= ' '.html_writer::tag('img', '', array('src'=>$OUTPUT->pix_url('t/locked'), 'class'=>'iconsmall', 'alt'=>get_string('default'), 'title'=>get_string('default'))); + $displayname .= ' '.$OUTPUT->pix_icon('t/locked', get_string('default')); $hideshow = ''; } @@ -8623,14 +8619,14 @@ public function output_html($data, $query='') { if ($updowncount > 1) { $updown .= "baseurl&action=moveup&repos=".$typename."\">"; - $updown .= "pix_url('t/up') . "\" alt=\"up\" class=\"iconsmall\" /> "; + $updown .= $OUTPUT->pix_icon('t/up', get_string('moveup')) . ' '; } else { $updown .= $spacer; } if ($updowncount < $totalrepositorytypes) { $updown .= "baseurl&action=movedown&repos=".$typename."\">"; - $updown .= "pix_url('t/down') . "\" alt=\"down\" class=\"iconsmall\" />"; + $updown .= $OUTPUT->pix_icon('t/down', get_string('movedown')) . ' '; } else { $updown .= $spacer; @@ -9424,11 +9420,11 @@ public function output_html($data, $query='') { // hide/show link if (in_array($protocol, $active_protocols)) { $hideshow = ""; - $hideshow .= "pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strdisable\" />"; + $hideshow .= $OUTPUT->pix_icon('t/hide', $strdisable) . ''; $displayname = "$name"; } else { $hideshow = ""; - $hideshow .= "pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strenable\" />"; + $hideshow .= $OUTPUT->pix_icon('t/show', $strenable) . ''; $displayname = "$name"; } diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php index 55124fb8317bc..84068b03c4a8f 100644 --- a/lib/deprecatedlib.php +++ b/lib/deprecatedlib.php @@ -1077,7 +1077,7 @@ function print_arrow($direction='up', $strsort=null, $return=false) { $strsort = get_string('sort' . $sortdir, 'grades'); } - $return = ' '.$strsort.' '; + $return = ' ' . $OUTPUT->pix_icon('t/' . $direction, $strsort) . ' '; if ($return) { return $return; @@ -5043,7 +5043,7 @@ function message_contact_link($userid, $linktype='add', $return=false, $script=n $iconpath = 't/addcontact'; } - $img = ''.$safealttext.''; + $img = $OUTPUT->pix_icon($iconpath, $safealttext); } $output = ''. @@ -5116,9 +5116,9 @@ function message_history_link($userid1, $userid2, $return=false, $keywords='', $ } if ($linktext == 'icon') { // Icon only - $fulllink = ''.$strmessagehistory.''; + $fulllink = $OUTPUT->pix_icon('t/messages', $strmessagehistory); } else if ($linktext == 'both') { // Icon and standard name - $fulllink = ''; + $fulllink = $OUTPUT->pix_icon('t/messages', ''); $fulllink .= ' '.$strmessagehistory; } else if ($linktext) { // Custom name $fulllink = $linktext; diff --git a/lib/editor/tinymce/adminlib.php b/lib/editor/tinymce/adminlib.php index 684a9140faaf1..181e53b4e7648 100644 --- a/lib/editor/tinymce/adminlib.php +++ b/lib/editor/tinymce/adminlib.php @@ -143,12 +143,12 @@ public function output_html($data, $query='') { $displayname = html_writer::tag('span', $name, array('class'=>'error')); } else if ($plugininfo->is_enabled()) { $url = new moodle_url('/lib/editor/tinymce/subplugins.php', array('sesskey'=>sesskey(), 'return'=>'settings', 'disable'=>$name)); - $hideshow = html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/hide'), 'class'=>'iconsmall', 'alt'=>$strdisable)); + $hideshow = $OUTPUT->pix_icon('t/hide', $strdisable); $hideshow = html_writer::link($url, $hideshow); $displayname = $namestr; } else { $url = new moodle_url('/lib/editor/tinymce/subplugins.php', array('sesskey'=>sesskey(), 'return'=>'settings', 'enable'=>$name)); - $hideshow = html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/show'), 'class'=>'iconsmall', 'alt'=>$strenable)); + $hideshow = $OUTPUT->pix_icon('t/show', $strenable); $hideshow = html_writer::link($url, $hideshow); $displayname = $namestr; $class = 'dimmed_text'; diff --git a/lib/filelib.php b/lib/filelib.php index bebbe77eee176..f9ddae50c141e 100644 --- a/lib/filelib.php +++ b/lib/filelib.php @@ -690,11 +690,11 @@ function file_get_drafarea_files($draftitemid, $filepath = '/') { if ($file->is_directory()) { $item->filesize = 0; - $item->icon = $OUTPUT->pix_url(file_folder_icon(24))->out(false); + $item->icon = $OUTPUT->image_url(file_folder_icon(24))->out(false); $item->type = 'folder'; $foldername = explode('/', trim($item->filepath, '/')); $item->fullname = trim(array_pop($foldername), '/'); - $item->thumbnail = $OUTPUT->pix_url(file_folder_icon(90))->out(false); + $item->thumbnail = $OUTPUT->image_url(file_folder_icon(90))->out(false); } else { // do NOT use file browser here! $item->mimetype = get_mimetype_description($file); @@ -705,8 +705,8 @@ function file_get_drafarea_files($draftitemid, $filepath = '/') { } $itemurl = moodle_url::make_draftfile_url($draftitemid, $item->filepath, $item->filename); $item->url = $itemurl->out(); - $item->icon = $OUTPUT->pix_url(file_file_icon($file, 24))->out(false); - $item->thumbnail = $OUTPUT->pix_url(file_file_icon($file, 90))->out(false); + $item->icon = $OUTPUT->image_url(file_file_icon($file, 24))->out(false); + $item->thumbnail = $OUTPUT->image_url(file_file_icon($file, 90))->out(false); if ($imageinfo = $file->get_imageinfo()) { $item->realthumbnail = $itemurl->out(false, array('preview' => 'thumb', 'oid' => $file->get_timemodified())); $item->realicon = $itemurl->out(false, array('preview' => 'tinyicon', 'oid' => $file->get_timemodified())); @@ -1450,7 +1450,8 @@ function mimeinfo($element, $filename) { foreach ($filenames as $filename) { foreach ($iconpostfixes as $size => $postfix) { $fullname = $CFG->dirroot.'/pix/f/'.$filename.$postfix; - if ($iconsize >= $size && (file_exists($fullname.'.png') || file_exists($fullname.'.gif'))) { + if ($iconsize >= $size && + (file_exists($fullname.'.svg') || file_exists($fullname.'.png') || file_exists($fullname.'.gif'))) { return $filename.$postfix; } } @@ -1508,7 +1509,7 @@ function mimeinfo_from_type($element, $mimetype) { * Usage: * * // $file - instance of stored_file or file_info - * $icon = $OUTPUT->pix_url(file_file_icon($file))->out(); + * $icon = $OUTPUT->image_url(file_file_icon($file))->out(); * echo html_writer::empty_tag('img', array('src' => $icon, 'alt' => get_mimetype_description($file))); * * or @@ -1557,12 +1558,12 @@ function file_file_icon($file, $size = null) { * * Usage: * - * $icon = $OUTPUT->pix_url(file_folder_icon())->out(); + * $icon = $OUTPUT->image_url(file_folder_icon())->out(); * echo html_writer::empty_tag('img', array('src' => $icon)); * * or * - * echo $OUTPUT->pix_icon(file_folder_icon(32)); + * echo $OUTPUT->pix_icon(file_folder_icon(32), ''); * * * @param int $iconsize The size of the icon. Defaults to 16 can also be 24, 32, 48, 64, 72, 80, 96, 128, 256 @@ -1588,12 +1589,12 @@ function file_folder_icon($iconsize = null) { /** * Returns the relative icon path for a given mime type * - * This function should be used in conjunction with $OUTPUT->pix_url to produce + * This function should be used in conjunction with $OUTPUT->image_url to produce * a return the full path to an icon. * * * $mimetype = 'image/jpg'; - * $icon = $OUTPUT->pix_url(file_mimetype_icon($mimetype))->out(); + * $icon = $OUTPUT->image_url(file_mimetype_icon($mimetype))->out(); * echo html_writer::empty_tag('img', array('src' => $icon, 'alt' => get_mimetype_description($mimetype))); * * @@ -1611,12 +1612,12 @@ function file_mimetype_icon($mimetype, $size = NULL) { /** * Returns the relative icon path for a given file name * - * This function should be used in conjunction with $OUTPUT->pix_url to produce + * This function should be used in conjunction with $OUTPUT->image_url to produce * a return the full path to an icon. * * * $filename = '.jpg'; - * $icon = $OUTPUT->pix_url(file_extension_icon($filename))->out(); + * $icon = $OUTPUT->image_url(file_extension_icon($filename))->out(); * echo html_writer::empty_tag('img', array('src' => $icon, 'alt' => '...')); * * @@ -4088,7 +4089,7 @@ function file_pluginfile($relativepath, $forcedownload, $preview = null) { // also if login is required for profile images and is not logged in or guest // do not use require_login() because it is expensive and not suitable here anyway $theme = theme_config::load($themename); - redirect($theme->pix_url('u/'.$filename, 'moodle')); // intentionally not cached + redirect($theme->image_url('u/'.$filename, 'moodle')); // intentionally not cached } if (!$file = $fs->get_file($context->id, 'user', 'icon', 0, '/', $filename.'.png')) { diff --git a/lib/formslib.php b/lib/formslib.php index a4bdf52847294..d13625cd20f21 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -1486,8 +1486,8 @@ public function __construct($formName, $method, $action, $target='', $attributes }else { $this->updateAttributes(array('class'=>'mform')); } - $this->_reqHTML = ''.get_string('requiredelement', 'form').''; - $this->_advancedHTML = ''.get_string('advancedelement', 'form').''; + $this->_reqHTML = '' . $OUTPUT->pix_icon('req', get_string('requiredelement', 'form')) . ''; + $this->_advancedHTML = '' . $OUTPUT->pix_icon('adv', get_string('advancedelement', 'form')) . ''; $this->setRequiredNote(get_string('somefieldsrequired', 'form', $OUTPUT->pix_icon('req', get_string('requiredelement', 'form')))); } diff --git a/lib/googleapi.php b/lib/googleapi.php index 1c2be1d99f9c7..3d2a3fe85230e 100644 --- a/lib/googleapi.php +++ b/lib/googleapi.php @@ -131,7 +131,7 @@ public function get_file_list($search = '') { 'url' => "{$gdoc->link[0]->attributes()->href}", 'source' => $source, 'date' => strtotime($gdoc->updated), - 'thumbnail' => (string) $OUTPUT->pix_url(file_extension_icon($title, 32)) + 'thumbnail' => (string) $OUTPUT->image_url(file_extension_icon($title, 32)) ); } core_date::set_default_server_timezone(); diff --git a/lib/listlib.php b/lib/listlib.php index 9cc815b11079f..354c38fbb96a1 100644 --- a/lib/listlib.php +++ b/lib/listlib.php @@ -594,13 +594,13 @@ public function set_icon_html($first, $last, $lastitem) { public function image_icon($action, $url, $icon) { global $OUTPUT; - return ' - ' . s($action). ' '; + return '' . + $OUTPUT->pix_icon('t/' . $icon, $action) . ' '; } public function image_spacer() { global $OUTPUT; - return ''; + return $OUTPUT->spacer(); } /** diff --git a/lib/modinfolib.php b/lib/modinfolib.php index f6f9a13428cf4..f8a06616dc268 100644 --- a/lib/modinfolib.php +++ b/lib/modinfolib.php @@ -1381,18 +1381,18 @@ public function get_icon_url($output = null) { } else if (!empty($this->icon)) { if (substr($this->icon, 0, 4) === 'mod/') { list($modname, $iconname) = explode('/', substr($this->icon, 4), 2); - $icon = $output->pix_url($iconname, $modname); + $icon = $output->image_url($iconname, $modname); } else { if (!empty($this->iconcomponent)) { // Icon has specified component - $icon = $output->pix_url($this->icon, $this->iconcomponent); + $icon = $output->image_url($this->icon, $this->iconcomponent); } else { // Icon does not have specified component, use default - $icon = $output->pix_url($this->icon); + $icon = $output->image_url($this->icon); } } } else { - $icon = $output->pix_url('icon', $this->modname); + $icon = $output->image_url('icon', $this->modname); } return $icon; } @@ -2356,19 +2356,19 @@ class cached_cm_info { /** * Name of icon for this activity. Normally, this should be used together with $iconcomponent - * to define the icon, as per pix_url function. + * to define the icon, as per image_url function. * For backward compatibility, if this value is of the form 'mod/forum/icon' then an icon * within that module will be used. * @see cm_info::get_icon_url() - * @see renderer_base::pix_url() + * @see renderer_base::image_url() * @var string */ public $icon; /** - * Component for icon for this activity, as per pix_url; leave blank to use default 'moodle' + * Component for icon for this activity, as per image_url; leave blank to use default 'moodle' * component - * @see renderer_base::pix_url() + * @see renderer_base::image_url() * @var string */ public $iconcomponent; diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php index 6f93fa52fb99a..9ed4ac816ac7a 100644 --- a/lib/outputcomponents.php +++ b/lib/outputcomponents.php @@ -359,7 +359,7 @@ public function get_url(moodle_page $page, renderer_base $renderer = null) { $size = (int)$this->size; } - $defaulturl = $renderer->pix_url('u/'.$filename); // default image + $defaulturl = $renderer->image_url('u/'.$filename); // default image if ((!empty($CFG->forcelogin) and !isloggedin()) || (!empty($CFG->forceloginforprofileimage) && (!isloggedin() || isguestuser()))) { @@ -682,7 +682,7 @@ public function export_for_template(renderer_base $output) { } } - $attributes['src'] = $output->pix_url($this->pix, $this->component)->out(false); + $attributes['src'] = $output->image_url($this->pix, $this->component)->out(false); $templatecontext = array(); foreach ($attributes as $name => $value) { $templatecontext[] = array('name' => $name, 'value' => $value); @@ -3149,7 +3149,7 @@ class block_contents { /** * @var array A (possibly empty) array of editing controls. Each element of * this array should be an array('url' => $url, 'icon' => $icon, 'caption' => $caption). - * $icon is the icon name. Fed to $OUTPUT->pix_url. + * $icon is the icon name. Fed to $OUTPUT->image_url. */ public $controls = array(); diff --git a/lib/outputlib.php b/lib/outputlib.php index 169c3ec761d56..db753acb1e62e 100644 --- a/lib/outputlib.php +++ b/lib/outputlib.php @@ -1572,7 +1572,7 @@ public function post_process($css) { $replaced[$match[0]] = true; $imagename = $match[2]; $component = rtrim($match[1], '|'); - $imageurl = $this->pix_url($imagename, $component)->out(false); + $imageurl = $this->image_url($imagename, $component)->out(false); // we do not need full url because the image.php is always in the same dir $imageurl = preg_replace('|^http.?://[^/]+|', '', $imageurl); $css = str_replace($match[0], $imageurl, $css); diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 0be6043ca7743..94df7fdda62c0 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -955,13 +955,13 @@ public function home_link() { // Special case for site home page - please do not remove return '
    ' . '' . - ''.get_string('moodlelogo').'
    '; + ''.get_string('moodlelogo').'
    '; } else if (!empty($CFG->target_release) && $CFG->target_release != $CFG->release) { // Special case for during install/upgrade. return '
    '. '' . - ''.get_string('moodlelogo').'
    '; + ''.get_string('moodlelogo').'
    '; } else if ($this->page->course->id == $SITE->id || strpos($this->page->pagetype, 'course-view') === 0) { return '
    ' . @@ -2095,9 +2095,7 @@ protected function render_pix_icon(pix_icon $icon) { * @return string HTML fragment */ protected function render_pix_emoticon(pix_emoticon $emoticon) { - $attributes = $emoticon->attributes; - $attributes['src'] = $this->pix_url($emoticon->pix, $emoticon->component); - return html_writer::empty_tag('img', $attributes); + return $this->render_pix_icon($emoticon); } /** @@ -3974,7 +3972,7 @@ public function page_title() { * @return string The favicon URL */ public function favicon() { - return $this->pix_url('favicon', 'theme'); + return $this->image_url('favicon', 'theme'); } /** diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php index 3569d341346dd..ab8c7eaaf601d 100644 --- a/lib/outputrequirementslib.php +++ b/lib/outputrequirementslib.php @@ -316,7 +316,6 @@ public function get_config_for_javascript(moodle_page $page, renderer_base $rend $this->M_cfg = array( 'wwwroot' => $CFG->httpswwwroot, // Yes, really. See above. 'sesskey' => sesskey(), - 'loadingicon' => $renderer->pix_url('i/loading_small', 'moodle')->out(false), 'themerev' => theme_get_revision(), 'slasharguments' => (int)(!empty($CFG->slasharguments)), 'theme' => $page->theme->name, diff --git a/lib/portfoliolib.php b/lib/portfoliolib.php index c1f00b77b4c0d..e484432fc0bd5 100644 --- a/lib/portfoliolib.php +++ b/lib/portfoliolib.php @@ -351,7 +351,7 @@ public function to_html($format=null, $addstr=null) { break; case PORTFOLIO_ADD_ICON_FORM: $formoutput .= $selectoutput; - $formoutput .= "\n" . ''; + $formoutput .= "\n" . ''; $formoutput .= "\n" . ''; break; case PORTFOLIO_ADD_ICON_LINK: diff --git a/lib/rsslib.php b/lib/rsslib.php index 2be2a5c183eb1..b74d3c10c1332 100644 --- a/lib/rsslib.php +++ b/lib/rsslib.php @@ -64,9 +64,8 @@ function rss_get_link($contextid, $userid, $componentname, $id, $tooltiptext='') static $rsspath = ''; $rsspath = rss_get_url($contextid, $userid, $componentname, $id); - $rsspix = $OUTPUT->pix_url('i/rss'); - return ''.get_string('rss').''; + return '' . $OUTPUT->pix_icon('i/rss', $tooltiptext) . ''; } /** @@ -281,7 +280,7 @@ function rss_standard_header($title = NULL, $link = NULL, $description = NULL) { */ //write image info - $rsspix = $OUTPUT->pix_url('i/rsssitelogo'); + $rsspix = $OUTPUT->image_url('i/rsssitelogo'); //write the info $result .= rss_start_tag('image', 2, true); diff --git a/lib/tablelib.php b/lib/tablelib.php index ca252da80f6db..47c4670b40f67 100644 --- a/lib/tablelib.php +++ b/lib/tablelib.php @@ -1177,16 +1177,14 @@ protected function show_hide_link($column, $index) { 'aria-expanded' => 'false', 'aria-controls' => $ariacontrols); return html_writer::link($this->baseurl->out(false, array($this->request[TABLE_VAR_SHOW] => $column)), - html_writer::empty_tag('img', array('src' => $OUTPUT->pix_url('t/switch_plus'), 'alt' => get_string('show'))), - $linkattributes); + $OUTPUT->pix_icon('t/switch_plus', get_string('show')), $linkattributes); } else if ($this->headers[$index] !== NULL) { $linkattributes = array('title' => get_string('hide') . ' ' . strip_tags($this->headers[$index]), 'aria-expanded' => 'true', 'aria-controls' => $ariacontrols); return html_writer::link($this->baseurl->out(false, array($this->request[TABLE_VAR_HIDE] => $column)), - html_writer::empty_tag('img', array('src' => $OUTPUT->pix_url('t/switch_minus'), 'alt' => get_string('hide'))), - $linkattributes); + $OUTPUT->pix_icon('t/switch_minus', get_string('hide')), $linkattributes); } } @@ -1295,11 +1293,9 @@ protected function sort_icon($isprimary, $order) { } if ($order == SORT_ASC) { - return html_writer::empty_tag('img', - array('src' => $OUTPUT->pix_url('t/sort_asc'), 'alt' => get_string('asc'), 'class' => 'iconsort')); + return $OUTPUT->pix_icon('t/sort_asc', get_string('asc')); } else { - return html_writer::empty_tag('img', - array('src' => $OUTPUT->pix_url('t/sort_desc'), 'alt' => get_string('desc'), 'class' => 'iconsort')); + return $OUTPUT->pix_icon('t/sort_desc', get_string('desc')); } } diff --git a/lib/templates/permissionmanager_role.mustache b/lib/templates/permissionmanager_role.mustache index cec6d59d41c49..d6314dfd160ae 100644 --- a/lib/templates/permissionmanager_role.mustache +++ b/lib/templates/permissionmanager_role.mustache @@ -47,7 +47,9 @@  {{rolename}}  {{#imageurl}} - {{action}} + {{#icon}} + {{#pix}}{{icon}}, 'core', {{iconalt}}{{/pix}} + {{/icon}} {{/imageurl}} diff --git a/lib/weblib.php b/lib/weblib.php index a39007d6a31db..fd886002c67a8 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -2574,7 +2574,7 @@ function navmenulist($course, $sections, $modinfo, $strsection, $strjumpto, $wid $class = 'activity '.$mod->modname; $class .= ($cmid == $mod->id) ? ' selected' : ''; $menu[] = '
  • '. - ''. + $OUTPUT->activity_icon('icon', '', $mod->modname). ''.$mod->name.'
    • '; } @@ -2618,8 +2618,7 @@ function print_grade_menu($courseid, $name, $current, $includenograde=true, $ret } $output .= html_writer::select($grades, $name, $current, false); - $helppix = $OUTPUT->pix_url('help'); - $linkobject = ''.$strscales.''; + $linkobject = '' . $OUTPUT->pix_icon('help', $strscales) . ''; $link = new moodle_url('/course/scales.php', array('id' => $courseid, 'list' => 1)); $action = new popup_action('click', $link, 'ratingscales', array('height' => 400, 'width' => 500)); $output .= $OUTPUT->action_link($link, $linkobject, $action, array('title' => $strscales)); diff --git a/message/output/popup/classes/output/popup_notification.php b/message/output/popup/classes/output/popup_notification.php index 288ab02056a89..215b7795a12ec 100644 --- a/message/output/popup/classes/output/popup_notification.php +++ b/message/output/popup/classes/output/popup_notification.php @@ -73,9 +73,9 @@ public function export_for_template(\renderer_base $output) { $context->shortenedsubject = shorten_text($context->subject, 125); if (!empty($context->component) && substr($context->component, 0, 4) == 'mod_') { - $iconurl = $output->pix_url('icon', $context->component); + $iconurl = $output->image_url('icon', $context->component); } else { - $iconurl = $output->pix_url('i/marker', 'core'); + $iconurl = $output->image_url('i/marker', 'core'); } $context->iconurl = $iconurl->out(); diff --git a/message/renderer.php b/message/renderer.php index f094ff1c2399f..1aac25975b4a8 100644 --- a/message/renderer.php +++ b/message/renderer.php @@ -73,23 +73,11 @@ public function manage_messageoutputs($processors) { $enable->text = html_writer::nonempty_tag('span', get_string('outputnotconfigured', 'message'), array('class' => 'error')); } else if ($processor->enabled) { $url = new moodle_url('/admin/message.php', array('disable' => $processor->id, 'sesskey' => sesskey())); - $enable->text = html_writer::link($url, html_writer::empty_tag('img', - array('src' => $this->output->pix_url('t/hide'), - 'class' => 'iconsmall', - 'title' => get_string('outputenabled', 'message'), - 'alt' => get_string('outputenabled', 'message'), - ) - )); + $enable->text = html_writer::link($url, $this->output->pix_icon('t/hide', get_string('outputenabled', 'message'))); } else { $row->attributes['class'] = 'dimmed_text'; $url = new moodle_url('/admin/message.php', array('enable' => $processor->id, 'sesskey' => sesskey())); - $enable->text = html_writer::link($url, html_writer::empty_tag('img', - array('src' => $this->output->pix_url('t/show'), - 'class' => 'iconsmall', - 'title' => get_string('outputdisabled', 'message'), - 'alt' => get_string('outputdisabled', 'message'), - ) - )); + $enable->text = html_writer::link($url, $this->output->pix_icon('t/show', get_string('outputdisabled', 'message'))); } // Settings $settings = new html_table_cell(); diff --git a/mnet/service/enrol/course.php b/mnet/service/enrol/course.php index 7f065f8414acb..be357c78b6242 100644 --- a/mnet/service/enrol/course.php +++ b/mnet/service/enrol/course.php @@ -57,7 +57,7 @@ echo $OUTPUT->header(); // course name -$icon = html_writer::empty_tag('img', array('src' => $OUTPUT->pix_url('i/course'), 'alt' => get_string('category'))); +$icon = $OUTPUT->pix_icon('i/course', get_string('category')); echo $OUTPUT->heading($icon . s($course->fullname)); // collapsible course summary diff --git a/mnet/service/enrol/host.php b/mnet/service/enrol/host.php index 7aac73a5cf24f..281a2cf65efe9 100644 --- a/mnet/service/enrol/host.php +++ b/mnet/service/enrol/host.php @@ -83,7 +83,7 @@ get_string('action') ); $table->attributes['class'] = 'generaltable remotecourses'; -$icon = html_writer::empty_tag('img', array('src' => $OUTPUT->pix_url('i/course'), 'alt' => get_string('category'))); +$icon = $OUTPUT->pix_icon('i/course', get_string('category')); $prevcat = null; foreach ($courses as $course) { $course = (object)$course; diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php index a8ab25d3f9c64..06a9b2d171f4c 100644 --- a/mod/assign/gradingtable.php +++ b/mod/assign/gradingtable.php @@ -855,8 +855,7 @@ public function col_fullname($row) { if (!$this->assignment->is_active_user($row->id)) { $suspendedstring = get_string('userenrolmentsuspended', 'grades'); - $fullname .= ' ' . html_writer::empty_tag('img', array('src' => $this->output->pix_url('i/enrolmentsuspended'), - 'title' => $suspendedstring, 'alt' => $suspendedstring, 'class' => 'usersuspendedicon')); + $fullname .= ' ' . $this->output->pix_icon('i/enrolmentsuspended', $suspendedstring); $fullname = html_writer::tag('span', $fullname, array('class' => 'usersuspended')); } return $fullname; diff --git a/mod/assign/lib.php b/mod/assign/lib.php index f8eaf08562967..5a9f8e6ed8fae 100644 --- a/mod/assign/lib.php +++ b/mod/assign/lib.php @@ -1074,8 +1074,7 @@ function assign_print_recent_mod_activity($activity, $courseid, $detail, $modnam if ($detail) { $modname = $modnames[$activity->type]; echo '
    '; - echo '' . $modname . ''; + echo $OUTPUT->activity_icon('icon', $modname, 'assign'); echo ''; echo $activity->name; echo ''; diff --git a/mod/assign/overrides.php b/mod/assign/overrides.php index e8472f86790f9..d4bc66204ba0b 100644 --- a/mod/assign/overrides.php +++ b/mod/assign/overrides.php @@ -180,21 +180,18 @@ // Edit. $editurlstr = $overrideediturl->out(true, array('id' => $override->id)); $iconstr = '' . - '' . - get_string('edit') . ' '; + $OUTPUT->pix_icon('t/edit', get_string('edit')) . ' '; // Duplicate. $copyurlstr = $overrideediturl->out(true, array('id' => $override->id, 'action' => 'duplicate')); $iconstr .= '' . - '' . - get_string('copy') . ' '; + $OUTPUT->pix_icon('t/copy', get_string('copy')) . ' '; } // Delete. $deleteurlstr = $overridedeleteurl->out(true, array('id' => $override->id, 'sesskey' => sesskey())); $iconstr .= '' . - '' . - get_string('delete') . ' '; + $OUTPUT->pix_icon('t/delete', get_string('delete')) . ' '; if ($groupmode) { $usergroupstr = ' - '.get_string('moveup').' '; + '&id=' . $override->id .'&action=movegroupoverride&dir=up&sesskey='.sesskey().'">' . + $OUTPUT->pix_icon('t/up', get_string('moveup')) . ' '; } else { - $iconstr .= ' '; + $iconstr .= $OUTPUT->spacer() . ' '; } // Move down. if ($override->sortorder < $overridecountgroup) { $iconstr .= ' - '.get_string('movedown').' '; + '&id=' . $override->id . '&action=movegroupoverride&dir=down&sesskey='.sesskey().'">' . + $OUTPUT->pix_icon('t/down', get_string('movedown')) . ' '; } else { - $iconstr .= ' '; + $iconstr .= $OUTPUT->spacer() . ' '; } diff --git a/mod/assign/renderer.php b/mod/assign/renderer.php index 093b69a839394..2abf463a5031a 100644 --- a/mod/assign/renderer.php +++ b/mod/assign/renderer.php @@ -140,8 +140,7 @@ public function render_assign_user_summary(assign_user_summary $summary) { if ($summary->suspendeduser) { $supendedclass = ' usersuspended'; $suspendedstring = get_string('userenrolmentsuspended', 'grades'); - $suspendedicon = ' ' . html_writer::empty_tag('img', array('src' => $this->pix_url('i/enrolmentsuspended'), - 'title' => $suspendedstring, 'alt' => $suspendedstring, 'class' => 'usersuspendedicon')); + $suspendedicon = ' ' . $this->pix_icon('i/enrolmentsuspended', $suspendedstring); } $o .= $this->output->container_start('usersummary'); $o .= $this->output->box_start('boxaligncenter usersummarysection'.$supendedclass); diff --git a/mod/data/field/checkbox/field.class.php b/mod/data/field/checkbox/field.class.php index 4a871c44843b3..dbfb3de09cb58 100644 --- a/mod/data/field/checkbox/field.class.php +++ b/mod/data/field/checkbox/field.class.php @@ -52,8 +52,7 @@ function display_add_field($recordid = 0, $formdata = null) { if ($this->field->required) { $str .= '$nbsp;' . get_string('requiredelement', 'form'); $str .= ''; - $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'), - array('class' => 'req', 'title' => get_string('requiredelement', 'form'))); + $image = $OUTPUT->pix_icon('req', get_string('requiredelement', 'form')); $str .= html_writer::div($image, 'inline-req'); } else { $str .= ''; diff --git a/mod/data/field/file/field.class.php b/mod/data/field/file/field.class.php index 363fe847c35e4..5e6cf2fad0206 100644 --- a/mod/data/field/file/field.class.php +++ b/mod/data/field/file/field.class.php @@ -71,8 +71,7 @@ function display_add_field($recordid = 0, $formdata = null) { if ($this->field->required) { $html .= ' ' . get_string('requiredelement', 'form') . ''; - $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'), - array('class' => 'req', 'title' => get_string('requiredelement', 'form'))); + $image = $OUTPUT->pix_icon('req', get_string('requiredelement', 'form')); $html .= html_writer::div($image, 'inline-req'); } else { $html .= ''; diff --git a/mod/data/field/latlong/field.class.php b/mod/data/field/latlong/field.class.php index ce9fba78423f9..e504bf2cd1a73 100644 --- a/mod/data/field/latlong/field.class.php +++ b/mod/data/field/latlong/field.class.php @@ -65,8 +65,7 @@ function display_add_field($recordid = 0, $formdata = null) { $classes = 'mod-data-input form-control-static'; $str .= ''; @@ -77,8 +76,7 @@ function display_add_field($recordid = 0, $formdata = null) { $str .= 'field->id . '">'; $str .= html_writer::span($this->field->name, 'accesshide'); if ($this->field->required) { - $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'), - array('class' => 'req', 'title' => get_string('requiredelement', 'form'))); + $image = $OUTPUT->pix_icon('req', get_string('requiredelement', 'form')); $str .= html_writer::div($image, 'inline-req'); } $str .= ''; diff --git a/mod/data/field/multimenu/field.class.php b/mod/data/field/multimenu/field.class.php index 92590d6199ee1..885bbe8d3029f 100644 --- a/mod/data/field/multimenu/field.class.php +++ b/mod/data/field/multimenu/field.class.php @@ -56,8 +56,7 @@ function display_add_field($recordid = 0, $formdata = null) { $str .= html_writer::span($this->field->name); if ($this->field->required) { $str .= '
    '; - $str .= html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'), - array('class' => 'req', 'title' => get_string('requiredelement', 'form'))); + $str .= $OUTPUT->pix_icon('req', get_string('requiredelement', 'form')); $str .= '
    '; } $str .= ''; diff --git a/mod/data/field/picture/field.class.php b/mod/data/field/picture/field.class.php index 8007b905794f5..fbcdf99133240 100644 --- a/mod/data/field/picture/field.class.php +++ b/mod/data/field/picture/field.class.php @@ -76,8 +76,7 @@ function display_add_field($recordid = 0, $formdata = null) { if ($this->field->required) { $str .= ' ' . get_string('requiredelement', 'form') . ''; - $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'), - array('class' => 'req', 'title' => get_string('requiredelement', 'form'))); + $image = $OUTPUT->pix_icon('req', get_string('requiredelement', 'form')); $str .= html_writer::div($image, 'inline-req'); } else { $str .= ''; diff --git a/mod/data/field/radiobutton/field.class.php b/mod/data/field/radiobutton/field.class.php index da00d80a6b8ad..ed508053c1959 100644 --- a/mod/data/field/radiobutton/field.class.php +++ b/mod/data/field/radiobutton/field.class.php @@ -53,8 +53,7 @@ function display_add_field($recordid = 0, $formdata = null) { if ($this->field->required) { $str .= ' ' . get_string('requiredelement', 'form') . ''; - $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'), - array('class' => 'req', 'title' => get_string('requiredelement', 'form'))); + $image = $OUTPUT->pix_icon('req', get_string('requiredelement', 'form')); $str .= html_writer::div($image, 'inline-req'); } else { $str .= ''; diff --git a/mod/data/field/textarea/field.class.php b/mod/data/field/textarea/field.class.php index bdbd6e9a1bf95..3ae89d2ebf9e1 100644 --- a/mod/data/field/textarea/field.class.php +++ b/mod/data/field/textarea/field.class.php @@ -64,8 +64,7 @@ function display_add_field($recordid = 0, $formdata = null) { $str .= ''; diff --git a/mod/data/field/url/field.class.php b/mod/data/field/url/field.class.php index 3b3641cc3d1aa..2c8f5bb8b75ba 100644 --- a/mod/data/field/url/field.class.php +++ b/mod/data/field/url/field.class.php @@ -69,8 +69,7 @@ function display_add_field($recordid = 0, $formdata = null) { $label = '