[wp-cvs] wordpress/wp-admin categories.php, 1.36,
1.37 edit-comments.php, 1.30, 1.31 edit.php, 1.25,
1.26 menu.php, 1.20, 1.21 moderation.php, 1.13, 1.14
Matthew Mullenweg
saxmatt at users.sourceforge.net
Wed Jul 28 07:19:02 UTC 2004
Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22115/wp-admin
Modified Files:
categories.php edit-comments.php edit.php menu.php
moderation.php
Log Message:
Menu re-org
Index: edit-comments.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-comments.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** edit-comments.php 21 Jul 2004 07:43:58 -0000 1.30
--- edit-comments.php 28 Jul 2004 07:18:59 -0000 1.31
***************
*** 10,15 ****
<ul id="adminmenu2">
<li><a href="edit.php"><?php _e('Posts') ?></a></li>
! <li><a href="edit-comments.php" class="current"><?php _e('Comments') ?></a></li>
! <li><a href="moderation.php"><?php _e('Awaiting Moderation') ?></a></li>
</ul>
<script type="text/javascript">
--- 10,16 ----
<ul id="adminmenu2">
<li><a href="edit.php"><?php _e('Posts') ?></a></li>
! <li><a href="categories.php"><?php _e('Categories') ?></a></li>
! <li><a href="edit-comments.php" class="current"><?php _e('Comments') ?></a></li>
! <li><a href="moderation.php"><?php _e('Awaiting Moderation') ?></a></li>
</ul>
<script type="text/javascript">
Index: categories.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/categories.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** categories.php 24 Jul 2004 03:55:31 -0000 1.36
--- categories.php 28 Jul 2004 07:18:59 -0000 1.37
***************
*** 92,96 ****
$cat_name = $category->cat_name;
?>
!
<div class="wrap">
<h2><?php _e('Edit Category') ?></h2>
--- 92,101 ----
$cat_name = $category->cat_name;
?>
! <ul id="adminmenu2">
! <li><a href="edit.php"><?php _e('Posts') ?></a></li>
! <li><a href="categories.php" class="current"><?php _e('Categories') ?></a></li>
! <li><a href="edit-comments.php"><?php _e('Comments') ?></a></li>
! <li class="last"><a href="moderation.php"><?php _e('Awaiting Moderation') ?></a></li>
! </ul>
<div class="wrap">
<h2><?php _e('Edit Category') ?></h2>
***************
*** 147,150 ****
--- 152,161 ----
$messages[3] = __('Category updated.');
?>
+ <ul id="adminmenu2">
+ <li><a href="edit.php"><?php _e('Posts') ?></a></li>
+ <li><a class="current"><?php _e('Categories') ?></a></li>
+ <li><a href="edit-comments.php"><?php _e('Comments') ?></a></li>
+ <li><a href="moderation.php"><?php _e('Awaiting Moderation') ?></a></li>
+ </ul>
<?php if (isset($_GET['message'])) : ?>
<div class="updated"><p><?php echo $messages[$_GET['message']]; ?></p></div>
Index: menu.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/menu.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** menu.php 21 Jul 2004 07:20:13 -0000 1.20
--- menu.php 28 Jul 2004 07:18:59 -0000 1.21
***************
*** 7,13 ****
// The minimum level the user needs to access the item: between 0 and 10
// The URL of the item's file
$menu[5] = array(__('Write'), 1, 'post.php');
! $menu[10] = array(__('Edit'), 1, 'edit.php');
! $menu[15] = array(__('Categories'), 3, 'categories.php');
$menu[20] = array(__('Links'), 5, 'link-manager.php');
$menu[25] = array(__('Users'), 3, 'users.php');
--- 7,13 ----
// The minimum level the user needs to access the item: between 0 and 10
// The URL of the item's file
+ $menu[0] = array(__('Dashboard'), 0, 'index.php');
$menu[5] = array(__('Write'), 1, 'post.php');
! $menu[10] = array(__('Manage'), 1, 'edit.php');
$menu[20] = array(__('Links'), 5, 'link-manager.php');
$menu[25] = array(__('Users'), 3, 'users.php');
Index: moderation.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/moderation.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** moderation.php 15 Jun 2004 23:24:35 -0000 1.13
--- moderation.php 28 Jul 2004 07:18:59 -0000 1.14
***************
*** 99,105 ****
?>
<ul id="adminmenu2">
! <li><a href="edit.php"> <?php _e('Posts') ?></a></li>
! <li><a href="edit-comments.php"> <?php _e('Comments') ?></a></li>
! <li class="last"><a href="moderation.php" class="current"><?php _e('Awaiting Moderation') ?></a></li>
</ul>
<?php
--- 99,106 ----
?>
<ul id="adminmenu2">
! <li><a href="edit.php"> <?php _e('Posts') ?></a></li>
! <li><a href="categories.php"><?php _e('Categories') ?></a></li>
! <li><a href="edit-comments.php"> <?php _e('Comments') ?></a></li>
! <li><a href="moderation.php" class="current"><?php _e('Awaiting Moderation') ?></a></li>
</ul>
<?php
Index: edit.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** edit.php 6 Jul 2004 18:14:42 -0000 1.25
--- edit.php 28 Jul 2004 07:18:59 -0000 1.26
***************
*** 8,13 ****
<ul id="adminmenu2">
<li><a href="edit.php" class="current"><?php _e('Posts') ?></a></li>
<li><a href="edit-comments.php"><?php _e('Comments') ?></a></li>
! <li class="last"><a href="moderation.php"><?php _e('Awaiting Moderation') ?></a></li>
</ul>
<?php
--- 8,14 ----
<ul id="adminmenu2">
<li><a href="edit.php" class="current"><?php _e('Posts') ?></a></li>
+ <li><a href="categories.php"><?php _e('Categories') ?></a></li>
<li><a href="edit-comments.php"><?php _e('Comments') ?></a></li>
! <li><a href="moderation.php"><?php _e('Awaiting Moderation') ?></a></li>
</ul>
<?php
***************
*** 85,90 ****
<th scope="col"><?php _e('Comments') ?></th>
<th scope="col"><?php _e('Author') ?></th>
! <th scope="col"><?php _e('Edit') ?></th>
! <th scope="col"><?php _e('Delete') ?></th>
</tr>
<?php
--- 86,92 ----
<th scope="col"><?php _e('Comments') ?></th>
<th scope="col"><?php _e('Author') ?></th>
! <th scope="col"></th>
! <th scope="col"></th>
! <th scope="col"></th>
</tr>
<?php
***************
*** 100,112 ****
<th scope="row"><?php echo $id ?></th>
<td><?php the_time('Y-m-d \<\b\r \/\> g:i:s a'); ?></td>
! <td><a href="<?php the_permalink(); ?>" rel="permalink">
<?php the_title() ?>
- </a>
<?php if ('private' == $post->post_status) _e(' - <strong>Private</strong>'); ?></td>
<td><?php the_category(','); ?></td>
<td><a href="edit.php?p=<?php echo $id ?>&c=1">
! <?php comments_number(__('no comments'), __('1 comment'), __("% comments")) ?>
</a></td>
<td><?php the_author() ?></td>
<td><?php if (($user_level > $authordata->user_level) or ($user_login == $authordata->user_login)) { echo "<a href='post.php?action=edit&post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td>
<td><?php if (($user_level > $authordata->user_level) or ($user_login == $authordata->user_login)) { echo "<a href='post.php?action=delete&post=$id' class='delete' onclick=\"return confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n \'OK\' to delete, \'Cancel\' to stop."), the_title('','',0)) . "')\">" . __('Delete') . "</a>"; } ?></td>
--- 102,114 ----
<th scope="row"><?php echo $id ?></th>
<td><?php the_time('Y-m-d \<\b\r \/\> g:i:s a'); ?></td>
! <td>
<?php the_title() ?>
<?php if ('private' == $post->post_status) _e(' - <strong>Private</strong>'); ?></td>
<td><?php the_category(','); ?></td>
<td><a href="edit.php?p=<?php echo $id ?>&c=1">
! <?php comments_number(__('0'), __('1'), __('%')) ?>
</a></td>
<td><?php the_author() ?></td>
+ <td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit">View</a></td>
<td><?php if (($user_level > $authordata->user_level) or ($user_login == $authordata->user_login)) { echo "<a href='post.php?action=edit&post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td>
<td><?php if (($user_level > $authordata->user_level) or ($user_login == $authordata->user_login)) { echo "<a href='post.php?action=delete&post=$id' class='delete' onclick=\"return confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n \'OK\' to delete, \'Cancel\' to stop."), the_title('','',0)) . "')\">" . __('Delete') . "</a>"; } ?></td>
More information about the cvs
mailing list