[wp-cvs] wordpress/wp-admin categories.php, 1.37, 1.38 edit-comments.php, 1.31, 1.32 edit.php, 1.26, 1.27 moderation.php, 1.14, 1.15 post.php, 1.74, 1.75

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1842/wp-admin

Modified Files:
	categories.php edit-comments.php edit.php moderation.php 
	post.php 
Log Message:
Static pages.  Take 1.

Index: edit-comments.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-comments.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** edit-comments.php	28 Jul 2004 07:18:59 -0000	1.31
--- edit-comments.php	10 Aug 2004 05:35:58 -0000	1.32
***************
*** 10,13 ****
--- 10,14 ----
  <ul id="adminmenu2">
  	<li><a href="edit.php"><?php _e('Posts') ?></a></li>
+   <li><a href="edit-pages.php"><?php _e('Pages') ?></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>

Index: moderation.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/moderation.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** moderation.php	28 Jul 2004 07:18:59 -0000	1.14
--- moderation.php	10 Aug 2004 05:35:58 -0000	1.15
***************
*** 100,103 ****
--- 100,104 ----
  <ul id="adminmenu2">
  	<li><a href="edit.php"> <?php _e('Posts') ?></a></li>
+     <li><a href="edit-pages.php"><?php _e('Pages') ?></a></li> 
  	<li><a href="categories.php"><?php _e('Categories') ?></a></li>
  	<li><a href="edit-comments.php"> <?php _e('Comments') ?></a></li>

Index: categories.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/categories.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** categories.php	28 Jul 2004 07:18:59 -0000	1.37
--- categories.php	10 Aug 2004 05:35:58 -0000	1.38
***************
*** 94,97 ****
--- 94,98 ----
  <ul id="adminmenu2"> 
    <li><a href="edit.php"><?php _e('Posts') ?></a></li> 
+   <li><a href="edit-pages.php"><?php _e('Pages') ?></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> 
***************
*** 154,157 ****
--- 155,159 ----
  <ul id="adminmenu2"> 
  	<li><a href="edit.php"><?php _e('Posts') ?></a></li> 
+     <li><a href="edit-pages.php"><?php _e('Pages') ?></a></li> 
  	<li><a class="current"><?php _e('Categories') ?></a></li>
  	<li><a href="edit-comments.php"><?php _e('Comments') ?></a></li> 

Index: post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/post.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** post.php	6 Aug 2004 01:28:50 -0000	1.74
--- post.php	10 Aug 2004 05:35:58 -0000	1.75
***************
*** 108,112 ****
  	if ('' != $_POST['publish']) $post_status = 'publish';
  	if ('' != $_POST['advanced']) $post_status = 'draft';
! 
  
  	if((get_settings('use_geo_positions')) && (strlen($latstr) > 2) && (strlen($lonstr) > 2) ) {
--- 108,112 ----
  	if ('' != $_POST['publish']) $post_status = 'publish';
  	if ('' != $_POST['advanced']) $post_status = 'draft';
! 	if ('' != $_POST['savepage']) $post_status = 'static';
  
  	if((get_settings('use_geo_positions')) && (strlen($latstr) > 2) && (strlen($lonstr) > 2) ) {
***************
*** 144,147 ****
--- 144,150 ----
  		$location = "post.php?action=edit&post=$post_ID";
  
+ 	if ( '' != $_POST['savepage'] )
+ 		$location = "post.php?action=createpage";
+ 
  	header("Location: $location"); // Send user on their way while we keep working
  
***************
*** 234,238 ****
  		$post_name = $postdata->post_name;
  
! 		include('edit-form-advanced.php');
  
  		$post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = '$post_ID'");
--- 237,245 ----
  		$post_name = $postdata->post_name;
  
!         if ($post_status == 'static') {
!             include('edit-page-form.php');
!         } else {
!             include('edit-form-advanced.php');
!         }
  
  		$post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = '$post_ID'");
***************
*** 713,716 ****
--- 720,753 ----
  	break;
  
+  case 'createpage':
+ 	$standalone = 0;
+ 	$title = __('Create New Page');
+ 	require_once ('./admin-header.php');
+ 
+ 	if ($user_level > 0) {
+ 		$action = 'post';
+ 		get_currentuserinfo();
+ 		//set defaults
+ 		$post_status = 'static';
+ 		$comment_status = get_settings('default_comment_status');
+ 		$ping_status = get_settings('default_ping_status');
+ 		$post_pingback = get_settings('default_pingback_flag');
+ 		$default_post_cat = get_settings('default_post_category');
+ 
+         include('edit-page-form.php');
+ 	} else {
+ ?>
+ <div class="wrap">
+ 		<p><?php printf(__('Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to raise your level to 1, in order to be authorized to post.<br />
+ You can also <a href="mailto:%s?subject=Promotion?">e-mail the admin</a> to ask for a promotion.<br />
+ When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)'), get_settings('admin_email')); ?>
+ 		</p>
+ </div>
+ <?php
+ 
+ 	}
+ 
+      break;
+ 
  default:
  	$standalone = 0;

Index: edit.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** edit.php	28 Jul 2004 07:18:59 -0000	1.26
--- edit.php	10 Aug 2004 05:35:58 -0000	1.27
***************
*** 8,11 ****
--- 8,12 ----
   <ul id="adminmenu2"> 
    <li><a href="edit.php" class="current"><?php _e('Posts') ?></a></li> 
+   <li><a href="edit-pages.php"><?php _e('Pages') ?></a></li> 
    <li><a href="categories.php"><?php _e('Categories') ?></a></li>
    <li><a href="edit-comments.php"><?php _e('Comments') ?></a></li>