Changeset 1655

Timestamp:

09/14/2004 12:01:31 PM (20 years ago)

Author:

saxmatt

Message:

Some UI changes to theme manager. Seems to be updating the stylesheet but not the template.

Location:

trunk/wp-admin

Files:

• admin-functions.php (modified) (1 diff)
• themes.php (modified) (5 diffs)

trunk/wp-admin/admin-functions.php

@@ -566 +566 @@
     
     // The default theme always exists.
-    $themes['Default'] = array('Name' => 'Default', 'Title' => 'Default', 'Description' => 'The default theme', 'Author' => '', 'Version' => '1.3', 'Template' => 'default', 'Stylesheet' => 'default', 'Template Files' => $default_template_files, 'Stylesheet Files' => $default_stylesheet_files, 'Template Dir' => '/', 'Stylesheet Dir' => '/', 'Parent Theme' => '');
+    $themes['Default'] = array('Name' => 'Default', 'Title' => 'WordPress Default', 'Description' => 'The default theme included with WordPress.', 'Author' => 'Dave Shea', 'Version' => '1.3', 'Template' => 'default', 'Stylesheet' => 'default', 'Template Files' => $default_template_files, 'Stylesheet Files' => $default_stylesheet_files, 'Template Dir' => '/', 'Stylesheet Dir' => '/', 'Parent Theme' => '');
 
     if (!$themes_dir || !$theme_files) {

trunk/wp-admin/themes.php

@@ -16 +16 @@
       }
 
-      header('Location: themes.php?activate=true');
+      header('Location: themes.php?activated=true');
     }
  }
@@ -25 +25 @@
 require_once('admin-header.php');
 
-if ($user_level < 9) // Must be at least level 9
-    die (__('Sorry, you must be at least a level 8 user to modify themes.'));
+if ($user_level < 9)
+    die (__('Sorry, you must be at least a level 9 user to modify themes.'));
 ?>
+
+<?php if ( isset($activated) ) : ?>
+<div class="updated"><p><?php _e('New theme activated'); ?></p></div>
+<?php endif; ?>
 
 <?php
 $themes = get_themes();
 $current_theme = get_current_theme();
+$current_title = $themes[$current_theme]['Title'];
+$current_version = $themes[$current_theme]['Version'];
 $current_parent_theme = $themes[$current_theme]['Parent Theme'];
 $current_template_dir = $themes[$current_theme]['Template Dir'];
@@ -39 +45 @@
 ?>
 
+<div class="wrap">
+<h2><?php _e('Current Theme'); ?></h2>
+<div id="currenttheme">
+<h3><?php printf(__('%s %s by %s'), $current_title, $current_version, $themes[$current_theme]['Author']) ; ?></h3>
+<p><?php echo $themes[$current_theme]['Description']; ?></p>
 <?php if ($current_parent_theme) { ?>
-    <div class="updated"><p><?php printf(__('The active theme is <strong>%s</strong>.  The template files are located in <code>%s</code>.  The stylesheet files are located in <code>%s</code>.  <strong>%s</strong> uses templates from <strong>%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></div>
+    <p><?php printf(__('The active theme is <strong>%s</strong>.  The template files are located in <code>%s</code>.  The stylesheet files are located in <code>%s</code>.  <strong>%s</strong> uses templates from <strong>%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 { ?>
-    <div class="updated"><p><?php printf(__('The active theme is <strong>%s</strong>.  The template files are located in <code>%s</code>.  The stylesheet files are located in <code>%s</code>.'), $current_theme, $current_template_dir, $current_stylesheet_dir); ?></p></div>
+    <p><?php printf(__('The active theme is <strong>%s</strong>.  The template files are located in <code>%s</code>.  The stylesheet files are located in <code>%s</code>.'), $current_theme, $current_template_dir, $current_stylesheet_dir); ?></p>
 <?php } ?>
+</div>
 
-<div class="wrap">
-<h2><?php _e('Theme Management'); ?></h2>
+<h2><?php _e('Other Themes'); ?></h2>
 <p><?php _e('Themes are usually downloaded separately from WordPress. To install a theme you generally just need to put the theme file or files into your <code>wp-content/themes</code> directory. Once a theme is installed, you may select it here.'); ?></p>
-<?php
 
-if (empty($themes)) {
-    _e("<p>Couldn't open themes directory or there are no themes available.</p>"); // TODO: make more helpful
-} else {
-?>
+<?php if ( 1 < count($themes) ) { ?>
 <table width="100%" cellpadding="3" cellspacing="3">
     <tr>
-        <th><?php _e('Theme'); ?></th>
-        <th><?php _e('Version'); ?></th>
+        <th><?php _e('Name'); ?></th>
         <th><?php _e('Author'); ?></th>
         <th><?php _e('Description'); ?></th>
@@ -77 +83 @@
 
         if ($template == $current_template && $stylesheet == $current_stylesheet) {
-            $action = "<a href='themes.php' title='" . __('Active theme') . "' class='edit'>" . __('Active Theme') . '</a>';
+            $action = __('Active Theme');
         } else {
             $action = "<a href='themes.php?action=activate&amp;template=$template&amp;stylesheet=$stylesheet' title='" . __('Select this theme') . "' class='edit'>" . __('Select') . '</a>';
@@ -85 +91 @@
         echo "
       <tr $theme>
-         <td>$title</td>
-         <td>$version</td>
-         <td>$author</td>
+         <td>$title $version</td>
+         <td align='center'>$author</td>
          <td>$description</td>
-         <td>$action</td>
+         <td align='center'>$action</td>
       </tr>";
     }