From 982f4bc40e376037d507edc422ea32a897c1c2f1 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 14 Feb 2013 16:54:04 +0800 Subject: [PATCH] MDL-38301 usability: Fixed wrong icon size --- enrol/cohort/lib.php | 3 ++- enrol/manual/lib.php | 3 ++- enrol/paypal/lib.php | 3 ++- enrol/self/lib.php | 3 ++- group/groupings.php | 17 ++++++++++------- theme/base/style/core.css | 2 ++ 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/enrol/cohort/lib.php b/enrol/cohort/lib.php index a2370d4c96e..6741732ceff 100644 --- a/enrol/cohort/lib.php +++ b/enrol/cohort/lib.php @@ -118,7 +118,8 @@ class enrol_cohort_plugin extends enrol_plugin { if (has_capability('enrol/cohort:config', $context)) { $editlink = new moodle_url("/enrol/cohort/edit.php", array('courseid'=>$instance->courseid, 'id'=>$instance->id)); - $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('i/edit', get_string('edit'), 'core', array('class'=>'icon'))); + $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('t/edit', get_string('edit'), 'core', + array('class' => 'smallicon'))); } return $icons; diff --git a/enrol/manual/lib.php b/enrol/manual/lib.php index 7ffba73f879..5b6ae7ecb5e 100644 --- a/enrol/manual/lib.php +++ b/enrol/manual/lib.php @@ -117,7 +117,8 @@ class enrol_manual_plugin extends enrol_plugin { } if (has_capability('enrol/manual:config', $context)) { $editlink = new moodle_url("/enrol/manual/edit.php", array('courseid'=>$instance->courseid)); - $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('i/edit', get_string('edit'), 'core', array('class'=>'icon'))); + $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('t/edit', get_string('edit'), 'core', + array('class' => 'iconsmall'))); } return $icons; diff --git a/enrol/paypal/lib.php b/enrol/paypal/lib.php index ca3cd7487bc..b79dbe119f5 100644 --- a/enrol/paypal/lib.php +++ b/enrol/paypal/lib.php @@ -118,7 +118,8 @@ class enrol_paypal_plugin extends enrol_plugin { if (has_capability('enrol/paypal:config', $context)) { $editlink = new moodle_url("/enrol/paypal/edit.php", array('courseid'=>$instance->courseid, 'id'=>$instance->id)); - $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('i/edit', get_string('edit'), 'core', array('class'=>'icon'))); + $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('t/edit', get_string('edit'), 'core', + array('class' => 'smallicon'))); } return $icons; diff --git a/enrol/self/lib.php b/enrol/self/lib.php index b624d92b5a1..31679c774f7 100644 --- a/enrol/self/lib.php +++ b/enrol/self/lib.php @@ -160,7 +160,8 @@ class enrol_self_plugin extends enrol_plugin { if (has_capability('enrol/self:config', $context)) { $editlink = new moodle_url("/enrol/self/edit.php", array('courseid'=>$instance->courseid, 'id'=>$instance->id)); - $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('i/edit', get_string('edit'), 'core', array('class'=>'icon'))); + $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('t/edit', get_string('edit'), 'core', + array('class' => 'smallicon'))); } return $icons; diff --git a/group/groupings.php b/group/groupings.php index 04800d24e51..ec8b094f08c 100644 --- a/group/groupings.php +++ b/group/groupings.php @@ -83,17 +83,20 @@ if ($groupings = $DB->get_records('groupings', array('courseid'=>$course->id), ' } $line[2] = $DB->count_records('course_modules', array('course'=>$course->id, 'groupingid'=>$grouping->id)); - $buttons = "id\">pix_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> "; + $url = new moodle_url('/group/grouping.php', array('id' => $grouping->id)); + $buttons = html_writer::link($url, $OUTPUT->pix_icon('t/edit', $stredit, 'core', + array('class' => 'iconsmall')), array('title' => $stredit)); if (empty($grouping->idnumber) || $canchangeidnumber) { - // It's only possible to delete groups without an idnumber unless the user has the changeidnumber capability - $buttons .= "id&delete=1\">pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /> "; + // It's only possible to delete groups without an idnumber unless the user has the changeidnumber capability. + $url = new moodle_url('/group/grouping.php', array('id' => $grouping->id, 'delete' => 1)); + $buttons .= html_writer::link($url, $OUTPUT->pix_icon('t/delete', $strdelete, 'core', + array('class' => 'iconsmall')), array('title' => $strdelete)); } else { $buttons .= $OUTPUT->spacer(); } - $buttons .= "id\">pix_url('i/group') . "\" class=\"icon\" alt=\"$strmanagegrping\" /> "; + $url = new moodle_url('/group/assign.php', array('id' => $grouping->id)); + $buttons .= html_writer::link($url, $OUTPUT->pix_icon('t/groups', $strmanagegrping, 'core', + array('class' => 'iconsmall')), array('title' => $strmanagegrping)); $line[3] = $buttons; $data[] = $line; diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 819f38c0955..5d56f1bff96 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -260,7 +260,9 @@ a.skip:active {position: static;display: block;} .dir-rtl .mform .helplink img { margin: 0 .45em 0 0; padding: 0;} .mform legend .helplink img { margin-right: .2em; } .dir-rtl .mform legend .helplink img { margin: 0 .45em 0 .2em; } +.urlselect label, .singleselect label { margin-right: .3em; } +.dir-rtl .urlselect label, .dir-rtl .singleselect label { margin-left: .3em; margin-right: 0; } input#id_externalurl {direction:ltr;}