Ticket #9665: themes.related.stuff.tweaks.2.patch

wp-admin/css/colors-classic.css

@@ -58 +58 @@
         border-color: #ccc;
 }
 
-#poststuff .inside label.spam {
+#poststuff .inside label.spam,
+.delete-theme {
         color: red;
 }
 
@@ -66 +67 @@
         color: orange;
 }
 
-#poststuff .inside label.approved {
+#poststuff .inside label.approved,
+.activate-theme {
         color: green;
 }
 
@@ -417 +419 @@
 
 .updated,
 .login #login_error,
-.login .message {
+.login .message,
+.theme-update  {
         background-color: #ffffe0;
         border-color: #e6db55;
 }

wp-admin/css/colors-fresh.css

@@ -42 +42 @@
         border-color: #ccc;
 }
 
-#poststuff .inside label.spam {
+#poststuff .inside label.spam,
+.delete-theme {
         color: red;
 }
 
@@ -50 +51 @@
         color: orange;
 }
 
-#poststuff .inside label.approved {
+#poststuff .inside label.approved,
+.activate-theme {
         color: green;
 }
 
@@ -392 +394 @@
 
 .updated,
 .login #login_error,
-.login .message {
+.login .message,
+.theme-update  {
         background-color: #ffffe0;
         border-color: #e6db55;
 }

wp-admin/css/theme-editor.css

@@ -13 +13 @@
         width: 190px;
 }
 
-#templateside h3, #postcustomstuff p.submit {
+#templateside h3,
+#postcustomstuff p.submit {
         margin: 0;
 }
 
@@ -25 +26 @@
         margin-bottom: 0;
 }
 
-#templateside ol, #templateside ul {
+#templateside ol,
+#templateside ul {
         list-style: none;
         margin: .5em;
         padding: 0;
 }
 
-#templateside ol li, #templateside ul li {
+#templateside ol li,
+#templateside ul li {
         margin: 1px 0;
 }
 
@@ -40 +43 @@
         float: right;
         position: relative;
         bottom: 25px;
-        top:20px;
+        top: 20px;
 }
 
 #themeselector select {
@@ -49 +52 @@
 }
 
 .nonessential {
-        font-size: small;
+        font-style: italic;
+        font-size: 10px;
 }
 
 .highlight {
@@ -68 +72 @@
 #documentation {
         margin-top: 10px;
 }
+
 #documentation label {
         line-height: 22px;
         vertical-align: top;

wp-admin/css/theme-install.css

@@ -132 +132 @@
         float: left;
         text-align: right;
         width: 65px;
+        font-weight: bold;
 }
 
 .feature-filter .feature-group li {

wp-admin/themes.php

@@ -98 +98 @@
                 $details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
                 $update_url = wp_nonce_url('update.php?action=upgrade-theme&theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet);
 
-                if ( ! current_user_can('update_themes') )
-                        printf( __('<p>There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a>.</p>'), $theme_name, $details_url, $update['new_version']);
-                else if ( empty($update->package) )
-                        printf( __('<p>There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> <em>automatic upgrade unavailable for this theme</em>.</p>'), $theme_name, $details_url, $update['new_version']);
-                else
-                        printf( __('<p>There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s">upgrade automatically</a>.</p>'), $theme_name, $details_url, $update['new_version'], $update_url );
+                if ( ! current_user_can('update_themes') ) {
+                        ?><div class="theme-update"><?php printf( __('There is a new version of %1$s available. <br /><a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a>.'), $theme_name, $details_url, $update['new_version']); ?></div><?php
+                } else if ( empty($update->package) ) {
+                        ?><div class="theme-update"><?php printf( __('There is a new version of %1$s available. <br /><a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> <em>automatic upgrade unavailable for this theme</em>.'), $theme_name, $details_url, $update['new_version']); ?></div><?php
+                } else {
+                        ?><div class="theme-update"><?php printf( __('There is a new version of %1$s available. <br /><a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s">upgrade automatically</a>.'), $theme_name, $details_url, $update['new_version'], $update_url ); ?></div><?php
+                }
         }
 }
 
