mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-36559-master-int' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2012-11-27 10:50:31 +08:00
commit 8204e57309
57 changed files with 365 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/blocks.php
View File

@ -201,10 +201,10 @@
$visible = '';
} else if ($blocks[$blockid]->visible) {
$visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strhide.'">'.
'<img src="'.$OUTPUT->pix_url('i/hide') . '" class="icon" alt="'.$strhide.'" /></a>';
'<img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.$strhide.'" /></a>';
} else {
$visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strshow.'">'.
'<img src="'.$OUTPUT->pix_url('i/show') . '" class="icon" alt="'.$strshow.'" /></a>';
'<img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.$strshow.'" /></a>';
$class = ' class="dimmed_text"'; // Leading space required!
}
@ -219,10 +219,10 @@
$undeletable = '';
} else if (in_array($blockname, $undeletableblocktypes)) {
$undeletable = '<a href="blocks.php?unprotect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strunprotect.'">'.
'<img src="'.$OUTPUT->pix_url('t/unlock') . '" class="icon" alt="'.$strunprotect.'" /></a>';
'<img src="'.$OUTPUT->pix_url('t/unlock') . '" class="iconsmall" alt="'.$strunprotect.'" /></a>';
} else {
$undeletable = '<a href="blocks.php?protect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strprotect.'">'.
'<img src="'.$OUTPUT->pix_url('t/unlock_gray') . '" class="icon" alt="'.$strprotect.'" /></a>';
'<img src="'.$OUTPUT->pix_url('t/lock') . '" class="iconsmall" alt="'.$strprotect.'" /></a>';
}
$row = array(

6
admin/filters.php
View File

@ -247,15 +247,15 @@ function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings)
// Re-order
$updown = '';
$spacer = '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" /> ';
$spacer = '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" />';
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;
}

4
admin/modules.php
View File

@ -161,11 +161,11 @@
$class = '';
} else if ($module->visible) {
$visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=".sesskey()."\" title=\"$strhide\">".
"<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"$strhide\" /></a>";
"<img src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strhide\" /></a>";
$class = '';
} else {
$visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=".sesskey()."\" title=\"$strshow\">".
"<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"$strshow\" /></a>";
"<img src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strshow\" /></a>";
$class = ' class="dimmed_text"';
}
if ($module->name == "forum") {

10
admin/qbehaviours.php
View File

@ -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));
}

10
admin/qtypes.php
View File

@ -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));
}

6
admin/renderer.php
View File

@ -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);

2
cache/renderer.php vendored
View File

@ -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) {

11
grade/lib.php
View File

@ -1182,7 +1182,7 @@ class grade_structure {
'" alt="'.s($stroutcome).'"/>';
} else {
$strmanual = get_string('manualitem', 'grades');
return '<img src="'.$OUTPUT->pix_url('t/manual_item') . '" '.
return '<img src="'.$OUTPUT->pix_url('i/manual_item') . '" '.
'class="icon itemicon" title="'.s($strmanual).
'" alt="'.s($strmanual).'"/>';
}
@ -1191,7 +1191,7 @@ class grade_structure {
case 'category':
$strcat = get_string('category', 'grades');
return '<img src="'.$OUTPUT->pix_url(file_folder_icon()) . '" class="icon itemicon" ' .
return '<img src="'.$OUTPUT->pix_url('i/folder') . '" class="icon itemicon" ' .
'title="'.s($strcat).'" alt="'.s($strcat).'" />';
}
@ -1573,7 +1573,8 @@ class grade_structure {
$strparamobj->itemname = $element['object']->grade_item->itemname;
$strnonunlockable = get_string('nonunlockableverbose', 'grades', $strparamobj);
$action = $OUTPUT->pix_icon('t/unlock_gray', $strnonunlockable);
$action = html_writer::tag('span', $OUTPUT->pix_icon('t/locked', $strnonunlockable),
array('class' => 'action-icon'));
} else if ($element['object']->is_locked()) {
$type = 'unlock';
@ -1639,7 +1640,7 @@ class grade_structure {
$url = new moodle_url('/grade/edit/tree/calculation.php', array('courseid' => $this->courseid, 'id' => $object->id));
$url = $gpr->add_url_params($url);
return $OUTPUT->action_icon($url, new pix_icon($icon, $streditcalculation)) . "\n";
return $OUTPUT->action_icon($url, new pix_icon($icon, $streditcalculation));
}
}
@ -2274,7 +2275,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')));
}

