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

mod/assign/gradingtable.php

@@ -772,7 +772,7 @@ class assign_grading_table extends table_sql implements renderable {
         $edit .= html_writer::start_tag('ul');
         $edit .= html_writer::start_tag('li', array('class'=>'menuicon'));
 
-        $menuicon = $this->output->pix_icon('i/menu', get_string('actions'));
+        $menuicon = $this->output->pix_icon('t/contextmenu', get_string('actions'));
         $edit .= $this->output->action_link('#menu' . $row->id, $menuicon, null, array('class'=>'yui3-menu-label'));
         $edit .= $this->output->container_start(array('yui3-menu', 'yui3-loading'), 'menu' . $row->id);
         $edit .= $this->output->container_start(array('yui3-menu-content'));

mod/assign/pix/gradefeedback.svg

@@ -0,0 +1,15 @@
+<?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="M11,5.2V11c0,0.5-0.5,1-1,1H1c-0.5,0-1-0.5-1-1V2c0-0.5,0.5-1,1-1h5.8l-1,1H2C1.5,2,1,2.4,1,3v3.8V10
+	v1h1h3.2H9c0.5,0,1-0.5,1-1V6.2L11,5.2z M6.8,2.3L2,7.1V10h2.8l4.8-4.8L6.8,2.3z M11.4,0.6L11.4,0.6c-0.8-0.8-2.1-0.8-2.8,0L7.8,1.3
+	l2.8,2.8l0.7-0.7C12.2,2.6,12.2,1.4,11.4,0.6z"/>
+</svg>

mod/assign/styles.css

@@ -114,7 +114,9 @@ div.earlysubmission {
 
 .gradingtable .yui3-menu-label {
     padding-left: 0px;
+    line-height: 12px;
 }
+.gradingtable .yui3-menu-label img { padding: 0 3px; }
 .gradingtable .yui3-menu li {
     list-style-type: none;
 }
@@ -125,6 +127,7 @@ div.earlysubmission {
 
 .gradingtable .yui3-menu .yui3-menu-content {
     border: 0px;
+    padding-top: 0;
 }
 
 #page-mod-assign-view div.gradingtable tr .quickgrademodified {

pix/t/contextmenu.svg

@@ -0,0 +1,16 @@
+<?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="M4.4,12H0V0h12v4.4C11.8,4.2,11.5,4,11,4V3H1v2h3.3C4.1,5.3,4,5.6,4,6v0H1v2h3v1H1v2h3
+	C4,11.4,4.2,11.8,4.4,12z M8.5,12l-1-1H7.3l-0.9,0.9c0,0-0.1,0-0.1,0.1H8.5z M11,7.5l1,1V6.3c0,0,0,0.1-0.1,0.1L11,7.3V7.5z
+	 M11.7,9.5L9.5,7.4l1.7-1.7C11.6,5.3,11.5,5,10.9,5H6C5.4,5,5,5.4,5,6v4.9c0,0.5,0.3,0.7,0.7,0.3l1.7-1.7l2.1,2.1
+	c0.4,0.4,1,0.4,1.4,0l0.7-0.7C12,10.6,12,9.9,11.7,9.5z"/>
+</svg>

theme/upgrade.txt

@@ -46,6 +46,7 @@ optional changes:
 * 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).
+* new icon t/contextmenu (12x12) for a monochrome version of i/menu.
 
 === 2.3 ===