Changeset 9604
- Timestamp:
- 11/11/2008 02:58:24 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/css/colors-fresh.css
r9585 r9604 1 2 html { 3 background-color: #f9f9f9; 4 } 1 5 2 6 .find-box-search { … … 66 70 .widefat { 67 71 border-color: #dfdfdf; 72 background-color: #fff; 68 73 } 69 74 … … 1161 1166 1162 1167 /* inline editor */ 1163 .inline-editor input, 1164 .inline-editor textarea, 1168 .inline-edit-row fieldset input[type="text"], 1169 .inline-edit-row fieldset textarea, 1170 #bulk-titles, 1165 1171 #replyrow input { 1166 1172 border-color: #ddd; … … 1173 1179 .inline-editor ul.cat-checklist { 1174 1180 background-color: #FFFFFF; 1181 border-color: #ddd; 1182 } 1183 1184 .inline-edit-row p.submit { 1185 background-color: #f1f1f1; 1175 1186 } 1176 1187 -
trunk/wp-admin/css/dashboard.css
r9536 r9604 297 297 } 298 298 299 #dashboard-widgets #dashboard_quick_press form p.submit .cancel {300 padding-left: 0;301 padding-right: 0;302 border: none;303 background-color: transparent;304 text-decoration: underline;305 color: red;306 }307 308 #dashboard-widgets #dashboard_quick_press form p.submit .cancel:hover {309 text-decoration: none;310 }311 312 313 299 #dashboard-widgets #dashboard_quick_press form p.submit #publish { 314 300 float: right; -
trunk/wp-admin/css/global.css
r9556 r9604 62 62 height: auto; 63 63 min-height: 100%; 64 overflow: hidden;65 64 width: 100%; 66 65 } -
trunk/wp-admin/css/ie.css
r9585 r9604 137 137 margin-top: 10px; 138 138 } 139 140 /* Inline Editor */ 141 #wpbody-content .quick-edit-row-post .inline-edit-col-left { 142 width: 39%; 143 } 144 145 #wpbody-content .inline-edit-row-post .inline-edit-col-center { 146 width: 19%; 147 } 148 149 #wpbody-content .quick-edit-row-page .inline-edit-col-left { 150 width: 49%; 151 } 152 153 #wpbody-content .bulk-edit-row .inline-edit-col-left { 154 width: 29%; 155 } 156 157 .inline-edit-row p.submit { 158 zoom: 100%; 159 } 160 161 .inline-edit-row fieldset label span.title { 162 display: block; 163 float: left; 164 width: 5em; 165 } 166 167 .inline-edit-row fieldset label span.input-text-wrap { 168 margin-left: 0; 169 zoom: 100%; 170 } 171 172 #wpbody-content .inline-edit-row fieldset label span.input-text-wrap input { 173 line-height: 130%; 174 } 175 /* end Inline Editor */ 139 176 140 177 * html div.widget-liquid-left-holder, -
trunk/wp-admin/includes/post.php
r9596 r9604 216 216 $post_IDs = array_map( intval, (array) $post_data['post'] ); 217 217 218 $reset = array( 'post_author', 'post_status', 'post_password', 'post_parent', 'page_template', 'comment_status', 'ping_status', 'keep_private', 'tags_input', 'post_category' );218 $reset = array( 'post_author', 'post_status', 'post_password', 'post_parent', 'page_template', 'comment_status', 'ping_status', 'keep_private', 'tags_input', 'post_category', 'sticky' ); 219 219 foreach ( $reset as $field ) { 220 220 if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) ) … … 275 275 $post_data['ID'] = $post_ID; 276 276 $updated[] = wp_update_post( $post_data ); 277 278 if ( current_user_can( 'edit_others_posts' ) && isset( $post_data['sticky'] ) ) { 279 if ( 'sticky' == $post_data['sticky'] ) 280 stick_post( $post_ID ); 281 else 282 unstick_post( $post_ID ); 283 } 284 277 285 } 278 286 -
trunk/wp-admin/includes/template.php
r9596 r9604 205 205 $is_tag = $type == 'tag'; 206 206 $columns = $is_tag ? get_column_headers('tag') : get_column_headers('category'); 207 $hidden = (array) get_user_option( "manage-$type-columns-hidden" ); 207 $hidden = array_intersect( array_keys( $columns ), array_filter( (array) get_user_option( "manage-$type-columns-hidden" ) ) ); 208 $col_count = count($columns) - count($hidden); 208 209 $output = ''; ?> 209 210 210 211 <form method="get" action=""><table style="display: none"><tbody id="inlineedit"> 211 <tr id="inline-edit" style="display: none"><td colspan="8"> 212 <?php 212 <tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $col_count; ?>"> 213 214 <fieldset><div class="inline-edit-col"> 215 <h4><?php _e( 'Quick Edit' ); ?></h4> 216 217 <label> 218 <span class="title"><?php _e( 'Name' ); ?></span> 219 <span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span> 220 </label> 221 222 <label> 223 <span class="title"><?php _e( 'Slug' ); ?></span> 224 <span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span> 225 </label> 226 227 <?php if ( 'category' == $type ) : ?> 228 229 <label> 230 <span class="title"><?php _e( 'Parent' ); ?></span> 231 <?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('None'))); ?> 232 </label> 233 234 <?php endif; // $type ?> 235 236 </div></fieldset> 237 238 <?php 239 240 $core_columns = array( 'cb' => true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true ); 213 241 214 242 foreach ( $columns as $column_name => $column_display_name ) { 215 $class = "class=\"$column_name column-$column_name quick-edit-div\""; 216 $style = in_array($column_name, $hidden) ? ' style="display:none;"' : ''; 217 $attributes = "$class$style"; 218 219 switch ($column_name) { 220 case 'cb': 221 break; 222 case 'description': 223 break; 224 case 'name': ?> 225 <div class="tax-name quick-edit-div"<?php echo $style ?> title="<?php _e('Name'); ?>"> 226 <div class="title"><?php _e('Name'); ?></div> 227 <div class="in"> 228 <input type="text" name="name" class="ptitle" value="" /> 229 </div> 230 </div> 231 <?php 232 233 $output .= "<td $attributes></td>"; 234 break; 235 case 'slug': ?> 236 <div class="tax-slug quick-edit-div"<?php echo $style ?> title="<?php _e('Slug'); ?>"> 237 <div class="title"><?php _e('Slug'); ?></div> 238 <div class="in"> 239 <input type="text" name="slug" class="ptitle" value="" /> 240 </div> 241 </div> 242 <?php 243 244 $output .= "<td $attributes></td>"; 245 break; 246 case 'posts': 247 if ( 'category' == $type ) { ?> 248 <div class="tax-parent quick-edit-div"<?php echo $style ?> title="<?php _e('Parent Category'); ?>"> 249 <div class="title"><?php _e('Parent Category'); ?></div> 250 <div class="in"> 251 <?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('None'))); ?> 252 </div> 253 </div> 254 <?php } 255 break; 256 } 257 } 258 ?> 259 <div class="clear"></div> 260 <div class="quick-edit-save"> 261 <a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel"><?php _e('Cancel'); ?></a> 262 <a accesskey="s" href="#inline-edit" title="<?php _e('Save'); ?>" class="button-secondary save"><?php _e('Save'); ?></a> 243 if ( isset( $core_columns[$column_name] ) ) 244 continue; 245 do_action( 'quick_edit_custom_box', $column_name, $type ); 246 } 247 248 ?> 249 250 <p class="inline-edit-save submit"> 251 <a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a> 252 <a accesskey="s" href="#inline-edit" title="<?php _e('Save'); ?>" class="save button-primary alignright"><?php _e('Save'); ?></a> 263 253 <img class="waiting" style="display:none;" src="images/loading.gif" alt="" /> 264 254 <span class="error" style="display:none;"></span> 265 255 <?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?> 266 </div> 256 <br class="clear" /> 257 </p> 267 258 </td></tr> 268 259 </tbody></table></form> … … 887 878 888 879 $columns = $is_page ? wp_manage_pages_columns() : wp_manage_posts_columns(); 889 $hidden = (array) get_user_option( "manage-$type-columns-hidden" ); 890 $hidden_count = empty($hidden[0]) ? 0 : count($hidden); 891 $col_count = count($columns) - $hidden_count; 880 $hidden = array_intersect( array_keys( $columns ), array_filter( (array) get_user_option( "manage-$type-columns-hidden" ) ) ); 881 $col_count = count($columns) - count($hidden); 892 882 $m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list'; 893 $can_publish = current_user_can('publish_posts'); ?> 883 $can_publish = current_user_can('publish_posts'); 884 $core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true ); 885 886 ?> 894 887 895 888 <form method="get" action=""><table style="display: none"><tbody id="inlineedit"> … … 898 891 while ( $bulk < 2 ) { ?> 899 892 900 <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" style="display: none"><td colspan="<?php echo $col_count; ?>"> 901 <?php 902 foreach($columns as $column_name=>$column_display_name) { 903 $class = "class=\"$column_name column-$column_name quick-edit-div\""; 904 905 $style = ''; 906 if ( in_array($column_name, $hidden) ) 907 $style = ' style="display:none;"'; 908 909 $attributes = "$class$style"; 910 911 switch($column_name) { 912 case 'cb': 913 break; 914 915 case 'date': 916 if ( ! $bulk ) { ?> 917 <div <?php echo $attributes; ?> title="<?php _e('Timestamp'); ?>"> 918 <div class="title"><?php _e('Timestamp'); ?></div> 919 <div class="in"> 920 <?php touch_time(1, 1, 4, 1); ?> 921 </div> 922 </div> 923 <?php 924 } 925 break; 926 927 case 'title': 928 $attributes = "class=\"$type-title column-title quick-edit-div\"" . $style; ?> 929 <?php if ( $bulk ) { ?> 930 <div <?php echo $attributes; ?> id="bulk-title-div" title="<?php $is_page ? _e('Selected pages') : _e('Selected posts'); ?>"> 931 <div class="title"><?php $is_page ? _e('Selected pages') : _e('Selected posts'); ?></div> 932 <div class="in"> 933 <div id="bulk-titles"></div> 934 </div> 935 </div> 936 <?php } else { ?> 937 <div <?php echo $attributes ?>> 938 <div class="title"><?php _e('Title'); ?></div> 939 <div class="in"> 940 <label title="<?php _e('Title'); ?>"><input type="text" name="post_title" class="ptitle" value="" /></label><br /> 941 <div class="slug"> 942 <label title="<?php _e('Slug'); ?>"><?php _e('Slug'); ?><input type="text" name="post_name" value="" /></label></div> 943 </div> 944 </div> 945 <?php } ?> 946 947 <div class="status quick-edit-div" title="<?php _e('Status'); ?>"> 948 <div class="title"><?php _e('Status'); ?></div> 949 <div class="in"> 950 <select name="_status"> 951 <?php if ( $bulk ) { ?> 952 <option value="-1"><?php _e('- No Change -'); ?></option> 953 <?php if ( $can_publish ) { ?> 954 <option value="private"><?php _e('Private') ?></option> 955 <?php } ?> 956 <?php } ?> 957 <?php if ( $can_publish ) { // Contributors only get "Unpublished" and "Pending Review" ?> 958 <option value="publish"><?php _e('Published') ?></option> 959 <option value="future"><?php _e('Scheduled') ?></option> 960 <?php } ?> 961 <option value="pending"><?php _e('Pending Review') ?></option> 962 <option value="draft"><?php _e('Unpublished') ?></option> 963 </select> 964 <?php if ( !$is_page ) { ?> 965 <label title="<?php _e('Sticky') ?>"> 966 <input type="checkbox" name="sticky" value="sticky" /> <?php _e('Sticky') ?></label> 967 <?php } ?> 968 </div> 969 </div> 970 971 <?php if ( $is_page ) { ?> 972 <div class="parent quick-edit-div" title="<?php _e('Page Parent'); ?>"> 973 <div class="title"><?php _e('Page Parent'); ?></div> 974 <div class="in"> 975 <select name="post_parent"> 976 <?php if ( $bulk ) { ?> 977 <option value="-1"><?php _e('- No Change -'); ?></option> 978 <?php } ?> 979 <option value="0"><?php _e('Main Page (no parent)'); ?></option> 980 <?php parent_dropdown(); ?> 981 </select> 982 </div> 983 </div> 984 985 <div class="template quick-edit-div" title="<?php _e('Page Template'); ?>"> 986 <div class="title"><?php _e('Page Template'); ?></div> 987 <div class="in"> 988 <select name="page_template"> 989 <?php if ( $bulk ) { ?> 990 <option value="-1"><?php _e('- No Change -'); ?></option> 991 <?php } ?> 992 <option value="default"><?php _e('Default Template'); ?></option> 993 <?php page_template_dropdown() ?> 994 </select> 995 </div> 996 </div> 997 998 <?php if ( ! $bulk ) { ?> 999 <div class="order quick-edit-div" title="<?php _e('Page Order'); ?>"> 1000 <div class="title"><?php _e('Page Order'); ?></div> 1001 <div class="in"> 1002 <input type="text" name="menu_order" value="<?php echo $post->menu_order ?>" /> 1003 </div> 1004 </div> 1005 <?php } 1006 } 1007 1008 break; 1009 1010 case 'categories': ?> 1011 <?php if ( ! $bulk ) { ?> 1012 <div <?php echo $attributes ?> title="<?php _e('Categories'); ?>"> 1013 <div class="title"><?php _e('Categories'); ?> 1014 <span class="catshow"><?php _e('(expand)'); ?></span> 1015 <span class="cathide" style="display:none;"><?php _e('(fold)'); ?></span></div> 1016 <ul class="cat-checklist"> 1017 <?php wp_category_checklist(); ?> 1018 </ul> 1019 </div> 1020 <?php } 1021 break; 1022 1023 case 'tags': ?> 1024 <?php if ( ! $bulk ) { ?> 1025 <div <?php echo $attributes ?> title="<?php _e('Tags'); ?>"> 1026 <div class="title"><?php _e('Tags'); ?></div> 1027 <div class="in"> 1028 <textarea cols="22" rows="1" name="tags_input" class="tags_input"></textarea> 1029 </div> 1030 </div> 1031 <?php } 1032 break; 1033 1034 case 'comments': 1035 ?> 1036 <div <?php echo $attributes ?> title="<?php _e('Comments and Pings'); ?>"> 1037 <div class="title"><?php _e('Comments and Pings'); ?></div> 1038 <div class="in"> 1039 <?php if ( $bulk ) { ?> 1040 <select name="comment_status"> 1041 <option value=""><?php _e('- No Change -'); ?></option> 1042 <option value="open"><?php _e('Allow Comments'); ?></option> 1043 <option value="closed"><?php _e('Disallow Comments'); ?></option> 1044 </select> 1045 <select name="ping_status"> 1046 <option value=""><?php _e('- No Change -'); ?></option> 1047 <option value="open"><?php _e('Allow Pings'); ?></option> 1048 <option value="closed"><?php _e('Disallow Pings'); ?></option> 1049 </select> 1050 <?php } else { ?> 1051 <label><input type="checkbox" name="comment_status" value="open" /> 1052 <?php _e('Allow Comments'); ?></label><br /> 1053 <label><input type="checkbox" name="ping_status" value="open" /> 1054 <?php _e('Allow Pings'); ?></label> 1055 <?php } ?> 1056 </div> 1057 </div> 1058 <?php 1059 break; 1060 1061 case 'author': 1062 $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM 1063 if ( $authors && count( $authors ) > 1 ) { ?> 1064 <div <?php echo $attributes ?> title="<?php _e('Author'); ?>"> 1065 <div class="title"><?php _e('Author'); ?></div> 1066 <div class="in"> 1067 <?php 1068 $users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1); 1069 if ( $bulk ) $users_opt['show_option_none'] = __('- No Change -'); 1070 wp_dropdown_users( $users_opt ); ?> 1071 </div> 1072 </div> 1073 <?php } ?> 1074 1075 <?php if ( ! $bulk ) { ?> 1076 <div class="password quick-edit-div" title="<?php _e('Password'); ?>"> 1077 <div class="title"><?php _e('Password'); ?></div> 1078 <div class="in"> 1079 <input type="text" name="post_password" value="" /> 1080 <label title="<?php _e('Privacy'); ?>"> 1081 <input type="checkbox" name="keep_private" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php echo $is_page ? __('Keep this page private') : __('Keep this post private'); ?></label> 1082 </div> 1083 </div> 1084 <?php } 1085 break; 1086 1087 default: 1088 if ( $bulk ) 1089 do_action('bulk_edit_custom_box', $column_name, $type); 1090 else 1091 do_action('quick_edit_custom_box', $column_name, $type); 1092 1093 break; 1094 } 1095 } ?> 1096 1097 <div class="clear"></div> 1098 <div class="quick-edit-save"> 1099 <a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel"><?php _e('Cancel'); ?></a> 1100 <a accesskey="s" href="#inline-edit" title="<?php _e('Save'); ?>" class="button-secondary save"><?php _e('Save'); ?></a> 893 <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$type "; 894 echo $bulk ? "bulk-edit-row bulk-edit-row-$type" : "quick-edit-row quick-edit-row-$type"; 895 ?>" style="display: none"><td colspan="<?php echo $col_count; ?>"> 896 897 <fieldset class="inline-edit-col-left"><div class="inline-edit-col"> 898 <h4><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></h4> 899 900 901 <?php if ( $bulk ) : ?> 902 <div id="bulk-title-div"> 903 <div id="bulk-titles"></div> 904 </div> 905 906 <?php else : // $bulk ?> 907 908 <label> 909 <span class="title"><?php _e( 'Title' ); ?></span> 910 <span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span> 911 </label> 912 913 <?php endif; // $bulk ?> 914 915 916 <?php if ( !$bulk ) : ?> 917 918 <label> 919 <span class="title"><?php _e( 'Slug' ); ?></span> 920 <span class="input-text-wrap"><input type="text" name="post_name" value="" /></span> 921 </label> 922 923 <label><span class="title"><?php _e( 'Date' ); ?></span></label> 924 <div class="inline-edit-date"> 925 <?php touch_time(1, 1, 4, 1); ?> 926 </div> 927 <br class="clear" /> 928 929 <?php endif; // $bulk 930 931 ob_start(); 932 $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM 933 if ( $authors && count( $authors ) > 1 ) : 934 $users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1); 935 if ( $bulk ) 936 $users_opt['show_option_none'] = __('- No Change -'); 937 ?> 938 <label> 939 <span class="title"><?php _e( 'Author' ); ?></span> 940 <?php wp_dropdown_users( $users_opt ); ?> 941 </label> 942 943 <?php 944 endif; // authors 945 $authors_dropdown = ob_get_clean(); 946 ?> 947 948 <?php if ( !$bulk ) : echo $authors_dropdown; ?> 949 950 <div class="inline-edit-group"> 951 <label class="alignleft"> 952 <span class="title"><?php _e( 'Password' ); ?></span> 953 <span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span> 954 </label> 955 956 <label class="alignleft inline-edit-private"> 957 <input type="checkbox" name="keep_private" value="private" <?php checked($post->post_status, 'private'); ?> /> 958 <span class="checkbox-title"><?php echo $is_page ? __('Private page') : __('Private post'); ?></span> 959 </label> 960 </div> 961 962 <?php endif; ?> 963 964 </div></fieldset> 965 966 <?php if ( !$is_page && !$bulk ) : ?> 967 968 <fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col"> 969 <span class="title inline-edit-categories-label"><?php _e( 'Categories' ); ?> 970 <span class="catshow"><?php _e('[more]'); ?></span> 971 <span class="cathide" style="display:none;"><?php _e('[less]'); ?></span> 972 </span> 973 <ul class="cat-checklist"> 974 <?php wp_category_checklist(); ?> 975 </ul> 976 </div></fieldset> 977 978 <?php endif; // !$is_page && !$bulk ?> 979 980 <fieldset class="inline-edit-col-right"><div class="inline-edit-col"> 981 982 <?php 983 if ( $bulk ) 984 echo $authors_dropdown; 985 ?> 986 987 <?php if ( $is_page ) : ?> 988 989 <label> 990 <span class="title"><?php _e( 'Parent' ); ?></span> 991 <select name="post_parent"> 992 <?php if ( $bulk ) : ?> 993 <option value="-1"><?php _e('- No Change -'); ?></option> 994 <?php endif; // $bulk ?> 995 <option value="0"><?php _e( 'Main Page (no parent)' ); ?></option> 996 <?php parent_dropdown(); ?> 997 </select> 998 </label> 999 1000 <?php if ( !$bulk ) : ?> 1001 1002 <label> 1003 <span class="title"><?php _e( 'Order' ); ?></span> 1004 <span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order ?>" /></span> 1005 </label> 1006 1007 <?php endif; // !$bulk ?> 1008 1009 <label> 1010 <span class="title"><?php _e( 'Template' ); ?></span> 1011 <select name="page_template"> 1012 <?php if ( $bulk ) : ?> 1013 <option value="-1"><?php _e('- No Change -'); ?></option> 1014 <?php endif; // $bulk ?> 1015 <option value="default"><?php _e( 'Default Template' ); ?></option> 1016 <?php page_template_dropdown() ?> 1017 </select> 1018 </label> 1019 1020 <?php elseif ( !$bulk ) : // $is_page ?> 1021 1022 <label class="inline-edit-tags"> 1023 <span class="title"><?php _e( 'Tags' ); ?></span> 1024 <textarea cols="22" rows="1" name="tags_input" class="tags_input"></textarea> 1025 </label> 1026 1027 <?php endif; // $is_page ?> 1028 1029 <?php if ( $bulk ) : ?> 1030 1031 <div class="inline-edit-group"> 1032 <label class="alignleft"> 1033 <span class="title"><?php _e( 'Comments' ); ?></span> 1034 <select name="comment_status"> 1035 <option value=""><?php _e('- No Change -'); ?></option> 1036 <option value="open"><?php _e('Allow'); ?></option> 1037 <option value="closed"><?php _e('Do not allow'); ?></option> 1038 </select> 1039 </label> 1040 1041 <label class="alignright"> 1042 <span class="title"><?php _e( 'Pings' ); ?></span> 1043 <select name="ping_status"> 1044 <option value=""><?php _e('- No Change -'); ?></option> 1045 <option value="open"><?php _e('Allow'); ?></option> 1046 <option value="closed"><?php _e('Do not allow'); ?></option> 1047 </select> 1048 </label> 1049 </div> 1050 1051 <?php else : // $bulk ?> 1052 1053 <div class="inline-edit-group"> 1054 <label class="alignleft"> 1055 <input type="checkbox" name="comment_status" value="open" /> 1056 <span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span> 1057 </label> 1058 1059 <label class="alignleft"> 1060 <input type="checkbox" name="ping_status" value="open" /> 1061 <span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span> 1062 </label> 1063 </div> 1064 1065 <?php endif; // $bulk ?> 1066 1067 1068 <div class="inline-edit-group"> 1069 <label class="inline-edit-status alignleft"> 1070 <span class="title"><?php _e( 'Status' ); ?></span> 1071 <select name="_status"> 1072 <?php if ( $bulk ) : ?> 1073 <option value="-1"><?php _e('- No Change -'); ?></option> 1074 <?php endif; // $bulk ?> 1075 <?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?> 1076 <option value="publish"><?php _e( 'Published' ); ?></option> 1077 <option value="future"><?php _e( 'Scheduled' ); ?></option> 1078 <?php if ( $bulk ) : ?> 1079 <option value="private"><?php _e('Private') ?></option> 1080 <?php endif; // $bulk ?> 1081 <?php endif; ?> 1082 <option value="pending"><?php _e( 'Pending Review' ); ?></option> 1083 <option value="draft"><?php _e( 'Unpublished' ); ?></option> 1084 </select> 1085 </label> 1086 1087 <?php if ( !$is_page && $can_publish && current_user_can( 'edit_others_posts' ) ) : ?> 1088 1089 <?php if ( $bulk ) : ?> 1090 1091 <label class="alignright"> 1092 <span class="title"><?php _e( 'Sticky' ); ?></span> 1093 <select name="sticky"> 1094 <option value="-1"><?php _e( '- No Change -' ); ?></option> 1095 <option value="sticky"><?php _e( 'Sticky' ); ?></option> 1096 <option value="unsticky"><?php _e( 'Not Sticky' ); ?></option> 1097 </select> 1098 </label> 1099 1100 <?php else : // $bulk ?> 1101 1102 <label class="alignleft"> 1103 <input type="checkbox" name="sticky" value="sticky" /> 1104 <span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span> 1105 </label> 1106 1107 <?php endif; // $bulk ?> 1108 1109 <?php endif; // !$is_page && $can_publish && current_user_can( 'edit_others_posts' ) ?> 1110 1111 </div> 1112 1113 </div></fieldset> 1114 1115 <?php 1116 foreach ( $columns as $column_name => $column_display_name ) { 1117 if ( isset( $core_columns[$column_name] ) ) 1118 continue; 1119 do_action( $bulk ? 'bulk_edit_custom_box' : 'quick_edit_custom_box', $column_name, $type); 1120 } 1121 ?> 1122 <p class="submit inline-edit-save"> 1123 <a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel alignleft"><?php _e('Cancel'); ?></a> 1124 <a accesskey="s" href="#inline-edit" title="<?php _e('Save'); ?>" class="button-primary save alignright"><?php _e('Save'); ?></a> 1101 1125 <?php if ( ! $bulk ) { 1102 1126 wp_nonce_field( 'inlineeditnonce', '_inline_edit', false ); ?> … … 1104 1128 <?php } ?> 1105 1129 <input type="hidden" name="post_view" value="<?php echo $m; ?>" /> 1106 </div> 1130 <br class="clear" /> 1131 </p> 1107 1132 </td></tr> 1108 1133 <?php … … 2031 2056 <div id="replycontainer"><textarea rows="8" cols="40" name="replycontent" tabindex="104" id="replycontent"></textarea></div> 2032 2057 2033 <p id="replysubmit" >2034 <a href="#comments-form" class="cancel button " tabindex="106"><?php _e('Cancel'); ?></a>2035 <a href="#comments-form" class="save button " tabindex="104">2058 <p id="replysubmit" class="submit"> 2059 <a href="#comments-form" class="cancel button-secondary alignleft" tabindex="106"><?php _e('Cancel'); ?></a> 2060 <a href="#comments-form" class="save button-primary alignright" tabindex="104"> 2036 2061 <span id="savebtn" style="display:none;"><?php _e('Save'); ?></span> 2037 2062 <span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a> 2038 2063 <img class="waiting" style="display:none;" src="images/loading.gif" alt="" /> 2039 2064 <span class="error" style="display:none;"></span> 2065 <br class="clear" /> 2040 2066 </p> 2041 2067 -
trunk/wp-admin/js/inline-edit-post.js
r9585 r9604 30 30 t.addEvents(t.rows); 31 31 32 $('#bulk-title-div').after( 33 $('#inline-edit div.categories').clone(), 34 $('#inline-edit div.tags').clone() 32 $('#bulk-title-div').parents('fieldset').after( 33 $('#inline-edit fieldset.inline-edit-categories').clone() 34 ).siblings( 'fieldset:last' ).prepend( 35 // ).siblings( 'fieldset:last' ).after( '<fieldset class="inline-edit-col-bottom"><div class="inline-edit-col"></div></fieldset>' ); 36 // $('fieldset.inline-edit-col-bottom').prepend( 37 $('#inline-edit label.inline-edit-tags').clone() 35 38 ); 36 39 … … 98 101 if ( $(this).attr('checked') ) { 99 102 var id = $(this).val(); 100 c = c == '' ? ' class="alternate"' : ''; 101 te += '<div'+c+' id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton">X</a>'+$('#inline_'+id+' .post_title').text()+'</div>'; 103 te += '<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton">X</a>'+$('#inline_'+id+' .post_title').text()+'</div>'; 102 104 } 103 105 }); … … 189 191 id = this.getId(id); 190 192 191 $('table.widefat . quick-edit-save .waiting').show();193 $('table.widefat .inline-edit-save .waiting').show(); 192 194 193 195 var params = { … … 219 221 inlineEditPost.addEvents(row); 220 222 } else { 221 $('#edit-'+id+' . quick-edit-save').append('<span class="error">'+inlineEditL10n.error+'</span>');223 $('#edit-'+id+' .inline-edit-save').append('<span class="error">'+inlineEditL10n.error+'</span>'); 222 224 } 223 225 } … … 234 236 235 237 if ( id = $('table.widefat tr.inline-editor').attr('id') ) { 236 $('table.widefat . quick-edit-save .waiting').hide();238 $('table.widefat .inline-edit-save .waiting').hide(); 237 239 238 240 if ( 'bulk-edit' == id ) { -
trunk/wp-admin/js/inline-edit-tax.js
r9588 r9604 93 93 id = this.getId(id); 94 94 95 $('table.widefat . quick-edit-save .waiting').show();95 $('table.widefat .inline-edit-save .waiting').show(); 96 96 97 97 var params = { … … 118 118 inlineEditTax.addEvents(row); 119 119 } else 120 $('#edit-'+id+' . quick-edit-save .error').html(r).show();120 $('#edit-'+id+' .inline-edit-save .error').html(r).show(); 121 121 } else 122 $('#edit-'+id+' . quick-edit-save .error').html(inlineEditL10n.error).show();122 $('#edit-'+id+' .inline-edit-save .error').html(inlineEditL10n.error).show(); 123 123 } 124 124 ); … … 130 130 131 131 if ( id ) { 132 $('table.widefat . quick-edit-save .waiting').hide();132 $('table.widefat .inline-edit-save .waiting').hide(); 133 133 $('#'+id).remove(); 134 134 id = id.substr( id.lastIndexOf('-') + 1 ); -
trunk/wp-admin/wp-admin.css
r9587 r9604 203 203 border-bottom-left-radius: 3px; 204 204 border-bottom-right-radius: 3px; 205 } 206 207 form p.submit .cancel { 208 padding-left: 0; 209 padding-right: 0; 210 border: none; 211 background: transparent; 212 text-decoration: underline; 213 color: red; 214 } 215 216 form p.submit .cancel:hover { 217 text-decoration: none; 205 218 } 206 219 … … 2384 2397 2385 2398 #replysubmit img.waiting, 2386 . quick-edit-save img.waiting,2399 .inline-edit-save img.waiting, 2387 2400 #commentstatusdiv img.waiting { 2388 2401 padding: 0 10px; … … 2557 2570 } 2558 2571 2559 /* Inline Editor */ 2560 .inline-editor { 2561 font-size: 11px; 2562 } 2563 2564 .inline-editor td { 2565 padding: 3px; 2566 } 2567 2568 .inline-editor .save, 2569 .inline-editor .cancel { 2570 margin-right: 5px; 2571 } 2572 2573 .inline-editor .quick-edit-div { 2574 float: left; 2575 height: 85px; 2576 margin: 0 5px 3px 0; 2577 width: 130px; 2572 /* Inline Editor 2573 .quick-edit* is for Quick Edit 2574 .bulk-edit* is for Bulk Edit 2575 .inline-edit* is for everything 2576 */ 2577 /* Layout */ 2578 tr.inline-edit-row td { 2579 padding: 0 0.5em; 2580 } 2581 2582 #wpbody-content .inline-edit-row fieldset { 2583 font-size: 12px; 2584 float: left; 2585 margin: 0; 2586 padding: 0; 2587 width: 100%; 2588 } 2589 2590 #wpbody-content .inline-edit-row fieldset .inline-edit-col { 2591 padding: 0 0.5em; 2592 } 2593 2594 #wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col { 2595 border-left: 1px solid; 2596 } 2597 2598 #wpbody-content .quick-edit-row-post .inline-edit-col-left { 2599 width: 40%; 2600 } 2601 2602 #wpbody-content .quick-edit-row-post .inline-edit-col-right { 2603 width: 39%; 2604 } 2605 2606 #wpbody-content .inline-edit-row-post .inline-edit-col-center { 2607 width: 20%; 2608 } 2609 2610 #wpbody-content .quick-edit-row-page .inline-edit-col-left { 2611 width: 50%; 2612 } 2613 2614 #wpbody-content .quick-edit-row-page .inline-edit-col-right, 2615 #wpbody-content .bulk-edit-row-post .inline-edit-col-right { 2616 width: 49%; 2617 } 2618 2619 #wpbody-content .bulk-edit-row .inline-edit-col-left { 2620 width: 30%; 2621 } 2622 2623 #wpbody-content .bulk-edit-row-page .inline-edit-col-right { 2624 width: 69%; 2625 } 2626 2627 #wpbody-content .bulk-edit-row .inline-edit-col-bottom { 2628 float: right; 2629 width: 69%; 2630 } 2631 2632 #wpbody-content .inline-edit-row-page .inline-edit-col-right, 2633 #owpbody-content .bulk-edit-row-post .inline-edit-col-right { 2634 margin-top: 27px; 2635 } 2636 2637 .inline-edit-row fieldset .inline-edit-group { 2638 clear: both; 2639 } 2640 2641 .inline-edit-row fieldset .inline-edit-group:after { 2642 content: "."; 2643 display: block; 2644 height: 0; 2645 clear: both; 2646 visibility: hidden; 2647 } 2648 2649 .inline-edit-row p.submit { 2650 clear: both; 2651 padding: 0.5em; 2652 margin: 0.5em 0 0; 2653 } 2654 2655 /* Positioning */ 2656 .inline-edit-row h4 { 2657 margin: .2em 0; 2658 padding: 0; 2659 line-height: 27px; 2660 } 2661 .inline-edit-row fieldset span.title, 2662 .inline-edit-row fieldset span.checkbox-title { 2663 margin: 0; 2664 padding: 0; 2665 line-height: 27px; 2666 } 2667 2668 .inline-edit-row fieldset label, 2669 .inline-edit-row fieldset span.inline-edit-categories-label { 2670 display: block; 2671 margin: .2em 0; 2672 } 2673 2674 .inline-edit-row fieldset label.inline-edit-tags { 2675 margin-top: 0; 2676 } 2677 2678 .inline-edit-row fieldset label.inline-edit-tags span.title { 2679 margin: .2em 0; 2680 } 2681 2682 .inline-edit-row fieldset label span.title { 2683 display: block; 2684 float: left; 2685 width: 5em; 2686 } 2687 2688 .inline-edit-row fieldset label span.input-text-wrap { 2689 display: block; 2690 margin-left: 5em; 2691 } 2692 2693 .quick-edit-row-post fieldset.inline-edit-col-right label span.title { 2694 width: auto; 2695 padding-right: 0.5em; 2696 } 2697 2698 .inline-edit-row fieldset label input[type=text] { 2699 width: 100%; 2700 } 2701 2702 .inline-edit-row fieldset label input[type=checkbox] { 2703 vertical-align: text-bottom; 2704 } 2705 2706 .inline-edit-row fieldset label textarea { 2707 width: 100%; 2708 height: 4em; 2709 } 2710 2711 #wpbody-content .bulk-edit-row fieldset .inline-edit-group label { 2712 max-width: 50%; 2713 } 2714 2715 #wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child { 2716 margin-right: 0.5em 2717 } 2718 2719 /* Styling */ 2720 .inline-edit-row h4 { 2721 text-transform: uppercase; 2722 } 2723 2724 .inline-edit-row fieldset span.title, 2725 .inline-edit-row fieldset span.checkbox-title { 2726 font-family: Georgia, serif; 2727 font-style: italic; 2728 } 2729 2730 /* Specific Elements */ 2731 .inline-edit-row fieldset input[type="text"], 2732 .inline-edit-row fieldset textarea { 2578 2733 border-style: solid; 2579 2734 border-width: 1px; 2580 padding: 2px; 2581 } 2582 2583 .inline-editor .in { 2584 padding: 4px; 2585 margin: 2px 0 0; 2586 line-height: 15px; 2587 } 2588 2589 .inline-editor input { 2590 font-size: 11px !important; 2591 padding: 2px; 2735 } 2736 2737 .inline-edit-row fieldset .inline-edit-date { 2738 float: left; 2739 } 2740 2741 .inline-edit-row fieldset input[name=jj], 2742 .inline-edit-row fieldset input[name=hh], 2743 .inline-edit-row fieldset input[name=mn] { 2744 font-size: 12px; 2745 width: 2.1em; 2746 } 2747 2748 .inline-edit-row fieldset input[name=aa] { 2749 font-size: 12px; 2750 width: 3.5em; 2751 } 2752 2753 .inline-edit-row fieldset label input.inline-edit-password-input { 2754 width: 8em; 2755 } 2756 2757 ul.cat-checklist { 2758 height: 12em; 2759 border-style: solid; 2592 2760 border-width: 1px; 2761 overflow-y: scroll; 2762 padding: 0 5px; 2763 margin: 0 0 5px; 2764 } 2765 2766 #bulk-titles { 2767 display: block; 2768 height: 12em; 2593 2769 border-style: solid; 2594 } 2595 2596 #wpbody-content .inline-editor select { 2597 padding: 0; 2770 border-width: 1px; 2771 overflow-y: scroll; 2772 padding: 0 5px; 2773 margin: 0 0 5px; 2774 } 2775 2776 .inline-edit-row fieldset ul.cat-checklist li, 2777 .inline-edit-row fieldset ul.cat-checklist input { 2778 margin: 0; 2779 } 2780 2781 .inline-edit-row fieldset ul.cat-checklist label, 2782 .inline-edit-row .catshow, 2783 .inline-edit-row .cathide, 2784 .inline-edit-row #bulk-titles div { 2785 font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; 2786 font-style: normal; 2787 font-size: 11px; 2788 } 2789 2790 table .inline-edit-row fieldset ul.cat-hover { 2598 2791 height: auto; 2599 width: 120px; 2600 font-size: 11px !important; 2601 } 2602 2603 .inline-editor div.title { 2604 height: 18px; 2605 line-height: 16px; 2606 padding: 1px 5px; 2607 cursor: default; 2608 } 2609 2610 .inline-editor .post-title, 2611 .inline-editor .page-title, 2612 .inline-editor .tax-name, 2613 .inline-editor .tax-slug { 2614 width: 260px; 2615 } 2616 2617 #bulk-edit .post-title, 2618 #bulk-edit .page-title { 2619 width: 200px; 2620 height: 179px; 2621 } 2622 2623 .inline-editor .post-title .ptitle, 2624 .inline-editor .page-title .ptitle, 2625 .inline-editor .tax-name .ptitle, 2626 .inline-editor .tax-slug .ptitle { 2627 width: 245px; 2628 margin-bottom: 5px; 2629 font-size: 12px !important; 2630 } 2631 2632 .inline-editor .post-title .slug, 2633 .inline-editor .page-title .slug { 2634 text-align: right; 2635 } 2636 2637 .inline-editor .slug input { 2638 width: 170px; 2639 margin: 0 2px 0 4px; 2640 } 2641 2642 .inline-editor .password input, 2643 .inline-editor .order input { 2644 width: 112px; 2645 } 2646 2647 .inline-editor .password label input { 2648 width: auto; 2649 margin: 3px 0 0; 2650 } 2651 2652 .inline-editor .date, 2653 .inline-editor .modified { 2654 width: 160px; 2655 } 2656 2657 .inline-editor .date input, 2658 .inline-editor .modified input { 2659 padding: 2px 1px; 2660 margin: 1px; 2661 width: 2em; 2662 } 2663 2664 .inline-editor .date input[name="aa"], 2665 .inline-editor .modified input[name="aa"] { 2666 width: 3.5em; 2667 } 2668 2669 #wpbody-content .inline-editor .date select, 2670 #wpbody-content .inline-editor .modified select { 2671 width: 6em; 2672 } 2673 2674 .inline-editor .categories, 2675 .inline-editor .column-posts { 2676 width: 200px; 2677 } 2678 2679 .inline-editor .categories ul.cat-checklist { 2680 list-style: none; 2681 padding: 0 0 0 4px; 2682 margin: 0; 2683 height: 65px; 2684 overflow: auto; 2685 font-size: 11px; 2686 z-index: 5; 2687 position: relative; 2688 overflow-x: hidden; 2689 } 2690 2691 .inline-editor .categories ul.cat-hover { 2692 height: 200px; 2693 overflow-x: auto; 2694 } 2695 2696 .inline-editor .categories ul.children { 2697 list-style: none; 2698 padding-left: 15px; 2699 } 2700 2701 .inline-editor .categories li { 2702 margin-bottom: 3px; 2703 line-height: auto; 2704 } 2705 2706 .inline-editor .categories input { 2707 vertical-align: middle; 2708 padding: 0; 2709 border: 0; 2710 } 2711 2712 .inline-editor .categories .catshow, 2713 .inline-editor .categories .cathide { 2714 font-size: 9px; 2715 cursor: pointer; 2716 } 2717 2718 .inline-editor .tags { 2719 width: 200px; 2720 } 2721 2722 .inline-editor textarea { 2723 border-width: 1px; 2724 border-style: solid; 2725 height: 45px; 2726 width: 180px; 2727 font-size: 11px; 2728 } 2729 2730 .inline-editor .comments { 2731 text-align: left; 2732 width: 160px; 2733 } 2734 2735 #wpbody-content .inline-editor .comments select { 2736 margin-bottom: 3px; 2737 width: 150px; 2738 } 2739 2740 .inline-editor .parent, 2741 .inline-editor .tax-parent { 2742 width: 180px; 2743 } 2744 2745 #wpbody-content .inline-editor .parent select, 2746 #wpbody-content .inline-editor .tax-parent select { 2747 width: 170px; 2748 } 2749 2750 .inline-editor .quick-edit-save { 2751 padding: 8px 10px; 2792 max-height: 30em; 2793 overflow-y: auto; 2794 position: absolute; 2795 } 2796 2797 .inline-edit-row fieldset label input.inline-edit-menu-order-input { 2798 width: 3em; 2799 } 2800 2801 .inline-edit-row fieldset label input.inline-edit-slug-input { 2802 width: 75%; 2803 } 2804 2805 .quick-edit-row-post fieldset label.inline-edit-status { 2806 float: left; 2752 2807 } 2753 2808 2754 2809 #bulk-titles { 2755 height: 150px; 2756 overflow: auto; 2757 cursor: default; 2758 } 2759 2810 line-height: 140%; 2811 } 2760 2812 #bulk-titles div { 2761 padding: 1px 2px;2813 margin: 0.2em 0.3em; 2762 2814 } 2763 2815 … … 3059 3111 } 3060 3112 3113 -
trunk/wp-includes/script-loader.php
r9596 r9604 264 264 $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' ); 265 265 266 $scripts->add( 'inline-edit-post', '/wp-admin/js/inline-edit-post.js', array( 'jquery', 'jquery-form', 'suggest' ), '200811 07' );266 $scripts->add( 'inline-edit-post', '/wp-admin/js/inline-edit-post.js', array( 'jquery', 'jquery-form', 'suggest' ), '20081110' ); 267 267 $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array( 268 268 'error' => __('Error while saving the changes.') 269 269 ) ); 270 270 271 $scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '200811 07' );271 $scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081110' ); 272 272 $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array( 273 273 'error' => __('Error while saving the changes.') … … 329 329 $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie', 'plugin-install', 'farbtastic' ); 330 330 331 $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '200811 09' );331 $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081110' ); 332 332 $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); 333 333 … … 342 342 $styles->add( 'media', '/wp-admin/css/media.css', array(), '20080709' ); 343 343 $styles->add( 'widgets', '/wp-admin/css/widgets.css' ); 344 $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '200811 05' );344 $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081110' ); 345 345 $styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' ); 346 346 $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
Note: See TracChangeset
for help on using the changeset viewer.