From 4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23 Mon Sep 17 00:00:00 2001
From: iionly <iionly@gmx.de>
Date: Tue, 19 Feb 2013 20:15:34 +0100
Subject: Tinymce plugin: update to version 3.5.8 of Tinymce editor

---
 .../tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm')

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
index ad1bb0f6c..b625531a6 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
@@ -62,12 +62,8 @@
 
 	<div class="mceActionPanel">
 		<input type="submit" id="insert" name="insert" value="{#apply}" />
-
-		<div id="preview"></div>
-
-		<div id="previewblock">
-			<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" class="text mceFocus" aria-required="true" />
-		</div>
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();"/>
+		<div id="preview_wrapper"><div id="previewblock"><label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" class="text mceFocus" aria-required="true" /></div><span id="preview"></span></div>
 	</div>
 </form>
 </body>
-- 
cgit v1.2.3