Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit e4d7ec6b3be4fe9ddb87fe1b777b3ec6b4d2c399 2 parents 7dd3674 + fc5e084
Dan Poltawski danpoltawski authored
8 lib/portfoliolib.php
@@ -341,7 +341,7 @@ public function to_html($format=null, $addstr=null) {
341 341
342 342 $formoutput = '<form method="post" action="' . $CFG->wwwroot . '/portfolio/add.php" id="portfolio-add-button">' . "\n";
343 343 $formoutput .= html_writer::input_hidden_params($url);
344   - $linkoutput = '<a class="portfolio-add-link" title="'.$addstr.'" href="' . $url->out();
  344 + $linkoutput = '';
345 345
346 346 switch ($format) {
347 347 case PORTFOLIO_ADD_FULL_FORM:
@@ -355,10 +355,12 @@ public function to_html($format=null, $addstr=null) {
355 355 $formoutput .= "\n" . '</form>';
356 356 break;
357 357 case PORTFOLIO_ADD_ICON_LINK:
358   - $linkoutput .= '"><img class="portfolio-add-icon iconsmall" src="' . $OUTPUT->pix_url('t/portfolioadd') . '" alt="' . $addstr .'" /></a>';
  358 + $linkoutput = $OUTPUT->action_icon($url, new pix_icon('t/portfolioadd', $addstr, '',
  359 + array('class' => 'portfolio-add-icon smallicon')));
359 360 break;
360 361 case PORTFOLIO_ADD_TEXT_LINK:
361   - $linkoutput .= '">' . $addstr .'</a>';
  362 + $linkoutput = html_writer::link($url, $addstr, array('class' => 'portfolio-add-link',
  363 + 'title' => $addstr));
362 364 break;
363 365 default:
364 366 debugging(get_string('invalidaddformat', 'portfolio', $format));
1  mod/data/styles.css
@@ -48,6 +48,7 @@
48 48 .path-mod-data-field input.picturefieldsize {
49 49 width:70px;
50 50 }
  51 +.path-mod-data .action-icon img.portfolio-add-icon { margin-left: 0; }
51 52
52 53 /** UI Usability Hacks **/
53 54 #page-mod-data-export #notice span {padding:0 10px;}
10 mod/glossary/lib.php
@@ -1245,7 +1245,7 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h
1245 1245 $mainglossary = $DB->get_record('glossary', array('mainglossary'=>1,'course'=>$course->id));
1246 1246 if ( $mainglossary ) { // if there is a main glossary defined, allow to export the current entry
1247 1247 $output = true;
1248   - $return .= ' <a title="'.get_string('exporttomainglossary','glossary') . '" href="exportentry.php?id='.$entry->id.'&amp;prevmode='.$mode.'&amp;hook='.urlencode($hook).'"><img src="'.$OUTPUT->pix_url('export', 'glossary').'" class="iconsmall" alt="'.get_string('exporttomainglossary','glossary').$altsuffix.'" /></a>';
  1248 + $return .= ' <a class="action-icon" title="'.get_string('exporttomainglossary','glossary') . '" href="exportentry.php?id='.$entry->id.'&amp;prevmode='.$mode.'&amp;hook='.urlencode($hook).'"><img src="'.$OUTPUT->pix_url('export', 'glossary').'" class="smallicon" alt="'.get_string('exporttomainglossary','glossary').$altsuffix.'" /></a>';
1249 1249 }
1250 1250 }
1251 1251
@@ -1261,13 +1261,13 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h
1261 1261 $ineditperiod = ((time() - $entry->timecreated < $CFG->maxeditingtime) || $glossary->editalways);
1262 1262 if ( !$importedentry and (has_capability('mod/glossary:manageentries', $context) or ($entry->userid == $USER->id and ($ineditperiod and has_capability('mod/glossary:write', $context))))) {
1263 1263 $output = true;
1264   - $return .= " <a title=\"" . get_string("delete") . "\" href=\"deleteentry.php?id=$cm->id&amp;mode=delete&amp;entry=$entry->id&amp;prevmode=$mode&amp;hook=".urlencode($hook)."\"><img src=\"";
  1264 + $return .= "<a class='action-icon' title=\"" . get_string("delete") . "\" href=\"deleteentry.php?id=$cm->id&amp;mode=delete&amp;entry=$entry->id&amp;prevmode=$mode&amp;hook=".urlencode($hook)."\"><img src=\"";
1265 1265 $return .= $icon;
1266   - $return .= "\" class=\"iconsmall\" alt=\"" . get_string("delete") .$altsuffix."\" /></a> ";
  1266 + $return .= "\" class=\"smallicon\" alt=\"" . get_string("delete") .$altsuffix."\" /></a>";
1267 1267
1268   - $return .= " <a title=\"" . get_string("edit") . "\" href=\"edit.php?cmid=$cm->id&amp;id=$entry->id&amp;mode=$mode&amp;hook=".urlencode($hook)."\"><img src=\"" . $OUTPUT->pix_url('t/edit') . "\" class=\"iconsmall\" alt=\"" . get_string("edit") .$altsuffix. "\" /></a>";
  1268 + $return .= "<a class='action-icon' title=\"" . get_string("edit") . "\" href=\"edit.php?cmid=$cm->id&amp;id=$entry->id&amp;mode=$mode&amp;hook=".urlencode($hook)."\"><img src=\"" . $OUTPUT->pix_url('t/edit') . "\" class=\"smallicon\" alt=\"" . get_string("edit") .$altsuffix. "\" /></a>";
1269 1269 } elseif ( $importedentry ) {
1270   - $return .= " <font size=\"-1\">" . get_string("exportedentry","glossary") . "</font>";
  1270 + $return .= "<font size=\"-1\">" . get_string("exportedentry","glossary") . "</font>";
1271 1271 }
1272 1272 }
1273 1273 if (!empty($CFG->enableportfolios) && (has_capability('mod/glossary:exportentry', $context) || ($iscurrentuser && has_capability('mod/glossary:exportownentry', $context)))) {
BIN  pix/t/go.png
13 pix/t/go.svg
... ... @@ -0,0 +1,13 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
  3 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
  4 + <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
  5 +]>
  6 +<svg version="1.1"
  7 + xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
  8 + x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
  9 + xml:space="preserve">
  10 +<defs>
  11 +</defs>
  12 +<circle style="fill:#99CC33;" cx="6" cy="6" r="6"/>
  13 +</svg>
BIN  pix/t/portfolioadd.png
14 pix/t/portfolioadd.svg
... ... @@ -0,0 +1,14 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
  3 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
  4 + <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
  5 +]>
  6 +<svg version="1.1"
  7 + xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
  8 + x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
  9 + xml:space="preserve">
  10 +<defs>
  11 +</defs>
  12 +<path style="fill:#999999;" d="M5.3,12H0V2.6v0L2.6,0h0H10v3.8l-1-1V1H4v3H1v7h4C5,11.4,5.1,11.7,5.3,12z M11.8,7L8.3,3.4
  13 + C7.9,3,7.3,3,6.9,3.4L3.4,7.1C3,7.5,3.1,8,3.7,8H6v3c0,0.5,0.5,1,1.1,1h1C8.6,12,9,11.5,9,11V8h2.5C12,8,12.2,7.4,11.8,7z"/>
  14 +</svg>
BIN  pix/t/stop.png
13 pix/t/stop.svg
... ... @@ -0,0 +1,13 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
  3 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
  4 + <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
  5 +]>
  6 +<svg version="1.1"
  7 + xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
  8 + x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
  9 + xml:space="preserve">
  10 +<defs>
  11 +</defs>
  12 +<circle style="fill:#FF403C;" cx="6" cy="6" r="6"/>
  13 +</svg>
2  user/portfoliologs.php
@@ -91,7 +91,7 @@
91 91 $iconstr = $OUTPUT->action_icon(new moodle_url($baseurl, array('cancel'=>1)), new pix_icon('t/stop', get_string('cancel')));
92 92
93 93 if (!$e->get('queued') && $e->get('expirytime') > $now) {
94   - $iconstr .= '&nbsp;' . $OUTPUT->action_icon($baseurl, new pix_icon('t/go', get_string('continue')));
  94 + $iconstr .= $OUTPUT->action_icon($baseurl, new pix_icon('t/go', get_string('continue')));
95 95 }
96 96 $table->data[] = array(
97 97 $e->get('caller')->display_name(),

0 comments on commit e4d7ec6

Please sign in to comment.
Something went wrong with that request. Please try again.