Changeset 9847

Timestamp:

11/23/2008 06:37:15 AM (16 years ago)

Author:

azaozz

Message:

Gallery settings for TinyMCE

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/css/colors-classic.css (modified) (1 diff)
• wp-admin/css/colors-fresh.css (modified) (1 diff)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/wp-admin.css (modified) (2 diffs)
• wp-includes/js/tinymce/langs/wp-langs-en.js (modified) (1 diff)
• wp-includes/js/tinymce/langs/wp-langs.php (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css (modified) (4 diffs)
• wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/wpgallery (added)
• wp-includes/js/tinymce/plugins/wpgallery/css (added)
• wp-includes/js/tinymce/plugins/wpgallery/css/gallery.css (added)
• wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js (added)
• wp-includes/js/tinymce/plugins/wpgallery/gallery.html (added)
• wp-includes/js/tinymce/plugins/wpgallery/img (added)
• wp-includes/js/tinymce/plugins/wpgallery/img/delete.png (added)
• wp-includes/js/tinymce/plugins/wpgallery/img/edit.png (added)
• wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png (added)
• wp-includes/js/tinymce/plugins/wpgallery/img/t.gif (added)
• wp-includes/js/tinymce/plugins/wpgallery/js (added)
• wp-includes/js/tinymce/plugins/wpgallery/js/gallery.js (added)
• wp-includes/js/tinymce/wordpress.css (modified) (1 diff)
• wp-includes/media.php (modified) (5 diffs)
• wp-includes/post-template.php (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -40 +40 @@
     }
 
-    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;
 };
 //]]>

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

@@ -1450 +1450 @@
 }
 
-#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;

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

@@ -1453 +1453 @@
 }
 
-#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;

trunk/wp-admin/includes/post.php

@@ -1125 +1125 @@
         $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' );
 
         /*

trunk/wp-admin/wp-admin.css

@@ -2184 +2184 @@
 }
 
-#wp_editbtns {
+#wp_editbtns,
+#wp_gallerybtns {
     padding: 2px;
     position: absolute;
@@ -2191 +2192 @@
 }
 
-#wp_editimgbtn, #wp_delimgbtn {
+#wp_editimgbtn,
+#wp_delimgbtn,
+#wp_editgallery,
+#wp_delgallery {
     margin: 2px;
     padding: 2px;

trunk/wp-includes/js/tinymce/langs/wp-langs-en.js

@@ -428 +428 @@
 alt:"Edit Alternate Text"
 });
+
+tinyMCE.addI18n("en.gallery",{
+settings:"Gallery Settings",
+linkto:"Link thumbnails to:",
+linktofile:"Image File",
+linktopost:"Attachment Page",
+orderby:"Order images by:",
+menu_order:"Menu order",
+byname:"Name",
+bydate:"Date/Time",
+random:"Random",
+order:"Order:",
+orderasc:"Ascending",
+orderdesc:"Descending",
+cols:"Gallery columns:",
+two:"two",
+three:"three",
+four:"four",
+five:"five",
+six:"six",
+seven:"seven",
+eight:"eight",
+nine:"nine",
+imgwidth:"Limit the thumbnails width:",
+imgwidthhelp:"Overrides the thumbnail images width. The default can be changed from the Media Settings page."
+});

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

@@ -451 +451 @@
 alt:"' . mce_escape( __('Edit Alternate Text') ) . '"
 });
+
+tinyMCE.addI18n("' . $language . '.gallery",{
+settings:"' . mce_escape( __('Gallery Settings') )  . '",
+linkto:"' . mce_escape( __('Link thumbnails to:') )  . '",
+linktofile:"' . mce_escape( __('Image File') )  . '",
+linktopost:"' . mce_escape( __('Attachment Page') )  . '",
+orderby:"' . mce_escape( __('Order images by:') ) . '",
+menu_order:"' . mce_escape( __('Menu order') ) . '",
+byname:"' . mce_escape( __('Name') ) . '",
+bydate:"' . mce_escape( __('Date/Time') ) . '",
+random:"' . mce_escape( __('Random') ) . '",
+order:"' . mce_escape( __('Order:') ) . '",
+orderasc:"' . mce_escape( __('Ascending') ) . '",
+orderdesc:"' . mce_escape( __('Descending') ) . '",
+cols:"' . mce_escape( __('Gallery columns:') )  . '",
+two:"' . mce_escape( __('two') ) . '",
+three:"' . mce_escape( __('three') ) . '",
+four:"' . mce_escape( __('four') ) . '",
+five:"' . mce_escape( __('five') ) . '",
+six:"' . mce_escape( __('six') )  . '",
+seven:"' . mce_escape( __('seven') ) . '",
+eight:"' . mce_escape( __('eight') ) . '",
+nine:"' . mce_escape( __('nine') ) . '",
+imgwidth:"' . mce_escape( __('Limit the thumbnails width:') ) . '",
+imgwidthhelp:"' . mce_escape( __('Overrides the thumbnail images width. The default can be changed from the Media Settings page.') ) . '"
+});
 ';
-
-// mce_put_file( ABSPATH . WPINC . '/js/tinymce/langs/wp-langs-' . $language . '.js', $lang );

trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css

@@ -89 +89 @@
 }
 
-#media-upload #img-edit {
+#img-edit {
     border: 1px solid #dfdfdf;
     width: 623px;
@@ -101 +101 @@
 
 #img_demo_txt {
-    font-size: 6px;
-    line-height: 10px;
-    font-family: "Courier New",Courier,monotype;
-    color: #ccc;
-    background-color: #ccc;
+    font-size: 9px;
+    line-height: 13px;
+    font-family: Monaco,"Courier New",Courier,monospace;
+    color: #888;
 }
 
@@ -133 +132 @@
     display: block;
     float: left;
+    height: 28px;
     line-height: 28px;
     text-decoration: none;
@@ -333 +333 @@
     font-weight: bold;
 }
+
+* html #sidemenu li {
+    zoom: 100%;
+}
+
+* html #sidemenu a {
+    height: 27px;
+    line-height: 26px;
+}

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js

@@ -12 +12 @@
             ed.addCommand('WP_EditImage', function() {
                 var el = ed.selection.getNode(), vp = tinymce.DOM.getViewPort(), H = vp.h, W = ( 720 < vp.w ) ? 720 : vp.w;
-
-                if ( ed.dom.getAttrib(el, 'class').indexOf('mceItem') != -1 || el.nodeName != 'IMG' )
+                var cls = ed.dom.getAttrib(el, 'class');
+
+                if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 || el.nodeName != 'IMG' )
                     return;
 
@@ -143 +144 @@
         showButtons : function(n) {
             var t = this, ed = tinyMCE.activeEditor, p1, p2, vp, DOM = tinymce.DOM, X, Y;
-
-            if (ed.dom.getAttrib(n, 'class').indexOf('mceItem') != -1)
+            var cls = ed.dom.getAttrib(n, 'class');
+
+            if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 )
                 return;
 

trunk/wp-includes/js/tinymce/wordpress.css

@@ -41 +41 @@
 }
 
+img.wpGallery {
+    border: 1px dotted #cc0000;
+    background: #ffffcc url("plugins/wpgallery/img/gallery.png") no-repeat scroll center center;
+    width: 99%;
+    height: 250px;
+}
+
 body.mceContentBody {
     background: #fff;

trunk/wp-includes/media.php

@@ -523 +523 @@
  * @param string $size Optional, default is 'thumbnail'.
  * @param bool $icon Optional, default is false. Whether it is an icon.
+ * @param int $imgwidth Override image width.
  * @return string HTML img element or empty string on failure.
  */
