Changeset 10788

Timestamp:

03/15/2009 11:04:34 AM (16 years ago)

Author:

azaozz

Message:

Theme install style tweaks, see #8652

Location:

trunk

Files:

• wp-admin/css/theme-install.css (modified) (1 diff)
• wp-admin/includes/plugin-install.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-admin/includes/theme-install.php (modified) (3 diffs)
• wp-admin/js/theme-preview.dev.js (modified) (2 diffs)
• wp-admin/js/theme-preview.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/css/theme-install.css

@@ -76 +76 @@
     margin-bottom: 3px;
 }
+
+#search-field {
+    padding: 1px;
+}
+
+p.popular-tags {
+    line-height: 1.8em;
+}
+
+.available-theme {
+    text-align: center;
+}
+
+#theme-information .available-theme a.screenshot {
+    border: 0 none;
+    display: inline;
+}
+
+#theme-information .available-theme h3 {
+    margin: 1em 0;
+}
+

trunk/wp-admin/includes/plugin-install.php

@@ -126 +126 @@
 
     <h4><?php _e('Search') ?></h4>
-    <?php install_search_form('<a href="' . add_query_arg('show-help', !isset($_REQUEST['show-help'])) .'" onclick="jQuery(\'#search-help\').toggle(); return false;">' . __('[need help?]') . '</a>') ?>
-    <div id="search-help" style="display: <?php echo isset($_REQUEST['show-help']) ? 'block' : 'none'; ?>;">
-    <p> <?php _e('You may search based on 3 criteria:') ?><br />
-        <?php _e('<strong>Term:</strong> Searches plugins names and descriptions for the specified term') ?><br />
-        <?php _e('<strong>Tag:</strong> Searches for plugins tagged as such') ?><br />
-        <?php _e('<strong>Author:</strong> Searches for plugins created by the Author, or which the Author contributed to.') ?></p>
-    </div>
+    <?php install_search_form(); ?>
 
     <h4><?php _e('Install a plugin in .zip format') ?></h4>

trunk/wp-admin/includes/template.php

@@ -3381 +3381 @@
         case 'options-general':
             if ( !isset($_wp_contextual_help['options-general']) )
-                $_wp_contextual_help['options-general'] =  __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">General Settings</a>');
+                $_wp_contextual_help['options-general'] = __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">General Settings</a>');
+            break;
+        case 'theme-install':
+        case 'plugin-install':
+            if ( !isset($_GET['tab']) || 'dashboard' == $_GET['tab'] )
+                $_wp_contextual_help[$screen] = '
+        <p><strong>' . __('Search help') . '</strong></p>' .
+        '<p>' . __('You may search based on 3 criteria:') . '<br />' .
+        __('<strong>Term:</strong> Searches theme names and descriptions for the specified term') . '<br />' .
+        __('<strong>Tag:</strong> Searches for themes tagged as such') . '<br />' .
+        __('<strong>Author:</strong> Searches for themes created by the Author, or which the Author contributed to.') . "</p>\n";
             break;
     }
@@ -3449 +3459 @@
 }
 
-
 function screen_layout($screen) {
     global $screen_layout_columns;

trunk/wp-admin/includes/theme-install.php

@@ -143 +143 @@
 <p><?php _e('Search for themes by keyword, author, or tag.') ?></p>
 
-    <?php install_theme_search_form('<a href="' . add_query_arg('show-help', !isset($_REQUEST['show-help'])) .'" onclick="jQuery(\'#search-help\').toggle(); return false;">' . __('[need help?]') . '</a>') ?>
-<div id="search-help" style="display: <?php echo isset($_REQUEST['show-help']) ? 'block' : 'none'; ?>;">
-<p><?php _e('You may search based on 3 criteria:') ?><br />
-    <?php _e('<strong>Term:</strong> Searches theme names and descriptions for the specified term') ?><br />
-    <?php _e('<strong>Tag:</strong> Searches for themes tagged as such') ?><br />
-    <?php _e('<strong>Author:</strong> Searches for themes created by the Author, or which the Author contributed to.') ?></p>
-</div>
+    <?php install_theme_search_form(); ?>
 
 <h4><?php _e('Advanced Search') ?></h4>
@@ -169 +163 @@
                                 'count' => $tag['count'] );
     }
-    echo '<p>';
+    echo '<p class="popular-tags">';
     echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d theme'), 'multiple_text' => __('%d themes') ) );
     echo '</p><br class="clear" />';
