Changeset 2757

Timestamp:

08/07/2005 10:11:30 AM (21 years ago)

Author:

matt

Message:

Making the presentation page a little more intuitive

Location:

trunk

Files:

• wp-admin/themes.php (modified) (5 diffs)
• wp-admin/wp-admin.css (modified) (3 diffs)
• wp-content/themes/classic/screenshot.png (added)
• wp-content/themes/default/screenshot.png (added)
• wp-includes/functions.php (modified) (4 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/themes.php

@@ -40 +40 @@
 $current_template = $themes[$current_theme]['Template'];
 $current_stylesheet = $themes[$current_theme]['Stylesheet'];
+$current_screenshot = $themes[$current_theme]['Screenshot'];
 ?>
 
@@ -45 +46 @@
 <h2><?php _e('Current Theme'); ?></h2>
 <div id="currenttheme">
+<?php if ( $current_screenshot ) : ?>
+<img src="<?php echo get_option('siteurl') . '/' . $current_stylesheet_dir . '/' . $current_screenshot; ?>" alt="Current theme preview" />
+<?php endif; ?>
 <h3><?php printf(__('%1$s %2$s by %3$s'), $current_title, $current_version, $themes[$current_theme]['Author']) ; ?></h3>
 <p><?php echo $themes[$current_theme]['Description']; ?></p>
 <?php if ($current_parent_theme) { ?>
-        <p><?php printf(__('The active theme is <strong>%1$s</strong>.  The template files are located in <code>%2$s</code>.  The stylesheet files are located in <code>%3$s</code>.  <strong>%4$s</strong> uses templates from <strong>%5$s</strong>.  Changes made to the templates will affect both themes.'), $current_theme, $current_template_dir, $current_stylesheet_dir, $current_theme, $current_parent_theme); ?></p>
+        <p><?php printf(__('The template files are located in <code>%2$s</code>.  The stylesheet files are located in <code>%3$s</code>.  <strong>%4$s</strong> uses templates from <strong>%5$s</strong>.  Changes made to the templates will affect both themes.'), $current_theme, $current_template_dir, $current_stylesheet_dir, $current_theme, $current_parent_theme); ?></p>
 <?php } else { ?>
-        <p><?php printf(__('The active theme is <strong>%1$s</strong>.  The template files are located in <code>%2$s</code>.  The stylesheet files are located in <code>%3$s</code>.'), $current_theme, $current_template_dir, $current_stylesheet_dir); ?></p>
+        <p><?php printf(__('All of this theme&#8217;s files are located in <code>%2$s</code>.'), $current_theme, $current_template_dir, $current_stylesheet_dir); ?></p>
 <?php } ?>
 </div>
@@ -56 +60 @@
 <h2><?php _e('Available Themes'); ?></h2>
 <?php if ( 1 < count($themes) ) { ?>
-<table width="100%" cellpadding="3" cellspacing="3">
-        <tr>
-                <th><?php _e('Name'); ?></th>
-                <th><?php _e('Author'); ?></th>
-                <th><?php _e('Description'); ?></th>
-                <th></th>
-        </tr>
+
 <?php
-        $style = '';
+$style = '';
 
-        $theme_names = array_keys($themes);
-        natcasesort($theme_names);
+$theme_names = array_keys($themes);
+natcasesort($theme_names);
 
-        foreach ($theme_names as $theme_name) {
-                $template = $themes[$theme_name]['Template'];
-                $stylesheet = $themes[$theme_name]['Stylesheet'];
-                $title = $themes[$theme_name]['Title'];
-                $version = $themes[$theme_name]['Version'];
-                $description = $themes[$theme_name]['Description'];
-                $author = $themes[$theme_name]['Author'];
-
+foreach ($theme_names as $theme_name) {
+        if ( $theme_name == $current_theme )
+                continue;
+        $template = $themes[$theme_name]['Template'];
+        $stylesheet = $themes[$theme_name]['Stylesheet'];
+        $title = $themes[$theme_name]['Title'];
+        $version = $themes[$theme_name]['Version'];
+        $description = $themes[$theme_name]['Description'];
+        $author = $themes[$theme_name]['Author'];
+        $screenshot = $themes[$theme_name]['Screenshot'];
+        $stylesheet_dir = $themes[$theme_name]['Stylesheet Dir'];
+?>
+<div class="available-theme">
+<h3><a href="<?php echo "themes.php?action=activate&amp;template=$template&amp;stylesheet=$stylesheet"; ?>"><?php echo "$title $version"; ?>
+<span>
+<?php if ( $screenshot ) : ?>
+<img src="<?php echo get_option('siteurl') . '/' . $stylesheet_dir . '/' . $screenshot; ?>" alt="" />
+<?php endif; ?>
+</span>
+</a></h3>
+<p><?php echo $description; ?></p>
+</div>
+<?php
+/*
                 if ($template == $current_template && $stylesheet == $current_stylesheet) {
                         $action = '<strong>' . __('Active Theme') . '</strong>';
                         $current = true;
                 } else {
-                        $action = "<a href='themes.php?action=activate&amp;template=$template&amp;stylesheet=$stylesheet' title='" . __('Select this theme') . "' class='edit'>" . __('Select') . '</a>';
+                        $action = "<a href='' title='" . __('Select this theme') . "' class='edit'>" . __('Select') . '</a>';
                         $current = false;
                 }
@@ -94 +108 @@
         echo "<td><strong>$title $version</strong></td>";
 else
-        echo "<td>$title $version</td>";
+        echo "<td></td>";
 echo "
              <td class=\"auth\">$author</td>
@@ -100 +114 @@
              <td class=\"togl\">$action</td>
           </tr>";
+*/
         }
+
 ?>
 
-</table>
 <?php
 }

trunk/wp-admin/wp-admin.css

@@ -161 +161 @@
 }
 
+.available-theme {
+        width: 250px;
+        margin-right: 2.5em;
+        float: left;
+        text-align: center;
+}
+
+.available-theme span {
+        width: 250px;
+        height: 187px;
+        display: block;
+        margin: auto;
+        background: #f1f1f1;
+        border: 1px solid #ccc;
+}
+
+.available-theme img {
+        width: 100%;
+}
+
 .checkbox {
         background: #fff;
@@ -268 +288 @@
 .wrap h2 {
         margin: .8em 0 .5em;
+        clear: both;
 }
 
@@ -340 +361 @@
         margin-left: 2%;
         width: 97%;
+}
+
+#currenttheme img {
+        float: left;
+        border: 1px solid #666;
+        margin-right: 1em;
+        margin-bottom: 1.5em;
 }
 

