Changeset 16714

Timestamp:

12/04/2010 03:52:59 AM (14 years ago)

Author:

nacin

Message:

Don't even show parent theme files when viewing the child theme. see #15672.

Location:

trunk

Files:

• wp-admin/css/theme-editor.css (modified) (1 diff)
• wp-admin/css/theme-editor.dev.css (modified) (1 diff)
• wp-admin/theme-editor.php (modified) (6 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -1 @@
-#template textarea{font-family:Consolas,Monaco,Courier,monospace;font-size:12px;width:97%;}#template p{width:97%;}#templateside{float:right;width:190px;word-wrap:break-word;}#templateside h3,#postcustomstuff p.submit{margin:0;}#templateside h4{margin:1em 0 0;}#templateside ol,#templateside ul{margin:.5em;padding:0;}#templateside li{margin:4px 0;}#templateside ul li a span.highlight{display:block;}.nonessential{font-size:11px;font-style:italic;padding-left:12px;}.highlight{padding:3px 3px 3px 12px;margin-left:-12px;font-weight:bold;-moz-border-radius:8px;-khtml-border-radius:8px;-webkit-border-radius:8px;border-radius:8px;}div.tablenav{margin-right:210px;}#documentation{margin-top:10px;}#documentation label{line-height:22px;vertical-align:top;font-weight:bold;}.fileedit-sub{padding:10px 0 8px;line-height:180%;}
+h3 span{font-weight:normal;}#template textarea{font-family:Consolas,Monaco,Courier,monospace;font-size:12px;width:97%;}#template p{width:97%;}#templateside{float:right;width:190px;word-wrap:break-word;}#templateside h3,#postcustomstuff p.submit{margin:0;}#templateside h4{margin:1em 0 0;}#templateside ol,#templateside ul{margin:.5em;padding:0;}#templateside li{margin:4px 0;}#templateside ul li a span.highlight{display:block;}.nonessential{font-size:11px;font-style:italic;padding-left:12px;}.highlight{padding:3px 3px 3px 12px;margin-left:-12px;font-weight:bold;-moz-border-radius:8px;-khtml-border-radius:8px;-webkit-border-radius:8px;border-radius:8px;}div.tablenav{margin-right:210px;}#documentation{margin-top:10px;}#documentation label{line-height:22px;vertical-align:top;font-weight:bold;}.fileedit-sub{padding:10px 0 8px;line-height:180%;}

trunk/wp-admin/css/theme-editor.dev.css

@@ +1 @@
+h3 span {
+    font-weight: normal;
+}
+
 #template textarea {
     font-family: Consolas, Monaco, Courier, monospace;

trunk/wp-admin/theme-editor.php

@@ -126 +126 @@
 
 $description = get_file_description($file);
-$desc_header = ( $description != $file_show ) ? "<strong>$description</strong> (%s)" : "%s";
+$desc_header = ( $description != $file_show ) ? "$description <span>(%s)</span>" : "<span>%s</span>";
+
+$is_child_theme = $themes[$theme]['Template'] != $themes[$theme]['Stylesheet'];
 ?>
 <div class="wrap">
@@ -134 +136 @@
 <div class="fileedit-sub">
 <div class="alignleft">
-<big><?php echo sprintf($desc_header, $file_show); ?></big>
+<h3><?php 
+if ( $is_child_theme && strpos( $file, $themes[$theme]['Template Dir'] ) === 0 )
+    echo $themes[$theme]['Parent Theme'] . ': ';
+else
+    echo $themes[$theme]['Name'] . ': ';
+printf( $desc_header, $file_show ); ?></h3>
 </div>
 <div class="alignright">
@@ -156 +163 @@
 </div>
     <div id="templateside">
-
 <?php
 if ($allowed_files) :
 ?>
     <h3><?php _e('Templates'); ?></h3>
+    <?php if ( $is_child_theme ) : ?>
+    <p class="howto"><?php printf( __( 'This child theme inherits templates from a parent theme, %s.' ), $themes[$theme]['Parent Theme'] ); ?></p>
+    <?php endif; ?>
     <ul>
 <?php
@@ -166 +175 @@
     $template_dir = $themes[$theme]['Template Dir'];
     foreach ( $themes[$theme]['Template Files'] as $template_file ) {
+        // Don't show parent templates.
+        if ( $is_child_theme && strpos( $template_file, $themes[$theme]['Template Dir'] ) === 0 )
+            continue;
+
         $description = trim( get_file_description($template_file) );
         $template_show = basename($template_file);
@@ -193 +206 @@
     $stylesheet_dir = $themes[$theme]['Stylesheet Dir'];
     foreach ( $themes[$theme]['Stylesheet Files'] as $style_file ) {
+        // Don't show parent styles.
+        if ( $is_child_theme && strpos( $style_file, $themes[$theme]['Template Dir'] ) === 0 )
+            continue;
+
         $description = trim( get_file_description($style_file) );
         $style_show = basename($style_file);
@@ -225 +242 @@
 
         <div>
-        <?php if ( is_child_theme() ) :
-            if ( strpos( $file, $themes[$theme]['Template Dir'] ) === 0 ) { ?>
-                <p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
-                <?php printf( __( 'This is a file in your parent theme, &#8220;%s.&#8221;' ), $themes[$theme]['Parent Theme'] ); ?></p>
-            <?php } else { ?>
-                <p><?php printf( __( 'This is a file in your child theme, &#8220;%s.&#8221;' ), $themes[$theme]['Name'] ); ?></p>
-            <?php } ?>
+        <?php if ( is_child_theme() && ! $is_child_theme && $themes[$theme]['Template'] == get_option('template') ) : ?>
+            <p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
+            <?php _e( 'This is a file in your current parent theme.' ); ?></p>
         <?php endif; ?>
 <?php

trunk/wp-includes/script-loader.php

@@ -507 +507 @@
     $styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css", array(), '20101020' );
     $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20101020' ); // Readme as well
-    $styles->add( 'theme-editor', "/wp-admin/css/theme-editor$suffix.css", array(), '20100514' );
+    $styles->add( 'theme-editor', "/wp-admin/css/theme-editor$suffix.css", array(), '20101203' );
     $styles->add( 'press-this', "/wp-admin/css/press-this$suffix.css", array(), '20101020' );
     $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' );