Changeset 8066

Timestamp:

06/10/2008 04:40:21 AM (17 years ago)

Author:

ryan

Message:

Unify TinyMCE image popup and insert image popup. Props azaozz. see #6811

Location:

trunk

Files:

• wp-admin/css/colors-classic.css (modified) (1 diff)
• wp-admin/css/colors-fresh.css (modified) (1 diff)
• wp-admin/gears-manifest.php (modified) (5 diffs)
• wp-admin/wp-admin.css (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpeditimage (added)
• wp-includes/js/tinymce/plugins/wpeditimage/css (added)
• wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css (added)
• wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (added)
• wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (added)
• wp-includes/js/tinymce/plugins/wpeditimage/img (added)
• wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png (added)
• wp-includes/js/tinymce/plugins/wpeditimage/img/image.png (added)
• wp-includes/js/tinymce/plugins/wpeditimage/js (added)
• wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (added)
• wp-includes/js/tinymce/tiny_mce_config.php (modified) (3 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/css/colors-classic.css

@@ -562 +562 @@
 
 /* Containers */
-.wp_themeSkin table {
+.wp_themeSkin table, #wp_editbtns {
     background: #83B4D5;
 }

trunk/wp-admin/css/colors-fresh.css

@@ -534 +534 @@
 
 /* Containers */
-.wp_themeSkin table {
+.wp_themeSkin table, #wp_editbtns {
     background: #cee1ef;
 }

trunk/wp-admin/gears-manifest.php

@@ -88 +88 @@
 {
 "betaManifestVersion" : 1,
-"version" : "<?php echo $man_version; ?>_20080602",
+"version" : "<?php echo $man_version; ?>_20080606",
 "entries" : [
 <?php echo $defaults; ?>
@@ -150 +150 @@
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=3091" },
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=3091" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=3091" },
 
 { "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=3091" },
@@ -163 +164 @@
 { "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=3091" },
 { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=3091" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=3091" },
 { "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=3091" },
 
@@ -175 +177 @@
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=3091" },
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=3091" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=3091" },
 { "url" : "../wp-includes/js/tinymce/wordpress.css?ver=3091" },
 
@@ -209 +212 @@
 { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif" },
 { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png" },
 { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.gif" }
 ]}

trunk/wp-admin/wp-admin.css

@@ -1588 +1588 @@
     padding: 0 7px;
 }
+
+#wp_editbtns {
+    padding: 2px;
+    position: absolute;
+    display: none;
+    z-index: 999998;
+}
+
+#wp_editimgbtn, #wp_delimgbtn {
+    margin: 2px;
+    padding: 2px;
+    border: 1px solid #999;
+    background-color: #eee;
+    -moz-border-radius: 3px;
+    -khtml-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+}
+
+#wp_editimgbtn:hover, #wp_delimgbtn:hover {
+    border-color: #555;
+    background-color: #ccc;
+}

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -71 +71 @@
 $mce_spellchecker_languages = apply_filters('mce_spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv');
 
-$plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen' );
+$plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen', 'wpeditimage' );
 
 /* 
@@ -123 +123 @@
 $plugins = implode($plugins, ',');
 
-$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'image', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' ));
+$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' ));
 $mce_buttons = implode($mce_buttons, ',');
 
@@ -227 +227 @@
 if ( $disk_cache ) {
 
-    $cacheKey = apply_filters('tiny_mce_version', '20080602');
+    $cacheKey = apply_filters('tiny_mce_version', '20080606');
 
     foreach ( $initArray as $v )

trunk/wp-includes/script-loader.php

@@ -36 +36 @@
 
     // Modify this version when tinyMCE plugins are changed.
-    $mce_version = apply_filters('tiny_mce_version', '20080602');
+    $mce_version = apply_filters('tiny_mce_version', '20080606');
     $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );