From 851d3b7a97f6a635b19ad0eb0045a4c62861f5e3 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Mon, 26 Nov 2012 14:02:44 +0800 Subject: [PATCH] MDL-36830 usability: Glossary and database small design improvements --- mod/data/lib.php | 8 ++++++-- mod/glossary/lib.php | 13 ++++++++----- mod/glossary/pix/export.png | Bin 0 -> 209 bytes mod/glossary/pix/export.svg | 14 ++++++++++++++ mod/glossary/styles.css | 1 + pix/t/approve.png | Bin 0 -> 266 bytes pix/t/approve.svg | 14 ++++++++++++++ theme/upgrade.txt | 2 ++ 8 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 mod/glossary/pix/export.png create mode 100644 mod/glossary/pix/export.svg create mode 100644 pix/t/approve.png create mode 100644 pix/t/approve.svg diff --git a/mod/data/lib.php b/mod/data/lib.php index 2d120ca6020..b26d77ddccf 100644 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -1251,8 +1251,12 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r $replacement [] = userdate($record->timemodified); $patterns[]='##approve##'; - if (has_capability('mod/data:approve', $context) && ($data->approval) && (!$record->approved)){ - $replacement[] = ''.get_string('approve').''; + if (has_capability('mod/data:approve', $context) && ($data->approval) && (!$record->approved)) { + $approveurl = new moodle_url('/mod/data/view.php', + array('d' => $data->id, 'approve' => $record->id, 'sesskey' => sesskey())); + $approveicon = new pix_icon('t/approve', get_string('approve'), '', array('class' => 'iconsmall')); + $replacement[] = html_writer::tag('span', $OUTPUT->action_icon($approveurl, $approveicon), + array('class' => 'approve')); } else { $replacement[] = ''; } diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index dd0518cebdb..7fa2109017a 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -1234,7 +1234,8 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h if (!$entry->approved) { $output = true; - $return .= get_string('entryishidden','glossary'); + $return .= html_writer::tag('span', get_string('entryishidden','glossary'), + array('class' => 'glossary-hidden-note')); } $iscurrentuser = ($entry->userid == $USER->id); @@ -1245,7 +1246,7 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h $mainglossary = $DB->get_record('glossary', array('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').$altsuffix.''; + $return .= ''.get_string('exporttomainglossary','glossary').$altsuffix.''; } } @@ -1292,8 +1293,6 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h $return .= $button->to_html(PORTFOLIO_ADD_ICON_LINK); } - $return .= "  "; // just to make up a little the output in Mozilla ;) - $return .= ''; if (!empty($CFG->usecomments) && has_capability('mod/glossary:comment', $context) and $glossary->allowcomments) { @@ -1394,7 +1393,11 @@ function glossary_print_entry_approval($cm, $entry, $mode, $align="right", $ins if ($insidetable) { echo '
'; } - echo ''.get_string('approve','glossary').''; + echo $OUTPUT->action_icon( + new moodle_url('approve.php', array('eid' => $entry->id, 'mode' => $mode, 'sesskey' => sesskey())), + new pix_icon('t/approve', get_string('approve','glossary'), '', + array('class' => 'iconsmall', 'align' => $align)) + ); if ($insidetable) { echo '
'; } diff --git a/mod/glossary/pix/export.png b/mod/glossary/pix/export.png new file mode 100644 index 0000000000000000000000000000000000000000..fd8cbbe438e4396ba64fe63207a808f9fa644e92 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G#hxyXAr-fhQXH6#)6eBF1bq$2ORlP_V%}sU%&fNI_`zc< z8TAz+nUyb`Wp#*R@YIp(5MA(w-C>V_=R0QZ2``Q(FJKB{nDAU>0&j1|!o-FrNBA9T z7(L%9C{L@n!M{Xi!5!uU6$MN3HzZvy5MY<)VPN86nD9-ED383{1p00i_>zopr E0C_b;x&QzG literal 0 HcmV?d00001 diff --git a/mod/glossary/pix/export.svg b/mod/glossary/pix/export.svg new file mode 100644 index 00000000000..9197663cd77 --- /dev/null +++ b/mod/glossary/pix/export.svg @@ -0,0 +1,14 @@ + + + +]> + + + + + diff --git a/mod/glossary/styles.css b/mod/glossary/styles.css index b08d4c29054..21b14a1d876 100644 --- a/mod/glossary/styles.css +++ b/mod/glossary/styles.css @@ -7,6 +7,7 @@ .path-mod-glossary .glossarypost .entrylowersection .aliases {text-align:center;} .path-mod-glossary .glossarypost .entrylowersection .icons {text-align:right;padding-right: 5px;} .path-mod-glossary .glossarypost .entrylowersection .ratings {text-align:right;padding-right: 5px;padding-bottom: 2px;} +.path-mod-glossary .glossarypost .glossary-hidden-note { margin: 0 .45em; } .path-mod-glossary .glossarydisplay {margin-left:auto;margin-right:auto;} .path-mod-glossary .glossarydisplay .tabs {width: 100%;margin-bottom: 0px;} diff --git a/pix/t/approve.png b/pix/t/approve.png new file mode 100644 index 0000000000000000000000000000000000000000..43540a5d82350eb9b61b4847358d7b1568de8a64 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GYdl>XLn>}1B`PqaotvY{u;iWdPT@!ij%FqWv4%~rXL8I~ z#}L$_Qqs`b@bdG;ADuoGKIIHSd>&51mo8tHHxSJH#jcRYVi?h&Cdu%UVZ!eQHJOH4 ze4kb@O=@#nAmbs-tQ_#kW`bEmC07S`V}*Ut2^$8ju$Gr8jzMP_NdA2AEQ+(glDQy3$K^VMKmvmlho0i?)Q!nNcQbgp L`njxgN@xNABiUML literal 0 HcmV?d00001 diff --git a/pix/t/approve.svg b/pix/t/approve.svg new file mode 100644 index 00000000000..b29d965c734 --- /dev/null +++ b/pix/t/approve.svg @@ -0,0 +1,14 @@ + + + +]> + + + + + diff --git a/theme/upgrade.txt b/theme/upgrade.txt index 0c57b65f2ec..8e2e316be0c 100644 --- a/theme/upgrade.txt +++ b/theme/upgrade.txt @@ -22,6 +22,7 @@ deprecation: * i/tick_amber_big: Use i/caution or i/grade_partiallycorrect * No more small versions of i/cross_red_small, i/tick_green_small and i/tick_amber_small, use their big equivalent. * t/addgreen: Use t/add instead. +* i/approve: Use t/approve instead optional changes: * new optional boolean parameter $withlinks for public function login_info() in lib/outputrenderers.php (MDL-31365) @@ -44,6 +45,7 @@ optional changes: * new classes 'icon-pre' and 'icon-post' supposedly to be used when the icon is positioned before or after the text. This is not really used yet, but it's a start towards some standardisation of the icon selectors. * new icons i/valid, i/caution and i/invalid for generic statuses. * new icons i/grade_correct, i/grade_partiallycorrect and i/grade_incorrect for grades. +* new icon t/approve (12x12). === 2.3 ===