Upgrade TinyMCE to v3.4.5

[citadel.git] / webcit / tiny_mce / themes / advanced / color_picker.htm
diff --git a/webcit/tiny_mce/themes/advanced/color_picker.htm b/webcit/tiny_mce/themes/advanced/color_picker.htm

index a8f297c6038adb555386335aff4956e2cb6a4b8d..ad1bb0f6ccfaee3762641f44044e39d2fbae4d8a 100644 (file)
--- a/webcit/tiny_mce/themes/advanced/color_picker.htm
+++ b/webcit/tiny_mce/themes/advanced/color_picker.htm
@@ -5,15 +5,15 @@
         <script type="text/javascript" src="../../tiny_mce_popup.js"></script>\r
         <script type="text/javascript" src="../../utils/mctabs.js"></script>\r
         <script type="text/javascript" src="js/color_picker.js"></script>\r
-       <base target="_self" />\r
  </head>\r
-<body id="colorpicker" style="display: none">\r
+<body id="colorpicker" style="display: none" role="application" aria-labelledby="app_label">\r
+       <span class="mceVoiceLabel" id="app_label" style="display:none;">{#advanced_dlg.colorpicker_title}</span>\r
  <form onsubmit="insertAction();return false" action="#">\r
         <div class="tabs">\r
                 <ul>\r
-                       <li id="picker_tab" class="current"><span><a href="javascript:mcTabs.displayTab('picker_tab','picker_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_picker_tab}</a></span></li>\r
-                       <li id="rgb_tab"><span><a href="javascript:;" onclick="generateWebColors();mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_palette_tab}</a></span></li>\r
-                       <li id="named_tab"><span><a  href="javascript:;" onclick="generateNamedColors();javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_named_tab}</a></span></li>\r
+                       <li id="picker_tab" aria-controls="picker_panel" class="current"><span><a href="javascript:mcTabs.displayTab('picker_tab','picker_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_picker_tab}</a></span></li>\r
+                       <li id="rgb_tab" aria-controls="rgb_panel"><span><a href="javascript:;" onclick="mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_palette_tab}</a></span></li>\r
+                       <li id="named_tab" aria-controls="named_panel"><span><a  href="javascript:;" onclick="javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_named_tab}</a></span></li>\r
                 </ul>\r
         </div>\r
  \r
@@ -22,7 +22,7 @@
                         <fieldset>\r
                                 <legend>{#advanced_dlg.colorpicker_picker_title}</legend>\r
                                 <div id="picker">\r
-                                       <img id="colors" src="img/colorpicker.jpg" onclick="computeColor(event)" onmousedown="isMouseDown = true;return false;" onmouseup="isMouseDown = false;" onmousemove="if (isMouseDown && isMouseOver) computeColor(event); return false;" onmouseover="isMouseOver=true;" onmouseout="isMouseOver=false;" />\r
+                                       <img id="colors" src="img/colorpicker.jpg" onclick="computeColor(event)" onmousedown="isMouseDown = true;return false;" onmouseup="isMouseDown = false;" onmousemove="if (isMouseDown && isMouseOver) computeColor(event); return false;" onmouseover="isMouseOver=true;" onmouseout="isMouseOver=false;" alt="" />\r
  \r
                                         <div id="light">\r
                                                 <!-- Will be filled with divs -->\r
@@ -35,7 +35,7 @@
  \r
                 <div id="rgb_panel" class="panel">\r
                         <fieldset>\r
-                               <legend>{#advanced_dlg.colorpicker_palette_title}</legend>\r
+                               <legend id="webcolors_title">{#advanced_dlg.colorpicker_palette_title}</legend>\r
                                 <div id="webcolors">\r
                                         <!-- Gets filled with web safe colors-->\r
                                 </div>\r
@@ -45,9 +45,9 @@
                 </div>\r
  \r
                 <div id="named_panel" class="panel">\r
-                       <fieldset>\r
-                               <legend>{#advanced_dlg.colorpicker_named_title}</legend>\r
-                               <div id="namedcolors">\r
+                       <fieldset id="named_picker_label">\r
+                               <legend id="named_title">{#advanced_dlg.colorpicker_named_title}</legend>\r
+                               <div id="namedcolors" role="listbox" tabindex="0" aria-labelledby="named_picker_label">\r
                                         <!-- Gets filled with named colors-->\r
                                 </div>\r
  \r
@@ -61,14 +61,12 @@
         </div>\r
  \r
         <div class="mceActionPanel">\r
-               <div style="float: left">\r
-                       <input type="submit" id="insert" name="insert" value="{#apply}" />\r
-               </div>\r
+               <input type="submit" id="insert" name="insert" value="{#apply}" />\r
  \r
                 <div id="preview"></div>\r
  \r
                 <div id="previewblock">\r
-                       <label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" maxlength="8" class="text mceFocus" />\r
+                       <label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" class="text mceFocus" aria-required="true" />\r
                 </div>\r
         </div>\r
  </form>\r