Make WordPress Core

Changeset 10823


Ignore:
Timestamp:
03/20/2009 12:14:57 AM (17 years ago)
Author:
azaozz
Message:

More theme install styling, see #8652

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin-header.php

    r10632 r10823  
    7777<?php } ?>
    7878</head>
    79 <body class="wp-admin <?php echo apply_filters( 'admin_body_class', '' ); ?>">
     79<body class="wp-admin <?php echo apply_filters( 'admin_body_class', preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix) ); ?>">
    8080
    8181<div id="wpwrap">
  • trunk/wp-admin/css/colors-classic.css

    r10696 r10823  
    15821582        background-color: #eee;
    15831583}
     1584
     1585p.popular-tags {
     1586        background-color: #FFFFFF;
     1587        border-color: #DFDFDF;
     1588}
     1589
     1590#theme-information .action-button {
     1591        border-top-color: #DFDFDF;
     1592}
     1593
     1594.theme-listing br.line {
     1595        border-bottom-color: #ccc;
     1596}
  • trunk/wp-admin/css/colors-fresh.css

    r10696 r10823  
    15821582        background-color: #eee;
    15831583}
     1584
     1585p.popular-tags {
     1586        background-color: #FFFFFF;
     1587        border-color: #DFDFDF;
     1588}
     1589
     1590#theme-information .action-button {
     1591        border-top-color: #DFDFDF;
     1592}
     1593
     1594.theme-listing br.line {
     1595        border-bottom-color: #ccc;
     1596}
  • trunk/wp-admin/css/theme-install.css

    r10788 r10823  
    7373
    7474.theme-listing br.line {
    75         border-bottom: thin solid #ccc;
     75        border-bottom-width: 1px;
     76        border-bottom-style: solid;
    7677        margin-bottom: 3px;
    7778}
    7879
    79 #search-field {
    80         padding: 1px;
     80.available-theme {
     81        padding: 20px 15px;
    8182}
    8283
    83 p.popular-tags {
    84         line-height: 1.8em;
     84#theme-information .theme-preview-img {
     85        float: left;
     86        margin: 5px 25px 10px 15px;
     87        width: 300px;
    8588}
    8689
    87 .available-theme {
    88         text-align: center;
     90#theme-information .action-button {
     91        border-top-width: 1px;
     92        border-top-style: solid;
     93        margin: 10px 5px 20px;
    8994}
    9095
    91 #theme-information .available-theme a.screenshot {
    92         border: 0 none;
    93         display: inline;
     96#theme-information .action-button #cancel {
     97        float: left;
     98        margin: 10px 15px;
     99}
     100
     101#theme-information .action-button #install {
     102        float: right;
     103        margin: 10px 15px;
    94104}
    95105
     
    98108}
    99109
     110body#theme-information {
     111        height: auto;
     112}
     113
     114
  • trunk/wp-admin/includes/plugin-install.php

    r10820 r10823  
    126126
    127127        <h4><?php _e('Search') ?></h4>
     128        <p class="install-help"><?php _e('Search for plugins by keyword, author, or tag.') ?></p>
    128129        <?php install_search_form(); ?>
    129130
    130131        <h4><?php _e('Install a plugin in .zip format') ?></h4>
    131         <p><?php _e('If you have a plugin in a .zip format, You may install it by uploading it here.') ?></p>
     132        <p class="install-help"><?php _e('If you have a plugin in a .zip format, You may install it by uploading it here.') ?></p>
    132133        <form method="post" enctype="multipart/form-data" action="<?php echo admin_url('plugin-install.php?tab=upload') ?>">
    133134                <?php wp_nonce_field( 'plugin-upload') ?>
     
    137138
    138139        <h4><?php _e('Popular tags') ?></h4>
    139         <p><?php _e('You may also browse based on the most popular tags in the Plugin Directory:') ?></p>
     140        <p class="install-help"><?php _e('You may also browse based on the most popular tags in the Plugin Directory:') ?></p>
    140141        <?php
    141142
     
    150151                                                                'id' => sanitize_title_with_dashes($tag['name']),
    151152                                                                'count' => $tag['count'] );
    152         echo '<p>';
     153        echo '<p class="popular-tags">';
    153154        echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d plugin'), 'multiple_text' => __('%d plugins') ) );
    154155        echo '</p><br class="clear" />';
     
    170171                        <option value="tag"<?php selected('tag', $type) ?>><?php _e('Tag') ?></option>
    171172                </select>
    172                 <input type="text" name="s" id="search-field" value="<?php echo attribute_escape($term) ?>" />
     173                <input type="text" name="s" class="search-input" value="<?php echo attribute_escape($term) ?>" />
    173174                <input type="submit" name="search" value="<?php echo attribute_escape(__('Search')) ?>" class="button" />
    174175        </form><?php
  • trunk/wp-admin/includes/template.php

    r10810 r10823  
    32443244<?php
    32453245wp_enqueue_style( 'global' );
    3246 wp_enqueue_style( 'colors' );
    32473246if ( ! $limit_styles )
    32483247        wp_enqueue_style( 'wp-admin' );
     3248wp_enqueue_style( 'colors' );
    32493249?>
    32503250<script type="text/javascript">
    32513251//<![CDATA[
    3252 function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}else{ var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}}
     3252addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
     3253function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
    32533254//]]>
    32543255</script>
     
    32713272function iframe_footer() {
    32723273        echo '
     3274        <script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
    32733275        </body>
    32743276</html>';
  • trunk/wp-admin/includes/theme-install.php

    r10810 r10823  
    141141function install_themes_dashboard() {
    142142        ?>
    143 <p><?php _e('Search for themes by keyword, author, or tag.') ?></p>
     143<p class="install-help"><?php _e('Search for themes by keyword, author, or tag.') ?></p>
    144144
    145145        <?php install_theme_search_form(); ?>
    146146
    147 <h4><?php _e('Advanced Search') ?></h4>
    148 <p><?php _e('Tag filter goes here') ?></p>
    149 
    150147<h4><?php _e('Popular tags') ?></h4>
    151 <p><?php _e('You may also browse based on the most popular tags in the Theme Directory:') ?></p>
     148<p class="install-help"><?php _e('You may also browse based on the most popular tags in the Theme Directory:') ?></p>
    152149        <?php
    153150
     
    184181        <option value="author" <?php selected('author', $type) ?>><?php _e('Author') ?></option>
    185182        <option value="tag" <?php selected('tag', $type) ?>><?php _e('Tag') ?></option>
    186 </select> <input type="text" name="s" id="search-field"
     183</select> <input type="text" name="s" class="search-input"
    187184        value="<?php echo attribute_escape($term) ?>" /> <input type="submit"
    188185        name="search" value="<?php echo attribute_escape(__('Search')) ?>"
     
    259256        ?>
    260257<h4><?php _e('Install a theme in .zip format') ?></h4>
    261 <p><?php _e('If you have a theme in a .zip format, you may install it by uploading it here.') ?></p>
     258<p class="install-help"><?php _e('If you have a theme in a .zip format, you may install it by uploading it here.') ?></p>
    262259<form method="post" enctype="multipart/form-data"
    263260        action="<?php echo admin_url('theme-install.php?tab=do_upload') ?>"><?php wp_nonce_field( 'theme-upload') ?>
     
    280277
    281278        $preview_link = $theme->preview_url . '?TB_iframe=true&amp;width=600&amp;height=400';
    282         if ( empty($actions) ) {
     279        if ( !is_array($actions) ) {
    283280                $actions = array();
    284281                $actions[] = '<a href="' . admin_url('theme-install.php?tab=theme-information&amp;theme=' . $theme->slug .
    285                                                                                 '&amp;TB_iframe=true&amp;width=600&amp;height=800') . '" class="thickbox onclick" title="' . attribute_escape(sprintf(__('Install "%s"'), $name)) . '">' . __('Install') . '</a>';
     282                                                                                '&amp;TB_iframe=true&amp;tbWidth=500&amp;tbHeight=350') . '" class="thickbox thickbox-preview onclick" title="' . attribute_escape(sprintf(__('Install "%s"'), $name)) . '">' . __('Install') . '</a>';
    286283                $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview onclick previewlink" title="' . attribute_escape(sprintf(__('Preview "%s"'), $name)) . '">' . __('Preview') . '</a>';
    287284                $actions = apply_filters('theme_install_action_links', $actions, $theme);
     
    291288        ?>
    292289<a class='thickbox thickbox-preview screenshot'
    293         href='<? echo clean_url($preview_link) ?>'
    294         title='<?php attribute_escape(sprintf(__('Preview "%s"'), $name)) ?>'>
    295 <img src='<?php echo clean_url($theme->screenshot_url) ?>' width='150' />
     290        href='<? echo clean_url($preview_link); ?>'
     291        title='<?php echo attribute_escape(sprintf(__('Preview "%s"'), $name)); ?>'>
     292<img src='<?php echo clean_url($theme->screenshot_url); ?>' width='150' />
    296293</a>
    297294<h3><?php echo $name ?></h3>
     
    432429function install_theme_information() {
    433430        //TODO: This function needs a LOT of UI work :)
    434         global $tab, $themes_allowedtags;;
     431        global $tab, $themes_allowedtags;
    435432
    436433        $api = themes_api('theme_information', array('slug' => stripslashes( $_REQUEST['theme'] ) ));
     
    445442                $api->$key = wp_kses($api->$key, $themes_allowedtags);
    446443
    447         $section = isset($_REQUEST['section']) ? stripslashes( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English.
    448         if ( empty($section) || ! isset($api->sections[ $section ]) )
    449                 $section = array_shift( $section_titles = array_keys((array)$api->sections) );
    450 
    451444        iframe_header( __('Theme Install') );
     445
     446        if ( empty($api->download_link) ) {
     447                echo '<div id="message" class="error"><p>' . __('<strong>Error:</strong> This theme is currently not available. Please try again later.') . '</p></div>';
     448                iframe_footer();
     449                exit;
     450        }
    452451
    453452        if ( version_compare($GLOBALS['wp_version'], $api->tested, '>') )
     
    456455                echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This theme has not been marked as <strong>compatible</strong> with your version of WordPress.') . '</p></div>';
    457456
    458         if ( empty($api->download_link) ) {
    459                 // No go
    460         }
    461         ?>
    462 
    463 <p class="action-button"><?php
    464457        // Default to a "new" theme
    465458        $type = 'install';
    466459        // Check to see if this theme is known to be installed, and has an update awaiting it.
    467         $update_themes = get_option('update_themes');
    468         foreach ( (array)$update_themes->response as $file => $theme ) {
    469                 if ( $theme->slug === $api->slug ) {
    470                         $type = 'update_available';
    471                 $update_file = $file;
    472                 break;
    473         }
    474 }
    475 
    476 $action = '';
     460        $update_themes = get_transient('update_themes');
     461        if ( is_object($update_themes) ) {
     462                foreach ( (array)$update_themes->response as $file => $theme ) {
     463                        if ( $theme->slug === $api->slug ) {
     464                                $type = 'update_available';
     465                                $update_file = $file;
     466                                break;
     467                        }
     468                }
     469        }
     470
     471        $themes = get_themes();
     472        foreach ( $themes as $this_theme ) {
     473                if ( is_array($this_theme) && $this_theme['Stylesheet'] == $api->slug ) {
     474                        if ( $this_theme['Version'] == $api->version ) {
     475                                $type = 'latest_installed';
     476                        } elseif ( $this_theme['Version'] > $api->version ) {
     477                                $type = 'newer_installed';
     478                                $newer_version = $this_theme['Version'];
     479                        }
     480                        break;
     481                }
     482        }
     483?>
     484
     485<div class='available-theme'>
     486<img src='<?php echo clean_url($api->screenshot_url) ?>' width='300' class="theme-preview-img" />
     487<h3><?php echo $api->name; ?></h3>
     488<p><?php printf(__('by %s'), $api->author); ?></p>
     489<p><?php printf(__('Version: %s'), $api->version); ?></p>
     490
     491<?php
     492$buttons = '<a class="button" id="cancel" href="#" onclick="tb_close();return false;">' . __('Cancel') . '</a> ';
     493
    477494switch ( $type ) {
    478         default:
    479         case 'install':
    480                 if ( current_user_can('install_themes') ) :
    481                         $action = '<a class="button" href="' . wp_nonce_url(admin_url('theme-install.php?tab=install&theme=' . $api->slug), 'install-theme_' . $api->slug) . '" target="_parent">' . __('Install Now') . '</a>';
     495default:
     496case 'install':
     497        if ( current_user_can('install_themes') ) :
     498        $buttons .= '<a class="button-primary" id="install" href="' . wp_nonce_url(admin_url('theme-install.php?tab=install&theme=' . $api->slug), 'install-theme_' . $api->slug) . '" target="_parent">' . __('Install Now') . '</a>';
    482499        endif;
    483500        break;
    484501case 'update_available':
    485502        if ( current_user_can('update_themes') ) :
    486         ?><a class="button"
    487         href="<?php echo wp_nonce_url(admin_url('update.php?action=upgrade-theme&theme=' . $update_file), 'upgrade-theme_' . $update_file) ?>"
    488         target="_parent"><?php _e('Install Update Now') ?></a><?php
     503        $buttons .= '<a class="button-primary" id="install"     href="' . wp_nonce_url(admin_url('update.php?action=upgrade-theme&theme=' . $update_file), 'upgrade-theme_' . $update_file) . '" target="_parent">' . __('Install Update Now') . '</a>';
    489504        endif;
    490505        break;
    491506case 'newer_installed':
    492507        if ( current_user_can('install_themes') || current_user_can('update_themes') ) :
    493         ?><a><?php printf(__('Newer Version (%s) Installed'), $newer_version) ?></a><?php
     508        ?><p><?php printf(__('Newer version (%s) is installed.'), $newer_version); ?></p><?php
    494509        endif;
    495510        break;
    496511case 'latest_installed':
    497512        if ( current_user_can('install_themes') || current_user_can('update_themes') ) :
    498         ?><a><?php _e('Latest Version Installed') ?></a><?php
     513        ?><p><?php _e('This version is already installed.'); ?></p><?php
    499514        endif;
    500515        break;
    501 } ?></p>
    502 <div class='available-theme'>
     516} ?>
     517<br class="clear" />
     518</div>
     519
     520<p class="action-button">
     521<?php echo $buttons; ?>
     522<br class="clear" />
     523</p>
     524
    503525<?php
    504 display_theme($api, array($action), false);
    505 ?>
    506 </div>
    507         <?php
    508526        iframe_footer();
    509527        exit;
  • trunk/wp-admin/js/theme-preview.dev.js

    r10788 r10823  
    11
    2 var thickDims;
     2var thickDims, tbWidth, tbHeight;
    33jQuery(document).ready(function($) {
    44
    55        thickDims = function() {
    6                 var tbWindow = $('#TB_window'), H = $(window).height(), W = $(window).width();
     6                var tbWindow = $('#TB_window'), H = $(window).height(), W = $(window).width(), w, h;
     7
     8                w = (tbWidth && tbWidth < W - 90) ? tbWidth : W - 90;
     9                h = (tbHeight && tbHeight < H - 60) ? tbHeight : H - 60;
    710
    811                if ( tbWindow.size() ) {
    9                         tbWindow.width( W - 90 ).height( H - 60 );
    10                         $('#TB_iframeContent').width( W - 90 ).height( H - 90 );
    11                         tbWindow.css({'margin-left': '-' + parseInt((( W - 90 ) / 2),10) + 'px'});
     12                        tbWindow.width(w).height(h);
     13                        $('#TB_iframeContent').width(w).height(h - 27);
     14                        tbWindow.css({'margin-left': '-' + parseInt((w / 2),10) + 'px'});
    1215                        if ( typeof document.body.style.maxWidth != 'undefined' )
    1316                                tbWindow.css({'top':'30px','margin-top':'0'});
    14                 };
    15 
    16                 return $('a.thickbox-preview').each( function() {
    17                         var href = $(this).parents('.available-theme').find('.previewlink').attr('href');
    18                         if ( ! href ) return;
    19                         href = href.replace(/&width=[0-9]+/g, '');
    20                         href = href.replace(/&height=[0-9]+/g, '');
    21                         $(this).attr( 'href', href + '&width=' + ( W - 110 ) + '&height=' + ( H - 100 ) );
    22                 });
     17                }
    2318        };
    2419
    25         thickDims()
    26         .click( function() {
    27                 var alink = $(this).parents('.available-theme').find('.activatelink'), url = '', text = '';
     20        thickDims();
     21        $(window).resize( function() { thickDims() } );
     22
     23        $('a.thickbox-preview').click( function() {
     24                var alink = $(this).parents('.available-theme').find('.activatelink'), link = '', href = $(this).attr('href'), url, text;
     25
     26                if ( tbWidth = href.match(/&tbWidth=[0-9]+/) )                 
     27                        tbWidth = parseInt(tbWidth[0].replace(/[^0-9]+/g, ''), 10);
     28                else
     29                        tbWidth = $(window).width() - 90;
     30
     31                if ( tbHeight = href.match(/&tbHeight=[0-9]+/) )               
     32                        tbHeight = parseInt(tbHeight[0].replace(/[^0-9]+/g, ''), 10);
     33                else
     34                        tbHeight = $(window).height() - 60;
    2835
    2936                if ( alink.length ) {
    3037                        url = alink.attr('href') || '';
    31                         text = alink.html() || '';
     38                        text = alink.attr('title') || '';
     39                        link = '&nbsp; <a href="' + url + '" target="_top" class="tb-theme-preview-link">' + text + '</a>';
     40                } else {
     41                        text = $(this).attr('title') || '';
     42                        link = '&nbsp; <span class="tb-theme-preview-link">' + text + '</span>';
    3243                }
    33                
    34                 $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
     44
     45                $('#TB_title').css({'background-color':'#222','color':'#dfdfdf'});
    3546                $('#TB_closeAjaxWindow').css({'float':'left'});
    36                 $('#TB_ajaxWindowTitle').css({'float':'right'})
    37                         .append('&nbsp;<a href="' + url + '" target="_top" class="tb-theme-preview-link">' + text + '</a>');
     47                $('#TB_ajaxWindowTitle').css({'float':'right'}).html(link);
    3848
    3949                $('#TB_iframeContent').width('100%');
     50                thickDims();
    4051                return false;
    4152        } );
    4253
    43         $(window).resize( function() { thickDims() } );
    44 
    45         // Theme details disclosure
     54        // Theme details
    4655        $('.theme-detail').click(function () {
    4756                $(this).siblings('.themedetaildiv').toggle();
    4857                return false;
    4958        });
     59
    5060});
    5161
    52 function tb_position() {
    53         thickDims();
    54 }
  • trunk/wp-admin/js/theme-preview.js

    r10788 r10823  
    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="",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()};
     1var thickDims,tbWidth,tbHeight;jQuery(document).ready(function(a){thickDims=function(){var f=a("#TB_window"),d=a(window).height(),b=a(window).width(),c,e;c=(tbWidth&&tbWidth<b-90)?tbWidth:b-90;e=(tbHeight&&tbHeight<d-60)?tbHeight:d-60;if(f.size()){f.width(c).height(e);a("#TB_iframeContent").width(c).height(e-27);f.css({"margin-left":"-"+parseInt((c/2),10)+"px"});if(typeof document.body.style.maxWidth!="undefined"){f.css({top:"30px","margin-top":"0"})}}};thickDims();a(window).resize(function(){thickDims()});a("a.thickbox-preview").click(function(){var d=a(this).parents(".available-theme").find(".activatelink"),e="",b=a(this).attr("href"),c,f;if(tbWidth=b.match(/&tbWidth=[0-9]+/)){tbWidth=parseInt(tbWidth[0].replace(/[^0-9]+/g,""),10)}else{tbWidth=a(window).width()-90}if(tbHeight=b.match(/&tbHeight=[0-9]+/)){tbHeight=parseInt(tbHeight[0].replace(/[^0-9]+/g,""),10)}else{tbHeight=a(window).height()-60}if(d.length){c=d.attr("href")||"";f=d.attr("title")||"";e='&nbsp; <a href="'+c+'" target="_top" class="tb-theme-preview-link">'+f+"</a>"}else{f=a(this).attr("title")||"";e='&nbsp; <span class="tb-theme-preview-link">'+f+"</span>"}a("#TB_title").css({"background-color":"#222",color:"#dfdfdf"});a("#TB_closeAjaxWindow").css({"float":"left"});a("#TB_ajaxWindowTitle").css({"float":"right"}).html(e);a("#TB_iframeContent").width("100%");thickDims();return false});a(".theme-detail").click(function(){a(this).siblings(".themedetaildiv").toggle();return false})});
  • trunk/wp-admin/themes.php

    r10810 r10823  
    182182        $stylesheet_dir = $themes[$theme_name]['Stylesheet Dir'];
    183183        $preview_link = clean_url( get_option('home') . '/');
    184         $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true', 'width' => 600, 'height' => 400 ), $preview_link ) );
     184        $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), $preview_link ) );
    185185        $preview_text = attribute_escape( sprintf( __('Preview of "%s"'), $title ) );
    186186        $tags = $themes[$theme_name]['Tags'];
     
    189189        $activate_text = attribute_escape( sprintf( __('Activate "%s"'), $title ) );
    190190        $actions = array();
    191         $actions[] = '<a href="' . $activate_link .  '" title="' . $activate_text . '">' . __('Activate') . '</a>';
     191        $actions[] = '<a href="' . $activate_link .  '" class="activatelink" title="' . $activate_text . '">' . __('Activate') . '</a>';
    192192        $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . attribute_escape(sprintf(__('Preview "%s"'), $theme_name)) . '">' . __('Preview') . '</a>';
    193193        if ( current_user_can('update_themes') )
     
    197197        $actions = implode ( ' | ', $actions );
    198198?>
    199                 <a href="<?php echo $activate_link; ?>" class="<?php echo $thickbox_class; ?> screenshot">
     199                <a href="<?php echo $preview_link; ?>" class="<?php echo $thickbox_class; ?> screenshot">
    200200<?php if ( $screenshot ) : ?>
    201201                        <img src="<?php echo WP_CONTENT_URL . $stylesheet_dir . '/' . $screenshot; ?>" alt="" />
     
    209209<?php endif; ?>
    210210                <?php theme_update_available( $themes[$theme_name] ); ?>
    211                 <noscript><p class="themeactions"><a href="<?php echo $preview_link; ?>" title="<?php echo $preview_text; ?>"><?php _e('Preview'); ?></a> <a href="<?php echo $activate_link; ?>" title="<?php echo $activate_text; ?>"><?php _e('Activate'); ?></a></p></noscript>
    212                 <div style="display:none;"><a class="previewlink" href="<?php echo $preview_link; ?>"><?php echo $preview_text; ?></a> <a class="activatelink" href="<?php echo $activate_link; ?>"><?php echo $activate_text; ?></a></div>
    213211<?php endif; // end if not empty theme_name ?>
    214212        </td>
  • trunk/wp-admin/wp-admin.css

    r10790 r10823  
    30073007        padding: 0 5px;
    30083008}
     3009
     3010.theme-install-php h4,
     3011.plugin-install-php h4 {
     3012        margin: 2.5em 0 8px;
     3013}
     3014
     3015p.install-help {
     3016        margin: 8px 0;
     3017        font-style: italic;
     3018}
     3019
     3020p.popular-tags {
     3021        -moz-border-radius: 8px;
     3022        -khtml-border-radius: 8px;
     3023        -webkit-border-radius: 8px;
     3024        border-radius: 8px;
     3025        border-width: 1px;
     3026        border-style: solid;
     3027        line-height: 2em;
     3028        padding: 8px 12px 12px;
     3029}
     3030
     3031p.popular-tags a {
     3032        padding: 0 3px;
     3033}
     3034
  • trunk/wp-includes/script-loader.php

    r10817 r10823  
    354354                ));
    355355
    356                 $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20090314' );
     356                $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20090319' );
    357357                $scripts->add_data( 'theme-preview', 'group', 1 );
    358358
     
    447447        $styles->add( 'login', '/wp-admin/css/login.css', array(), '20081210' );
    448448        $styles->add( 'plugin-install', '/wp-admin/css/plugin-install.css', array(), '20081210' );
    449         $styles->add( 'theme-install', '/wp-admin/css/theme-install.css', array(), '20090314' );
     449        $styles->add( 'theme-install', '/wp-admin/css/theme-install.css', array(), '20090319' );
    450450        $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' );
    451451
Note: See TracChangeset for help on using the changeset viewer.