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

alseambusher · Nov 29, 2012 · e4d7ec6 · e4d7ec6
2 parents 7dd3674 + fc5e084
commit e4d7ec6
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 9 deletions.
diff --git a/lib/portfoliolib.php b/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));

diff --git 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
@@ -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)))) {

diff --git a/pix/t/go.png b/pix/t/go.png
diff --git a/pix/t/go.svg b/pix/t/go.svg
diff --git a/pix/t/portfolioadd.png b/pix/t/portfolioadd.png
diff --git a/pix/t/portfolioadd.svg b/pix/t/portfolioadd.svg
diff --git a/pix/t/stop.png b/pix/t/stop.png
diff --git a/pix/t/stop.svg b/pix/t/stop.svg
diff --git a/user/portfoliologs.php b/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(),