WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More work on publishing module. WIP. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9365 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2008-10-27 06:07:59 +00:00
parent ea9b087c7a
commit 8b07a301c5
3 changed files with 37 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/css/colors-fresh.css
View File

@ -290,12 +290,8 @@ div.dashboard-widget-submit input,
} }
.submitbox .submitdelete { .submitbox .submitdelete {
border-bottom-color: #999; color: #f00;
} border-bottom-color: #f00;
#normal-sortables .submitbox .submitdelete {
color: #000;
border-bottom-color: #999;
} }
.submitbox .submitdelete:hover, .submitbox .submitdelete:hover,

19
wp-admin/edit-form-advanced.php
View File

@ -70,15 +70,15 @@ function post_submit_meta_box($post) {
?> ?>
<div class="submitbox" id="submitpost"> <div class="submitbox" id="submitpost">
<div class="inside-submitbox"> <!--<div class="inside-submitbox">-->
<div id="minor-publishing"> <div id="minor-publishing">
<div id="misc-publishing-actions"> <div id="misc-publishing-actions">
<?php if ( $can_publish && current_user_can( 'edit_others_posts' ) ) { ?> <?php if ( $can_publish && current_user_can( 'edit_others_posts' ) ) { ?>
<div class="insidebox" id="sticky-checkbox"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID), true); ?> tabindex="4" /> <label for="sticky" class="selectit"><?php _e('Stick to front page') ?></label></div> <div class="misc-pub-section" id="sticky-checkbox"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID), true); ?> tabindex="4" /> <label for="sticky" class="selectit"><?php _e('Stick to front page') ?></label></div>
<?php } ?> <?php } ?>
<div class="insidebox" id="visibility"> <div class="misc-pub-section" id="visibility">
<?php _e('Visibility:'); ?> <?php _e('Public'); // TODO: dropdown ?> <?php _e('Visibility:'); ?> <?php _e('Public'); // TODO: dropdown ?>
</div> </div>
@ -102,14 +102,14 @@ if ( 0 != $post->ID ) {
} }
?> ?>
<?php if ( $can_publish ) : // Contributors don't get to choose the date of publish ?> <?php if ( $can_publish ) : // Contributors don't get to choose the date of publish ?>
<div class="insidebox curtime"> <div class="misc-pub-section curtime">
<span id="timestamp"><?php printf($stamp, $date, $time); ?></span> <span id="timestamp"><?php printf($stamp, $date, $time); ?></span>
&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a> &nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
<div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'),1,4); ?></div> <div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'),1,4); ?></div>
</div> </div>
<?php endif; ?> <?php endif; ?>
<div class="insidebox"><label for="post_status"><?php _e('Status:') ?></label> <div class="misc-pub-section misc-pub-section-last"><label for="post_status"><?php _e('Status:') ?></label>
<strong><span id="post-status-display"> <strong><span id="post-status-display">
<?php <?php
switch ( $post->post_status ) { switch ( $post->post_status ) {
@ -168,7 +168,7 @@ if ( $can_publish OR ( $post->post_status == 'publish' AND current_user_can('edi
<div id="minor-publishing-actions"> <div id="minor-publishing-actions">
<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status ) <?php if ( 'publish' == $post->post_status || 'private' == $post->post_status )
$savebtn = attribute_escape( __('Save') ); $savebtn = attribute_escape( __('Update Post') );
else else
$savebtn = attribute_escape( __('Save Draft') ); $savebtn = attribute_escape( __('Save Draft') );
?> ?>
@ -182,7 +182,7 @@ else
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div> <!--</div>-->
<div id="major-publishing-actions"> <div id="major-publishing-actions">
<?php do_action('post_submitbox_start'); ?> <?php do_action('post_submitbox_start'); ?>
@ -197,13 +197,14 @@ if ( ( 'edit' == $action ) && current_user_can('delete_post', $post->ID) ) { ?>
<?php <?php
if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post->ID ) { ?> if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post->ID ) { ?>
<?php if ( current_user_can('publish_posts') ) : ?> <?php if ( current_user_can('publish_posts') ) : ?>
<input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" /> <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
<?php else : ?> <?php else : ?>
<input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" /> <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />
<?php endif; ?> <?php endif; ?>
<?php } ?> <?php } ?>
</div> </div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>

55
wp-admin/wp-admin.css
View File

@ -208,8 +208,18 @@ table#availablethemes td.bottom {
} }
#misc-publishing-actions { #misc-publishing-actions {
width: 70%; width: 69%;
float: left; float: left;
border-right: 1px solid #ddd;
}
.misc-pub-section {
padding: 6px 0;
border-bottom: 1px solid #ddd;
}
.misc-pub-section-last {
border-bottom: 0;
} }
#minor-publishing-actions { #minor-publishing-actions {
@ -218,26 +228,37 @@ table#availablethemes td.bottom {
text-align: right; text-align: right;
} }
.preview {
float: right;
padding: 2px 8px !important;
top: 10px;
position: relative;
}
#minor-publishing { #minor-publishing {
border-bottom: 1px solid #ddd;
} }
#major-publishing-actions { #major-publishing-actions {
padding: 0 3px; background: #eaf2fa;
padding-top: 8px;
clear: both; clear: both;
height: 30px;
line-height: 30px;
} }
#delete-action { #delete-action {
line-height: 25px;
vertical-align: middle;
text-align: left; text-align: left;
float: left; float: left;
width: 30%; width: 30%;
background: #eaf2fa;
} }
#publishing-action { #publishing-action {
text-align: right; text-align: right;
float: right; float: right;
width: 70%; width: 70%;
background: #eaf2fa;
} }
.side-info { .side-info {
@ -793,7 +814,6 @@ ul#adminmenu li.write-new-button a {
border-style: none none solid; border-style: none none solid;
} }
#adminmenu .wp-submenu { #adminmenu .wp-submenu {
margin: 0; margin: 0;
position: relative; position: relative;
@ -950,7 +970,6 @@ ul#adminmenu li.write-new-button a {
} }
/* end side admin menu */ /* end side admin menu */
/* 2.6 */ /* 2.6 */
#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { #adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
position: absolute; position: absolute;
@ -966,9 +985,6 @@ ul#adminmenu li.write-new-button a {
display: none; display: none;
} }
.post-com-count-wrapper { .post-com-count-wrapper {
min-width: 22px; min-width: 22px;
} }
@ -1254,19 +1270,6 @@ table.form-table td .updated {
width: 99.5%; width: 99.5%;
} }
#normal-sortables .inside-submitbox .insidebox {
float: left;
margin: 5px 12px 5px 0;
}
#normal-sortables .submit #publish {
margin: 8px 0 0 12px;
}
#normal-sortables .inside-submitbox {
/* float: left; */
}
#trackback_url { #trackback_url {
width: 99%; width: 99%;
} }
@ -1329,7 +1332,6 @@ table.form-table td .updated {
border: none; border: none;
} }
#submitdiv div.inside,
#pagesubmitdiv div.inside, #pagesubmitdiv div.inside,
#linksubmitdiv div.inside, #linksubmitdiv div.inside,
div.inside { div.inside {
@ -1575,17 +1577,12 @@ table.form-table td .updated {
margin: 0; margin: 0;
} }
/* /*
#side-info-column #side-sortables { #side-info-column #side-sortables {
height: 100%; height: 100%;
} }
*/ */
.submitbox .submit { .submitbox .submit {
text-align: left; text-align: left;
padding: 12px 10px 10px; padding: 12px 10px 10px;
@ -2065,7 +2062,6 @@ fieldset {
padding: 5px; padding: 5px;
} }
/* media popup 0819 */ /* media popup 0819 */
#sidemenu { #sidemenu {
margin: -30px 15px 0 315px; margin: -30px 15px 0 315px;
@ -2565,7 +2561,6 @@ fieldset {
width: 10px; width: 10px;
} }
/* Media library */ /* Media library */
#wpbody-content #media-items .describe { #wpbody-content #media-items .describe {
border-collapse: collapse; border-collapse: collapse;