From ef27582f081e9f68f24dd0b43a407f0479f84e88 Mon Sep 17 00:00:00 2001
From: Barbara Ramiro <barbara@moodle.com>
Date: Thu, 31 Jan 2013 10:55:18 +0800
Subject: [PATCH 1/2] MDL-35847 - Usability - Adding new warning icons

---
 pix/i/warning.png | Bin 0 -> 278 bytes
 pix/i/warning.svg |  15 +++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pix/i/warning.png
 create mode 100644 pix/i/warning.svg

diff --git a/pix/i/warning.png b/pix/i/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..fedfa4dfd90705812aa3a0fb7efc9950218c4dcf
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5Xc6hothE&{2`t$$4J+o>9>-;BcA~(x1XjUr3&6qZAT7xgI
zu-sYBfU^n${7<weq%a7W2t0Uf#&EWbt!7<<Qo?U{g?Sz4MSWOu{2AEd7$+%807V~s
z=g%<V@Hvplz_))fbNvD<_87ek1*5+v2@(y5%a~21*xn?9G*{aPJY=1)xo~Hb;1ux%
z+s+?<7!wfk>G6c(6rd5U4m@4kx_2CE>O3*wIP0643(OuceRSYCHSyOD5e60shPijG
VPu$%7Nge1122WQ%mvv4FO#lbzXLbMp

literal 0
HcmV?d00001

diff --git a/pix/i/warning.svg b/pix/i/warning.svg
new file mode 100644
index 00000000000..0608f422a8f
--- /dev/null
+++ b/pix/i/warning.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="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
+	 xml:space="preserve">
+<defs>
+</defs>
+<path style="fill:#999999;" d="M7,0.7L0.2,14.1c-0.5,1,0,1.8,1.1,1.8h13.2c1.1,0,1.6-0.8,1.1-1.8L8.8,0.7C8.3-0.2,7.5-0.2,7,0.7z
+	 M9.4,13.4c0,0.8-0.7,1.5-1.5,1.5c-0.8,0-1.5-0.7-1.5-1.5c0-0.8,0.7-1.5,1.5-1.5C8.7,11.9,9.4,12.5,9.4,13.4z M9.2,5.9v4
+	c0,0.5-0.5,1-1,1H7.6c-0.5,0-1-0.5-1-1v-4c0-0.6,0.5-1,1-1h0.6C8.8,4.9,9.2,5.3,9.2,5.9z"/>
+</svg>

From 3246648b4838d7c25d4b8a534354933fbb3220aa Mon Sep 17 00:00:00 2001
From: Jason Fowler <phalacee@gmail.com>
Date: Thu, 31 Jan 2013 11:02:49 +0800
Subject: [PATCH 2/2] MDL-35847 - Accessibility - Adding warning icon to the
 login error message

---
 lib/outputrenderers.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index c5633ba4604..c0c3a28e18e 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -2325,12 +2325,14 @@ EOD;
      * If the error message is blank, nothing is output.
      *
      * @param string $message the error message.
+     * @param bool $icon display the icon along with the error message.
      * @return string the HTML to output.
      */
     public function error_text($message) {
         if (empty($message)) {
             return '';
         }
+        $message = $this->pix_icon('i/warning', get_string('error'), '', array('class' => 'icon icon-pre', 'title'=>'')) . $message;
         return html_writer::tag('span', $message, array('class' => 'error'));
     }