trunk/wp-includes/functions.php

@@ -1512 +1512 @@
         $name = trim($name);
         $theme = $name;
-        if ('' != $theme_uri[1] && '' != $name) {
-                $theme = '<a href="' . $theme_uri[1] . '" title="' . __('Visit theme homepage') . '">' . $theme . '</a>';
-        }
 
         if ('' == $author_uri[1]) {
@@ -1570 +1567 @@
         foreach($theme_files as $theme_file) {
                 $theme_data = get_theme_data("$theme_root/$theme_file");
-          
+
                 $name = $theme_data['Name']; 
                 $title = $theme_data['Title'];
@@ -1578 +1575 @@
                 $template = $theme_data['Template'];
                 $stylesheet = dirname($theme_file);
+
+                $screenshot = glob("$theme_root/$stylesheet/screenshot.png");
+                if ( !empty( $screenshot ) )
+                        $screenshot = basename( $screenshot[0] );
+                else
+                        $screenshot = false;
 
                 if (empty($name)) {
@@ -1641 +1644 @@
                 }
                 
-                $themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template, 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files, 'Template Dir' => $template_dir, 'Stylesheet Dir' => $stylesheet_dir, 'Status' => $theme_data['Status']);
+                $themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template, 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files, 'Template Dir' => $template_dir, 'Stylesheet Dir' => $stylesheet_dir, 'Status' => $theme_data['Status'], 'Screenshot' => $screenshot);
         }
 

trunk/wp-includes/version.php

@@ -3 +3 @@
 // This just holds the version number, in a separate file so we can bump it without cluttering the SVN
 
-$wp_version = '1.6-ALPHA-2';
+$wp_version = '1.6-ALPHA-2-still-dont-use';
 
 ?>