WordPress.org
Get WordPress

Make WordPress Core

Changeset 8379


Ignore:
Timestamp:
07/20/2008 03:00:17 AM (18 years ago)
Author:
azaozz
Message:

crazyhorse: added fixed toolbar on all pages that had postbox, added most of the needed changes.

Location:
branches/crazyhorse/wp-admin
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • branches/crazyhorse/wp-admin/admin-footer.php

    r8371 r8379  
    1 </div><!-- wpbody-content -->
    21<?php if ( ! $fixed_bar ) { ?>
     2<br class="clear" /></div><!-- wpbody-content -->
     3<?php } ?>
    34</div><!-- wpbody -->
    4 <?php } ?>
    55</div><!-- wpcontent -->
    66</div><!-- wpwrap -->

  • branches/crazyhorse/wp-admin/admin-header.php

    r8371 r8379  
    1717}
    1818
    19 $fixed_bar_pages = array( 'post.php', 'post-new.php' );
    20 $fixed_bar = in_array( $the_current_page, $fixed_bar_pages ) ? true : false;
     19$fixed_bar_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php' );
     20if ( ! isset($fixed_bar) ) $fixed_bar = in_array( $the_current_page, $fixed_bar_pages ) ? true : false;
    2121
    2222get_admin_page_title();

  • branches/crazyhorse/wp-admin/comment.php

    r8004 r8379  
    2222
    2323    wp_enqueue_script('comment');
     24    $fixed_bar = true;
    2425
    2526    require_once('admin-header.php');

  • branches/crazyhorse/wp-admin/css/colors-fresh.css

    r8371 r8379  
    489489}
    490490
    491 .login #backtoblog a, .curtime, #user_info a, #dashmenu a {
     491.login #backtoblog a, #curtime, #user_info a, #dashmenu a {
    492492    color: #ccc;
    493493}
    … …  
    685685}
    686686
    687 .curtime {
     687#curtime {
    688688    color: #666;
    689689}
    … …  
    728728
    729729#fixedbar a,
    730 #fixedbar .curtime {
     730#fixedbar #curtime {
    731731    color: #ccc;
    732732}

  • branches/crazyhorse/wp-admin/css/dashboard.css

    r8371 r8379  
    268268
    269269#dashboard_inbox p.actions {
     270    margin-bottom:0pt;
    270271    margin-top: 0;
     272    float:left;
    271273}
    272274
    … …  
    293295    margin: 0;
    294296}
     297
     298#inbox-message {
     299    margin:0 0 0 75px;
     300    padding:5px;
     301}

  • branches/crazyhorse/wp-admin/css/global.css

    r8291 r8379  
    212212    border-style: solid;
    213213    padding: 0 0.6em;
    214     max-width: 950px;
    215214    margin-bottom: 1em;
    216215}

  • branches/crazyhorse/wp-admin/edit-form-advanced.php

    r8371 r8379  
    3939?>
    4040
     41<form name="post" action="post.php" method="post" id="post">
     42<div id="wpbody-content">
     43
    4144
    4245<?php
    … …  
    226229
    227230?>
    228 
    229 <form name="post" action="post.php" method="post" id="post">
    230 <div id="wpbody-content">
    231231
    232232<?php if ( $notice ) : ?>
    … …  
    339339
    340340<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
    341 <h3>
    342     <label for="content"><?php _e('Post') ?></label>
    343     <a id="add-media-button" href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Add Media' ); ?></a>
    344     <br class="clear" />
    345 </h3>
     341
     342<div id="add-media-button"><a href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Add Media' ); ?></a></div>
     343
     344<h3><?php _e('Post') ?></h3>
    346345
    347346<?php the_editor($post->post_content); ?>
    … …  
    395394
    396395</div>
    397 </div>
     396<br class="clear" /></div><!-- wpbody-content (fixedbar) -->
    398397
    399398<div id="fixedbar">
    400399<table id="fixedbar-wrap"><tbody><tr>
    401400<td id="preview-link">&nbsp;
     401<span>
    402402<?php if ( 'publish' == $post->post_status ) { ?>
    403403<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View this Post'); ?></a>
    … …  
    405405<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank"  tabindex="4"><?php _e('Preview this Post'); ?></a>
    406406<?php } ?>
     407</span>
    407408</td>
     409
    408410<td id="submitpost" class="submitbox">
    409411<div id="post-time-info" class="alignleft">
    … …  
    427429        }
    428430?>
    429 
    430     <p class="curtime"><?php printf($stamp, $date, $time, $edit); ?></p>
     431    <p id="curtime"><?php printf($stamp, $date, $time, $edit); ?></p>
    431432    <div id='timestampdiv' class='hide-if-js'><?php touch_time(($action == 'edit'),1,4); ?></div>
    432433
    … …  
    438439<?php
    439440
    440     if ( ( 'edit' == $action) && current_user_can('delete_post', $post_ID) )
     441    if ( ( 'edit' == $action ) && current_user_can('delete_post', $post_ID) )
    441442        echo "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post_ID", 'delete-post_' . $post_ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;post') . "</a>";
    442 
     443    elseif ( 'edit' != $action )
     444        echo "<a class='submitdelete' href='index.php' onclick=\"if ( confirm('" . js_escape( __("You are about to delete this post\n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Cancel&nbsp;post') . "</a>";
    443445?>
    444446

  • branches/crazyhorse/wp-admin/edit-form-comment.php

    r8300 r8379  
    77
    88<form name="post" action="comment.php" method="post" id="post">
     9<div id="wpbody-content">
     10
    911<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
    1012<div class="wrap">
    … …  
    1517<div id="poststuff">
    1618
     19<!--
    1720<p id="big-add-button">
    1821<span id="previewview">
    … …  
    2023</span>
    2124</p>
     25-->
    2226
    2327<!-- crazyhorse
    … …  
    7680
    7781<div id="postdiv" class="postarea">
    78 <h3><label for="content"><?php _e('Comment') ?></label></h3>
     82<h3><?php _e('Comment') ?></h3>
    7983<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
    8084<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
    81 </div>
    82 
    83 <div id="submitpost" class="submitbox">
    84 <div id="comment-time-info" class="alignleft">
    85 <?php
    86 $stamp = __('Timestamp: <span class="timestamp">%1$s at %2$s %3$s</span>');
    87 $date = mysql2date(get_option('date_format'), $comment->comment_date);
    88 $time = mysql2date(get_option('time_format'), $comment->comment_date);
    89 $edit = '<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js">' . __('(Change)') . '</a>';
    90 
    91 ?>
    92 <p class="curtime"><?php printf($stamp, $date, $time, $edit); ?></p>
    93 
    94 <div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0, 5); ?></div>
    95 </div>
    96 
    97 <p class="submit alignright">
    98 <?php
    99 echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete comment') . "</a>";
    100 ?>
    101 <input type="submit" name="save" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" />
    102 </p>
    103 
    104 <br class="clear" />
    105 
    10685</div>
    10786
    … …  
    11998</div>
    12099
     100</div><!-- wpbody-content (fixedbar) -->
     101
     102<div id="fixedbar">
     103<table id="fixedbar-wrap"><tbody><tr>
     104
     105<td id="preview-link">&nbsp;
     106<span>
     107<a href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View this Comment'); ?></a>
     108</span>
     109</td>
     110
     111<td id="submitpost" class="submitbox">
     112<div id="comment-time-info" class="alignleft">
     113<?php
     114$stamp = __('Timestamp: <span class="timestamp">%1$s at %2$s %3$s</span>');
     115$date = mysql2date(get_option('date_format'), $comment->comment_date);
     116$time = mysql2date(get_option('time_format'), $comment->comment_date);
     117$edit = '(<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js">' . __('Change') . '</a>)';
     118
     119?>
     120<p id="curtime"><?php printf($stamp, $date, $time, $edit); ?></p>
     121
     122<div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0, 5); ?></div>
     123</div>
     124
     125<p class="submit alignright">
     126<?php
     127echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete comment') . "</a>&nbsp;";
     128?>
     129<input type="submit" name="save" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" />
     130</p>
     131</td></tr></tbody></table>
     132</div><!-- /fixedbar -->
     133
     134
     135
     136
     137
    121138</form>
    122139

  • branches/crazyhorse/wp-admin/edit-link-form.php

    r8291 r8379  
    229229
    230230<?php echo $form ?>
     231<div id="wpbody-content">
     232
     233<?php echo $link_added; ?>
     234
    231235<?php wp_nonce_field($nonce_action); ?>
    232236<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
    … …  
    236240<h2><?php echo $heading; ?></h2>
    237241
     242<!--
    238243<p id="big-add-button">
    239244<span id="previewview">
    … …  
    243248</span>
    244249</p>
     250-->
    245251
    246252<!-- TODO
    … …  
    296302    <?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?>
    297303</div>
    298 </div>
    299 
    300 <div class="submitbox" id="submitlink">
    301 <p class="submit alignright">
    302 <?php
    303 if ( ( 'edit' == $action) && current_user_can('manage_links') )
    304     echo "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link_id", 'delete-bookmark_' . $link_id) . "' onclick=\"if ( confirm('" . js_escape( sprintf( __("You are about to delete this link '%s'\n'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;link') . "</a>";
    305 ?>
    306 <input type="submit" class="button button-highlighted" name="save" value="<?php _e('Save'); ?>" tabindex="4" />
    307 </p>
    308 <br class="clear" />
    309304</div>
    310305
    … …  
    330325</div>
    331326
     327<br class="clear" /></div><!-- wpbody-content (fixedbar) -->
     328
     329<div id="fixedbar">
     330<table id="fixedbar-wrap"><tbody><tr>
     331
     332<td id="preview-link">&nbsp;
     333<span>
     334<?php if ( !empty($link_id) ) { ?>
     335<a href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
     336<?php } ?>
     337</span>
     338</td>
     339
     340<td id="submitlink" class="submitbox">
     341<p class="submit alignright">
     342<?php
     343if ( ( 'edit' == $action) && current_user_can('manage_links') )
     344    echo "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link_id", 'delete-bookmark_' . $link_id) . "' onclick=\"if ( confirm('" . js_escape( sprintf( __("You are about to delete this link '%s'\n'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;link') . "</a>&nbsp;";
     345?>
     346<input type="submit" class="button button-highlighted" name="save" value="<?php _e('Save'); ?>" tabindex="4" />
     347</p>
     348</td>
     349</tr></tbody></table>
     350</div><!-- /fixedbar -->
     351
    332352</form>

  • branches/crazyhorse/wp-admin/edit-page-form.php

    r8291 r8379  
    3434?>
    3535
     36<form name="post" action="page.php" method="post" id="post">
     37<div id="wpbody-content">
     38
    3639<?php if ( $notice ) : ?>
    3740<div id="notice" class="error"><p><?php echo $notice ?></p></div>
    … …  
    147150add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'normal', 'core');
    148151endif;
    149 
    150 ?>
    151 
    152 <form name="post" action="page.php" method="post" id="post">
     152?>
     153
    153154<div class="wrap">
    154155<h2><?php
    … …  
    159160?></h2>
    160161
     162<!--
    161163<p id="big-add-button">
    162164<span id="previewview">
    … …  
    168170</span>
    169171</p>
     172-->
    170173
    171174<?php
    … …  
    255258
    256259<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
    257 <h3><label for="content"><?php _e('Page') ?></label></h3>
     260
     261<div id="add-media-button"><a href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Add Media' ); ?></a></div>
     262
     263<h3><?php _e('Page') ?></h3>
    258264<?php the_editor($post->post_content); ?>
    259265<div id="post-status-info">
    260266    <span id="wp-word-count" class="alignleft"></span>
    261     <span id="autosave" class="alignright"></span>
     267    <span class="alignright">
     268    <span id="autosave">&nbsp;</span>
     269
     270<?php
     271    if ($post_ID) {
     272        if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
     273            $last_user = get_userdata($last_id);
     274            printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
     275        } else {
     276            printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
     277        }
     278    }
     279?>
     280    </span>
    262281    <br class="clear" />
    263282</div>
    264283
    265 <div class="submitbox" id="submitpage">
     284
     285<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
     286<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
     287<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
     288<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
     289<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
     290</div>
     291
     292<?php
     293
     294do_meta_boxes('page', 'normal', $post);
     295do_action('edit_page_form');
     296do_meta_boxes('page', 'advanced', $post);
     297
     298?>
     299
     300</div>
     301</div>
     302</div>
     303
     304</div>
     305
     306<br class="clear" /></div><!-- wpbody-content (fixedbar) -->
     307
     308<div id="fixedbar">
     309<table id="fixedbar-wrap"><tbody><tr>
     310
     311<td id="preview-link">&nbsp;
     312<span>
     313<?php if ( 'publish' == $post->post_status ) { ?>
     314<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank"  tabindex="4"><?php _e('View this Page'); ?></a>
     315<?php } elseif ( 'edit' == $action ) { ?>
     316<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank" tabindex="4"><?php _e('Preview this Page'); ?></a>
     317<?php } ?>
     318</span>
     319</td>
     320
     321<td id="submitpage" class="submitbox">
    266322<div id="post-time-info" class="alignleft">
    267323<?php
    268324    if ($post_ID) {
    269325        if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
    270             $stamp = __('Scheduled for:<br />%1$s at %2$s');
     326            $stamp = __('Scheduled for: <span class="timestamp">%1$s at %2$s</span>');
    271327        } else if ( 'publish' == $post->post_status ) { // already published
    272             $stamp = __('Published on:<br />%1$s at %2$s');
     328            $stamp = __('Published on: <span class="timestamp">%1$s at %2$s</span>');
    273329        } else if ( '0000-00-00 00:00:00' == $post->post_date ) { // draft, 1 or more saves, no date specified
    274330            $stamp = __('Publish immediately');
    275331        } else { // draft, 1 or more saves, date specified
    276             $stamp = __('Publish on:<br />%1$s at %2$s');
     332            $stamp = __('Publish on: <span class="timestamp">%1$s at %2$s</span>');
    277333        }
    278334        $date = mysql2date(get_option('date_format'), $post->post_date);
    … …  
    284340    }
    285341?>
    286     <p class="curtime"><?php printf($stamp, $date, $time); ?> <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a></p>
     342    <p id="curtime"><?php printf($stamp, $date, $time); ?> <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a></p>
    287343    <div id='timestampdiv' class='hide-if-js'><?php touch_time(($action == 'edit'),1,4); ?></div>
    288 
    289 <?php
    290 
    291     if ($post_ID) {
    292         if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
    293             $last_user = get_userdata($last_id);
    294             printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
    295         } else {
    296             printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
    297         }
    298     }
    299 ?>
    300344</div>
    301345
    302346<p class="submit alignright">
    303 
    304 <?php
    305 
    306 if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) )
     347<?php
     348if ( ('edit' == $action ) && current_user_can('delete_page', $post_ID) )
    307349    echo "<a class='submitdelete' href='" . wp_nonce_url("page.php?action=delete&amp;post=$post_ID", 'delete-page_' . $post_ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;page') . "</a>";
    308 
    309 ?>
    310 
    311 <input type="submit" name="save" class="button button-highlighted" value="<?php _e('Save'); ?>" tabindex="4" />
     350elseif ( 'edit' != $action )
     351    echo "<a class='submitdelete' href='index.php' onclick=\"if ( confirm('" . js_escape( __("You are about to delete this page\n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Cancel&nbsp;page') . "</a>";
     352?>
     353    <input type="submit" name="save" class="button button-highlighted" value="<?php _e('Save'); ?>" tabindex="4" />
    312354
    313355<?php
    314356    if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) :
    315357        if ( current_user_can('publish_pages') ) : ?>
    316 
    317358    <input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
    318 
    319359<?php       else : ?>
    320 
    321360    <input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />
    322 
    323361<?php
    324 
    325362        endif;
    326363    endif;
    327 
    328364?>
    329365</p>
    330 <br class="clear" />
    331 </div>
    332 <?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
    333 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
    334 <?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
    335 <?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
    336 <?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
    337 </div>
    338 
    339 <?php
    340 
    341 do_meta_boxes('page', 'normal', $post);
    342 do_action('edit_page_form');
    343 do_meta_boxes('page', 'advanced', $post);
    344 
    345 ?>
    346 
    347 </div>
    348 </div>
    349 </div>
    350 
    351 </div>
     366</td></tr></tbody></table>
     367</div><!-- /fixedbar -->
    352368
    353369</form>

  • branches/crazyhorse/wp-admin/includes/dashboard.php

    r8283 r8379  
    434434            $('#inbox-filter').submit( function() { return false; } )
    435435                .find( ':button' ).click( function() {
     436                    var done = $(':checked').size().toString(), txt = (done == '1') ? '<?php _e(' item archived'); ?>' : '<?php _e(' items archived'); ?>';
    436437                    $(':checked').parent().slideUp( 'normal', function() {
    437438                        $('.inbox-count').text( $('#inbox-filter li:visible').size().toString() );
     439                        $('#inbox-message').addClass('updated');
     440                        $('#inbox-message').text(done+txt);
    438441                    } );
    439442                } );
    … …  
    443446    <form id="inbox-filter" action="" method="get">
    444447        <p class="actions"><input type="button" value="Archive" name="archive" class="button"></p>
     448        <div id="inbox-message"></div>
     449        <br class="clear" />
     450       
    445451        <ul>
    446452

  • branches/crazyhorse/wp-admin/js/comment.js

    r8371 r8379  
    1111    jQuery('.edit-timestamp').click(function () {
    1212        if (jQuery('#timestampdiv').is(":hidden")) {
     13            jQuery('#curtime').slideUp("normal");
    1314            jQuery('#timestampdiv').slideDown("normal");
    14             jQuery('.timestamp').hide();
    1515        } else {
    16             jQuery('#timestampdiv').hide();
     16            jQuery('#timestampdiv').slideUp("normal");
    1717            jQuery('#mm').val(jQuery('#hidden_mm').val());
    1818            jQuery('#jj').val(jQuery('#hidden_jj').val());
    … …  
    2020            jQuery('#hh').val(jQuery('#hidden_hh').val());
    2121            jQuery('#mn').val(jQuery('#hidden_mn').val());
    22             jQuery('.timestamp').show();
     22            jQuery('#curtime').slideDown("normal");
    2323        }
    2424        return false;
     25    });
    2526
    26     });
    2727    jQuery('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
    2828        jQuery('#timestampdiv').hide();
    … …  
    3030        jQuery('.timestamp').show().html(
    3131            jQuery( '#mm option[value=' + jQuery('#mm').val() + ']' ).text() + ' ' +
    32             jQuery('#jj').val() + ', ' +
    33             jQuery('#aa').val() + ' @ ' +
     32            jQuery('#jj').val() + ',' +
     33            jQuery('#aa').val() + '@' +
    3434            jQuery('#hh').val() + ':' +
    3535            jQuery('#mn').val() + ' '
    3636        ).append( link );
     37        jQuery('#curtime').slideDown("normal");
    3738        return false;
    3839    });

  • branches/crazyhorse/wp-admin/js/common.js

    r8371 r8379  
    55    // Reveal
    66    jQuery('.wp-no-js-hidden').removeClass( 'wp-no-js-hidden' );
     7   
     8    // show things that should be visible, hide what should be hidden
     9    jQuery('.hide-if-no-js').show();
     10    jQuery('.hide-if-js').hide();
    711
    812    // Basic form validation
    … …  
    5862    $('#wpbody-content').css("min-height", minH);
    5963
    60 
    6164} );
    6265

  • branches/crazyhorse/wp-admin/js/page.js

    r8371 r8379  
    55    // close postboxes that should be closed
    66    jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
    7 
    8     // show things that should be visible, hide what should be hidden
    9     jQuery('.hide-if-no-js').show();
    10     jQuery('.hide-if-js').hide();
    117
    128    jQuery('#title').blur( function() { if ( (jQuery("#post_ID").val() > 0) || (jQuery("#title").val().length == 0) ) return; autosave(); } );
    … …  
    1713    jQuery('.edit-timestamp').click(function () {
    1814        if (jQuery('#timestampdiv').is(":hidden")) {
     15            jQuery('#curtime').slideUp("normal");
    1916            jQuery('#timestampdiv').slideDown("normal");
    20             jQuery('.edit-timestamp').text(postL10n.cancel);
    2117        } else {
    22             jQuery('#timestampdiv').hide();
     18            jQuery('#timestampdiv').slideUp("normal");
    2319            jQuery('#mm').val(jQuery('#hidden_mm').val());
    2420            jQuery('#jj').val(jQuery('#hidden_jj').val());
    … …  
    2622            jQuery('#hh').val(jQuery('#hidden_hh').val());
    2723            jQuery('#mn').val(jQuery('#hidden_mn').val());
    28             jQuery('.edit-timestamp').text(postL10n.edit);
     24            jQuery('#curtime').slideDown("normal");
    2925        }
    3026        return false;
    31     });
     27    });
     28
     29    jQuery('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
     30        jQuery('#timestampdiv').hide();
     31        var link = jQuery('.timestamp a').clone( true );
     32        jQuery('.timestamp').show().html(
     33            jQuery( '#mm option[value=' + jQuery('#mm').val() + ']' ).text() + ' ' +
     34            jQuery('#jj').val() + ',' +
     35            jQuery('#aa').val() + '@' +
     36            jQuery('#hh').val() + ':' +
     37            jQuery('#mn').val() + ' '
     38        ).append( link );
     39        jQuery('#curtime').slideDown("normal");
     40        return false;
     41    });
    3242});

  • branches/crazyhorse/wp-admin/js/post.js

    r8371 r8379  
    6464    // close postboxes that should be closed
    6565    jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
    66 
    67     // show things that should be visible, hide what should be hidden
    68     jQuery('.hide-if-no-js').show();
    69     jQuery('.hide-if-js').hide();
    7066
    7167    // postboxes
    … …  
    162158    jQuery('.edit-timestamp').click(function () {
    163159        if (jQuery('#timestampdiv').is(":hidden")) {
    164             jQuery('.curtime').slideUp("normal");
     160            jQuery('#curtime').slideUp("normal");
    165161            jQuery('#timestampdiv').slideDown("normal");
    166     //      jQuery('.timestamp').hide();
    167162        } else {
    168163            jQuery('#timestampdiv').slideUp("normal");
    … …  
    172167            jQuery('#hh').val(jQuery('#hidden_hh').val());
    173168            jQuery('#mn').val(jQuery('#hidden_mn').val());
    174             jQuery('.curtime').slideDown("normal");
    175         //  jQuery('.timestamp').show();
     169            jQuery('#curtime').slideDown("normal");
    176170        }
    177171        return false;
     172    });
    178173
    179     });
    180174    jQuery('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
    181175        jQuery('#timestampdiv').hide();
    … …  
    183177        jQuery('.timestamp').show().html(
    184178            jQuery( '#mm option[value=' + jQuery('#mm').val() + ']' ).text() + ' ' +
    185             jQuery('#jj').val() + ', ' +
    186             jQuery('#aa').val() + ' @ ' +
     179            jQuery('#jj').val() + ',' +
     180            jQuery('#aa').val() + '@' +
    187181            jQuery('#hh').val() + ':' +
    188182            jQuery('#mn').val() + ' '
    189183        ).append( link );
    190         jQuery('.curtime').slideDown("normal");
     184        jQuery('#curtime').slideDown("normal");
    191185        return false;
    192186    });

  • branches/crazyhorse/wp-admin/link-add.php

    r8124 r8379  
    1616wp_enqueue_script('xfn');
    1717
     18$link_added = ( isset($_GET['added']) && '' != $_POST['link_name'] ) ?
     19    '<div id="message" class="updated fade"><p>' . __('Link added.') . '</p></div>' : '';
     20
     21$fixed_bar = true;
    1822require('admin-header.php');
    19 ?>
    2023
    21 <?php if ($_GET['added'] && '' != $_POST['link_name']) : ?>
    22 <div id="message" class="updated fade"><p><?php _e('Link added.'); ?></p></div>
    23 <?php endif; ?>
    24 
    25 <?php
    2624$link = get_default_link_to_edit();
    2725include('edit-link-form.php');

  • branches/crazyhorse/wp-admin/link.php

    r7961 r8379  
    9696            wp_die(__('Link not found.'));
    9797
     98        $fixed_bar = true;
    9899        include_once ('admin-header.php');
    99100        include ('edit-link-form.php');

  • branches/crazyhorse/wp-admin/rtl.css

    r8335 r8379  
    150150}
    151151
    152 .curtime
     152#curtime
    153153{
    154154    background-position:right 2px;

  • branches/crazyhorse/wp-admin/wp-admin.css

    r8371 r8379  
    11461146}
    11471147
    1148 .postarea h3 #add-media-button {
    1149     float: right;
     1148.postarea #add-media-button {
     1149    float:right;
     1150    margin:7px 0pt 0pt;
     1151    position:relative;
     1152    right:10px;
    11501153}
    11511154
    … …  
    15051508}
    15061509
    1507 #submitpost p.curtime {
     1510#submitpost p#curtime {
    15081511    background-image: url(images/date-button.gif);
    15091512    background-repeat: no-repeat;
    1510     background-position: left 2px;
     1513    background-position: left 4px;
    15111514    padding-left: 18px;
     1515    padding-top: 2px;
    15121516}
    15131517
    … …  
    16651669/* fixed bottom bar */
    16661670.postarea h3 label {
    1667     float:none;
     1671
     1672}
     1673
     1674#footer {
     1675    z-index: -1;
    16681676}
    16691677
    … …  
    16771685
    16781686#fixedbar #submitpost {
    1679     width: 690px;
     1687   
    16801688}
    16811689
    … …  
    17051713    padding: 14px 18px;
    17061714    border-left: 1px solid #aaa;
    1707 }
    1708 
    1709 #fixedbar #post-time-info {
    1710     margin-top: 17px;
     1715    width: 690px;
     1716}
     1717
     1718#fixedbar #post-time-info,
     1719#fixedbar #comment-time-info {
     1720    margin-top: 16px;
    17111721}
    17121722
Note: See TracChangeset for help on using the changeset viewer.