@@ -306 +300 @@
 <?php if ( $show_details ) { ?>
 <a href="#theme_detail" class="theme-detail hide-if-no-js" tabindex='4'><?php _e('Details') ?></a>
-<div id="themedetaildiv" class="hide-if-js">
+<div class="themedetaildiv hide-if-js">
 <p><strong><?php _e('Version:') ?></strong> <?php echo wp_kses($theme->version, $themes_allowedtags) ?></p>
 <p><strong><?php _e('Author:') ?></strong> <?php echo wp_kses($theme->author, $themes_allowedtags) ?></p>

trunk/wp-admin/js/theme-preview.dev.js

@@ -25 +25 @@
     thickDims()
     .click( function() {
-        var alink = $(this).parents('.available-theme').find('.activatelink'), url = alink.attr('href'), text = alink.html();
+        var alink = $(this).parents('.available-theme').find('.activatelink'), url = '', text = '';
 
-        if ( null == text ) text = '';
+        if ( alink.length ) {
+            url = alink.attr('href') || '';
+            text = alink.html() || '';
+        }
+        
         $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
         $('#TB_closeAjaxWindow').css({'float':'left'});
@@ -41 +45 @@
     // Theme details disclosure
     $('.theme-detail').click(function () {
-        if ($(this).parents('.available-theme').find('#themedetaildiv').is(":hidden")) {
-            $(this).parents('.available-theme').find('#themedetaildiv').slideDown("normal");
-            $(this).hide();
-        }
-
+        $(this).siblings('.themedetaildiv').toggle();
         return false;
     });

trunk/wp-admin/js/theme-preview.js

@@ -1 @@
-var thickDims;jQuery(document).ready(function(a){thickDims=function(){var d=a("#TB_window"),c=a(window).height(),b=a(window).width();if(d.size()){d.width(b-90).height(c-60);a("#TB_iframeContent").width(b-90).height(c-90);d.css({"margin-left":"-"+parseInt(((b-90)/2),10)+"px"});if(typeof document.body.style.maxWidth!="undefined"){d.css({top:"30px","margin-top":"0"})}}return a("a.thickbox-preview").each(function(){var e=a(this).parents(".available-theme").find(".previewlink").attr("href");if(!e){return}e=e.replace(/&width=[0-9]+/g,"");e=e.replace(/&height=[0-9]+/g,"");a(this).attr("href",e+"&width="+(b-110)+"&height="+(c-100))})};thickDims().click(function(){var c=a(this).parents(".available-theme").find(".activatelink"),b=c.attr("href"),d=c.html();if(null==d){d=""}a("#TB_title").css({"background-color":"#222",color:"#cfcfcf"});a("#TB_closeAjaxWindow").css({"float":"left"});a("#TB_ajaxWindowTitle").css({"float":"right"}).append('&nbsp;<a href="'+b+'" target="_top" class="tb-theme-preview-link">'+d+"</a>");a("#TB_iframeContent").width("100%");return false});a(window).resize(function(){thickDims()});a(".theme-detail").click(function(){if(a(this).parents(".available-theme").find("#themedetaildiv").is(":hidden")){a(this).parents(".available-theme").find("#themedetaildiv").slideDown("normal");a(this).hide()}return false})});function tb_position(){thickDims()};
+var thickDims;jQuery(document).ready(function(a){thickDims=function(){var d=a("#TB_window"),c=a(window).height(),b=a(window).width();if(d.size()){d.width(b-90).height(c-60);a("#TB_iframeContent").width(b-90).height(c-90);d.css({"margin-left":"-"+parseInt(((b-90)/2),10)+"px"});if(typeof document.body.style.maxWidth!="undefined"){d.css({top:"30px","margin-top":"0"})}}return a("a.thickbox-preview").each(function(){var e=a(this).parents(".available-theme").find(".previewlink").attr("href");if(!e){return}e=e.replace(/&width=[0-9]+/g,"");e=e.replace(/&height=[0-9]+/g,"");a(this).attr("href",e+"&width="+(b-110)+"&height="+(c-100))})};thickDims().click(function(){var c=a(this).parents(".available-theme").find(".activatelink"),b="",d="";if(c.length){b=c.attr("href")||"";d=c.html()||""}a("#TB_title").css({"background-color":"#222",color:"#cfcfcf"});a("#TB_closeAjaxWindow").css({"float":"left"});a("#TB_ajaxWindowTitle").css({"float":"right"}).append('&nbsp;<a href="'+b+'" target="_top" class="tb-theme-preview-link">'+d+"</a>");a("#TB_iframeContent").width("100%");return false});a(window).resize(function(){thickDims()});a(".theme-detail").click(function(){a(this).siblings(".themedetaildiv").toggle();return false})});function tb_position(){thickDims()};

trunk/wp-includes/script-loader.php

@@ -354 +354 @@
         ));
 
-        $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20090225' );
+        $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20090314' );
         $scripts->add_data( 'theme-preview', 'group', 1 );
 
@@ -447 +447 @@
     $styles->add( 'login', '/wp-admin/css/login.css', array(), '20081210' );
     $styles->add( 'plugin-install', '/wp-admin/css/plugin-install.css', array(), '20081210' );
-    $styles->add( 'theme-install', '/wp-admin/css/theme-install.css', array(), '20090227' );
+    $styles->add( 'theme-install', '/wp-admin/css/theme-install.css', array(), '20090314' );
     $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' );