From 0d905d9f343cc422049b02328b88b067cb94435d Mon Sep 17 00:00:00 2001 From: skodak Date: Mon, 8 Jan 2007 09:14:05 +0000 Subject: [PATCH] MDL-7861 new class .icon and .iconsmall --- admin/auth.php | 8 ++-- admin/blocks.php | 4 +- admin/filters.php | 8 ++-- admin/lang.php | 4 +- admin/modules.php | 6 +-- admin/roles/manage.php | 12 +++--- blocks/HOWTO.html | 2 +- .../block_activity_modules.php | 2 +- blocks/course_list/block_course_list.php | 4 +- blocks/messages/block_messages.php | 2 +- blocks/mnet_hosts/block_mnet_hosts.php | 2 +- blocks/moodleblock.class.php | 2 +- blocks/participants/block_participants.php | 2 +- .../site_main_menu/block_site_main_menu.php | 2 +- .../block_social_activities.php | 4 +- blog/lib.php | 2 +- calendar/lib.php | 22 +++++----- course/category.php | 32 +++++++-------- course/format/lams/format.php | 10 ++--- course/grade.php | 4 +- course/grades.php | 4 +- course/index.php | 10 ++--- course/info.php | 4 +- course/lib.php | 40 +++++++++---------- course/mod.php | 2 +- course/modedit.php | 2 +- course/pending.php | 2 +- course/recent.php | 2 +- course/report/outline/index.php | 2 +- course/scales.php | 8 ++-- course/search.php | 2 +- course/user.php | 4 +- files/index.php | 10 ++--- index.php | 2 +- lib/editor/htmlarea/coursefiles.php | 8 ++-- lib/questionlib.php | 12 +++--- message/lib.php | 6 +-- mod/assignment/lib.php | 4 +- .../type/online/assignment.class.php | 2 +- .../type/upload/assignment.class.php | 6 +-- .../type/uploadsingle/assignment.class.php | 2 +- mod/data/field.php | 4 +- mod/data/field/file/field.class.php | 2 +- mod/data/lib.php | 8 ++-- mod/data/preset.php | 2 +- mod/exercise/lib.php | 2 +- mod/forum/lib.php | 8 ++-- mod/glossary/comments.php | 2 +- mod/glossary/editcategories.php | 4 +- mod/glossary/lib.php | 18 ++++----- mod/hotpot/index.php | 2 +- mod/hotpot/lib.php | 2 +- mod/lesson/locallib.php | 8 ++-- mod/quiz/lib.php | 2 +- .../type/directory/resource.class.php | 4 +- mod/scorm/locallib.php | 2 +- mod/workshop/lib.php | 2 +- mod/workshop/locallib.php | 9 ++--- mod/workshop/submissions.php | 2 +- mod/workshop/view.php | 8 ++-- question/category_class.php | 12 +++--- question/type/multianswer/questiontype.php | 2 +- theme/standard/styles_layout.css | 16 ++++++++ user/index.php | 2 +- 64 files changed, 203 insertions(+), 188 deletions(-) diff --git a/admin/auth.php b/admin/auth.php index d1e16c0e3c..221527c8e8 100644 --- a/admin/auth.php +++ b/admin/auth.php @@ -172,14 +172,14 @@ foreach ($displayauths as $auth => $name) { // hide/show link if (in_array($auth, $authsenabled)) { $hideshow = ""; - $hideshow .= "pixpath}/i/hide.gif\" height=\"16\" width=\"16\" alt=\"disable\" />"; + $hideshow .= "pixpath}/i/hide.gif\" class=\"icon\" alt=\"disable\" />"; // $hideshow = ""; $enabled = true; $displayname = "$name"; } else { $hideshow = ""; - $hideshow .= "pixpath}/i/show.gif\" height=\"16\" width=\"16\" alt=\"enable\" />"; + $hideshow .= "pixpath}/i/show.gif\" class=\"icon\" alt=\"enable\" />"; // $hideshow = ""; $enabled = false; $displayname = "$name"; @@ -193,14 +193,14 @@ foreach ($displayauths as $auth => $name) { $updown .= "pixpath}/t/up.gif\" alt=\"up\" /> "; } else { - $updown .= "pixpath}/spacer.gif\" height=\"16\" width=\"16\" alt=\"\" /> "; + $updown .= "pixpath}/spacer.gif\" class=\"icon\" alt=\"\" /> "; } if ($updowncount < $authcount) { $updown .= ""; $updown .= "pixpath}/t/down.gif\" alt=\"down\" />"; } else { - $updown .= "pixpath}/spacer.gif\" height=\"16\" width=\"16\" alt=\"\" />"; + $updown .= "pixpath}/spacer.gif\" class=\"icon\" alt=\"\" />"; } ++ $updowncount; } diff --git a/admin/blocks.php b/admin/blocks.php index 9a54e791a3..ccc7ccb45f 100644 --- a/admin/blocks.php +++ b/admin/blocks.php @@ -188,10 +188,10 @@ if ($blocks[$blockid]->visible) { $visible = ''. - ''.$strhide.''; + ''.$strhide.''; } else { $visible = ''. - ''.$strshow.''; + ''.$strshow.''; $class = ' class="dimmed_text"'; // Leading space required! } if ($blockobject->instance_allow_multiple()) { diff --git a/admin/filters.php b/admin/filters.php index 8af7797229..afd1b135e3 100644 --- a/admin/filters.php +++ b/admin/filters.php @@ -201,13 +201,13 @@ // get hide/show link if (in_array($path, $activefilters)) { $hideshow = ""; - $hideshow .= "pixpath}/i/hide.gif\" height=\"16\" width=\"16\" alt=\"$txt->hide\" />"; + $hideshow .= "pixpath}/i/hide.gif\" class=\"icon\" alt=\"$txt->hide\" />"; $hidden = false; $displayname = "$name"; } else { $hideshow = ""; - $hideshow .= "pixpath}/i/show.gif\" height=\"16\" width=\"16\" alt=\"$txt->show\" />"; + $hideshow .= "pixpath}/i/show.gif\" class=\"icon\" alt=\"$txt->show\" />"; $hidden = true; $displayname = "$name"; } @@ -220,14 +220,14 @@ $updown .= "\"$txt-up\" /> "; } else { - $updown .= "pixpath/spacer.gif\" height=\"16\" width=\"16\" alt=\"\" /> "; + $updown .= "pixpath/spacer.gif\" class=\"icon\" alt=\"\" /> "; } if ($updowncount<$activefilterscount) { $updown .= ""; $updown .= "\"$txt-down\" />"; } else { - $updown .= "pixpath/spacer.gif\" height=\"16\" width=\"16\" alt=\"\" />"; + $updown .= "pixpath/spacer.gif\" class=\"icon\" alt=\"\" />"; } ++$updowncount; } diff --git a/admin/lang.php b/admin/lang.php index 8d1b842835..3692c0421d 100644 --- a/admin/lang.php +++ b/admin/lang.php @@ -450,9 +450,9 @@ if (LANG_DISPLAY_MISSING_LINKS) { $missingtarget = ''; $missingnext = ''. - ''.$strnext.''; + ''.$strnext.''; $missingprev = ''. - ''.$strprev.''; + ''.$strprev.''; } else { $missingtarget = ''; $missingnext = ''; diff --git a/admin/modules.php b/admin/modules.php index 7dd7e73c68..43d606cc97 100644 --- a/admin/modules.php +++ b/admin/modules.php @@ -158,7 +158,7 @@ foreach ($modulebyname as $modulename => $module) { - $icon = "modpixpath/$module->name/icon.gif\" hspace=\"10\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" />"; + $icon = "modpixpath/$module->name/icon.gif\" hspace=\"10\" class=\"icon\" alt=\"\" />"; $delete = "name&sesskey=$USER->sesskey\">$strdelete"; @@ -172,11 +172,11 @@ if ($module->visible) { $visible = "name&sesskey=$USER->sesskey\" title=\"$strhide\">". - "pixpath/i/hide.gif\" align=\"middle\" height=\"16\" width=\"16\" border=\"0\" alt=\"$strhide\" />"; + "pixpath/i/hide.gif\" class=\"icon\" alt=\"$strhide\" />"; $class = ""; } else { $visible = "name&sesskey=$USER->sesskey\" title=\"$strshow\">". - "pixpath/i/show.gif\" align=\"middle\" height=\"16\" width=\"16\" border=\"0\" alt=\"$strshow\" />"; + "pixpath/i/show.gif\" class=\"icon\" alt=\"$strshow\" />"; $class = "class=\"dimmed_text\""; } if ($module->name == "forum") { diff --git a/admin/roles/manage.php b/admin/roles/manage.php index f630aa5ca8..360f4c899a 100755 --- a/admin/roles/manage.php +++ b/admin/roles/manage.php @@ -383,20 +383,20 @@ $row[1] = format_text($role->description, FORMAT_HTML); $row[2] = s($role->shortname); $row[3] = ''. - ''.$stredit.' '; + ''.$stredit.' '; $row[3] .= ''. - ''.$strdelete.' '; + ''.$strdelete.' '; if ($role->sortorder != 0) { $row[3] .= ''. - ''.$strmoveup.' '; + ''.$strmoveup.' '; } else { - $row[3] .= ' '; + $row[3] .= ' '; } if ($role->sortorder+1 < $rolescount) { $row[3] .= ''. - ''.$strmovedown.' '; + ''.$strmovedown.' '; } else { - $row[3] .= ' '; + $row[3] .= ' '; } $table->data[] = $row; diff --git a/blocks/HOWTO.html b/blocks/HOWTO.html index 6c2e91427d..64182abe04 100644 --- a/blocks/HOWTO.html +++ b/blocks/HOWTO.html @@ -560,7 +560,7 @@ function get_content() { $this->content->footer = 'Footer here...'; $this->content->items[] = '<a href="some_file.php">Menu Option 1</a>'; - $this->content->icons[] = '<img src="images/icons/1.gif" width="16" height="16" alt="" />'; + $this->content->icons[] = '<img src="images/icons/1.gif" class="icon" alt="" />'; // Add more list items here diff --git a/blocks/activity_modules/block_activity_modules.php b/blocks/activity_modules/block_activity_modules.php index 73d1c84263..d69714d2f1 100644 --- a/blocks/activity_modules/block_activity_modules.php +++ b/blocks/activity_modules/block_activity_modules.php @@ -36,7 +36,7 @@ class block_activity_modules extends block_list { foreach ($modnamesused as $modname => $modfullname) { if ($modname != 'label') { $this->content->items[] = ''.$modnamesplural[$modname].''; - $this->content->icons[] = ''; + $this->content->icons[] = ''; } } } diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php index ae879e7eb8..0a59406469 100644 --- a/blocks/course_list/block_course_list.php +++ b/blocks/course_list/block_course_list.php @@ -25,7 +25,7 @@ class block_course_list extends block_list { $this->content->footer = ''; $icon = "pixpath/i/course.gif\"". - " height=\"16\" width=\"16\" alt=\"".get_string("course")."\" />"; + " class=\"icon\" alt=\"".get_string("course")."\" />"; $adminseesall = true; if (isset($CFG->block_course_list_adminview)) { @@ -106,7 +106,7 @@ class block_course_list extends block_list { WHERE a.userid={$USER->id}"; if ($courses = get_records_sql($sql)) { $icon = "pixpath/i/mnethost.png\"". - " height=\"16\" width=\"16\" alt=\"".get_string("course")."\" />"; + " class=\"icon\" alt=\"".get_string("course")."\" />"; $this->content->items[] = 'Remote Courses'; $this->content->icons[] = ''; foreach ($courses as $course) { diff --git a/blocks/messages/block_messages.php b/blocks/messages/block_messages.php index 70e1215887..f8e9772b33 100644 --- a/blocks/messages/block_messages.php +++ b/blocks/messages/block_messages.php @@ -40,7 +40,7 @@ class block_messages extends block_base { $this->content->text .= print_user_picture($user->id, $this->instance->pageid, $user->picture, 16, true).' '; $timeago = format_time(time() - $user->lastaccess); $this->content->text .= ''.fullname($user).''; - $this->content->text .= '  '.$user->count.''; + $this->content->text .= '  '.$user->count.''; $this->content->text .= ''; } } else { diff --git a/blocks/mnet_hosts/block_mnet_hosts.php b/blocks/mnet_hosts/block_mnet_hosts.php index 6c41687d3e..1ef60b1746 100644 --- a/blocks/mnet_hosts/block_mnet_hosts.php +++ b/blocks/mnet_hosts/block_mnet_hosts.php @@ -53,7 +53,7 @@ class block_mnet_hosts extends block_list { $this->content->footer = ''; $icon = "pixpath/i/mnethost.png\"". - " height=\"16\" width=\"16\" alt=\"".get_string('server', 'block_mnet_hosts')."\" />"; + " class=\"icon\" alt=\"".get_string('server', 'block_mnet_hosts')."\" />"; foreach ($hosts as $host) { $this->content->icons[]=$icon; diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php index 4a37fc4d80..38e4287fa0 100644 --- a/blocks/moodleblock.class.php +++ b/blocks/moodleblock.class.php @@ -359,7 +359,7 @@ class block_base { // place holder for roles button $movebuttons .= '' . - ''.$this->str->assignroles.''; + ''.$this->str->assignroles.''; $movebuttons .= '' . ''.$title.''; diff --git a/blocks/participants/block_participants.php b/blocks/participants/block_participants.php index eadf0e2daf..6e7bcaae07 100644 --- a/blocks/participants/block_participants.php +++ b/blocks/participants/block_participants.php @@ -53,7 +53,7 @@ class block_participants extends block_list { $this->content->items[] = ''.get_string('participants').''; - $this->content->icons[] = ''; + $this->content->icons[] = ''; } diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php index 691f532223..ad0691a60a 100644 --- a/blocks/site_main_menu/block_site_main_menu.php +++ b/blocks/site_main_menu/block_site_main_menu.php @@ -57,7 +57,7 @@ class block_site_main_menu extends block_list { $editbuttons = ''; if ($ismoving) { - $this->content->icons[] = ' '; + $this->content->icons[] = ' '; $this->content->items[] = $USER->activitycopyname.' ('.$strcancel.')'; } diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php index f715c038d1..2a67f4d868 100644 --- a/blocks/social_activities/block_social_activities.php +++ b/blocks/social_activities/block_social_activities.php @@ -51,7 +51,7 @@ class block_social_activities extends block_list { $editbuttons = ''; if ($ismoving) { - $this->content->icons[] = ' '; + $this->content->icons[] = ' '; $this->content->items[] = $USER->activitycopyname.' ('.$strcancel.')'; } @@ -104,7 +104,7 @@ class block_social_activities extends block_list { } else { $this->content->items[] = ''.$instancename.''.$editbuttons; - $this->content->icons[] = ''.$mod->modfullname.''; + $this->content->icons[] = ''.$mod->modfullname.''; } } } diff --git a/blog/lib.php b/blog/lib.php index 9b2c34b7f1..ab5b896775 100755 --- a/blog/lib.php +++ b/blog/lib.php @@ -288,7 +288,7 @@ } else { $ffurl = "$CFG->wwwroot/file.php?file=/$filearea/$file"; } - $image = "pixpath/f/$icon\" height=\"16\" width=\"16\" alt=\"\" />"; + $image = "pixpath/f/$icon\" class=\"icon\" alt=\"\" />"; if ($return == "html") { $output .= "$image "; diff --git a/calendar/lib.php b/calendar/lib.php index 4522bef8fc..ae4d0da820 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -242,7 +242,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y $popupicon = $CFG->pixpath.'/c/user.gif'; $popupalt = ''; } - $popupcontent .= '
'.$popupalt.''.format_string($event->name,true).'
'; + $popupcontent .= '
'.$popupalt.''.format_string($event->name,true).'
'; } //Accessibility: functionality moved to calendar_get_popup. @@ -728,19 +728,19 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL) { $content .= ''; if($SESSION->cal_show_global) { - $content .= ''.get_string('hide').''; + $content .= ''.get_string('hide').''; $content .= ''.get_string('globalevents', 'calendar').''."\n"; } else { - $content .= ''.get_string('show').''; + $content .= ''.get_string('show').''; $content .= ''.get_string('globalevents', 'calendar').''."\n"; } if($SESSION->cal_show_course) { - $content .= ''.get_string('hide').''; + $content .= ''.get_string('hide').''; $content .= ''.get_string('courseevents', 'calendar').''."\n"; } else { - $content .= ''.get_string('hide').''; + $content .= ''.get_string('hide').''; $content .= ''.get_string('courseevents', 'calendar').''."\n"; } @@ -750,17 +750,17 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL) { if($groupevents) { // This course MIGHT have group events defined, so show the filter if($SESSION->cal_show_groups) { - $content .= ''.get_string('hide').''; + $content .= ''.get_string('hide').''; $content .= ''.get_string('groupevents', 'calendar').''."\n"; } else { - $content .= ''.get_string('show').''; + $content .= ''.get_string('show').''; $content .= ''.get_string('groupevents', 'calendar').''."\n"; } if ($SESSION->cal_show_user) { - $content .= ''.get_string('hide').''; + $content .= ''.get_string('hide').''; $content .= ''.get_string('userevents', 'calendar').''."\n"; } else { - $content .= ''.get_string('show').''; + $content .= ''.get_string('show').''; $content .= ''.get_string('userevents', 'calendar').''."\n"; } @@ -769,10 +769,10 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL) { $content .= ' '."\n"; if($SESSION->cal_show_user) { - $content .= ''.get_string('hide').''; + $content .= ''.get_string('hide').''; $content .= ''.get_string('userevents', 'calendar').''."\n"; } else { - $content .= ''.get_string('show').''; + $content .= ''.get_string('show').''; $content .= ''.get_string('userevents', 'calendar').''."\n"; } } diff --git a/course/category.php b/course/category.php index 5fcce5afad..751063662d 100644 --- a/course/category.php +++ b/course/category.php @@ -316,56 +316,56 @@ if (has_capability('moodle/course:update', $coursecontext)) { echo ''. - ''.$stredit.' '; } + ''.$stredit.' '; } // role assignment link if (has_capability('moodle/role:assign', $coursecontext)) { - echo''.get_string('assignroles', 'role').''; + echo''.get_string('assignroles', 'role').''; } if (has_capability('moodle/course:delete', $coursecontext)) { echo ''. - ''.$strdelete.' '; + ''.$strdelete.' '; } if (has_capability('moodle/course:visibility', $coursecontext)) { if (!empty($acourse->visible)) { echo ''. - ''.$strhide.' '; + ''.$strhide.' '; } else { echo ''. - ''.$strshow.' '; + ''.$strshow.' '; } } if (has_capability('moodle/site:backup', $coursecontext)) { echo ''. - ''.$strbackup.' '; + ''.$strbackup.' '; } if (has_capability('moodle/site:restore', $coursecontext)) { echo ''. - ''.$strrestore.' '; + ''.$strrestore.' '; } if (has_capability('moodle/category:update', $context)) { if ($up) { echo ''. - ''.$strmoveup.' '; + ''.$strmoveup.' '; } else { - echo ' '; + echo ' '; } if ($down) { echo ''. - ''.$strmovedown.' '; + ''.$strmovedown.' '; } else { - echo ' '; + echo ' '; } $abletomovecourses = true; } @@ -377,18 +377,18 @@ } else { echo ''; if (!empty($acourse->guest)) { - echo ''; } if (!empty($acourse->password)) { - echo ''; } if (!empty($acourse->summary)) { link_to_popup_window ("/course/info.php?id=$acourse->id", "courseinfo", - ''.get_string('info').'', + ''.get_string('info').'', 400, 500, $strsummary); } echo ""; diff --git a/course/format/lams/format.php b/course/format/lams/format.php index 617b5ac7f9..fdcc0a7848 100644 --- a/course/format/lams/format.php +++ b/course/format/lams/format.php @@ -106,7 +106,7 @@ if ($thissection->summary or $thissection->sequence or isediting($course->id)) { if (isediting($course->id)) { echo ''.$streditsummary.'

'; + ' class="iconsmall" alt="'.$streditsummary.'" />

'; } echo ''; if(!isset($CFG->lams_serverurl)||!isset($CFG->lams_serverid)||!isset($CFG->lams_serverkey)){ @@ -123,7 +123,7 @@ if ($thissection->summary or $thissection->sequence or isediting($course->id)) { }else{ if(isediting($course->id)){//editing turned on. In this case echo ''; - echo ''; + echo ''; $datetime = date("F d,Y g:i a"); $plaintext = trim($datetime).trim($USER->username).trim($LAMSCONSTANTS->author_method).trim($CFG->lams_serverid).trim($CFG->lams_serverkey); @@ -260,7 +260,7 @@ while ($section <= $course->numsections) { if (isediting($course->id)) { echo ' '. - ''.$streditsummary.'

'; + ''.$streditsummary.'

'; } echo ''; @@ -301,12 +301,12 @@ while ($section <= $course->numsections) { if ($section > 1) { // Add a arrow to move section up echo ''. - ''.$strmoveup.'
'; + ''.$strmoveup.'
'; } if ($section < $course->numsections) { // Add a arrow to move section down echo ''. - ''.$strmovedown.'
'; + ''.$strmovedown.'
'; } } diff --git a/course/grade.php b/course/grade.php index 1113cb4c90..733b1acd6c 100644 --- a/course/grade.php +++ b/course/grade.php @@ -55,8 +55,8 @@ $image = "wwwroot/mod/$mod->modname/view.php?id=$mod->id\"". " title=\"$mod->modfullname\">". - "modname/icon.gif\" ". - "height=\"16\" width=\"16\" alt=\"$mod->modfullname\" />"; + "modname/icon.gif\" ". + "class=\"icon\" alt=\"$mod->modfullname\" />"; $columnhtml[] = "$image ". "wwwroot/mod/$mod->modname/view.php?id=$mod->id\">". format_string($instance->name,true). diff --git a/course/grades.php b/course/grades.php index c0f63a0ead..53efe95737 100644 --- a/course/grades.php +++ b/course/grades.php @@ -95,8 +95,8 @@ $image = "wwwroot/mod/$mod->modname/view.php?id=$mod->id\"". " title=\"$mod->modfullname\">". - "modname/icon.gif\" ". - "height=\"16\" width=\"16\" alt=\"$mod->modfullname\" />"; + "modname/icon.gif\" ". + "class=\"icon\" alt=\"$mod->modfullname\" />"; if ($mod->visible) { $columnhtml[] = "$image ". "wwwroot/mod/$mod->modname/view.php?id=$mod->id\">". diff --git a/course/index.php b/course/index.php index 429ce9163b..cb2c4f3405 100644 --- a/course/index.php +++ b/course/index.php @@ -365,26 +365,26 @@ function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $ if (has_capability('moodle/category:delete', $context)) { echo "delete\" href=\"index.php?delete=$category->id&sesskey=$USER->sesskey\">pixpath/t/delete.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"$str->delete\" /> "; + " src=\"$CFG->pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$str->delete\" /> "; } if (has_capability('moodle/category:visibility', $context)) { if (!empty($category->visible)) { echo "hide\" href=\"index.php?hide=$category->id&sesskey=$USER->sesskey\">pixpath/t/hide.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"$str->hide\" /> "; + " src=\"$CFG->pixpath/t/hide.gif\" class=\"iconsmall\" alt=\"$str->hide\" /> "; } else { echo "show\" href=\"index.php?show=$category->id&sesskey=$USER->sesskey\">pixpath/t/show.gif\" height=\"11\" width=\"11\" border=\"0\"alt=\"$str->show\" /> "; + " src=\"$CFG->pixpath/t/show.gif\" class=\"iconsmall\" alt=\"$str->show\" /> "; } } if ($up) { echo "moveup\" href=\"index.php?moveup=$category->id&sesskey=$USER->sesskey\">pixpath/t/up.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"$str->moveup\" /> "; + " src=\"$CFG->pixpath/t/up.gif\" class=\"iconsmall\" alt=\"$str->moveup\" /> "; } if ($down) { echo "movedown\" href=\"index.php?movedown=$category->id&sesskey=$USER->sesskey\">pixpath/t/down.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"$str->movedown\" /> "; + " src=\"$CFG->pixpath/t/down.gif\" class=\"iconsmall\" alt=\"$str->movedown\" /> "; } echo ""; diff --git a/course/info.php b/course/info.php index 995517ae91..f0b02f4aa9 100644 --- a/course/info.php +++ b/course/info.php @@ -35,11 +35,11 @@ echo "
"; if ($course->guest) { $strallowguests = get_string("allowguests"); - echo "

\"\"pixpath/i/guest.gif\" /> $strallowguests

"; + echo "

\"\"pixpath/i/guest.gif\" /> $strallowguests

"; } if ($course->password) { $strrequireskey = get_string("requireskey"); - echo "

\"\"pixpath/i/key.gif\" /> $strrequireskey

"; + echo "

\"\"pixpath/i/key.gif\" /> $strrequireskey

"; } diff --git a/course/lib.php b/course/lib.php index d443e7ce08..c8652312b6 100644 --- a/course/lib.php +++ b/course/lib.php @@ -2148,13 +2148,13 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=- if ($mod->visible) { $hideshow = ''."\n"; + ' src="'.$CFG->pixpath.'/t/hide.gif" class="iconsmall" '. + ' alt="'.$str->hide.'" />'."\n"; } else { $hideshow = ''."\n"; + ' src="'.$CFG->pixpath.'/t/show.gif" class="iconsmall" '. + ' alt="'.$str->show.'" />'."\n"; } if ($mod->groupmode !== false) { if ($mod->groupmode == SEPARATEGROUPS) { @@ -2175,12 +2175,12 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=- } if ($mod->groupmodelink) { $groupmode = ''. - ''.$grouptitle.''; + ''; } else { $groupmode = ''.$grouptitle.''; + ' src="'.$groupimage.'" class="iconsmall" '. + 'alt="'.$grouptitle.'" />'; } } else { $groupmode = ""; @@ -2189,41 +2189,41 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=- if ($moveselect) { $move = ''."\n"; + ' src="'.$CFG->pixpath.'/t/move.gif" class="iconsmall" '. + ' alt="'.$str->move.'" />'."\n"; } else { $move = ''."\n". + ' src="'.$CFG->pixpath.'/t/up.gif" class="iconsmall" '. + ' alt="'.$str->moveup.'" />'."\n". ''."\n"; + ' src="'.$CFG->pixpath.'/t/down.gif" class="iconsmall" '. + ' alt="'.$str->movedown.'" />'."\n"; } $leftright = ""; if ($indent > 0) { $leftright .= ''."\n"; + ' src="'.$CFG->pixpath.'/t/left.gif" class="iconsmall" '. + ' alt="'.$str->moveleft.'" />'."\n"; } if ($indent >= 0) { $leftright .= ''."\n"; + ' src="'.$CFG->pixpath.'/t/right.gif" class="iconsmall" '. + ' alt="'.$str->moveright.'" />'."\n"; } return ''."\n".$leftright.$move. ''."\n". ''."\n".$hideshow.$groupmode."\n".''; } diff --git a/course/mod.php b/course/mod.php index 22beb9d919..8d24ef4297 100644 --- a/course/mod.php +++ b/course/mod.php @@ -695,7 +695,7 @@ $defaultformat = FORMAT_MOODLE; } - $icon = ' '; + $icon = ''; print_heading_with_help($pageheading, "mods", $module->name, $icon); print_simple_box_start('center', '', '', 5, 'generalbox', $module->name); diff --git a/course/modedit.php b/course/modedit.php index 98965a3954..387b65605a 100644 --- a/course/modedit.php +++ b/course/modedit.php @@ -274,7 +274,7 @@ $currenttab = 'update'; include_once($CFG->dirroot.'/'.$CFG->admin.'/roles/tabs.php'); } - $icon = ' '; + $icon = ''; print_heading_with_help($pageheading, "mods", $module->name, $icon); $mform->display(); diff --git a/course/pending.php b/course/pending.php index 5e794cddf3..c8655b4792 100644 --- a/course/pending.php +++ b/course/pending.php @@ -108,7 +108,7 @@ } //do not output raw html from request, quote html entities using s()!! $table->data[] = array(((!empty($course->password)) ? - ''.$strrequireskey.'' : ''), + ''.$strrequireskey.'' : ''), s($course->shortname),s($course->fullname),fullname($requester), s($course->summary),s($course->reason), ''.get_string('approve').' | ' diff --git a/course/recent.php b/course/recent.php index 358b42061c..173a7b9646 100644 --- a/course/recent.php +++ b/course/recent.php @@ -262,7 +262,7 @@ $linkformat = ''; } $image = "modpixpath/" . $activity->content->modname . "/icon.gif\"" . - " height=\"16\" width=\"16\" alt=\"" . $activity->content->modfullname . "\" />"; + " class=\"icon\" alt=\"" . $activity->content->modfullname . "\" />"; echo "
"; echo ""; diff --git a/course/scales.php b/course/scales.php index 9505364dab..5838d96cea 100644 --- a/course/scales.php +++ b/course/scales.php @@ -437,17 +437,17 @@ $buttons = ""; if (empty($scales_uses) && ($incustom || has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM, SITEID)))) { $buttons .= "id&scaleid=$scale->id&action=edit\">pixpath/t/edit.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"$stredit\" /> "; + " src=\"$CFG->pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"$stredit\" /> "; if ($incustom && has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM, SITEID))) { $buttons .= "id&scaleid=$scale->id&action=down&sesskey=$USER->sesskey\">pixpath/t/down.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"$strdown\" /> "; + " src=\"$CFG->pixpath/t/down.gif\" class=\"iconsmall\" alt=\"$strdown\" /> "; } if (!$incustom && has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM, SITEID))) { $buttons .= "id&scaleid=$scale->id&action=up&sesskey=$USER->sesskey\">pixpath/t/up.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"$strup\" /> "; + " src=\"$CFG->pixpath/t/up.gif\" class=\"iconsmall\" alt=\"$strup\" /> "; } $buttons .= "id&scaleid=$scale->id&action=delete&sesskey=$USER->sesskey\">pixpath/t/delete.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"$strdelete\" /> "; + " src=\"$CFG->pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" /> "; } $line[] = $buttons; diff --git a/course/search.php b/course/search.php index 044f28f802..da00455ccd 100644 --- a/course/search.php +++ b/course/search.php @@ -199,7 +199,7 @@ // checks whether user can do role assignment if (has_capability('moodle/role:assign', $coursecontext)) { echo''; - echo ''.get_string('assignroles', 'role').''; + echo ''.get_string('assignroles', 'role').''; } // checks whether user can delete course diff --git a/course/user.php b/course/user.php index 2c7cc13c43..394d4194fb 100644 --- a/course/user.php +++ b/course/user.php @@ -219,7 +219,7 @@ $user_complete = $mod->modname."_user_complete"; if (function_exists($user_complete)) { $image = "modname/icon.gif\" ". - "height=\"16\" width=\"16\" alt=\"$mod->modfullname\" />"; + "class=\"icon\" alt=\"$mod->modfullname\" />"; echo "

