From a9905a82d49702bc0642269b7b526e814dc79d85 Mon Sep 17 00:00:00 2001 From: Barbara Ramiro Date: Wed, 28 Nov 2012 13:37:08 +0800 Subject: [PATCH 1/2] MDL-36783 usability: New icons for portfolio --- pix/t/go.png | Bin 0 -> 235 bytes pix/t/go.svg | 13 +++++++++++++ pix/t/portfolioadd.png | Bin 0 -> 226 bytes pix/t/portfolioadd.svg | 14 ++++++++++++++ pix/t/stop.png | Bin 0 -> 235 bytes pix/t/stop.svg | 13 +++++++++++++ 6 files changed, 40 insertions(+) create mode 100644 pix/t/go.png create mode 100644 pix/t/go.svg create mode 100644 pix/t/portfolioadd.png create mode 100644 pix/t/portfolioadd.svg create mode 100644 pix/t/stop.png create mode 100644 pix/t/stop.svg diff --git a/pix/t/go.png b/pix/t/go.png new file mode 100644 index 0000000000000000000000000000000000000000..bf77a5f0a6459cc9cb4adc70586274c1be3a3c05 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1Gy`Ch!a z4op1(N7)>*>?b*uFkE`UaiyeDFzZvLP1i(INh8O(jvj{0A-=Z4SI!=3Vo+1^ZNGi! zh=Wo>Q&n5Uhel4Rb4QwZ6?l7HZZQR2KEcxK=*~1NLGU}no6G>7CMDJm@dcTG7(|U* eRwXiU7%*%!P~W + + +]> + + + + + diff --git a/pix/t/portfolioadd.png b/pix/t/portfolioadd.png new file mode 100644 index 0000000000000000000000000000000000000000..294809b4ecd7fcc111ac0c6aaf036c0c792ce145 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GEuJopAr-fhQW%O2)fwKUx07oNv-ybFo<{a!zNXi^C>1v69yd6$Co$9Ui}6-o)b2z{udY WQk&22MZZ7LJq(_%elF{r5}E+4pHIaA literal 0 HcmV?d00001 diff --git a/pix/t/portfolioadd.svg b/pix/t/portfolioadd.svg new file mode 100644 index 00000000000..7401456b68d --- /dev/null +++ b/pix/t/portfolioadd.svg @@ -0,0 +1,14 @@ + + + +]> + + + + + diff --git a/pix/t/stop.png b/pix/t/stop.png new file mode 100644 index 0000000000000000000000000000000000000000..741080ea32f5940d51c76159370afbda2ced5a62 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1Gy`C6&ONY2-N9(Zi5A#Mf5%%Go1L3~EZg?Y9pd zaZpNVs%ne)(8wuu?no1_0&lO&EvBH$Cs=wN-I-=32!3aHlNrF%q{P}Gz991tgQ#)K esze431BM1;4Nj-YJEsF3#^CAd=d#Wzp$P!5WK78b literal 0 HcmV?d00001 diff --git a/pix/t/stop.svg b/pix/t/stop.svg new file mode 100644 index 00000000000..00f5ca56bb3 --- /dev/null +++ b/pix/t/stop.svg @@ -0,0 +1,13 @@ + + + +]> + + + + + From fc5e08440a30be33d18459aa7e9880e377a182d6 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Wed, 28 Nov 2012 14:01:26 +0800 Subject: [PATCH 2/2] MDL-36783 usability: Portfolio CSS for new icons --- lib/portfoliolib.php | 8 +++++--- mod/data/styles.css | 1 + mod/glossary/lib.php | 10 +++++----- user/portfoliologs.php | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/portfoliolib.php b/lib/portfoliolib.php index 37d91dc0fd1..22a9c8555b9 100644 --- a/lib/portfoliolib.php +++ b/lib/portfoliolib.php @@ -341,7 +341,7 @@ class portfolio_add_button { $formoutput = '
' . "\n"; $formoutput .= html_writer::input_hidden_params($url); - $linkoutput = ''; break; case PORTFOLIO_ADD_ICON_LINK: - $linkoutput .= '">' . $addstr .''; + $linkoutput = $OUTPUT->action_icon($url, new pix_icon('t/portfolioadd', $addstr, '', + array('class' => 'portfolio-add-icon smallicon'))); break; case PORTFOLIO_ADD_TEXT_LINK: - $linkoutput .= '">' . $addstr .''; + $linkoutput = html_writer::link($url, $addstr, array('class' => 'portfolio-add-link', + 'title' => $addstr)); break; default: debugging(get_string('invalidaddformat', 'portfolio', $format)); diff --git a/mod/data/styles.css b/mod/data/styles.css index 600c79d4d8b..7cdd2f9b49c 100644 --- a/mod/data/styles.css +++ b/mod/data/styles.css @@ -48,6 +48,7 @@ .path-mod-data-field input.picturefieldsize { width:70px; } +.path-mod-data .action-icon img.portfolio-add-icon { margin-left: 0; } /** UI Usability Hacks **/ #page-mod-data-export #notice span {padding:0 10px;} diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 3c3f46379c5..dd0518cebdb 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -1245,7 +1245,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.''; } } @@ -1261,13 +1261,13 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h $ineditperiod = ((time() - $entry->timecreated < $CFG->maxeditingtime) || $glossary->editalways); if ( !$importedentry and (has_capability('mod/glossary:manageentries', $context) or ($entry->userid == $USER->id and ($ineditperiod and has_capability('mod/glossary:write', $context))))) { $output = true; - $return .= " id&mode=delete&entry=$entry->id&prevmode=$mode&hook=".urlencode($hook)."\">id&mode=delete&entry=$entry->id&prevmode=$mode&hook=".urlencode($hook)."\">\"" "; + $return .= "\" class=\"smallicon\" alt=\"" . get_string("delete") .$altsuffix."\" />"; - $return .= " id&id=$entry->id&mode=$mode&hook=".urlencode($hook)."\">pix_url('t/edit') . "\" class=\"iconsmall\" alt=\"" . get_string("edit") .$altsuffix. "\" />"; + $return .= "id&id=$entry->id&mode=$mode&hook=".urlencode($hook)."\">pix_url('t/edit') . "\" class=\"smallicon\" alt=\"" . get_string("edit") .$altsuffix. "\" />"; } elseif ( $importedentry ) { - $return .= " " . get_string("exportedentry","glossary") . ""; + $return .= "" . get_string("exportedentry","glossary") . ""; } } if (!empty($CFG->enableportfolios) && (has_capability('mod/glossary:exportentry', $context) || ($iscurrentuser && has_capability('mod/glossary:exportownentry', $context)))) { diff --git a/user/portfoliologs.php b/user/portfoliologs.php index 1fa544b43de..e0e5045e4d5 100644 --- a/user/portfoliologs.php +++ b/user/portfoliologs.php @@ -91,7 +91,7 @@ if (count($queued) > 0) { $iconstr = $OUTPUT->action_icon(new moodle_url($baseurl, array('cancel'=>1)), new pix_icon('t/stop', get_string('cancel'))); if (!$e->get('queued') && $e->get('expirytime') > $now) { - $iconstr .= ' ' . $OUTPUT->action_icon($baseurl, new pix_icon('t/go', get_string('continue'))); + $iconstr .= $OUTPUT->action_icon($baseurl, new pix_icon('t/go', get_string('continue'))); } $table->data[] = array( $e->get('caller')->display_name(),