-function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false) {
+function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false, $imgwidth = false) {
 
     $html = '';
@@ -531 +532 @@
     if ( $image ) {
         list($src, $width, $height) = $image;
-        $hwstring = image_hwstring($width, $height);
+        $hwstring = $imgwidth ? image_hwstring($imgwidth, '') : image_hwstring($width, $height);
         if ( is_array($size) )
             $size = join('x', $size);
@@ -619 +620 @@
         'columns'    => 3,
         'size'       => 'thumbnail',
+        'imgwidth'   => ''
     ), $attr));
 
@@ -638 +640 @@
     $columns = intval($columns);
     $itemwidth = $columns > 0 ? floor(100/$columns) : 100;
+    $imgwidth = isset($imgwidth) && (int) $imgwidth ? $imgwidth : false;
 
     $output = apply_filters('gallery_style', "
@@ -661 +664 @@
     $i = 0;
     foreach ( $attachments as $id => $attachment ) {
-        $link = wp_get_attachment_link($id, $size, true);
+        $link = isset($attr['link']) && 'file' == $attr['link'] ? wp_get_attachment_link($id, $size, false, false, $imgwidth) : wp_get_attachment_link($id, $size, true, false, $imgwidth);
+
         $output .= "<{$itemtag} class='gallery-item'>";
         $output .= "

trunk/wp-includes/post-template.php

@@ -758 +758 @@
  * @return string HTML content.
  */
-function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false, $icon = false) {
+function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $imgwidth = false) {
     $id = intval($id);
     $_post = & get_post( $id );
@@ -770 +770 @@
     $post_title = attribute_escape($_post->post_title);
 
-    $link_text = wp_get_attachment_image($id, $size, $icon);
+    $link_text = wp_get_attachment_image($id, $size, $icon, $imgwidth);
     if ( !$link_text )
         $link_text = $_post->post_title;

trunk/wp-includes/script-loader.php

@@ -62 +62 @@
     // Modify this version when tinyMCE plugins are changed.
     function mce_version() {
-        return '20081116';
+        return '20081122';
     }
     add_filter( 'tiny_mce_version', 'mce_version' );