Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-12 13:44:21 +01:00
Code Issues Projects Releases Wiki Activity

Theme install style tweaks, see #8652

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@10788 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-03-15 11:04:34 +00:00
parent 361b70792f
commit 5da7e83817
7 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-admin/css/theme-install.css
View File

@ -75,3 +75,25 @@ div.star img {
border-bottom: thin solid #ccc;
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;
}

8
wp-admin/includes/plugin-install.php
View File

@ -125,13 +125,7 @@ function install_dashboard() {
<p><?php _e('Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> or upload a plugin in .zip format via this page.') ?></p>
<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>
<p><?php _e('If you have a plugin in a .zip format, You may install it by uploading it here.') ?></p>

13
wp-admin/includes/template.php
View File

@ -3380,7 +3380,17 @@ function screen_meta($screen) {
break;
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;
}
@ -3448,7 +3458,6 @@ function drag_drop_help() {
';
}
function screen_layout($screen) {
global $screen_layout_columns;

12
wp-admin/includes/theme-install.php
View File

@ -142,13 +142,7 @@ function install_themes_dashboard() {
?>
<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>
<p><?php _e('Tag filter goes here') ?></p>
@ -168,7 +162,7 @@ function install_themes_dashboard() {
'id' => sanitize_title_with_dashes($tag['name']),
'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" />';
}
@ -305,7 +299,7 @@ function display_theme($theme, $actions = null, $show_details = true) {
<p><?php echo $desc ?></p>
<?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>
<?php if ( ! empty($theme->last_updated) ) : ?>

14
wp-admin/js/theme-preview.dev.js
View File

@ -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 ( alink.length ) {
url = alink.attr('href') || '';
text = alink.html() || '';
}
if ( null == text ) text = '';
$('#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;
});
});

2
wp-admin/js/theme-preview.js
View File

@ -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('&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()};

4
wp-includes/script-loader.php
View File

@ -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 )