Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit e4d7ec6b3be4fe9ddb87fe1b777b3ec6b4d2c399 2 parents 7dd3674 + fc5e084
@danpoltawski danpoltawski authored
View
8 lib/portfoliolib.php
@@ -341,7 +341,7 @@ public function to_html($format=null, $addstr=null) {
$formoutput = '<form method="post" action="' . $CFG->wwwroot . '/portfolio/add.php" id="portfolio-add-button">' . "\n";
$formoutput .= html_writer::input_hidden_params($url);
- $linkoutput = '<a class="portfolio-add-link" title="'.$addstr.'" href="' . $url->out();
+ $linkoutput = '';
switch ($format) {
case PORTFOLIO_ADD_FULL_FORM:
@@ -355,10 +355,12 @@ public function to_html($format=null, $addstr=null) {
$formoutput .= "\n" . '</form>';
break;
case PORTFOLIO_ADD_ICON_LINK:
- $linkoutput .= '"><img class="portfolio-add-icon iconsmall" src="' . $OUTPUT->pix_url('t/portfolioadd') . '" alt="' . $addstr .'" /></a>';
+ $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 .'</a>';
+ $linkoutput = html_writer::link($url, $addstr, array('class' => 'portfolio-add-link',
+ 'title' => $addstr));
break;
default:
debugging(get_string('invalidaddformat', 'portfolio', $format));
View
1  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;}
View
10 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 .= ' <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>';
+ $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>';
}
}
@@ -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 .= " <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=\"";
+ $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=\"";
$return .= $icon;
- $return .= "\" class=\"iconsmall\" alt=\"" . get_string("delete") .$altsuffix."\" /></a> ";
+ $return .= "\" class=\"smallicon\" alt=\"" . get_string("delete") .$altsuffix."\" /></a>";
- $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>";
+ $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>";
} elseif ( $importedentry ) {
- $return .= " <font size=\"-1\">" . get_string("exportedentry","glossary") . "</font>";
+ $return .= "<font size=\"-1\">" . get_string("exportedentry","glossary") . "</font>";
}
}
if (!empty($CFG->enableportfolios) && (has_capability('mod/glossary:exportentry', $context) || ($iscurrentuser && has_capability('mod/glossary:exportownentry', $context)))) {
View
BIN  pix/t/go.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
13 pix/t/go.svg
@@ -0,0 +1,13 @@
+<?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>
+<circle style="fill:#99CC33;" cx="6" cy="6" r="6"/>
+</svg>
View
BIN  pix/t/portfolioadd.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
14 pix/t/portfolioadd.svg
@@ -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="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
+ xml:space="preserve">
+<defs>
+</defs>
+<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
+ 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"/>
+</svg>
View
BIN  pix/t/stop.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
13 pix/t/stop.svg
@@ -0,0 +1,13 @@
+<?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>
+<circle style="fill:#FF403C;" cx="6" cy="6" r="6"/>
+</svg>
View
2  user/portfoliologs.php
@@ -91,7 +91,7 @@
$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 .= '&nbsp;' . $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(),

0 comments on commit e4d7ec6

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