@@ -188 +189 @@
         $parent_theme = $themes[$theme_name]['Parent Theme'];
         $preview_link = clean_url( get_option('home') . '/');
         $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), $preview_link ) );
-        $preview_text = attr( sprintf( __('Preview of "%s"'), $title ) );
+        $preview_text = attr( sprintf( __('Preview "%s"'), $title ) );
         $tags = $themes[$theme_name]['Tags'];
         $thickbox_class = 'thickbox thickbox-preview';
         $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=".urlencode($template)."&amp;stylesheet=".urlencode($stylesheet), 'switch-theme_' . $template);
         $activate_text = attr( sprintf( __('Activate "%s"'), $title ) );
+        $delete_link = wp_nonce_url("themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet);
+        $delete_onclick = "if ( confirm('" . js_escape(sprintf( __("You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete."), $theme_name )) . "') ) {return true;}return false;";
         $actions = array();
-        $actions[] = '<a href="' . $activate_link .  '" class="activatelink" title="' . $activate_text . '">' . __('Activate') . '</a>';
-        $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . attr(sprintf(__('Preview "%s"'), $theme_name)) . '">' . __('Preview') . '</a>';
+        $actions[] = '<a href="' . $activate_link .  '" class="activate-theme" title="' . $activate_text . '">' . __('Activate') . '</a>';
+        $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . $preview_text . '">' . __('Preview') . '</a>';
         if ( current_user_can('update_themes') )
-                $actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url("themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet) . '" onclick="' . "if ( confirm('" . js_escape(sprintf( __("You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete."), $theme_name )) . "') ) {return true;}return false;" . '">' . __('Delete') . '</a>';
+                $actions[] = '<a class="submitdelete delete-theme" href="' . $delete_link . '" onclick="' . $delete_onclick . '">' . __('Delete') . '</a>';
         $actions = apply_filters('theme_action_links', $actions, $themes[$theme_name]);
 
         $actions = implode ( ' | ', $actions );
@@ -210 +213 @@
 <h3><?php
         /* translators: 1: theme title, 2: theme version, 3: theme author */
         printf(__('%1$s %2$s by %3$s'), $title, $version, $author) ; ?></h3>
-<p class="description"><?php echo $description; ?></p>
-<span class='action-links'><?php echo $actions ?></span>
+<p class="theme-description"><?php echo $description; ?></p>
+<div class='action-links'><?php echo $actions ?></div>
         <?php if ($parent_theme) { ?>
         <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.'), $title, $template_dir, $stylesheet_dir, $title, $parent_theme); ?></p>
 <?php } else { ?>
         <p><?php printf(__('All of this theme&#8217;s files are located in <code>%2$s</code>.'), $title, $template_dir, $stylesheet_dir); ?></p>
 <?php } ?>
 <?php if ( $tags ) : ?>
-<p><?php _e('Tags:'); ?> <?php echo join(', ', $tags); ?></p>
+<p><strong><?php _e('Tags:'); ?></strong> <span class="theme-tags"><?php echo join(', ', $tags); ?></span></p>
 <?php endif; ?>
                 <?php theme_update_available( $themes[$theme_name] ); ?>
 <?php endif; // end if not empty theme_name ?>

wp-admin/wp-admin.css

@@ -121 +121 @@
         margin: 15px 0 5px;
 }
 
+.theme-update {
+        border-width: 1px;
+        border-style: solid;
+        padding: 8px;
+        font-size: 11px;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+}
+
+.theme-description {
+        text-align: justify;
+}
+
+.theme-tags {
+        font-size: 11px;
+}
+
+.action-links {
+        font-weight: bold;
+        text-align: center;
+}
+
 #current-theme {
         margin: 1em 0 1.5em;
 }