diff --git a/admin/blocks.php b/admin/blocks.php index 34e8e4e0e00..e703ee810cc 100644 --- a/admin/blocks.php +++ b/admin/blocks.php @@ -201,10 +201,10 @@ $visible = ''; } else if ($blocks[$blockid]->visible) { $visible = ''. - ''.$strhide.''; + ''.$strhide.''; } else { $visible = ''. - ''.$strshow.''; + ''.$strshow.''; $class = ' class="dimmed_text"'; // Leading space required! } @@ -219,10 +219,10 @@ $undeletable = ''; } else if (in_array($blockname, $undeletableblocktypes)) { $undeletable = ''. - ''.$strunprotect.''; + ''.$strunprotect.''; } else { $undeletable = ''. - ''.$strprotect.''; + ''.$strprotect.''; } $row = array( diff --git a/admin/filters.php b/admin/filters.php index 5f58bc7ee67..c1026662dd7 100644 --- a/admin/filters.php +++ b/admin/filters.php @@ -247,15 +247,15 @@ function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings) // Re-order $updown = ''; - $spacer = ' '; + $spacer = ''; if ($filterinfo->active != TEXTFILTER_DISABLED) { if (!$isfirstrow) { - $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'), new pix_icon('t/up', get_string('up'))); + $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'), new pix_icon('t/up', get_string('up'), '', array('class' => 'iconsmall'))); } else { $updown .= $spacer; } if (!$islastactive) { - $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'down'), new pix_icon('t/down', get_string('down'))); + $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'down'), new pix_icon('t/down', get_string('down'), '', array('class' => 'iconsmall'))); } else { $updown .= $spacer; } diff --git a/admin/modules.php b/admin/modules.php index 2290612b813..3ad0a72cc6e 100644 --- a/admin/modules.php +++ b/admin/modules.php @@ -161,11 +161,11 @@ $class = ''; } else if ($module->visible) { $visible = "name&sesskey=".sesskey()."\" title=\"$strhide\">". - "pix_url('i/hide') . "\" class=\"icon\" alt=\"$strhide\" />"; + "pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strhide\" />"; $class = ''; } else { $visible = "name&sesskey=".sesskey()."\" title=\"$strshow\">". - "pix_url('i/show') . "\" class=\"icon\" alt=\"$strshow\" />"; + "pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strshow\" />"; $class = ' class="dimmed_text"'; } if ($module->name == "forum") { diff --git a/admin/qbehaviours.php b/admin/qbehaviours.php index 1e72afad1aa..3dd14a07759 100644 --- a/admin/qbehaviours.php +++ b/admin/qbehaviours.php @@ -258,7 +258,7 @@ foreach ($sortedbehaviours as $behaviour => $behaviourname) { $rowclass = 'dimmed_text'; } } else { - $icons = $OUTPUT->spacer() . ' '; + $icons = $OUTPUT->spacer(array('class' => 'iconsmall')); } // Move icons. @@ -284,10 +284,10 @@ echo $OUTPUT->footer(); function question_behaviour_enable_disable_icons($behaviour, $enabled) { if ($enabled) { - return question_behaviour_icon_html('disable', $behaviour, 'i/hide', + return question_behaviour_icon_html('disable', $behaviour, 't/hide', get_string('enabled', 'question'), get_string('disable')); } else { - return question_behaviour_icon_html('enable', $behaviour, 'i/show', + return question_behaviour_icon_html('enable', $behaviour, 't/show', get_string('disabled', 'question'), get_string('enable')); } } @@ -296,7 +296,7 @@ function question_behaviour_icon_html($action, $behaviour, $icon, $alt, $tip) { global $OUTPUT; return $OUTPUT->action_icon(new moodle_url('/admin/qbehaviours.php', array($action => $behaviour, 'sesskey' => sesskey())), - new pix_icon($icon, $alt, 'moodle', array('title' => '')), - null, array('title' => $tip)) . ' '; + new pix_icon($icon, $alt, 'moodle', array('title' => '', 'class' => 'iconsmall')), + null, array('title' => $tip)); } diff --git a/admin/qtypes.php b/admin/qtypes.php index a37725cd837..1b35c438ff7 100644 --- a/admin/qtypes.php +++ b/admin/qtypes.php @@ -257,7 +257,7 @@ foreach ($sortedqtypes as $qtypename => $localname) { $rowclass = 'dimmed_text'; } } else { - $icons = $OUTPUT->spacer() . ' '; + $icons = $OUTPUT->spacer(); } // Move icons. @@ -294,10 +294,10 @@ echo $OUTPUT->footer(); function question_types_enable_disable_icons($qtypename, $createable) { if ($createable) { - return question_type_icon_html('disable', $qtypename, 'i/hide', + return question_type_icon_html('disable', $qtypename, 't/hide', get_string('enabled', 'question'), get_string('disable')); } else { - return question_type_icon_html('enable', $qtypename, 'i/show', + return question_type_icon_html('enable', $qtypename, 't/show', get_string('disabled', 'question'), get_string('enable')); } } @@ -306,7 +306,7 @@ function question_type_icon_html($action, $qtypename, $icon, $alt, $tip) { global $OUTPUT; return $OUTPUT->action_icon(new moodle_url('/admin/qtypes.php', array($action => $qtypename, 'sesskey' => sesskey())), - new pix_icon($icon, $alt, 'moodle', array('title' => '')), - null, array('title' => $tip)) . ' '; + new pix_icon($icon, $alt, 'moodle', array('title' => '', 'class' => 'iconsmall')), + null, array('title' => $tip)); } diff --git a/admin/renderer.php b/admin/renderer.php index 7ca6ea24dbd..de7847059ce 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -1092,9 +1092,9 @@ class core_admin_renderer extends plugin_renderer_base { $row->attributes['class'] = 'type-' . $plugin->type . ' name-' . $plugin->type . '_' . $plugin->name; if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name)) { - $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'smallicon pluginicon')); + $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'icon pluginicon')); } else { - $icon = $this->output->pix_icon('spacer', '', 'moodle', array('class' => 'smallicon pluginicon noicon')); + $icon = $this->output->pix_icon('spacer', '', 'moodle', array('class' => 'icon pluginicon noicon')); } if ($plugin->get_status() === plugin_manager::PLUGIN_STATUS_MISSING) { $msg = html_writer::tag('span', get_string('status_missing', 'core_plugin'), array('class' => 'notifyproblem')); @@ -1102,7 +1102,7 @@ class core_admin_renderer extends plugin_renderer_base { } else { $msg = ''; } - $pluginname = html_writer::tag('div', $icon . ' ' . $plugin->displayname . ' ' . $msg, array('class' => 'displayname')). + $pluginname = html_writer::tag('div', $icon . '' . $plugin->displayname . ' ' . $msg, array('class' => 'displayname')). html_writer::tag('div', $plugin->component, array('class' => 'componentname')); $pluginname = new html_table_cell($pluginname); diff --git a/cache/renderer.php b/cache/renderer.php index 2443a094123..81e86b14cc7 100644 --- a/cache/renderer.php +++ b/cache/renderer.php @@ -86,7 +86,7 @@ class core_cache_renderer extends plugin_renderer_base { $info = ''; if (!empty($store['default'])) { - $info = $this->output->pix_icon('i/info', $defaultstoreactions).' '; + $info = $this->output->pix_icon('i/info', $defaultstoreactions, '', array('class' => 'icon')); } $htmlactions = array(); foreach ($actions as $action) { diff --git a/grade/lib.php b/grade/lib.php index 645d73a7f7e..f60221622d9 100644 --- a/grade/lib.php +++ b/grade/lib.php @@ -2274,7 +2274,7 @@ function grade_button($type, $courseid, $object) { $url = new moodle_url('edit.php', array('courseid' => $courseid, 'id' => $object->id)); } - return $OUTPUT->action_icon($url, new pix_icon('t/'.$type, ${'str'.$type})); + return $OUTPUT->action_icon($url, new pix_icon('t/'.$type, ${'str'.$type}, '', array('class' => 'iconsmall'))); } diff --git a/lib/adminlib.php b/lib/adminlib.php index 9bb8e77f386..00410a1d57f 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -5063,13 +5063,13 @@ class admin_setting_manageenrols extends admin_setting { if (isset($active_enrols[$enrol])) { $aurl = new moodle_url($url, array('action'=>'disable', 'enrol'=>$enrol)); $hideshow = ""; - $hideshow .= "pix_url('i/hide') . "\" class=\"icon\" alt=\"$strdisable\" />"; + $hideshow .= "pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$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('i/show') . "\" class=\"icon\" alt=\"$strenable\" />"; + $hideshow .= "pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strenable\" />"; $enabled = false; $displayname = "$name"; } else { @@ -5597,14 +5597,14 @@ class admin_setting_manageauths extends admin_setting { // hide/show link if (in_array($auth, $authsenabled)) { $hideshow = ""; - $hideshow .= "pix_url('i/hide') . "\" class=\"icon\" alt=\"disable\" />"; + $hideshow .= "pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"disable\" />"; // $hideshow = ""; $enabled = true; $displayname = "$name"; } else { $hideshow = ""; - $hideshow .= "pix_url('i/show') . "\" class=\"icon\" alt=\"enable\" />"; + $hideshow .= "pix_url('t/show') . "\" class=\"iconsmall\" alt=\"enable\" />"; // $hideshow = ""; $enabled = false; $displayname = "$name"; @@ -5764,14 +5764,14 @@ class admin_setting_manageeditors extends admin_setting { // hide/show link if (in_array($editor, $active_editors)) { $hideshow = ""; - $hideshow .= "pix_url('i/hide') . "\" class=\"icon\" alt=\"disable\" />"; + $hideshow .= "pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"disable\" />"; // $hideshow = ""; $enabled = true; $displayname = "$name"; } else { $hideshow = ""; - $hideshow .= "pix_url('i/show') . "\" class=\"icon\" alt=\"enable\" />"; + $hideshow .= "pix_url('t/show') . "\" class=\"iconsmall\" alt=\"enable\" />"; // $hideshow = ""; $enabled = false; $displayname = "$name"; @@ -5896,14 +5896,14 @@ class admin_setting_managelicenses extends admin_setting { if ($value->enabled == 1) { $hideshow = html_writer::link($url.'&action=disable&license='.$value->shortname, - html_writer::tag('img', '', array('src'=>$OUTPUT->pix_url('i/hide'), 'class'=>'icon', 'alt'=>'disable'))); + html_writer::tag('img', '', array('src'=>$OUTPUT->pix_url('t/hide'), 'class'=>'iconsmall', 'alt'=>'disable'))); } else { $hideshow = html_writer::link($url.'&action=enable&license='.$value->shortname, - html_writer::tag('img', '', array('src'=>$OUTPUT->pix_url('i/show'), 'class'=>'icon', 'alt'=>'enable'))); + html_writer::tag('img', '', array('src'=>$OUTPUT->pix_url('t/show'), 'class'=>'iconsmall', 'alt'=>'enable'))); } if ($value->shortname == $CFG->sitedefaultlicense) { - $displayname .= ' '.html_writer::tag('img', '', array('src'=>$OUTPUT->pix_url('i/lock'), 'class'=>'icon', 'alt'=>get_string('default'), 'title'=>get_string('default'))); + $displayname .= ' '.html_writer::tag('img', '', array('src'=>$OUTPUT->pix_url('t/locked'), 'class'=>'iconsmall', 'alt'=>get_string('default'), 'title'=>get_string('default'))); $hideshow = ''; } @@ -6020,12 +6020,12 @@ class admin_setting_manageformats extends admin_setting { $hideshow = $txt->default; } else { $hideshow = html_writer::link($url->out(false, array('action' => 'disable')), - $OUTPUT->pix_icon('i/hide', $txt->disable, 'moodle', array('class' => 'icon'))); + $OUTPUT->pix_icon('t/hide', $txt->disable, 'moodle', array('class' => 'iconsmall'))); } } else { $strformatname = html_writer::tag('span', $format->displayname, array('class' => 'dimmed_text')); $hideshow = html_writer::link($url->out(false, array('action' => 'enable')), - $OUTPUT->pix_icon('i/show', $txt->enable, 'moodle', array('class' => 'icon'))); + $OUTPUT->pix_icon('t/show', $txt->enable, 'moodle', array('class' => 'iconsmall'))); } $updown = ''; if ($cnt) { @@ -7710,11 +7710,11 @@ class admin_setting_managewebserviceprotocols extends admin_setting { // hide/show link if (in_array($protocol, $active_protocols)) { $hideshow = ""; - $hideshow .= "pix_url('i/hide') . "\" class=\"icon\" alt=\"$strdisable\" />"; + $hideshow .= "pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strdisable\" />"; $displayname = "$name"; } else { $hideshow = ""; - $hideshow .= "pix_url('i/show') . "\" class=\"icon\" alt=\"$strenable\" />"; + $hideshow .= "pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strenable\" />"; $displayname = "$name"; } diff --git a/lib/editor/tinymce/adminlib.php b/lib/editor/tinymce/adminlib.php index 013319c7dad..09fcadae85b 100644 --- a/lib/editor/tinymce/adminlib.php +++ b/lib/editor/tinymce/adminlib.php @@ -199,20 +199,20 @@ class tiynce_subplugins_settings extends admin_setting { $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('i/hide'), 'class'=>'icon', 'alt'=>$strdisable)); + $hideshow = html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/hide'), 'class'=>'iconsmall', 'alt'=>$strdisable)); $hideshow = html_writer::link($url, $hideshow); $displayname = html_writer::tag('span', $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('i/show'), 'class'=>'icon', 'alt'=>$strenable)); + $hideshow = html_writer::empty_tag('img', array('src'=>$OUTPUT->pix_url('t/show'), 'class'=>'iconsmall', 'alt'=>$strenable)); $hideshow = html_writer::link($url, $hideshow); $displayname = html_writer::tag('span', $namestr, array('class'=>'dimmed_text')); } if ($PAGE->theme->resolve_image_location('icon', 'tinymce_' . $name, false)) { - $icon = $OUTPUT->pix_icon('icon', '', 'tinymce_' . $name, array('class' => 'smallicon pluginicon')); + $icon = $OUTPUT->pix_icon('icon', '', 'tinymce_' . $name, array('class' => 'icon pluginicon')); } else { - $icon = $OUTPUT->pix_icon('spacer', '', 'moodle', array('class' => 'smallicon pluginicon noicon')); + $icon = $OUTPUT->pix_icon('spacer', '', 'moodle', array('class' => 'icon pluginicon noicon')); } $displayname = $icon . ' ' . $displayname; diff --git a/message/renderer.php b/message/renderer.php index f92022a26c6..ba820937852 100644 --- a/message/renderer.php +++ b/message/renderer.php @@ -74,8 +74,8 @@ class core_message_renderer extends plugin_renderer_base { } 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('i/hide'), - 'class' => 'icon', + array('src' => $this->output->pix_url('t/hide'), + 'class' => 'iconsmall', 'title' => get_string('outputenabled', 'message'), 'alt' => get_string('outputenabled', 'message'), ) @@ -84,8 +84,8 @@ class core_message_renderer extends plugin_renderer_base { $name->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('i/show'), - 'class' => 'icon', + array('src' => $this->output->pix_url('t/show'), + 'class' => 'iconsmall', 'title' => get_string('outputdisabled', 'message'), 'alt' => get_string('outputdisabled', 'message'), ) diff --git a/mod/assign/adminlib.php b/mod/assign/adminlib.php index fcc5311b72e..a84c4cbcd82 100644 --- a/mod/assign/adminlib.php +++ b/mod/assign/adminlib.php @@ -187,16 +187,16 @@ class assign_plugin_manager { $visible = !get_config($this->subtype . '_' . $plugin, 'disabled'); if ($visible) { - $row[] = $this->format_icon_link('hide', $plugin, 'i/hide', get_string('disable')); + $row[] = $this->format_icon_link('hide', $plugin, 't/hide', get_string('disable')); } else { - $row[] = $this->format_icon_link('show', $plugin, 'i/show', get_string('enable')); + $row[] = $this->format_icon_link('show', $plugin, 't/show', get_string('enable')); } $movelinks = ''; if (!$idx == 0) { $movelinks .= $this->format_icon_link('moveup', $plugin, 't/up', get_string('up')); } else { - $movelinks .= $OUTPUT->spacer(array('width'=>15)); + $movelinks .= $OUTPUT->spacer(array('width'=>16)); } if ($idx != count($plugins) - 1) { $movelinks .= $this->format_icon_link('movedown', $plugin, 't/down', get_string('down')); diff --git a/mod/glossary/settings.php b/mod/glossary/settings.php index cc3216dc414..507d589032d 100644 --- a/mod/glossary/settings.php +++ b/mod/glossary/settings.php @@ -58,23 +58,19 @@ if ($ADMIN->fulltree) { asort($formats); $str = ''; - $pixpath = "$CFG->wwwroot/pix"; // ugly temporary hack until we get this rewritten to new setting - // TODO MDL-19674 We cannot refer to $CFG->pixpath here. This code is executed - // when the structure of the admin tree is being build. $CFG->pixpath is only - // set up once output has started. foreach ($formats as $formatid=>$formatname) { $recformat = $DB->get_record('glossary_formats', array('id'=>$formatid)); $str .= ''; $str .= ''; - $eicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=edit\">\"".get_string("edit")."\""; + $eicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=edit\">pix_url('t/edit')."\" alt=\"".get_string("edit")."\" />"; if ( $recformat->visible ) { $vtitle = get_string("hide"); - $vicon = "hide.gif"; + $vicon = "t/hide"; } else { $vtitle = get_string("show"); - $vicon = "show.gif"; + $vicon = "t/show"; } - $vicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=visible&sesskey=".sesskey()."\">\"$vtitle\""; + $vicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=visible&sesskey=".sesskey()."\">pix_url($vicon)."\" alt=\"$vtitle\" />"; $str .= ''; $str .= ''; diff --git a/pix/t/locked.png b/pix/t/locked.png new file mode 100644 index 00000000000..04b8c5bc82b Binary files /dev/null and b/pix/t/locked.png differ diff --git a/pix/t/locked.svg b/pix/t/locked.svg new file mode 100644 index 00000000000..3aab3ff4fa6 --- /dev/null +++ b/pix/t/locked.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/pix/t/unlocked.png b/pix/t/unlocked.png new file mode 100644 index 00000000000..8e1f0d7aeba Binary files /dev/null and b/pix/t/unlocked.png differ diff --git a/pix/t/unlocked.svg b/pix/t/unlocked.svg new file mode 100644 index 00000000000..524edbb8fa5 --- /dev/null +++ b/pix/t/unlocked.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/theme/base/style/admin.css b/theme/base/style/admin.css index 367bbbcf50a..54f09873207 100644 --- a/theme/base/style/admin.css +++ b/theme/base/style/admin.css @@ -54,6 +54,7 @@ #page-admin-qbehaviours #qbehaviours div, #page-admin-qbehaviours #qbehaviours form {display: inline;} #page-admin-qbehaviours #qbehaviours img.spacer {width: 16px;} +#page-admin-qbehaviours #qbehaviours img { padding-right: .45em; } #page-admin-qtypes .disabled {color: gray;} #page-admin-qtypes th {white-space: normal;} @@ -63,6 +64,7 @@ #page-admin-qtypes #qtypes div, #page-admin-qtypes #qtypes form {display: inline;} #page-admin-qtypes #qtypes img.spacer {width: 16px;} +#page-admin-qtypes #qtypes img { padding-right: .45em; vertical-align: text-bottom; } .path-admin-roles .buttons .singlebutton, #page-admin-course-index .buttons .singlebutton, @@ -156,6 +158,8 @@ #mnetconfig table, .environmenttable {margin-left:auto;margin-right:auto;} .environmenttable .cell {padding: 0.15em 0.5em;} +.environmenttable img.iconhelp { padding-right: 0.3em;} +.dir-rtl .environmenttable img.iconhelp { padding-left: 0.3em; padding-right: 0} #trustedhosts .generaltable {margin-left: auto;margin-right: auto;width: 500px;} #trustedhosts .standard {width: auto;} .form-buttons {margin: 10px 0 0 13em;} @@ -257,6 +261,7 @@ #page-admin-plugins #plugins-overview-filter .filter-item {padding:5px 10px;} #page-admin-plugins #plugins-overview-filter .filter-item.active {font-weight:bold;} #page-admin-plugins #plugins-overview-filter .separator {border-left:1px dotted #999;} +#page-admin-plugins #plugins-control-panel .displayname img.icon { padding-top:0; padding-bottom: 0; } #page-admin-plugins #plugins-control-panel .actions .uninstall {color:#900;} #page-admin-plugins #plugins-control-panel .notes .pluginupdateinfo {padding:5px 10px;margin:10px;background-color:#d2ebff;-moz-border-radius: 10px;-webkit-border-radius: 10px;border-radius: 10px;} #page-admin-plugins #plugins-control-panel .notes .pluginupdateinfo.maturity50 {background-color:#ffd3d9;} @@ -282,3 +287,5 @@ #core-cache-store-summaries .default-store td {color:#333;font-style: italic;} #core-cache-rescan-definitions, #core-cache-mode-mappings .edit-link {margin-top:0.5em;text-align:center;} + +.tinymcesubplugins img.icon { padding-top: 0; padding-bottom: 0; } diff --git a/theme/base/style/core.css b/theme/base/style/core.css index ced2b08b1d2..ef819ec1beb 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -90,8 +90,8 @@ a.autolink.glossary:hover {cursor: help;} img.resize {height: 1em;width: 1em;} .block img.resize, .breadcrumb img.resize {height: 0.9em;width: 0.8em;} -img.icon {height:16px;vertical-align:text-bottom;width:16px;padding: 2px 6px 2px 0;} -.dir-rtl img.icon {padding: 2px 0 2px 6px;} +img.icon {height:16px;vertical-align:text-bottom;width:16px;padding-right: 6px;} +.dir-rtl img.icon {padding-left: 6px; padding-right: 0; } img.iconsmall {height:12px;margin-right:3px;vertical-align:middle;width:12px;} img.iconhelp, .helplink img {height:16px; padding-left:3px;vertical-align:text-bottom;width:16px;} img.iconlarge {height: 24px; width: 24px; vertical-align:middle;} diff --git a/theme/base/style/question.css b/theme/base/style/question.css index 3d4a13cd430..b5156d736b0 100644 --- a/theme/base/style/question.css +++ b/theme/base/style/question.css @@ -13,7 +13,6 @@ #chooseqtype .submitbuttons {margin: 0.7em 0;text-align: center;} #qtypechoicecontainer {display: none;} -body.jsenabled #qtypechoicecontainer {display: block;} #qtypechoicecontainer_c.yui-panel-container.shadow .underlay {background: none;} #qtypechoicecontainer.yui-panel .hd {color:#333333;letter-spacing: 1px;text-shadow: 1px 1px 1px #FFFFFF;border-radius: 10px 10px 0 0;border: 1px solid #CCCCCC;border-bottom: 1px solid #BBBBBB;background: -webkit-gradient(linear, left top, left bottom, from(#FFFFFF), to(#CCCCCC));background: -moz-linear-gradient(top, #FFFFFF, #CCCCCC);} @@ -23,7 +22,7 @@ body.jsenabled #qtypechoicecontainer {display: block;} #qtypechoicecontainer #chooseqtypehead h3 {margin: 0;font-weight: normal;} #qtypechoicecontainer #chooseqtype .qtypes {position: relative;border-bottom: 1px solid #BBBBBB;padding: 0.24em 0;} #qtypechoicecontainer #chooseqtype .qtypeoption {margin-bottom: 0; padding: 0.3em 0 0.3em 1.6em;} -#qtypechoicecontainer #chooseqtype .qtypeoption img {vertical-align: middle;padding-left: 1em;padding-right: 0.5em;} +#qtypechoicecontainer #chooseqtype .qtypeoption img {vertical-align: text-bottom;padding-left: 1em;padding-right: 0.5em;} #qtypechoicecontainer #chooseqtype .selected {background-color: #FFFFFF;box-shadow: 0px 0px 10px 0px #CCCCCC;-webkit-box-shadow: 0px 0px 10px 0px #CCCCCC;-moz-box-shadow: 0px 0px 10px 0px #CCCCCC;} #qtypechoicecontainer #chooseqtype .instruction, #qtypechoicecontainer #chooseqtype .qtypesummary {display: none;position: absolute;top: 0px;right: 0px;bottom: 0px;left: 60%;margin: 0;padding: 1.5em 1.6em;background-color: #FFFFFF;} diff --git a/theme/upgrade.txt b/theme/upgrade.txt index 908ffb5cc43..01033c16bea 100644 --- a/theme/upgrade.txt +++ b/theme/upgrade.txt @@ -20,6 +20,7 @@ optional changes: * new icon t/cohorts (sized 12x12), to prevent the use of i/cohorts which is 16x16. * new icons t/sort_asc, t/sort_desc to use for ordering in table headers. * new class 'iconsort' for icons used for ordering in table headers. +* new icons t/locked and t/unlocked (12x12) which should be used when there is no action associated to the icon. === 2.3 ===
' . $formatname . ''.$eicon.'  '.$vicon.'