$image $mod->modfullname: ". "wwwroot/mod/$mod->modname/view.php?id=$mod->id\">". format_string($instance->name,true)."

"; @@ -261,7 +261,7 @@ function print_outline_row($mod, $instance, $result) { global $CFG; - $image = "modpixpath/$mod->modname/icon.gif\" height=\"16\" width=\"16\" alt=\"$mod->modfullname\" />"; + $image = "modpixpath/$mod->modname/icon.gif\" class=\"icon\" alt=\"$mod->modfullname\" />"; echo ""; echo ""; diff --git a/files/index.php b/files/index.php index 102316609b..87b83c1b38 100644 --- a/files/index.php +++ b/files/index.php @@ -621,7 +621,7 @@ function printfilelist($filelist) { foreach ($filelist as $file) { if (is_dir($basedir.'/'.$file)) { - echo "pixpath/f/folder.gif\" height=\"16\" width=\"16\" alt=\"$strfolder\" /> $file
"; + echo "pixpath/f/folder.gif\" class=\"icon\" alt=\"$strfolder\" /> $file
"; $subfilelist = array(); $currdir = opendir($basedir.'/'.$file); while (false !== ($subfile = readdir($currdir))) { @@ -633,7 +633,7 @@ function printfilelist($filelist) { } else { $icon = mimeinfo("icon", $file); - echo "pixpath/f/$icon\" height=\"16\" width=\"16\" alt=\"$strfile\" /> $file
"; + echo "pixpath/f/$icon\" class=\"icon\" alt=\"$strfile\" /> $file
"; } } } @@ -721,7 +721,7 @@ function displaydir ($wdir) { $fileurl = rawurlencode(dirname($wdir)); print_cell(); // alt attribute intentionally empty to prevent repetition in screen reader - print_cell('left', ' '.get_string('parentfolder').'', 'name'); + print_cell('left', ' '.get_string('parentfolder').'', 'name'); print_cell(); print_cell(); print_cell(); @@ -734,7 +734,7 @@ function displaydir ($wdir) { $filesize = display_size(get_directory_size("$fullpath/$dir")); $filedate = userdate(filemtime($filename), "%d %b %Y, %I:%M %p"); print_cell("center", "", 'checkbox'); - print_cell("left", "pixpath/f/folder.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"$strfolder\" /> ".htmlspecialchars($dir)."", 'name'); + print_cell("left", "pixpath/f/folder.gif\" class=\"icon\" alt=\"$strfolder\" /> ".htmlspecialchars($dir)."", 'name'); print_cell("right", $filesize, 'size'); print_cell("right", $filedate, 'date'); print_cell("right", "$strrename", 'commands'); @@ -770,7 +770,7 @@ function displaydir ($wdir) { $ffurl = str_replace('//', '/', "/file.php?file=/$id/$fileurl"); } link_to_popup_window ($ffurl, "display", - "pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"$strfile\" /> ".htmlspecialchars($file), + "pixpath/f/$icon\" class=\"icon\" alt=\"$strfile\" /> ".htmlspecialchars($file), 480, 640); echo ""; diff --git a/index.php b/index.php index 4d8ce128e7..3eb173be3f 100644 --- a/index.php +++ b/index.php @@ -141,7 +141,7 @@ $streditsummary = get_string('editsummary'); echo "id\">pixpath/t/edit.gif\" ". - " height=\"11\" width=\"11\" border=\"0\" alt=\"$streditsummary\" />

"; + " class=\"iconsmall\" alt=\"$streditsummary\" />

"; } get_all_mods($SITE->id, $mods, $modnames, $modnamesplural, $modnamesused); diff --git a/lib/editor/htmlarea/coursefiles.php b/lib/editor/htmlarea/coursefiles.php index 5a24ad79e6..8d6b2951c1 100644 --- a/lib/editor/htmlarea/coursefiles.php +++ b/lib/editor/htmlarea/coursefiles.php @@ -608,7 +608,7 @@ function printfilelist($filelist) { foreach ($filelist as $file) { if (is_dir($basedir.$file)) { - echo "pixpath/f/folder.gif\" height=\"16\" width=\"16\" alt=\"".get_string('folder')."\" /> $file
"; + echo "pixpath/f/folder.gif\" class=\"icon\" alt=\"".get_string('folder')."\" /> $file
"; $subfilelist = array(); $currdir = opendir($basedir.$file); while (false !== ($subfile = readdir($currdir))) { @@ -620,7 +620,7 @@ function printfilelist($filelist) { } else { $icon = mimeinfo("icon", $file); - echo "pixpath/f/$icon\" height=\"16\" width=\"16\" alt=\"".get_string('file')."\" /> $file
"; + echo "pixpath/f/$icon\" class=\"icon\" alt=\"".get_string('file')."\" /> $file
"; } } } @@ -727,7 +727,7 @@ function displaydir ($wdir) { if ($usecheckboxes) { print_cell("center", ""); } - print_cell("left", "pixpath/f/folder.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"".get_string('folder')."\" />".htmlspecialchars($dir).""); + print_cell("left", "pixpath/f/folder.gif\" class=\"icon\" alt=\"".get_string('folder')."\" />".htmlspecialchars($dir).""); print_cell("right", " "); print_cell("right", $filedate); @@ -771,7 +771,7 @@ function displaydir ($wdir) { $ffurl = "/file.php?file=/$id$fileurl"; } link_to_popup_window ($ffurl, "display", - "pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" align=\"middle\" alt=\"$strfile\" />", + "pixpath/f/$icon\" class=\"icon\" alt=\"$strfile\" />", 480, 640); $file_size = filesize($filename); diff --git a/lib/questionlib.php b/lib/questionlib.php index 359b7d0ef6..9592a5220b 100644 --- a/lib/questionlib.php +++ b/lib/questionlib.php @@ -884,26 +884,26 @@ function question_get_feedback_image($fraction, $selected=true) { if ($fraction >= 1.0) { if ($selected) { $feedbackimg = ''; + 'alt="'.get_string('correct', 'quiz').'" class="icon" />'; } else { $feedbackimg = ''; + 'alt="'.get_string('correct', 'quiz').'" class="icon" />'; } } else if ($fraction > 0.0 && $fraction < 1.0) { if ($selected) { $feedbackimg = ''; + 'alt="'.get_string('partiallycorrect', 'quiz').'" class="icon" />'; } else { $feedbackimg = ''; + 'alt="'.get_string('partiallycorrect', 'quiz').'" class="icon" />'; } } else { if ($selected) { $feedbackimg = ''; + 'alt="'.get_string('incorrect', 'quiz').'" class="icon" />'; } else { $feedbackimg = ''; + 'alt="'.get_string('incorrect', 'quiz').'" class="icon" />'; } } return $feedbackimg; diff --git a/message/lib.php b/message/lib.php index 6c278acb96..ec95cd6cdc 100644 --- a/message/lib.php +++ b/message/lib.php @@ -607,7 +607,7 @@ function message_contact_link($userid, $linktype='add', $return=false, $script=" $output = ''. ''. - ''.s($alttext).''. + ''.s($alttext).''. $text.''; if ($return) { @@ -638,9 +638,9 @@ function message_history_link($userid1, $userid2=0, $returnstr=false, $keywords= } if ($linktext == 'icon') { // Icon only - $fulllink = ''.$strmessagehistory.''; + $fulllink = ''.$strmessagehistory.''; } else if ($linktext == 'both') { // Icon and standard name - $fulllink = ''; + $fulllink = ''; $fulllink .= ' '.$strmessagehistory; } else if ($linktext) { // Custom name $fulllink = $linktext; diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 2cb1c7a457..64fc8874bf 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -1484,7 +1484,7 @@ class assignment_base { $ffurl = "$CFG->wwwroot/file.php?file=/$filearea/$file"; } - $output .= ''.$icon.''. + $output .= ''.$icon.''. ''.$file.'
'; } } @@ -2108,7 +2108,7 @@ function assignment_print_recent_mod_activity($activity, $course, $detail=false) if ($detail) { echo "modpixpath/$activity->type/icon.gif\" ". - "height=16 width=16 alt=\"$activity->type\"> "; + "class=\"icon\" alt=\"$activity->type\"> "; echo "wwwroot/mod/assignment/view.php?id=" . $activity->instance . "\">" . format_string($activity->name,true) . " - "; diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php index 6215b033be..336db2847f 100644 --- a/mod/assignment/type/online/assignment.class.php +++ b/mod/assignment/type/online/assignment.class.php @@ -174,7 +174,7 @@ class assignment_online extends assignment_base { return ''; } $output = '
'. - 'html'. + 'html'. link_to_popup_window ('/mod/assignment/type/online/file.php?id='.$this->cm->id.'&userid='. $submission->userid, 'file'.$userid, shorten_text(trim(strip_tags(format_text($submission->data1,$submission->data2))), 15), 450, 580, get_string('submission', 'assignment'), 'none', true). diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index 9b92801d2f..fdf94a3038 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -329,13 +329,13 @@ class assignment_upload extends assignment_base { $ffurl = "$CFG->wwwroot/file.php?file=/$filearea/$file"; - $output .= ''.$icon.''.$file.''; + $output .= ''.$icon.''.$file.''; if ($candelete) { $delurl = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&file=$file&userid={$submission->userid}&mode=$mode&offset=$offset"; $output .= ' ' - .' '; + .' '; } $output .= '
'; @@ -389,7 +389,7 @@ class assignment_upload extends assignment_base { $delurl = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&file=$file&userid=$userid&mode=$mode&offset=$offset&action=response"; $output .= ' ' - .' '; + .' '; } $output .= ' '; diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php index 1930ef3a03..523888df88 100644 --- a/mod/assignment/type/uploadsingle/assignment.class.php +++ b/mod/assignment/type/uploadsingle/assignment.class.php @@ -29,7 +29,7 @@ class assignment_uploadsingle extends assignment_base { } //died right here //require_once($ffurl); - $output = ''.$icon.''. + $output = ''.$icon.''. ''.$file.'
'; } } diff --git a/mod/data/field.php b/mod/data/field.php index f083022905..541db45b0f 100755 --- a/mod/data/field.php +++ b/mod/data/field.php @@ -275,10 +275,10 @@ shorten_text($field->field->description, 30), ''. - ''.get_string('edit').''. + ''.get_string('edit').''. ' '. ''. - ''.get_string('delete').'' + ''.get_string('delete').'' ); } diff --git a/mod/data/field/file/field.class.php b/mod/data/field/file/field.class.php index 006ec36dc5..0376a3f804 100755 --- a/mod/data/field/file/field.class.php +++ b/mod/data/field/file/field.class.php @@ -74,7 +74,7 @@ class data_field_file extends data_field_base { if ($recordid and isset($content)){ // Print icon require_once($CFG->libdir.'/filelib.php'); $icon = mimeinfo('icon', $src); - $str .= ''.$icon.' '. + $str .= ''.$icon.''. ''.$name.''; } return $str; diff --git a/mod/data/lib.php b/mod/data/lib.php index ce145ed8bd..e891605432 100755 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -843,15 +843,15 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re $patterns[]='##delete##'; if (has_capability('mod/data:manageentries', $context) or data_isowner($record->id)) { $replacement[] = ''.get_string('edit').''; + .$data->id.'&rid='.$record->id.'&sesskey='.sesskey().'">'.get_string('edit').''; $replacement[] = ''.get_string('delete').''; + .$data->id.'&delete='.$record->id.'&sesskey='.sesskey().'">'.get_string('delete').''; } else { $replacement[] = ''; $replacement[] = ''; } $patterns[]='##more##'; - $replacement[] = ''.get_string('more', 'data').''; + $replacement[] = ''.get_string('more', 'data').''; $patterns[]='##moreurl##'; $replacement[] = $CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&rid='.$record->id; @@ -862,7 +862,7 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re $patterns[]='##approve##'; if (has_capability('mod/data:approve', $context) && ($data->approval) && (!$record->approved)){ - $replacement[] = ''.get_string('approve').''; + $replacement[] = ''.get_string('approve').''; } else { $replacement[] = ''; } diff --git a/mod/data/preset.php b/mod/data/preset.php index bec4eb1497..7ac08ac6fc 100644 --- a/mod/data/preset.php +++ b/mod/data/preset.php @@ -362,7 +362,7 @@ foreach ($presets as $id => $preset) { $dellink = ''; if ($preset->userid > 0 and ($preset->userid == $USER->id || has_capability('mod/data:manageuserpresets', $context))) { $dellink = ' '. - ''.$strdelete.' '.$desc.''; + ''.$strdelete.' '.$desc.''; } echo ''.$dellink.'
'; diff --git a/mod/exercise/lib.php b/mod/exercise/lib.php index 71bbae264a..1ccb278a58 100644 --- a/mod/exercise/lib.php +++ b/mod/exercise/lib.php @@ -765,7 +765,7 @@ function exercise_print_submission_title($exercise, $submission) { } else { $ffurl = "file.php?file=/$filearea/$file"; } - return "pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"".get_string('file')."\" />". + return "pixpath/f/$icon\" class=\"icon\" alt=\"".get_string('file')."\" />". " wwwroot/$ffurl\">$submission->title"; } } diff --git a/mod/forum/lib.php b/mod/forum/lib.php index be1a493b23..384f016727 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -2222,7 +2222,7 @@ function forum_print_discussion_header(&$post, $forum, $group=-1, $datestring="" echo ''; echo '' . - ''.$strmarkalldread.''; + ''.$strmarkalldread.''; echo ''; } else { echo ''; @@ -2581,7 +2581,7 @@ function forum_print_attachments($post, $return=NULL) { } else { $ffurl = "$CFG->wwwroot/file.php?file=/$filearea/$file"; } - $image = "pixpath/f/$icon\" height=\"16\" width=\"16\" alt=\"\" />"; + $image = "pixpath/f/$icon\" class=\"icon\" alt=\"\" />"; if ($return == "html") { $output .= "$image "; @@ -3234,7 +3234,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis echo ' '. - ''.get_string('markallread', 'forum').''; + ''.get_string('markallread', 'forum').''; } echo ''; } @@ -3638,7 +3638,7 @@ function forum_print_recent_mod_activity($activity, $course, $detail=false) { if ($detail) { echo "modpixpath/$activity->type/icon.gif\" ". - "height=\"16\" width=\"16\" alt=\"".strip_tags(format_string($activity->name,true))."\" /> "; + "class=\"icon\" alt=\"".strip_tags(format_string($activity->name,true))."\" /> "; } echo "wwwroot/mod/forum/discuss.php?d=" . $activity->content->discussion . "#p" . $activity->content->id . "\">"; diff --git a/mod/glossary/comments.php b/mod/glossary/comments.php index f274486998..fb84530f1f 100644 --- a/mod/glossary/comments.php +++ b/mod/glossary/comments.php @@ -58,7 +58,7 @@ print_heading(format_string(get_string('commentson','glossary')." \"$entry->concept\"")); if ($glossary->allowcomments || has_capability('mod/glossary:managecomments', $context)) { - print_heading("id\">$straddcomment \"$straddcomment\""); + print_heading("id\">$straddcomment \"$straddcomment\""); } if ($comments = get_records("glossary_comments","entryid",$entry->id,"timemodified ASC")) { diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php index fff068ad02..abcb642fa8 100644 --- a/mod/glossary/editcategories.php +++ b/mod/glossary/editcategories.php @@ -201,8 +201,8 @@
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index b208dc1fe0..f8fa08358b 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -786,7 +786,7 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h if (has_capability('mod/glossary:comment', $context)) { $output = true; - $return .= ' '.get_string('addcomment','glossary').''; + $return .= ' '.get_string('addcomment','glossary').''; } @@ -796,7 +796,7 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h $mainglossary = get_record('glossary','mainglossary',1,'course',$course->id); if ( $mainglossary ) { // if there is a main glossary defined, allow to export the current entry $output = true; - $return .= ' '.get_string('exporttomainglossary','glossary').''; + $return .= ' '.get_string('exporttomainglossary','glossary').''; } } @@ -814,9 +814,9 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h $output = true; $return .= " id&mode=delete&entry=$entry->id&prevmode=$mode&hook=$hook\">\"" "; + $return .= "\" class=\"iconsmall\" alt=\"" . get_string("delete") . "\" /> "; - $return .= " id&e=$entry->id&mode=$mode&hook=$hook\">pixpath/t/edit.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"" . get_string("edit") . "\" />"; + $return .= " id&e=$entry->id&mode=$mode&hook=$hook\">pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"" . get_string("edit") . "\" />"; } elseif ( $importedentry ) { $return .= " " . get_string("exportedentry","glossary") . ""; } @@ -1177,7 +1177,7 @@ function glossary_print_attachments($entry, $return=NULL, $align="left") { } else { $ffurl = "$CFG->wwwroot/file.php?file=/$filearea/$file"; } - $image = "pixpath/f/$icon\" height=\"16\" width=\"16\" alt=\"\" />"; + $image = "pixpath/f/$icon\" class=\"icon\" alt=\"\" />"; if ($return == "html") { $output .= "$image "; @@ -1444,7 +1444,7 @@ global $CFG; $neworder = '&sortorder=asc'; $newordertitle = $asc; } - $icon = " \""."; + $icon = " \""."; } else { if ( $sortkey != 'CREATION' and $sortkey != 'UPDATE' and $sortkey != 'FIRSTNAME' and $sortkey != 'LASTNAME' ) { @@ -1453,7 +1453,7 @@ global $CFG; } else { $newordertitle = $desc; $neworder = '&sortorder=desc'; - $icon = ' '; + $icon = ' '; } } $ficon = ''; @@ -1558,11 +1558,11 @@ function glossary_print_comment($course, $cm, $glossary, $entry, $comment) { $ineditperiod = ((time() - $comment->timemodified < $CFG->maxeditingtime) || $glossary->editalways); if ( ($glossary->allowcomments && $ineditperiod && $USER->id == $comment->userid) || has_capability('mod/glossary:managecomments', $context)) { echo "id&action=edit\">\""pixpath/t/edit.gif\" height=\"11\" width=\"11\" border=\"0\" /> "; + alt=\"" . get_string("edit") . "\" src=\"$CFG->pixpath/t/edit.gif\" class=\"iconsmall\" /> "; } if ( ($glossary->allowcomments && $USER->id == $comment->userid) || has_capability('mod/glossary:managecomments', $context) ) { echo "id&action=delete\">\""pixpath/t/delete.gif\" height=\"11\" width=\"11\" border=\"0\" />"; + alt=\"" . get_string("delete") . "\" src=\"$CFG->pixpath/t/delete.gif\" class=\"iconsmall\" />"; } echo ''; diff --git a/mod/hotpot/index.php b/mod/hotpot/index.php index 18a76ddfb7..1898666c90 100644 --- a/mod/hotpot/index.php +++ b/mod/hotpot/index.php @@ -310,7 +310,7 @@ $printsection .= '
'.$strshowall.'
'; } else { $strshowone = get_string('showonly'.preg_replace('|s$|', '', $course->format, 1), '', $hotpot->section); - $printsection .= '
'.$strshowone.'
'; + $printsection .= '
'.$strshowone.'
'; } } } diff --git a/mod/hotpot/lib.php b/mod/hotpot/lib.php index 462207a084..d3a496fc88 100644 --- a/mod/hotpot/lib.php +++ b/mod/hotpot/lib.php @@ -1084,7 +1084,7 @@ function hotpot_print_recent_mod_activity($activity, $course, $detail=false) { if ($detail) { // activity icon $src = "$CFG->modpixpath/$activity->type/icon.gif"; - print ''.$activity->type.' '; + print ''.$activity->type.' '; // link to activity $href = "$CFG->wwwroot/mod/hotpot/view.php?hp=$activity->instance"; diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php index 20d6af37fb..4c074bc670 100644 --- a/mod/lesson/locallib.php +++ b/mod/lesson/locallib.php @@ -481,16 +481,16 @@ function lesson_print_page_actions($cmid, $page, $printmove, $printaddpage = fal if (has_capability('mod/lesson:edit', $context)) { if ($printmove) { $actions[] = "wwwroot/mod/lesson/lesson.php?id=$cmid&action=move&pageid=$page->id\"> - pixpath/t/move.gif\" height=\"11\" width=\"11\" alt=\"".get_string('move')."\" border=\"0\" />\n"; + pixpath/t/move.gif\" class=\"iconsmall\" alt=\"".get_string('move')."\" />\n"; } $actions[] = "wwwroot/mod/lesson/lesson.php?id=$cmid&action=editpage&pageid=$page->id\"> - pixpath/t/edit.gif\" height=\"11\" width=\"11\" alt=\"".get_string('update')."\" border=\"0\" />\n"; + pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"".get_string('update')."\" />\n"; $actions[] = "wwwroot/mod/lesson/view.php?id=$cmid&pageid=$page->id\"> - pixpath/t/preview.gif\" height=\"11\" width=\"11\" alt=\"".get_string('preview')."\" border=\"0\" />\n"; + pixpath/t/preview.gif\" class=\"iconsmall\" alt=\"".get_string('preview')."\" />\n"; $actions[] = "wwwroot/mod/lesson/lesson.php?id=$cmid&sesskey=".sesskey()."&action=confirmdelete&pageid=$page->id\"> - pixpath/t/delete.gif\" height=\"11\" width=\"11\" alt=\"".get_string('delete')."\" border=\"0\" />\n"; + pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"".get_string('delete')."\" />\n"; if ($printaddpage) { // Add page drop-down diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php index 93fb267000..9936a3883b 100644 --- a/mod/quiz/lib.php +++ b/mod/quiz/lib.php @@ -429,7 +429,7 @@ function quiz_print_recent_mod_activity($activity, $course, $detail=false) { if ($detail) { echo "modpixpath/$activity->type/icon.gif\" ". - "height=\"16\" width=\"16\" alt=\"$activity->type\" /> "; + "class=\"icon\" alt=\"$activity->type\" /> "; echo "wwwroot/mod/quiz/view.php?id=" . $activity->instance . "\">" . format_string($activity->name,true) . " - "; diff --git a/mod/resource/type/directory/resource.class.php b/mod/resource/type/directory/resource.class.php index 9be17062ad..b96c9e3888 100644 --- a/mod/resource/type/directory/resource.class.php +++ b/mod/resource/type/directory/resource.class.php @@ -121,11 +121,11 @@ function display() { echo ''; echo ''; echo ''; echo ''; diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php index 3ff3bd3bf4..6039925694 100755 --- a/mod/scorm/locallib.php +++ b/mod/scorm/locallib.php @@ -489,7 +489,7 @@ function scorm_course_format_display($user,$course) { $path = $CFG->wwwroot.'/course'; $headertext .= ''. ''. - ''.$strupdate.''; + ''.$strupdate.''; } $headertext .= ''; // Display report link diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php index 7a040354ea..6fd7629a17 100644 --- a/mod/workshop/lib.php +++ b/mod/workshop/lib.php @@ -1189,7 +1189,7 @@ function workshop_print_recent_mod_activity($activity, $course, $detail=false) { if ($detail) { echo "modpixpath/$activity->type/icon.gif\" ". - "height=\"16\" width=\"16\" alt=\"".strip_tags(format_string($activity->name,true))."\" /> "; + "class=\"icon\" alt=\"".strip_tags(format_string($activity->name,true))."\" /> "; } echo "wwwroot/mod/workshop/view.php?" . "#" . $activity->content->id . "\">".$activity->content->title; diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php index 23223b514f..822755cfac 100644 --- a/mod/workshop/locallib.php +++ b/mod/workshop/locallib.php @@ -2723,7 +2723,7 @@ function workshop_print_assignment_info($workshop) { if (workshop_is_teacheredit($workshop) and $workshop->nelements) { echo " id&action=editelements\">". "pixpath/t/edit.gif\" ". - 'height="11" width="11" border="0" alt="'.get_string('amendassessmentelements', 'workshop').'" />'; + 'class="iconsmall" alt="'.get_string('amendassessmentelements', 'workshop').'" />'; } echo ")
"; print_simple_box_end(); @@ -2863,8 +2863,7 @@ function workshop_print_submission($workshop, $submission) { $ffurl = "file.php?file=/$filearea/$file"; } echo ""; $n++; } @@ -2900,10 +2899,10 @@ function workshop_print_submission_assessments($workshop, $submission, $type) { if (workshop_is_teacher($workshop, $USER->id)) { $str .= ' id&sid=$submission->id\">pixpath/t/edit.gif\" ". - ' height="11" width="11" border="0" alt="'.get_string('reassess', 'workshop').'" />'; + ' class="iconsmall" alt="'.get_string('reassess', 'workshop').'" />'; $str .= ' id&aid=$assessment->id\">pixpath/t/delete.gif\" ". - ' height="11" width="11" border="0" alt="'.get_string('delete', 'workshop').'" />
'; + ' class="iconsmall" alt="'.get_string('delete', 'workshop').'" />
'; } } } diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php index 69c77a0e68..658372d0cd 100644 --- a/mod/workshop/submissions.php +++ b/mod/workshop/submissions.php @@ -271,7 +271,7 @@ $ffurl = "file.php?file=/$filearea/$file"; } echo "\n"; } } else { diff --git a/mod/workshop/view.php b/mod/workshop/view.php index 57359e0469..7a3cb397bd 100644 --- a/mod/workshop/view.php +++ b/mod/workshop/view.php @@ -336,10 +336,10 @@ $title = workshop_print_submission_title($workshop, $submission). " id&sid=$submission->id\">". "pixpath/t/edit.gif\" ". - 'height="11" width="11" border="0" alt="'.get_string('edit').'" />'. + 'class="iconsmall" alt="'.get_string('edit').'" />'. " id&sid=$submission->id\">". "pixpath/t/delete.gif\" ". - 'height="11" width="11" border="0" alt="'.get_string('delete', 'workshop').'" />'; + 'class="iconsmall" alt="'.get_string('delete', 'workshop').'" />'; $table->data[] = array($title, $teacherassessments, workshop_print_submission_assessments($workshop, $submission, "student")); } @@ -391,10 +391,10 @@ $data[] = workshop_print_submission_title($workshop, $submission). " id&sid=$submission->id\">". "pixpath/t/edit.gif\" ". - 'height="11" width="11" border="0" alt="'.get_string('amendtitle', 'workshop').'" />'. + 'class="iconsmall" alt="'.get_string('amendtitle', 'workshop').'" />'. " id&sid=$submission->id\">". "pixpath/t/delete.gif\" ". - 'height="11" width="11" border="0" alt="'.get_string('delete', 'workshop').'" />'; + 'class="iconsmall" alt="'.get_string('delete', 'workshop').'" />'; $sortdata['title'] = $submission->title; $data[] = userdate($submission->timecreated, get_string('datestr', 'workshop')); diff --git a/question/category_class.php b/question/category_class.php index 8b0c34743e..8caef30472 100644 --- a/question/category_class.php +++ b/question/category_class.php @@ -305,7 +305,7 @@ class question_category_object { $this->edittable->align["$category->id.name"] = "left"; $this->edittable->wrap["$category->id.name"] = "nowrap"; $row["$category->id.name"] = '' .$this->str->edit. ' ' . $fill . $category->name . ''; $this->edittable->align["$category->id.info"] = "left"; @@ -320,17 +320,17 @@ class question_category_object { $this->edittable->wrap["$category->id.publish"] = "nowrap"; if (!empty($category->publish)) { $row["$category->id.publish"] = '' .$this->str->hide. ' '; + '&sesskey='.$USER->sesskey.$pagelink.'">' .$this->str->hide. ' '; } else { $row["$category->id.publish"] = '' .$this->str->publish. ' '; + '&sesskey='.$USER->sesskey.$pagelink.'">' .$this->str->publish. ' '; } if ($category->id != $this->defaultcategory->id) { $this->edittable->align["$category->id.delete"] = "center"; $this->edittable->wrap["$category->id.delete"] = "nowrap"; $row["$category->id.delete"] = '' .$this->str->delete. ' '; + '&delete=' . $category->id . '&sesskey='.$USER->sesskey.$pagelink.'">' .$this->str->delete. ' '; } else { $row["$category->id.delete"] = ''; } @@ -340,11 +340,11 @@ class question_category_object { $icons = ''; if ($up) { $icons .= ' - ' . $this->str->moveup. ' '; + ' . $this->str->moveup. ' '; } if ($down) { $icons .= ' - ' .$this->str->movedown. ' '; + ' .$this->str->movedown. ' '; } $row["$category->id.order"]= $icons; diff --git a/question/type/multianswer/questiontype.php b/question/type/multianswer/questiontype.php index 2ee7543688..6223925d42 100644 --- a/question/type/multianswer/questiontype.php +++ b/question/type/multianswer/questiontype.php @@ -202,7 +202,7 @@ class embedded_cloze_qtype extends default_questiontype { // MDL-7497 if (!empty($USER->screenreader)) { echo "wwwroot/question/type/$question->qtype/icon.gif\" ". - "height=\"16\" width=\"16\" alt=\"".get_string('clozeaid','qtype_multichoice')."\" /> "; + "class=\"icon\" alt=\"".get_string('clozeaid','qtype_multichoice')."\" /> "; } // For this question type, we better print the image on top: if ($image = get_question_image($question, $cmoptions->course)) { diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index f1c1aca1c8..cb181e19d2 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -293,6 +293,22 @@ form.popupform { vertical-align: top; } +img.icon { + vertical-align: middle; + margin-right: 4px; + width:16px; + height:16px; + border:0px; +} + +img.iconsmall { + vertical-align: middle; + margin-right: 1px; + width:11px; + height:11px; + border:0px; +} + /*Accessibility: text 'seen' by screen readers but not visual users. Fixed for RTL languages, example Farsi. */ .accesshide { position:absolute; diff --git a/user/index.php b/user/index.php index bd12557e7d..007a6c4e30 100644 --- a/user/index.php +++ b/user/index.php @@ -418,7 +418,7 @@ $heading = get_string('xuserswiththerole', 'role', $a); if (user_can_assign($context, $roleid)) { $heading .= ' '; - $heading .= ''; + $heading .= ''; } print_heading($heading, 'center', 3); } else { -- 2.39.5
LAMS LAMS courseLAMS LAMS course
$image
$image id&action=delete&mode=cat&hook=$category->id\">\"" "; - echo "id&action=edit&mode=cat&hook=$category->id\">\"""; + echo "id&action=delete&mode=cat&hook=$category->id\">\"" "; + echo "id&action=edit&mode=cat&hook=$category->id\">\"""; ?>
'; echo "id}&subdir=$subdir/$file\">"; - echo "pixpath/f/$icon\" width=\"16\" height=\"16\" alt=\"$strfolder\" /> $file"; + echo "pixpath/f/$icon\" class=\"icon\" alt=\"$strfolder\" /> $file"; } else { echo '
'; - link_to_popup_window($relativeurl, "resourcedirectory{$resource->id}", "pixpath/f/$icon\" width=\"16\" height=\"16\" alt=\"$strfile\" /> $file", 450, 600, ''); + link_to_popup_window($relativeurl, "resourcedirectory{$resource->id}", "pixpath/f/$icon\" class=\"icon\" alt=\"$strfile\" /> $file", 450, 600, ''); } echo ' 
".get_string("attachment", "workshop")." $n: \n"; - echo "pixpath/f/$icon\" height=\"16\" width=\"16\" - border=\"0\" alt=\"".get_string('file')."\" />". + echo "pixpath/f/$icon\" class=\"icon\" alt=\"".get_string('file')."\" />". " wwwroot/$ffurl\">$file
".get_string("attachment", "workshop")." $n: pixpath/f/$icon\" - height=\"16\" width=\"16\" border=\"0\" alt=\"".get_string('file')."\" />". + class=\"icon\" alt=\"".get_string('file')."\" />". " wwwroot/$ffurl\">$file