Gallery settings for TinyMCE

git-svn-id: https://develop.svn.wordpress.org/trunk@9847 602fd350-edb4-49c9-b593-d223f7449a82

wp-admin/admin-header.php

@@ -39,12 +39,14 @@ function convertEntities(o) {
 		return s;
 	}
 
-	if ( typeof o === 'object' ) {
-		for (var v in o)
-			o[v] = c(o[v]);
-		return o;
-	} else if ( typeof o === 'string' )
+	if ( typeof o === 'string' )
 		return c(o);
+	else if ( typeof o === 'object' )
+		for (var v in o) {
+			if ( typeof o[v] === 'string' )
+				o[v] = c(o[v]);
+		}
+	return o;
 };
 //]]>
 </script>

wp-admin/css/colors-classic.css

@@ -1449,12 +1449,18 @@ form p.submit a.cancel:hover {
 	border-color: #999;
 }
 
-#wp_editimgbtn, #wp_delimgbtn {
+#wp_editimgbtn,
+#wp_delimgbtn,
+#wp_editgallery,
+#wp_delgallery {
 	border-color: #999;
 	background-color: #eee;
 }
 
-#wp_editimgbtn:hover, #wp_delimgbtn:hover {
+#wp_editimgbtn:hover,
+#wp_delimgbtn:hover,
+#wp_editgallery:hover,
+#wp_delgallery:hover {
 	border-color: #555;
 	background-color: #ccc;
 }

wp-admin/css/colors-fresh.css

@@ -1452,12 +1452,18 @@ form p.submit a.cancel:hover {
 	border-color: #999;
 }
 
-#wp_editimgbtn, #wp_delimgbtn {
+#wp_editimgbtn,
+#wp_delimgbtn,
+#wp_editgallery,
+#wp_delgallery {
 	border-color: #999;
 	background-color: #eee;
 }
 
-#wp_editimgbtn:hover, #wp_delimgbtn:hover {
+#wp_editimgbtn:hover,
+#wp_delimgbtn:hover,
+#wp_editgallery:hover,
+#wp_delgallery:hover {
 	border-color: #555;
 	background-color: #ccc;
 }

wp-admin/includes/post.php

@@ -1124,7 +1124,7 @@ function wp_tiny_mce( $teeny = false ) {
 		$plugins = apply_filters( 'teeny_mce_plugins', array('safari', 'inlinepopups', 'media', 'autosave', 'fullscreen') );
 		$ext_plugins = '';
 	} else {
-		$plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen', 'wpeditimage' );
+		$plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen', 'wpeditimage', 'wpgallery' );
 
 		/*
 		The following filter takes an associative array of external plugins for TinyMCE in the form 'plugin_name' => 'url'.

wp-admin/wp-admin.css

@@ -2183,14 +2183,18 @@ fieldset {
 	font: 18px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
 }
 
-#wp_editbtns {
+#wp_editbtns,
+#wp_gallerybtns {
 	padding: 2px;
 	position: absolute;
 	display: none;
 	z-index: 999998;
 }
 
-#wp_editimgbtn, #wp_delimgbtn {
+#wp_editimgbtn,
+#wp_delimgbtn,
+#wp_editgallery,
+#wp_delgallery {
 	margin: 2px;
 	padding: 2px;
 	border-width: 1px;