Changeset 7529

Timestamp:

03/26/2008 08:06:18 PM (18 years ago)

Author:

markjaquith

Message:

Clean up the Write Post/Write Page/Edit Comment screens for people without JS. Introduce the hide-if-no-js and hide-if-js automagical classes. fixes #6395

Location:

trunk

Files:

• wp-admin/css/global.css (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (3 diffs)
• wp-admin/edit-form-comment.php (modified) (1 diff)
• wp-admin/edit-page-form.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/js/comment.js (modified) (1 diff)
• wp-admin/js/page.js (modified) (1 diff)
• wp-admin/js/post.js (modified) (1 diff)
• wp-admin/wp-admin.css (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/css/global.css

@@ -195 +195 @@
     padding-right: 280px;
 }
-
-#timestampdiv {
-    display: none;
-}

trunk/wp-admin/edit-form-advanced.php

@@ -122 +122 @@
 <?php if ( current_user_can( 'publish_posts' ) ) : // Contributors don't get to choose the date of publish ?>
 <p class="curtime"><?php printf($stamp, $date, $time); ?>
-&nbsp;<a href="#edit_timestamp" class="edit-timestamp" tabindex='4'><?php _e('Edit') ?></a></p>
-
-<div id='timestampdiv'><?php touch_time(($action == 'edit'),1,4); ?></div>
+&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a></p>
+
+<div id='timestampdiv' class='hide-if-js'><?php touch_time(($action == 'edit'),1,4); ?></div>
 <?php endif; ?>
 
@@ -206 +206 @@
 <?php echo $form_prevstatus ?>
 
-<div id="tagsdiv" class="postbox <?php echo postbox_classes('tagsdiv', 'post'); ?>">
+<div id="tagsdiv" class="postbox <?php echo postbox_classes('tagsdiv', 'post'); ?> hide-if-no-js">
 <h3><?php _e('Tags'); ?></h3>
 <div class="inside">
@@ -219 +219 @@
 
 <div id="category-adder" class="wp-hidden-children">
-    <h4><a id="category-add-toggle" href="#category-add" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
+    <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
     <p id="category-add" class="wp-hidden-child">
         <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" />

trunk/wp-admin/edit-form-comment.php

@@ -38 +38 @@
 ?>
 <p class="curtime"><?php printf($stamp, $date, $time); ?>
-&nbsp;<a href="#edit_timestamp" class="edit-timestamp"><?php _e('Edit') ?></a></p>
+&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><?php _e('Edit') ?></a></p>
 
-<div id='timestampdiv'><?php touch_time(('editcomment' == $action), 0, 5); ?></div>
+<div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0, 5); ?></div>
 
 </div>

trunk/wp-admin/edit-page-form.php

@@ -107 +107 @@
 ?>
 <p class="curtime"><?php printf($stamp, $date, $time); ?>
-&nbsp;<a href="#edit_timestamp" class="edit-timestamp" tabindex='4'><?php _e('Edit') ?></a></p>
-
-<div id='timestampdiv'><?php touch_time(($action == 'edit'),1,4); ?></div>
+&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a></p>
+
+<div id='timestampdiv' class='hide-if-js'><?php touch_time(($action == 'edit'),1,4); ?></div>
 
 </div>

trunk/wp-admin/includes/post.php

@@ -590 +590 @@
     if ( $closed = get_usermeta( $current_user->ID, 'closedpostboxes_'.$page ) ) {
         if ( !is_array( $closed ) ) return '';
-        return in_array( $id, $closed )? 'closed' : '';
+        return in_array( $id, $closed )? 'if-js-closed' : '';
     } else {
         if ( 'tagsdiv' == $id || 'categorydiv' == $id ) return '';
-        else return 'closed';
+        else return 'if-js-closed';
     }
 }

trunk/wp-admin/js/comment.js

@@ -1 +1 @@
 jQuery(document).ready( function() {
     add_postbox_toggles('comment');
+
+    // close postboxes that should be closed
+    jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
+
+    // show things that should be visible, hide what should be hidden
+    jQuery('.hide-if-no-js').show();
+    jQuery('.hide-if-js').hide();
 
     jQuery('.edit-timestamp').click(function () {
         if (jQuery('#timestampdiv').is(":hidden")) {
             jQuery('#timestampdiv').slideDown("normal");
+            jQuery('.edit-timestamp').text(commentL10n.cancel);
         } else {
             jQuery('#timestampdiv').hide();
+            jQuery('#mm').val(jQuery('#hidden_mm').val());
+            jQuery('#jj').val(jQuery('#hidden_jj').val());
+            jQuery('#aa').val(jQuery('#hidden_aa').val());
+            jQuery('#hh').val(jQuery('#hidden_hh').val());
+            jQuery('#mn').val(jQuery('#hidden_mn').val());
+            jQuery('.edit-timestamp').text(commentL10n.edit);
         }
         return false;

trunk/wp-admin/js/page.js

@@ -2 +2 @@
     add_postbox_toggles('page');
     make_slugedit_clickable();
+
+    // close postboxes that should be closed
+    jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
+
+    // show things that should be visible, hide what should be hidden
+    jQuery('.hide-if-no-js').show();
+    jQuery('.hide-if-js').hide();
 
     jQuery('#title').blur( function() { if ( (jQuery("#post_ID").val() > 0) || (jQuery("#title").val().length == 0) ) return; autosave(); } );

trunk/wp-admin/js/post.js

@@ -60 +60 @@
 
 jQuery(document).ready( function() {
+    // close postboxes that should be closed
+    jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
+
+    // show things that should be visible, hide what should be hidden
+    jQuery('.hide-if-no-js').show();
+    jQuery('.hide-if-js').hide();
+
     // postboxes
     add_postbox_toggles('post');

trunk/wp-admin/wp-admin.css

@@ -1457 +1457 @@
     cursor: pointer;
 } 
+
+.hide-if-no-js {
+    display: none;
+}

trunk/wp-includes/general-template.php

@@ -941 +941 @@
 
     if ( $media_buttons ) { ?>
-        <div id="media-buttons">
+        <div id="media-buttons" class="hide-if-no-js">
         <?php do_action( 'media_buttons' ); ?>
         </div>

trunk/wp-includes/script-loader.php

@@ -161 +161 @@
             $this->add( 'link', '/wp-admin/js/link.js', array('jquery-ui-tabs', 'wp-lists', 'postbox'), '20080131' );
             $this->add( 'comment', '/wp-admin/js/comment.js', array('postbox'), '20080219' );
+            $this->localize( 'comment', 'commentL10n', array(
+                    'cancel' => __('Cancel'),
+                    'edit' => __('Edit'),
+                ) );
             $this->add( 'media-upload', '/wp-admin/js/media-upload.js', false, '20080109' );
             $this->localize( 'upload', 'uploadL10n', array(