Changeset 9427
- Timestamp:
- 10/31/08 04:23:17 (2 months ago)
- Files:
-
- trunk/wp-admin/css/dashboard.css (modified) (1 diff)
- trunk/wp-admin/includes/dashboard.php (modified) (8 diffs)
- trunk/wp-admin/includes/update.php (modified) (1 diff)
- trunk/wp-includes/script-loader.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/wp-admin/css/dashboard.css
r9380 r9427 92 92 } 93 93 94 /* Right Now */ 95 96 #dashboard_right_now p.sub, #dashboard_right_now .table, #dashboard_right_now .versions { 97 margin: -10px; 98 } 99 100 #dashboard_right_now .inside { 101 font-family: Georgia, serif; 102 font-size: 14px; 103 } 104 105 #dashboard_right_now p.sub { 106 font-style: italic; 107 padding: 5px 10px 15px; 108 color: #777; 109 } 110 111 #dashboard_right_now .table { 112 background: #f9f9f9; 113 border-top: #ececec 1px solid; 114 border-bottom: #ececec 1px solid; 115 margin: 0 -9px 10px; 116 padding: 0 10px; 117 } 118 119 #dashboard_right_now table { 120 width: 100%; 121 } 122 123 #dashboard_right_now table td { 124 border-top: #ececec 1px solid; 125 padding: 3px 0; 126 white-space: nowrap; 127 } 128 129 #dashboard_right_now table tr.first td { 130 border-top: none; 131 } 132 133 #dashboard_right_now a { 134 text-decoration: none; 135 } 136 137 #dashboard_right_now .b, #dashboard_right_now .b a { 138 color: #2583ad; 139 } 140 141 #dashboard_right_now td.b { 142 padding-right: 6px; 143 text-align: right; 144 font-family: Georgia, "Times New Roman", Times, serif; 145 font-size: 14px; 146 } 147 148 #dashboard_right_now td.b a { 149 font-size: 18px; 150 } 151 152 #dashboard_right_now .t { 153 font-size: 12px; 154 padding-right: 12px; 155 color: #777; 156 } 157 158 #dashboard_right_now td.first, 159 #dashboard_right_now td.last { 160 width: 1px; 161 } 162 163 #dashboard_right_now .spam { 164 color: red; 165 } 166 167 #dashboard_right_now .waiting { 168 color: orange; 169 } 170 171 #dashboard_right_now .approved { 172 color: green; 173 } 174 175 #dashboard_right_now .versions { 176 line-height: 2.5em; 177 padding: 10px; 178 } 179 180 #dashboard_right_now .versions { 181 font-style: italic; 182 font-size: 12px; 183 } 184 185 #dashboard_right_now .versions a, #dashboard_right_now .versions .b { 186 font-style: normal; 187 font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;; 188 font-weight: bold; 189 } 190 191 #dashboard_right_now a.button { 192 font-weight: normal; 193 float: right; 194 clear: right; 195 position: relative; 196 top: -5px; 197 198 } 199 94 200 /* Recent Comments */ 95 201 trunk/wp-admin/includes/dashboard.php
r9399 r9427 164 164 $num_comm = get_comment_count( ); 165 165 166 echo '<p>' . __('At a Glance') . '</p>';167 echo '<table>';168 echo '<tr>';166 echo "\n\t".'<p class="sub">' . __('At a Glance') . '</p>'; 167 echo "\n\t".'<div class="table">'."\n\t".'<table>'; 168 echo "\n\t".'<tr class="first">'; 169 169 170 170 // Posts … … 172 172 if ( current_user_can( 'edit_posts' ) ) 173 173 $num = "<a href='edit.php'>$num</a>"; 174 echo "<td>$num</td>";175 echo '<td >' . __ngettext( 'Post', 'Posts', $num_posts->publish ) . '</td>';174 echo '<td class="first b b-posts">'.$num.'</td>'; 175 echo '<td class="t posts">' . __ngettext( 'Post', 'Posts', $num_posts->publish ) . '</td>'; 176 176 /* TODO: Show status breakdown on hover 177 177 if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can … … 195 195 if ( current_user_can( 'moderate_comments' ) ) 196 196 $num = "<a href='edit-comments.php'>$num</a>"; 197 echo "<td>$num</td>";198 echo '<td >' . __ngettext( 'Comment', 'Comments', $num_comm['total_comments'] ) . '</td>';197 echo '<td class="b b-comments">'.$num.'</td>'; 198 echo '<td class="last t comments">' . __ngettext( 'Comment', 'Comments', $num_comm['total_comments'] ) . '</td>'; 199 199 200 200 echo '</tr><tr>'; … … 204 204 if ( current_user_can( 'edit_pages' ) ) 205 205 $num = "<a href='edit-pages.php'>$num</a>"; 206 echo "<td>$num</td>";207 echo '<td >' . __ngettext( 'Page', 'Pages', $num_pages->publish ) . '</td>';206 echo '<td class="first b b_pages">'.$num.'</td>'; 207 echo '<td class="t pages">' . __ngettext( 'Page', 'Pages', $num_pages->publish ) . '</td>'; 208 208 209 209 // Approved Comments … … 211 211 if ( current_user_can( 'moderate_comments' ) ) 212 212 $num = "<a href='edit-comments.php?comment_status=approved'>$num</a>"; 213 echo "<td>$num</td>";214 echo '<td >' . __ngettext( 'Approved', 'Approved', $num_comm['approved'] ) . '</td>';215 216 echo '</tr><tr>';213 echo '<td class="b b_approved">'.$num.'</td>'; 214 echo '<td class="last t approved">' . __ngettext( 'Approved', 'Approved', $num_comm['approved'] ) . '</td>'; 215 216 echo "</tr>\n\t<tr>"; 217 217 218 218 // Categories 219 219 $num = number_format_i18n( $num_cats ); 220 220 if ( current_user_can( 'manage_categories' ) ) 221 $num = "<a href='ca tegories.php'>$num</a>";222 echo "<td>$num</td>";223 echo '<td >' . __ngettext( 'Category', 'Categories', $num_cats ) . '</td>';221 $num = "<a href='caftegories.php'>$num</a>"; 222 echo '<td class="first b b-cats">'.$num.'</td>'; 223 echo '<td class="t cats">' . __ngettext( 'Category', 'Categories', $num_cats ) . '</td>'; 224 224 225 225 // Spam Comments … … 227 227 if ( current_user_can( 'moderate_comments' ) ) 228 228 $num = "<a href='edit-comments.php?comment_status=spam'>$num</a>"; 229 echo "<td>$num</td>";230 echo '<td >' . __ngettext( 'Spam', 'Spam', $num_comm['spam'] ) . '</td>';231 232 echo '</tr><tr>';229 echo '<td class="b b-spam">'.$num.'</td>'; 230 echo '<td class="last t spam">' . __ngettext( 'Spam', 'Spam', $num_comm['spam'] ) . '</td>'; 231 232 echo "</tr>\n\t<tr>"; 233 233 234 234 // Tags … … 236 236 if ( current_user_can( 'manage_categories' ) ) 237 237 $num = "<a href='edit-tags.php'>$num</a>"; 238 echo "<td>$num</td>";239 echo '<td >' . __ngettext( 'Tag', 'Tags', $num_tags ) . '</td>';238 echo '<td class="first b b-tags">'.$num.'</td>'; 239 echo '<td class="t tags">' . __ngettext( 'Tag', 'Tags', $num_tags ) . '</td>'; 240 240 241 241 // Pending Comments … … 243 243 if ( current_user_can( 'moderate_comments' ) ) 244 244 $num = "<a href='edit-comments.php?comment_status=moderated'>$num</a>"; 245 echo "<td>$num</td>"; 246 echo '<td>' . __ngettext( 'Pending', 'Pending', $num_comm['awaiting_moderation'] ) . '</td>'; 247 248 echo '</tr></table>'; 249 245 echo '<td class="b b-waiting">'.$num.'</td>'; 246 echo '<td class="last t waiting">' . __ngettext( 'Awaiting Moderation', 'Awaiting Moderation', $num_comm['awaiting_moderation'] ) . '</td>'; 247 248 echo "</tr>\n\t</table>\n\t</div>"; 249 250 echo "\n\t".'<div class="versions">'; 250 251 $ct = current_theme_info(); 251 252 $sidebars_widgets = wp_get_sidebars_widgets(); 252 253 $num_widgets = array_reduce( $sidebars_widgets, create_function( '$prev, $curr', 'return $prev+count($curr);' ), 0 ); 253 254 $num = number_format_i18n( $num_widgets ); 254 if ( $can_switch_themes = current_user_can( 'switch_themes' ) ) 255 $num = "<a href='widgets.php'>$num</a>"; 256 257 echo '<p>'; 258 printf(__ngettext('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $ct->title, $num); 259 if ( $can_switch_themes ) 260 echo ' <a href="themes.php" class="rbutton">' . __('Change Theme') . '</a>'; 255 256 echo "\n\t<p>"; 257 if ( current_user_can( 'switch_themes' ) ) { 258 echo '<a href="themes.php" class="button rbutton">' . __('Change Theme') . '</a>'; 259 printf(__ngettext('Theme <span class="b"><a href="themes.php">%1$s</a></span> with <span class="b"><a href="widgets.php">%2$s Widget</a></span>', 'Theme <span class="b"><a href="themes.php">%1$s</a></span> with <span class="b"><a href="widgets.php">%2$s Widgets</a></span>', $num_widgets), $ct->title, $num); 260 } else { 261 printf(__ngettext('Theme <span class="b">%1$s</span> with <span class="b">%2$s Widget</span>', 'Theme <span class="b">%1$s</span> with <span class="b">%2$s Widgets</span>', $num_widgets), $ct->title, $num); 262 } 263 261 264 echo '</p>'; 262 265 263 266 update_right_now_message(); 264 267 268 echo "\n\t".'</div>'; 265 269 do_action( 'rightnow_end' ); 266 270 do_action( 'activity_box_end' ); trunk/wp-admin/includes/update.php
r9348 r9427 58 58 $cur = get_option( 'update_core' ); 59 59 60 $msg = sprintf( __(' This is WordPress version %s.'), $GLOBALS['wp_version'] );60 $msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] ); 61 61 if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('manage_options') ) 62 $msg .= " <a href='update.php?action=upgrade-core' class=' rbutton'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';62 $msg .= " <a href='update.php?action=upgrade-core' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>'; 63 63 64 64 echo "<span id='wp-version-message'>$msg</span>"; trunk/wp-includes/script-loader.php
r9425 r9427 331 331 $styles->add( 'media', '/wp-admin/css/media.css', array(), '20080709' ); 332 332 $styles->add( 'widgets', '/wp-admin/css/widgets.css' ); 333 $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '200810 08' );333 $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081030' ); 334 334 $styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' ); 335 335 $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
