Changeset 7496

Timestamp:

03/24/2008 02:57:19 AM (17 years ago)

Author:

ryan

Message:

Gallery display enhancements from tellyworth. fixes #6368

Location:

trunk

Files:

• wp-admin/includes/media.php (modified) (2 diffs)
• wp-includes/media.php (modified) (5 diffs)
• wp-includes/shortcodes.php (modified) (1 diff)

trunk/wp-admin/includes/media.php

@@ -461 +461 @@
     if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
         $form_fields['post_title']['required'] = true;
-        $form_fields['post_excerpt']['label'] = __('Description');
+        $form_fields['post_excerpt']['label'] = __('Caption');
         $form_fields['post_excerpt']['helps'][] = __('Alternate text, e.g. "The Mona Lisa"');
 
-        $form_fields['post_content']['label'] = __('Long Description');
+        $form_fields['post_content']['label'] = __('Description');
 
         $thumb = wp_get_attachment_thumb_url($post->ID);
@@ -555 +555 @@
         ),
         'post_excerpt' => array(
-            'label'      => __('Description'),
+            'label'      => __('Caption'),
             'value'      => $edit_post->post_excerpt,
         ),
         'post_content' => array(
-            'label'      => __('Long description'),
+            'label'      => __('Description'),
             'value'      => $edit_post->post_content,
             'input'      => 'textarea',

trunk/wp-includes/media.php

@@ -340 +340 @@
     if ( $output != '' )
         return $output;
-
-    $attachments = get_children("post_parent=$post->ID&post_type=attachment&post_mime_type=image&orderby=\"menu_order ASC, ID ASC\"");
+        
+    extract(shortcode_atts(array(
+        'orderby'    => 'menu_order ASC, ID ASC',
+        'id'         => $post->ID,
+        'itemtag'    => 'dl',
+        'icontag'    => 'dt',
+        'captiontag' => 'dd',
+        'columns'    => 3,
+        'size'       => 'thumbnail',
+    ), $attr));
+
+    $id = intval($id);
+    $orderby = addslashes($orderby);
+    $attachments = get_children("post_parent=$id&post_type=attachment&post_mime_type=image&orderby=\"{$orderby}\"");
 
     if ( empty($attachments) )
@@ -349 +361 @@
         $output = "\n";
         foreach ( $attachments as $id => $attachment )
-            $output .= wp_get_attachment_link($id, 'thumbnail', true) . "\n";
+            $output .= wp_get_attachment_link($id, $size, true) . "\n";
         return $output;
     }
 
+    $listtag = tag_escape($listtag);
+    $itemtag = tag_escape($itemtag);
+    $captiontag = tag_escape($captiontag);
+    $columns = intval($columns);
+    
     $output = apply_filters('gallery_style', "
         <style type='text/css'>
@@ -358 +375 @@
                 margin: auto;
             }
-            .gallery div {
+            .gallery-item {
                 float: left;
                 margin-top: 10px;
@@ -366 +383 @@
                 border: 2px solid #cfcfcf;
             }
+            .gallery-caption {
+                margin-left: 0;
+            }
         </style>
         <!-- see gallery_shortcode() in wp-includes/media.php -->
@@ -371 +391 @@
 
     foreach ( $attachments as $id => $attachment ) {
-        $link = wp_get_attachment_link($id, 'thumbnail', true);
+        $link = wp_get_attachment_link($id, $size, true);
+        $output .= "<{$itemtag} class='gallery-item'>";
         $output .= "
-            <div>
+            <{$icontag} class='gallery-icon'>
                 $link
-            </div>";
-        if ( ++$i % 3 == 0 )
+            </{$icontag}>";
+        if ( $captiontag && trim($attachment->post_excerpt) ) {
+            $output .= "
+                <{$captiontag} class='gallery-caption'>
+                {$attachment->post_excerpt}
+                </{$captiontag}>";
+        }
+        $output .= "</{$itemtag}>";
+        if ( $columns > 0 && ++$i % $columns == 0 )
             $output .= '<br style="clear: both" />';
     }

trunk/wp-includes/shortcodes.php

@@ -119 +119 @@
 
 function shortcode_atts($pairs, $atts) {
+    $atts = (array)$atts;
     $out = array();
     foreach($pairs as $name => $default) {