From 2327dd41c749f4dce91c5073f924c29db0719db8 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sun, 15 Mar 2009 11:04:34 +0000 Subject: [PATCH] Theme install style tweaks, see #8652 git-svn-id: https://develop.svn.wordpress.org/trunk@10788 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/css/theme-install.css | 24 +++++++++++++++++++++++- wp-admin/includes/plugin-install.php | 8 +------- wp-admin/includes/template.php | 13 +++++++++++-- wp-admin/includes/theme-install.php | 12 +++--------- wp-admin/js/theme-preview.dev.js | 14 +++++++------- wp-admin/js/theme-preview.js | 2 +- wp-includes/script-loader.php | 4 ++-- 7 files changed, 48 insertions(+), 29 deletions(-) diff --git a/wp-admin/css/theme-install.css b/wp-admin/css/theme-install.css index 53a0d14f57..d289ce9bb1 100644 --- a/wp-admin/css/theme-install.css +++ b/wp-admin/css/theme-install.css @@ -74,4 +74,26 @@ div.star img { .theme-listing br.line { border-bottom: thin solid #ccc; margin-bottom: 3px; -} \ No newline at end of file +} + +#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; +} + diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 22c8380329..8bd090c8a5 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -125,13 +125,7 @@ function install_dashboard() {

WordPress Plugin Directory or upload a plugin in .zip format via this page.') ?>

- ' . __('[need help?]') . '') ?> -
-


- Term: Searches plugins names and descriptions for the specified term') ?>
- Tag: Searches for plugins tagged as such') ?>
- Author: Searches for plugins created by the Author, or which the Author contributed to.') ?>

-
+

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 8509674ef2..3968293478 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -3380,7 +3380,17 @@ function screen_meta($screen) { break; case 'options-general': if ( !isset($_wp_contextual_help['options-general']) ) - $_wp_contextual_help['options-general'] = __('General Settings'); + $_wp_contextual_help['options-general'] = __('General Settings'); + break; + case 'theme-install': + case 'plugin-install': + if ( !isset($_GET['tab']) || 'dashboard' == $_GET['tab'] ) + $_wp_contextual_help[$screen] = ' +

' . __('Search help') . '

' . + '

' . __('You may search based on 3 criteria:') . '
' . + __('Term: Searches theme names and descriptions for the specified term') . '
' . + __('Tag: Searches for themes tagged as such') . '
' . + __('Author: Searches for themes created by the Author, or which the Author contributed to.') . "

\n"; break; } @@ -3448,7 +3458,6 @@ function drag_drop_help() { '; } - function screen_layout($screen) { global $screen_layout_columns; diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php index 83acbf326c..8d5d2d5015 100644 --- a/wp-admin/includes/theme-install.php +++ b/wp-admin/includes/theme-install.php @@ -142,13 +142,7 @@ function install_themes_dashboard() { ?>

- ' . __('[need help?]') . '') ?> -
-


- Term: Searches theme names and descriptions for the specified term') ?>
- Tag: Searches for themes tagged as such') ?>
- Author: Searches for themes created by the Author, or which the Author contributed to.') ?>

-
+

@@ -168,7 +162,7 @@ function install_themes_dashboard() { 'id' => sanitize_title_with_dashes($tag['name']), 'count' => $tag['count'] ); } - echo '

'; + echo '

'; echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d theme'), 'multiple_text' => __('%d themes') ) ); echo '


'; } @@ -305,7 +299,7 @@ function display_theme($theme, $actions = null, $show_details = true) {

-
+

version, $themes_allowedtags) ?>

author, $themes_allowedtags) ?>

last_updated) ) : ?> diff --git a/wp-admin/js/theme-preview.dev.js b/wp-admin/js/theme-preview.dev.js index 79bac2f35d..5b5b2007bf 100644 --- a/wp-admin/js/theme-preview.dev.js +++ b/wp-admin/js/theme-preview.dev.js @@ -24,9 +24,13 @@ jQuery(document).ready(function($) { 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'}); $('#TB_ajaxWindowTitle').css({'float':'right'}) @@ -40,11 +44,7 @@ jQuery(document).ready(function($) { // 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; }); }); diff --git a/wp-admin/js/theme-preview.js b/wp-admin/js/theme-preview.js index c8b4d00289..52674f4d6f 100644 --- a/wp-admin/js/theme-preview.js +++ b/wp-admin/js/theme-preview.js @@ -1 +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(' '+d+"");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()}; \ No newline at end of file +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(' '+d+"");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()}; \ No newline at end of file diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 0b4796c215..7044c27c71 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -353,7 +353,7 @@ function wp_default_scripts( &$scripts ) { 'l10n_print_after' => 'try{convertEntities(wpGearsL10n);}catch(e){};' )); - $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 ); $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery-form', 'suggest' ), '20090125' ); @@ -446,7 +446,7 @@ function wp_default_styles( &$styles ) { $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20081210' ); $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' ); foreach ( $rtl_styles as $rtl_style )