1
grade/report/grader/index.php
View File

@ -140,7 +140,6 @@ $report->load_final_grades();
echo $report->group_selector;
echo '<div class="clearer"></div>';
// echo $report->get_toggles_html();
//show warnings if any
foreach($warnings as $warning) {

20
grade/report/grader/lib.php
View File

@ -517,10 +517,11 @@ class grade_report_grader extends grade_report {
/**
* Builds and returns a div with on/off toggles.
* @return string HTML code
* @deprecated since 2.4 as it appears not to be used any more.
*/
public function get_toggles_html() {
global $CFG, $USER, $COURSE, $OUTPUT;
debugging('Call to deprecated function grade_report_grader::get_toggles_html().', DEBUG_DEVELOPER);
$html = '';
if ($USER->gradeediting[$this->courseid]) {
if (has_capability('moodle/grade:manage', $this->context) or has_capability('moodle/grade:hide', $this->context)) {
@ -557,10 +558,11 @@ class grade_report_grader extends grade_report {
* @param string $type The type of toggle
* @param bool $return Whether to return the HTML string rather than printing it
* @return void
* @deprecated since 2.4 as it appears not to be used any more.
*/
public function print_toggle($type) {
global $CFG, $OUTPUT;
debugging('Call to deprecated function grade_report_grader::print_toggle().', DEBUG_DEVELOPER);
$icons = array('eyecons' => 't/hide',
'calculations' => 't/calc',
'locks' => 't/lock',
@ -1673,6 +1675,8 @@ class grade_report_grader extends grade_report {
$strsortdesc = $this->get_lang_string('sortdesc', 'grades');
$strfirstname = $this->get_lang_string('firstname');
$strlastname = $this->get_lang_string('lastname');
$iconasc = $OUTPUT->pix_icon('t/sort_asc', $strsortasc, '', array('class' => 'iconsmall sorticon'));
$icondesc = $OUTPUT->pix_icon('t/sort_desc', $strsortdesc, '', array('class' => 'iconsmall sorticon'));
$firstlink = html_writer::link(new moodle_url($this->baseurl, array('sortitemid'=>'firstname')), $strfirstname);
$lastlink = html_writer::link(new moodle_url($this->baseurl, array('sortitemid'=>'lastname')), $strlastname);
@ -1681,9 +1685,9 @@ class grade_report_grader extends grade_report {
if ($this->sortitemid === 'lastname') {
if ($this->sortorder == 'ASC') {
$arrows['studentname'] .= print_arrow('up', $strsortasc, true);
$arrows['studentname'] .= $iconasc;
} else {
$arrows['studentname'] .= print_arrow('down', $strsortdesc, true);
$arrows['studentname'] .= $icondesc;
}
}
@ -1691,9 +1695,9 @@ class grade_report_grader extends grade_report {
if ($this->sortitemid === 'firstname') {
if ($this->sortorder == 'ASC') {
$arrows['studentname'] .= print_arrow('up', $strsortasc, true);
$arrows['studentname'] .= $iconasc;
} else {
$arrows['studentname'] .= print_arrow('down', $strsortdesc, true);
$arrows['studentname'] .= $icondesc;
}
}
@ -1704,9 +1708,9 @@ class grade_report_grader extends grade_report {
if ($field == $this->sortitemid) {
if ($this->sortorder == 'ASC') {
$arrows[$field] .= print_arrow('up', $strsortasc, true);
$arrows[$field] .= $iconasc;
} else {
$arrows[$field] .= print_arrow('down', $strsortdesc, true);
$arrows[$field] .= $icondesc;
}
}
}

1
grade/report/grader/quickedit_item.php
View File

@ -94,7 +94,6 @@ print_grade_page_head($COURSE->id, 'report', 'grader', $reportname);
echo $report->group_selector;
echo '<div class="clearer"></div>';
// echo $report->get_toggles_html();
//show warnings if any
foreach($warnings as $warning) {

32
grade/report/grader/styles.css
View File

@ -11,6 +11,14 @@ width:20px;
height:20px;
}
.gradestable th img {
vertical-align: text-bottom;
padding-bottom: 0;
}
.gradestable th .grade_icons { margin-top: .3em; }
.gradestable th img.sorticon { margin-left: .3em; }
.dir-rtl .gradestable th img.sorticon { margin-left: 0; margin-right: .3em; }
table#user-grades .catlevel2 {
background-color:#f9f9f9;
}
@ -133,9 +141,8 @@ border-width:0 0 1px 1px;
}
table#user-grades th.categoryitem,
table#user-grades th.courseitem,
table#user-grades td.topleft {
vertical-align:top;
vertical-align: bottom;
border-style:solid;
border-width:0 1px;
}
@ -160,10 +167,10 @@ border-width:0 1px 0 0;
}
table#user-grades th.item ,
table#user-grades th.categoryitem ,
table#user-grades th.categoryitem,
table#user-grades th.courseitem {
border-bottom-color:#000;
vertical-align:top;
vertical-align:bottom;
border-style:solid;
border-width:1px;
}
@ -186,7 +193,9 @@ margin-right:10px;
table#user-grades .quickfeedback {
border:1px dashed #000;
margin-left: 10px;
}
.dir-rtl table#user-grades .quickfeedback { margin-left: 0; margin-right: 10px;}
.path-grade-report-grader #siteconfiglink {
text-align:right;
@ -214,7 +223,7 @@ border-color:#cecece;
}
.path-grade-report-grader th {
padding:2px 10px 0;
padding:2px 10px;
}
.path-grade-report-grader span.inclusion-links {
@ -255,7 +264,7 @@ padding:0;
table#user-grades th.categoryitem,
table#user-grades th.courseitem,
.path-grade-report-grader table td.topleft {
vertical-align:top;
vertical-align:bottom;
border-color:#cecece #cecece #000;
border-style:solid;
border-width:0 1px 1px;
@ -269,7 +278,7 @@ table#user-grades td.topleft {
background-color:#fff;
}
.path-grade-report-grader th.user img {
.path-grade-report-grader th.user img.userpicture {
border:3px double #cecece;
vertical-align:top;
width:2.7em;
@ -316,8 +325,6 @@ padding:0;
.path-grade-report-grader td input.text {
border:1px solid #666;
margin-left:10px;
margin-right:10px;
}
.path-grade-report-grader td input.submit {
@ -463,8 +470,6 @@ width:2000px;
float:right;
}
.path-grade-report-grader .action-icon {margin-left:0.3em;}
.path-grade-report-grader .gradestable th.user,
.path-grade-report-grader .gradestable th.range,
.path-grade-report-grader .flexible th,
@ -573,9 +578,12 @@ background-color:#f3ead8;
}
.path-grade-report-grader table th.usersuspended img.usersuspendedicon {
vertical-align:middle;
vertical-align: text-bottom;
margin-left: .45em;
}
.path-grade-report-grader .grade_icons { margin-bottom: .3em;}
.path-grade-report-grader .yui-overlay {
background-color: #FFEE69;
border-color: #D4C237 #A6982B #A6982B;

3
grade/report/lib.php
View File

@ -333,10 +333,11 @@ abstract class grade_report {
*/
protected function get_sort_arrow($direction='move', $sortlink=null) {
global $OUTPUT;
$pix = array('up' => 't/sort_desc', 'down' => 't/sort_asc', 'move' => 't/sort');
$matrix = array('up' => 'desc', 'down' => 'asc', 'move' => 'desc');
$strsort = $this->get_lang_string('sort' . $matrix[$direction]);
$arrow = print_arrow($direction, $strsort, true);
$arrow = $OUTPUT->pix_icon($pix[$direction], $strsort, '', array('class' => 'sorticon'));
return html_writer::link($sortlink, $arrow, array('title'=>$strsort));
}

26
lib/adminlib.php
View File

@ -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 = "<a href=\"$aurl\">";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"$strdisable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strdisable\" /></a>";
$enabled = true;
$displayname = "<span>$name</span>";
} else if (isset($enrols_available[$enrol])) {
$aurl = new moodle_url($url, array('action'=>'enable', 'enrol'=>$enrol));
$hideshow = "<a href=\"$aurl\">";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"$strenable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strenable\" /></a>";
$enabled = false;
$displayname = "<span class=\"dimmed_text\">$name</span>";
} else {
@ -5597,14 +5597,14 @@ class admin_setting_manageauths extends admin_setting {
// hide/show link
if (in_array($auth, $authsenabled)) {
$hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\">";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"disable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"disable\" /></a>";
// $hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\"><input type=\"checkbox\" checked /></a>";
$enabled = true;
$displayname = "<span>$name</span>";
}
else {
$hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\">";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"enable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"enable\" /></a>";
// $hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\"><input type=\"checkbox\" /></a>";
$enabled = false;
$displayname = "<span class=\"dimmed_text\">$name</span>";
@ -5764,14 +5764,14 @@ class admin_setting_manageeditors extends admin_setting {
// hide/show link
if (in_array($editor, $active_editors)) {
$hideshow = "<a href=\"$url&amp;action=disable&amp;editor=$editor\">";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"disable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"disable\" /></a>";
// $hideshow = "<a href=\"$url&amp;action=disable&amp;editor=$editor\"><input type=\"checkbox\" checked /></a>";
$enabled = true;
$displayname = "<span>$name</span>";
}
else {
$hideshow = "<a href=\"$url&amp;action=enable&amp;editor=$editor\">";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"enable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"enable\" /></a>";
// $hideshow = "<a href=\"$url&amp;action=enable&amp;editor=$editor\"><input type=\"checkbox\" /></a>";
$enabled = false;
$displayname = "<span class=\"dimmed_text\">$name</span>";
@ -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 = "<a href=\"$url&amp;action=disable&amp;webservice=$protocol\">";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"$strdisable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strdisable\" /></a>";
$displayname = "<span>$name</span>";
} else {
$hideshow = "<a href=\"$url&amp;action=enable&amp;webservice=$protocol\">";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"$strenable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strenable\" /></a>";
$displayname = "<span class=\"dimmed_text\">$name</span>";
}

8
lib/editor/tinymce/adminlib.php
View File

@ -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;

8
message/renderer.php
View File

@ -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'),
)

6
mod/assign/adminlib.php
View File

@ -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'));

12
mod/glossary/settings.php
View File

@ -58,23 +58,19 @@ if ($ADMIN->fulltree) {
asort($formats);
$str = '<table>';
$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 .= '<tr>';
$str .= '<td>' . $formatname . '</td>';
$eicon = "<a title=\"".get_string("edit")."\" href=\"$CFG->wwwroot/mod/glossary/formats.php?id=$formatid&amp;mode=edit\"><img class=\"iconsmall\" src=\"$pixpath/t/edit.gif\" alt=\"".get_string("edit")."\" /></a>";
$eicon = "<a title=\"".get_string("edit")."\" href=\"$CFG->wwwroot/mod/glossary/formats.php?id=$formatid&amp;mode=edit\"><img class=\"iconsmall\" src=\"".$OUTPUT->pix_url('t/edit')."\" alt=\"".get_string("edit")."\" /></a>";
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 = "<a title=\"".$vtitle."\" href=\"$CFG->wwwroot/mod/glossary/formats.php?id=$formatid&amp;mode=visible&amp;sesskey=".sesskey()."\"><img class=\"iconsmall\" src=\"$pixpath/t/".$vicon."\" alt=\"$vtitle\" /></a>";
$vicon = "<a title=\"".$vtitle."\" href=\"$CFG->wwwroot/mod/glossary/formats.php?id=$formatid&amp;mode=visible&amp;sesskey=".sesskey()."\"><img class=\"iconsmall\" src=\"".$OUTPUT->pix_url($vicon)."\" alt=\"$vtitle\" /></a>";
$str .= '<td align="center">'.$eicon.'&nbsp;&nbsp;'.$vicon.'</td>';
$str .= '</tr>';

BIN
pix/i/agg_mean.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 341 B

20
pix/i/agg_mean.svg Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="-0.9 0 16 16" style="overflow:visible;enable-background:new -0.9 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M2.3,4.8l4.4-0.8c0.8,1.2,1.4,2.6,1.7,4.1C9.2,7,9.8,6.1,10.3,5.6c0.6-0.7,1-1.1,1.4-1.3
c0.4-0.2,0.8-0.3,1.2-0.3c0.5,0,0.8,0.1,1.1,0.4c0.2,0.3,0.4,0.6,0.4,1c0,0.4-0.1,0.7-0.4,1c-0.2,0.3-0.6,0.4-0.9,0.4
c-0.3,0-0.6,0-0.9-0.1c-0.3-0.1-0.6-0.1-0.7-0.1c-0.4,0-0.7,0.1-1,0.4C9.9,7.3,9.3,8,8.7,9.1c0.7,2.5,1.3,4,1.7,4.6
c0.3,0.3,0.5,0.5,0.8,0.5c0.2,0,0.4-0.1,0.6-0.2c0.2-0.2,0.6-0.6,1.1-1.3l0.5,0.3c-0.7,1.2-1.5,2-2.2,2.5c-0.5,0.4-1.1,0.6-1.6,0.6
c-0.5,0-1-0.1-1.3-0.4c-0.4-0.2-0.7-0.6-0.9-1.2c-0.3-0.5-0.6-1.4-1-2.6c-1,1.2-1.7,2.2-2.3,2.7c-0.6,0.6-1,0.9-1.4,1.1
S1.8,16,1.4,16c-0.4,0-0.8-0.1-1-0.4S0,15.1,0,14.7c0-0.4,0.1-0.8,0.4-1.1c0.3-0.3,0.6-0.4,1.1-0.4c0.2,0,0.5,0.1,0.8,0.2
c0.4,0.2,0.7,0.3,0.9,0.3c0.2,0,0.5-0.1,0.7-0.2c0.3-0.1,0.6-0.4,1-0.8C5,12.5,5.4,12,6,11.1c-0.8-3-1.4-4.8-1.9-5.3
C3.9,5.4,3.5,5.2,3.1,5.2c-0.2,0-0.5,0-0.8,0.1L2.3,4.8z M6.5,0h7.3L13,2.6H5.7L6.5,0z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
pix/i/agg_sum.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 318 B

14
pix/i/agg_sum.svg Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="-1.9 0 16 16" style="overflow:visible;enable-background:new -1.9 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M9.2,12.4c-0.7,0.3-1.4,0.5-2.1,0.6H2.7l5.2-5.9L5.4,2h1.6C8.1,2,9,2.1,9.6,2.3c0.5,0.2,1,0.5,1.3,1
C11.1,3.7,11.2,4,11.2,5h0.4l1.3-5H12H5H2v2h0l2.8,5.6L0,13h0v3h5h5h0.4l2.5-6h-0.5C11.4,11,10.4,11.8,9.2,12.4z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 850 B

BIN
pix/i/calc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 193 B

15
pix/i/calc.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="-0.5 0 16 16" style="overflow:visible;enable-background:new -0.5 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M14,0H1C0.5,0,0,0.5,0,1v14c0,0.5,0.5,1,1,1h13c0.5,0,1-0.5,1-1V1C15,0.5,14.5,0,14,0z M4,14H2v-2h2
V14z M4,11H2V9h2V11z M4,8H2V6h2V8z M7,14H5v-2h2V14z M7,11H5V9h2V11z M7,8H5V6h2V8z M10,14H8v-2h2V14z M10,11H8V9h2V11z M10,8H8V6
h2V8z M13,14h-2V9h2V14z M13,8h-2V6h2V8z M13,5H2V2h11V5z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 926 B

BIN
pix/i/enrolmentsuspended.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 310 B

15
pix/i/enrolmentsuspended.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M8,0C3.6,0,0,3.6,0,8c0,4.4,3.6,8,8,8c4.4,0,8-3.6,8-8C16,3.6,12.4,0,8,0z M8,14c-3.3,0-6-2.7-6-6
s2.7-6,6-6s6,2.7,6,6S11.3,14,8,14z M7,10c0,0.5-0.5,1-1,1l0,0c-0.5,0-1-0.5-1-1V6c0-0.5,0.5-1,1-1l0,0c0.5,0,1,0.5,1,1V10z M11,10
c0,0.5-0.5,1-1,1l0,0c-0.5,0-1-0.5-1-1V6c0-0.5,0.5-1,1-1l0,0c0.5,0,1,0.5,1,1V10z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 942 B

BIN
pix/i/folder.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 173 B

14
pix/i/folder.svg Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 -1.3 16 16" style="overflow:visible;enable-background:new 0 -1.3 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M8,2.5c-0.5,0-1-0.5-1-1V1c0-0.5-0.5-1-1-1H1C0.5,0,0,0.5,0,1v0.5c0,0.5,0,11,0,11c0,0.5,0.5,1,1,1
h14c0.5,0,1-0.5,1-1v-9c0-0.5-0.5-1-1-1H8z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 782 B

BIN
pix/i/manual_item.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 275 B

15
pix/i/manual_item.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M15,5.2V15c0,0.5-0.5,1-1,1H1c-0.5,0-1-0.5-1-1V2c0-0.5,0.5-1,1-1h9.8l-2,2H3C2.5,3,2,3.4,2,4v9
c0,0.5,0.5,1,1,1h9c0.5,0,1-0.5,1-1V7.2L15,5.2z M15.4,0.6L15.4,0.6c-0.8-0.8-2.1-0.8-2.8,0l-1,1l2.8,2.8l1-1
C16.2,2.6,16.2,1.4,15.4,0.6z M10.6,2.6L4,9.1V12h2.8c0,0,1.8-1.8,1.8-1.8l4.8-4.8L10.6,2.6z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 929 B

BIN
pix/t/calc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 204 B

15
pix/t/calc.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="-0.5 0 12 12" style="overflow:visible;enable-background:new -0.5 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M10,0H1C0.5,0,0,0.5,0,1v10c0,0.5,0.5,1,1,1h9c0.5,0,1-0.5,1-1V1C11,0.5,10.5,0,10,0z M2,5h1v1H2V5z
M2,7h1v1H2V7z M3,10H2V9h1V10z M5,10H4V9h1V10z M5,8H4V7h1V8z M5,6H4V5h1V6z M7,7v1H6V7H7z M6,6V5h1v1H6z M7,10H6V9h1V10z M9,10H8
V7h1V10z M9,6H8V5h1V6z M9,4H2V2h7V4z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 907 B

BIN
pix/t/calc_off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 191 B

15
pix/t/calc_off.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="-0.5 0 12 12" style="overflow:visible;enable-background:new -0.5 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M10,0H1C0.5,0,0,0.5,0,1v10c0,0.5,0.5,1,1,1h9c0.5,0,1-0.5,1-1V1C11,0.5,10.5,0,10,0z M6,5h1v1H6V5z
M2,5h1v1H2V5z M2,7h1v1H2V7z M3,10H2V9h1V10z M5,10H4V9h1V10z M5,8H4V7h1V8z M5,6H4V5h1V6z M6,7h1v1H6V7z M7,10H6V9h1V10z M9,10H8
V7h1V10z M9,6H8V5h1V6z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 893 B

BIN
pix/t/grades.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 179 B

15
pix/t/grades.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M11,0H1C0.5,0,0,0.5,0,1v10c0,0.5,0.5,1,1,1h10c0.5,0,1-0.5,1-1V1C12,0.5,11.5,0,11,0z M7,3h1v1H7V3z
M7,5h1v1H7V5z M6,10H2V9h4V10z M6,8H2V7h4V8z M6,6H2V5h4V6z M6,4H2V3h4V4z M7,7h1v1H7V7z M8,10H7V9h1V10z M10,10H9V9h1V10z M10,8H9
V7h1V8z M10,6H9V5h1V6z M10,4H9V3h1V4z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 904 B

BIN
pix/t/lock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

15
pix/t/lock.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M6.5,0l-1,0c-1.7,0-3,1.3-3,3v1h2l0-1c0-0.6,0.5-1,1-1h1c0.6,0,1,0.4,1,1v2H1C0.5,5,0,5.5,0,6l0,5
c0,0.6,0.4,1,1,1h10c0.5,0,1-0.5,1-1l0-5c0-0.6-0.5-1-1-1H9.5l0-2C9.5,1.3,8.2,0,6.5,0z M7,8c0,0.4-0.2,0.7-0.6,0.9L6.5,9L7,10H6H5
l0.5-1l0.1-0.1C5.2,8.7,5,8.4,5,8c0-0.5,0.4-1,1-1S7,7.5,7,8z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 922 B

BIN
pix/t/locked.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 221 B

15
pix/t/locked.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M6.5,0l-1,0c-1.7,0-3,1.3-3,3v2H1C0.5,5,0,5.5,0,6l0,5c0,0.6,0.4,1,1,1h10c0.5,0,1-0.5,1-1l0-5
c0-0.6-0.5-1-1-1H9.5l0-2C9.5,1.3,8.2,0,6.5,0z M7,8c0,0.4-0.2,0.7-0.6,0.9L6.5,9L7,10H6H5l0.5-1l0.1-0.1C5.2,8.7,5,8.4,5,8
c0-0.5,0.4-1,1-1S7,7.5,7,8z M7.5,3v2l-3,0V3c0-0.6,0.5-1,1-1h1C7.1,2,7.5,2.4,7.5,3z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 935 B

BIN
pix/t/locktime.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 264 B

15
pix/t/locktime.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M6.5,0l-1,0c-1.7,0-3,1.3-3,3v2H1C0.5,5,0,5.5,0,6l0,5c0,0.6,0.4,1,1,1h10c0.6,0,1-0.4,1-1l0-2
c0,1.7-1.4,3-3,3c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3c1.7,0,3,1.3,3,3V6c0-0.5-0.5-1-1-1L9.5,5l0-2C9.5,1.3,8.2,0,6.5,0z M7.5,3v2h-3
V3c0-0.6,0.5-1,1-1h1C7.1,2,7.5,2.4,7.5,3z M11,9v1H9H8V9V7h1v2H11z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 925 B

BIN
pix/t/preview.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 292 B

15
pix/t/preview.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M11.4,9.4L9.9,7.9C9.8,7.8,9.7,7.8,9.6,7.7c0.4-0.8,0.7-1.6,0.7-2.5C10.3,2.3,8,0,5.2,0
C2.3,0,0,2.3,0,5.2s2.3,5.2,5.2,5.2c0.9,0,1.7-0.2,2.4-0.6C7.7,9.8,7.7,9.9,7.8,10l1.5,1.5c0.6,0.6,1.5,0.6,2.1,0S12,10,11.4,9.4z
M5.2,7.3C4,7.3,3,6.4,3,5.2C3,4,4,3,5.2,3c1.2,0,2.2,1,2.2,2.2C7.3,6.4,6.4,7.3,5.2,7.3z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 938 B

BIN
pix/t/sort.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 186 B

14
pix/t/sort.svg Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="-1 0 12 12" style="overflow:visible;enable-background:new -1 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M9.3,7C9.9,7,10,7.3,9.6,7.7l-4,4c-0.4,0.4-1,0.4-1.4,0l-4-4C-0.1,7.3,0,7,0.6,7H9.3z M9.4,5
c0.5,0,0.7-0.3,0.3-0.7l-4-4c-0.4-0.4-1-0.4-1.4,0l-4,4C-0.2,4.7,0,5,0.5,5H9.4z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 808 B

BIN
pix/t/switch_whole.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 231 B

17
pix/t/switch_whole.svg Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M11,0H1C0.5,0,0,0.5,0,1v10c0,0.5,0.5,1,1,1h10c0.5,0,1-0.5,1-1V1C12,0.5,11.5,0,11,0z M11,10
c0,0.5-0.5,1-1,1H2c-0.5,0-1-0.5-1-1V4c0-0.5,0.5-1,1-1h8c0.5,0,1,0.5,1,1V10z M9.8,4.2C9.9,4.3,10,4.4,10,4.5l0,3.5
c0,0.3-0.2,0.5-0.5,0.5h-1C8.2,8.6,8,8.3,8,8.1L8,6H5.9C5.6,6,5.4,5.8,5.4,5.5l0-1C5.4,4.3,5.6,4,5.9,4l3.6,0C9.6,4,9.7,4.1,9.8,4.2
z M6.6,8.5l0,1c0,0.3-0.2,0.5-0.5,0.5l-2.6,0c0,0-1,0-1,0C2.2,10,2,9.7,2,9.5l0-3.5c0-0.3,0.2-0.5,0.5-0.5l1,0C3.8,5.4,4,5.7,4,5.9
L4,8h2.1C6.4,8,6.6,8.2,6.6,8.5z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
pix/t/unlock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 221 B

15
pix/t/unlock.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M6.5,0l-1,0c-1.7,0-3,1.3-3,3v2H1C0.5,5,0,5.5,0,6l0,5c0,0.6,0.4,1,1,1h10c0.5,0,1-0.5,1-1l0-5
c0-0.6-0.5-1-1-1H9.5l0-2C9.5,1.3,8.2,0,6.5,0z M7,8c0,0.4-0.2,0.7-0.6,0.9L6.5,9L7,10H6H5l0.5-1l0.1-0.1C5.2,8.7,5,8.4,5,8
c0-0.5,0.4-1,1-1S7,7.5,7,8z M7.5,3v2l-3,0V3c0-0.6,0.5-1,1-1h1C7.1,2,7.5,2.4,7.5,3z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 935 B

BIN
pix/t/unlocked.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

15
pix/t/unlocked.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M6.5,0l-1,0c-1.7,0-3,1.3-3,3v1h2l0-1c0-0.6,0.5-1,1-1h1c0.6,0,1,0.4,1,1v2H1C0.5,5,0,5.5,0,6l0,5
c0,0.6,0.4,1,1,1h10c0.5,0,1-0.5,1-1l0-5c0-0.6-0.5-1-1-1H9.5l0-2C9.5,1.3,8.2,0,6.5,0z M7,8c0,0.4-0.2,0.7-0.6,0.9L6.5,9L7,10H6H5
l0.5-1l0.1-0.1C5.2,8.7,5,8.4,5,8c0-0.5,0.4-1,1-1S7,7.5,7,8z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 922 B

7
theme/base/style/admin.css
View File

@ -53,6 +53,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;}
@ -62,6 +63,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,
@ -155,6 +157,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;}
@ -256,6 +260,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;}
@ -281,3 +286,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; }

4
theme/base/style/core.css
View File

@ -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;}

2
theme/base/style/grade.css
View File

@ -19,7 +19,7 @@
.gradetreebox table {font-size: 0.8em;width: 100%;}
.gradetreebox td.colspan,
.gradetreebox tr.category .cell {background-color: #DDD;}
.gradetreebox th.actions {white-space: nowrap;width: 80px;}
.gradetreebox th.actions {white-space: nowrap;width: 105px;}
.gradetreebox td.name {white-space: nowrap;}
.gradetreebox td.name h4 {display: inline;}
.gradetreebox td.range {white-space: nowrap;}

3
theme/base/style/question.css
View File

@ -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;}

4
theme/upgrade.txt
View File

@ -9,6 +9,8 @@ required changes:
deprecation:
* i/roles: Use t/assignroles instead
* t/manual_item: Use i/manual_item instead
* t/unlock_gray: Use t/locked instead
optional changes:
* new optional boolean parameter $withlinks for public function login_info() in lib/outputrenderers.php (MDL-31365)
@ -21,6 +23,8 @@ 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.
* new icons i/folder (16x16), monochrome equivalent to f/folder.
=== 2.3 ===