Wordpress 2.5.1

[autoinstalls/wordpress.git] / wp-content / themes / default / image.php

diff --git a/wp-content/themes/default/attachment.php b/wp-content/themes/default/image.php
similarity index 58%
rename from wp-content/themes/default/attachment.php
rename to wp-content/themes/default/image.php
index 779af0df3ceb5daec672b5b056be9fc152c77a7f..5e039806af0ad3979e1c7891606e54f8d7639f5e 100644 (file)
--- a/wp-content/themes/default/attachment.php
+++ b/wp-content/themes/default/image.php
@@ -4,31 +4,26 @@
 
   <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
 
-               <div class="navigation">
-                       <div class="alignleft">&nbsp;</div>
-                       <div class="alignright">&nbsp;</div>
-               </div>
-<?php $attachment_link = get_the_attachment_link($post->ID, true, array(450, 800)); // This also populates the iconsize for the next line ?>
-<?php $_post = &get_post($post->ID); $classname = ($_post->iconsize[0] <= 128 ? 'small' : '') . 'attachment'; // This lets us style narrow icons specially ?>
                <div class="post" id="post-<?php the_ID(); ?>">
-                       <h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
+                       <h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <?php the_title(); ?></h2>
                        <div class="entry">
-                               <p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p>
+                               <p class="attachment"><a href="<?php echo wp_get_attachment_url($post->ID); ?>"><?php echo wp_get_attachment_image( $post->ID, 'medium' ); ?></a></p>
+                <div class="caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt(); // this is the "caption" ?></div>
 
                                <?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
 
-                               <?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
+                               <div class="navigation">
+                                       <div class="alignleft"><?php previous_image_link() ?></div>
+                                       <div class="alignright"><?php next_image_link() ?></div>
+                               </div>
+                               <br class="clear" />
 
                                <p class="postmetadata alt">
                                        <small>
-                                               This entry was posted
-                                               <?php /* This is commented, because it requires a little adjusting sometimes.
-                                                       You'll need to download this plugin, and follow the instructions:
-                                                       http://binarybonsai.com/archives/2004/08/17/time-since-plugin/ */
-                                                       /* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?>
-                                               on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>
+                                               This entry was posted on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>
                                                and is filed under <?php the_category(', ') ?>.
-                                               You can follow any responses to this entry through the <?php comments_rss_link('RSS 2.0'); ?> feed.
+                                               <?php the_taxonomies(); ?>
+                                               You can follow any responses to this entry through the <?php post_comments_feed_link('RSS 2.0'); ?> feed.
 
                                                <?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
                                                        // Both Comments and Pings are open ?>
@@ -52,6 +47,7 @@
                                </p>
 
                        </div>
+
                </div>
 
        <?php comments_template(); ?>