WordPress.org

Make WordPress Core

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

File themes.related.stuff.tweaks.2.patch, 9.1 KB (added by Simek, 5 years ago)

updated version of patch - some minor themes.php functions chnages

  • wp-admin/css/colors-classic.css

     
    5858        border-color: #ccc; 
    5959} 
    6060 
    61 #poststuff .inside label.spam { 
     61#poststuff .inside label.spam, 
     62.delete-theme { 
    6263        color: red; 
    6364} 
    6465 
     
    6667        color: orange; 
    6768} 
    6869 
    69 #poststuff .inside label.approved { 
     70#poststuff .inside label.approved, 
     71.activate-theme { 
    7072        color: green; 
    7173} 
    7274 
     
    417419 
    418420.updated, 
    419421.login #login_error, 
    420 .login .message { 
     422.login .message, 
     423.theme-update  { 
    421424        background-color: #ffffe0; 
    422425        border-color: #e6db55; 
    423426} 
  • wp-admin/css/colors-fresh.css

     
    4242        border-color: #ccc; 
    4343} 
    4444 
    45 #poststuff .inside label.spam { 
     45#poststuff .inside label.spam, 
     46.delete-theme { 
    4647        color: red; 
    4748} 
    4849 
     
    5051        color: orange; 
    5152} 
    5253 
    53 #poststuff .inside label.approved { 
     54#poststuff .inside label.approved, 
     55.activate-theme { 
    5456        color: green; 
    5557} 
    5658 
     
    392394 
    393395.updated, 
    394396.login #login_error, 
    395 .login .message { 
     397.login .message, 
     398.theme-update  { 
    396399        background-color: #ffffe0; 
    397400        border-color: #e6db55; 
    398401} 
  • wp-admin/css/theme-editor.css

     
    1313        width: 190px; 
    1414} 
    1515 
    16 #templateside h3, #postcustomstuff p.submit { 
     16#templateside h3, 
     17#postcustomstuff p.submit { 
    1718        margin: 0; 
    1819} 
    1920 
     
    2526        margin-bottom: 0; 
    2627} 
    2728 
    28 #templateside ol, #templateside ul { 
     29#templateside ol, 
     30#templateside ul { 
    2931        list-style: none; 
    3032        margin: .5em; 
    3133        padding: 0; 
    3234} 
    3335 
    34 #templateside ol li, #templateside ul li { 
     36#templateside ol li, 
     37#templateside ul li { 
    3538        margin: 1px 0; 
    3639} 
    3740 
     
    4043        float: right; 
    4144        position: relative; 
    4245        bottom: 25px; 
    43         top:20px; 
     46        top: 20px; 
    4447} 
    4548 
    4649#themeselector select { 
     
    4952} 
    5053 
    5154.nonessential { 
    52         font-size: small; 
     55        font-style: italic; 
     56        font-size: 10px; 
    5357} 
    5458 
    5559.highlight { 
     
    6872#documentation { 
    6973        margin-top: 10px; 
    7074} 
     75 
    7176#documentation label { 
    7277        line-height: 22px; 
    7378        vertical-align: top; 
  • wp-admin/css/theme-install.css

     
    132132        float: left; 
    133133        text-align: right; 
    134134        width: 65px; 
     135        font-weight: bold; 
    135136} 
    136137 
    137138.feature-filter .feature-group li { 
  • wp-admin/themes.php

     
    9898                $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. 
    9999                $update_url = wp_nonce_url('update.php?action=upgrade-theme&theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet); 
    100100 
    101                 if ( ! current_user_can('update_themes') ) 
    102                         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']); 
    103                 else if ( empty($update->package) ) 
    104                         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']); 
    105                 else 
    106                         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 ); 
     101                if ( ! current_user_can('update_themes') ) { 
     102                        ?><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 
     103                } else if ( empty($update->package) ) { 
     104                        ?><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 
     105                } else { 
     106                        ?><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 
     107                } 
    107108        } 
    108109} 
    109110 
     
    188189        $parent_theme = $themes[$theme_name]['Parent Theme']; 
    189190        $preview_link = clean_url( get_option('home') . '/'); 
    190191        $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), $preview_link ) ); 
    191         $preview_text = attr( sprintf( __('Preview of "%s"'), $title ) ); 
     192        $preview_text = attr( sprintf( __('Preview "%s"'), $title ) ); 
    192193        $tags = $themes[$theme_name]['Tags']; 
    193194        $thickbox_class = 'thickbox thickbox-preview'; 
    194195        $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=".urlencode($template)."&amp;stylesheet=".urlencode($stylesheet), 'switch-theme_' . $template); 
    195196        $activate_text = attr( sprintf( __('Activate "%s"'), $title ) ); 
     197        $delete_link = wp_nonce_url("themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet); 
     198        $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;"; 
    196199        $actions = array(); 
    197         $actions[] = '<a href="' . $activate_link .  '" class="activatelink" title="' . $activate_text . '">' . __('Activate') . '</a>'; 
    198         $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . attr(sprintf(__('Preview "%s"'), $theme_name)) . '">' . __('Preview') . '</a>'; 
     200        $actions[] = '<a href="' . $activate_link .  '" class="activate-theme" title="' . $activate_text . '">' . __('Activate') . '</a>'; 
     201        $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . $preview_text . '">' . __('Preview') . '</a>'; 
    199202        if ( current_user_can('update_themes') ) 
    200                 $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>'; 
     203                $actions[] = '<a class="submitdelete delete-theme" href="' . $delete_link . '" onclick="' . $delete_onclick . '">' . __('Delete') . '</a>'; 
    201204        $actions = apply_filters('theme_action_links', $actions, $themes[$theme_name]); 
    202205 
    203206        $actions = implode ( ' | ', $actions ); 
     
    210213<h3><?php 
    211214        /* translators: 1: theme title, 2: theme version, 3: theme author */ 
    212215        printf(__('%1$s %2$s by %3$s'), $title, $version, $author) ; ?></h3> 
    213 <p class="description"><?php echo $description; ?></p> 
    214 <span class='action-links'><?php echo $actions ?></span> 
     216<p class="theme-description"><?php echo $description; ?></p> 
     217<div class='action-links'><?php echo $actions ?></div> 
    215218        <?php if ($parent_theme) { ?> 
    216219        <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> 
    217220<?php } else { ?> 
    218221        <p><?php printf(__('All of this theme&#8217;s files are located in <code>%2$s</code>.'), $title, $template_dir, $stylesheet_dir); ?></p> 
    219222<?php } ?> 
    220223<?php if ( $tags ) : ?> 
    221 <p><?php _e('Tags:'); ?> <?php echo join(', ', $tags); ?></p> 
     224<p><strong><?php _e('Tags:'); ?></strong> <span class="theme-tags"><?php echo join(', ', $tags); ?></span></p> 
    222225<?php endif; ?> 
    223226                <?php theme_update_available( $themes[$theme_name] ); ?> 
    224227<?php endif; // end if not empty theme_name ?> 
  • wp-admin/wp-admin.css

     
    121121        margin: 15px 0 5px; 
    122122} 
    123123 
     124.theme-update { 
     125        border-width: 1px; 
     126        border-style: solid; 
     127        padding: 8px; 
     128        font-size: 11px; 
     129        -moz-border-radius: 3px; 
     130        -khtml-border-radius: 3px; 
     131        -webkit-border-radius: 3px; 
     132        border-radius: 3px; 
     133} 
     134 
     135.theme-description { 
     136        text-align: justify; 
     137} 
     138 
     139.theme-tags { 
     140        font-size: 11px; 
     141} 
     142 
     143.action-links { 
     144        font-weight: bold; 
     145        text-align: center; 
     146} 
     147 
    124148#current-theme { 
    125149        margin: 1em 0 1.5em; 
    126150}