[Webnotes-cvs] webnotes/themes/phpnet theme.css,1.1,1.2 theme_api.php,1.21,1.22

[<vb...@us...>]

Update of /cvsroot/webnotes/webnotes/themes/phpnet
In directory usw-pr-cvs1:/tmp/cvs-serv19759/themes/phpnet

Modified Files:
	theme.css theme_api.php 
Log Message:
- Added $g_cookie_url.
- Fixed a problem with logout that was introduced by the previous commit.
- Some changes towards more styles and less inline formatting.
- Modified note_add_page.php / note_preview_page.php / note_add.php to support editing and some cleanup.
- Added [ Edit ] action to inline moderation.
- Added the menu to the inline moderation mode.
- Changed the font for verdana/arial in the phpnet theme.

Index: theme.css
===================================================================
RCS file: /cvsroot/webnotes/webnotes/themes/phpnet/theme.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- theme.css	20 Sep 2002 05:00:36 -0000	1.1
+++ theme.css	21 Sep 2002 02:44:33 -0000	1.2
@@ -9,29 +9,7 @@
 	# --------------------------------------------------------
 */
 
-/*
-form { margin: 0px; display: inline; }
-body { background-color: #ffffff; font-family:Verdana, Arial; font-size: 10pt }
-td { font-family:Verdana, Arial; font-size: 10pt; padding: 4px; }
-p { font-family:Verdana, Arial; font-size: 10pt }
-h3 { font-family:Verdana, Arial; font-size: 13pt; font-weight: bold; text-align: center }
-address { font-family:Verdana, Arial; font-size: 8pt }
-div {width: auto; font-size: 10pt; clear: both;}
-div.code {background-color: #f0f0f0; border: 1px solid #444444; padding: 8px; font-family: courier new, courier, fixed; white-space: pre;}
-div.note75 { width: 75%; background-color: #c8e0f8; border: 1px solid #4444aa; padding: 8px;}
-div.note {background-color: #c8e0f8; border: 1px solid #4444aa; padding: 8px;}
-div.warning {background-color: #f8e0e0; border: 1px solid #aa4444; padding: 8px;}
-div.parent {background-color: #e8e8e8; border-bottom: 1px solid #aaaaaa; padding-top: 4px;}
-div.example {background-color: #f4f4f4; font-family: courier new, courier, fixed; border-left: 1px solid #000000; border-right: 1px solid #000000; display: inline;}
-div.title {background-color: #c8e0f8; border: 1px solid #4444aa; padding: 8px;}
-div.box { border: 1px solid #000000; padding: 8px;}
-div.warning {background-color: #f8e0e0; border: 1px solid #aa4444; padding: 8px;}
-div.menu {background-color: #f4f4f4; border: 1px solid #000000; padding: 8px; text-align: center; }
-tr.row-1 { background-color: #d8d8d8; color: #000000; }
-tr.row-2 { background-color: #e8e8e8; color: #000000; }
-td.category { background-color: #c8c8e8; color: #000000; font-weight: bold; }
-td.form-title { background-color: #ffffff; color: #000000; font-weight: bold; }
-td.form-buttons { background-color: #ffffff; color: #000000; font-weight: bold; text-align: center; }
-table.width50 { width: 50%; border: solid 1px #000000; }
-table.width75 { width: 75%; border: solid 1px #000000; }
-*/
+div.phpnet { font-family:Verdana, Arial; font-size: 10pt; background: transparent; }
+div.phpnet td { font-family:Verdana, Arial; font-size: 10pt; padding: 4px; }
+div.phpnet th { font-family:Verdana, Arial; font-size: 10pt; padding: 4px; }
+div.phpnet p { font-family:Verdana, Arial; font-size: 10pt; }

Index: theme_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/themes/phpnet/theme_api.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- theme_api.php	20 Sep 2002 06:57:44 -0000	1.21
+++ theme_api.php	21 Sep 2002 02:44:33 -0000	1.22
@@ -40,9 +40,7 @@
 
 		$t_notes = $p_page_data['notes'];
 		$t_page = $p_page_data['page'];
-		$t_url = $p_page_data['url'];
 
-		$c_url = urlencode( $t_url );
 		$t_page_id = $p_page_data['id'];
 
 		$t_images_base = $g_web_directory . 'themes/' . $g_theme . '/images/';
@@ -52,7 +50,7 @@
 		$next_picture = $t_images_base . 'caret_right.gif';
 
 		if ( false === $p_page_data['preview'] ) {
-			$t_link_start = "<a href=\"$g_note_add_page?f_page_id=$t_page_id&amp;f_url=$c_url\">";
+			$t_link_start = "<a href=\"$g_note_add_page?f_page_id=$t_page_id\">";
 			$t_link_end = '</a>';
 		} else {
 			$t_link_start = $t_link_end = '';
@@ -63,6 +61,7 @@
 		#
 
 		echo <<<EOT
+		<div class="phpnet">
 		<table summary="" border="0" cellpadding="4" cellspacing="0" width="100%">
 			<tr bgcolor="#d0d0d0" valign="top">
 				<td><small>User Contributed Notes</small><br /><strong>$t_page</strong></td>
@@ -103,6 +102,9 @@
 						 $t_moderation .= link_note_action( $t_note_info['id'], 'archive', $t_url, 
 							access_check_action( ACTION_NOTES_MODERATE_ARCHIVE ) ) . ' ';
 
+						 $t_moderation .= link_note_action( $t_note_info['id'], 'edit', $t_url, 
+							access_check_action( ACTION_NOTES_EDIT ) );
+
 						 $t_moderation .= link_note_action( $t_note_info['id'], 'delete', $t_url, 
 							access_check_action( ACTION_NOTES_MODERATE_DELETE ) );
 
@@ -186,7 +188,7 @@
 		}
 
 		if ( false === $p_page_data['preview'] ) {
-			$t_link_start = "<a href=\"$g_note_add_page?f_page_id=$t_page_id&amp;f_url=$c_url\">";
+			$t_link_start = "<a href=\"$g_note_add_page?f_page_id=$t_page_id\">";
 			$t_link_end = '</a>';
 		} else {
 			$t_link_start = $t_link_end = '';
@@ -211,7 +213,13 @@
 		</table>
 </td></tr>
 		</table>
+		</div>
 EOT;
+		if ( access_is_logged_in() ) {
+			echo '<div class="pwn">';
+			print_admin_menu();
+			echo '</div>';
+		}
 	}
 	### --------------------
 ?>