diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2013-02-21 13:34:49 -0800 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2013-02-21 13:34:49 -0800 |
| commit | 556b3f68be6d568e1ab19a6e02a073da8f49ea38 (patch) | |
| tree | 4d5b09112ec2199ae9008109ba97e1478b915a21 /mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm | |
| parent | 88b7f8a3a32542e8b016c2163f44e1ebce7211fc (diff) | |
| parent | 4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23 (diff) | |
| download | elgg-556b3f68be6d568e1ab19a6e02a073da8f49ea38.tar.gz elgg-556b3f68be6d568e1ab19a6e02a073da8f49ea38.tar.bz2 | |
Merge pull request #5095 from iionly/tinymce_update_3_5_8
Tinymce plugin: update to version 3.5.8 of Tinymce editor
Diffstat (limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm')
| -rw-r--r-- | mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm | 8 |
1 files changed, 2 insertions, 6 deletions
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>
|