[Webnotes-cvs] webnotes/themes/phpnet theme_api.php,1.23,1.24

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

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

Modified Files:
	theme_api.php 
Log Message:
- Fixed the [ edit ] action in inline moderation
- Remove the [ action x ], if the note is already in state x.
- Remove the <small>...</small> tags from around the actions.
- In manage notes, pages are now sorted in descending order according to last updated.
- Fixed a problem with the cross referencing where preserve spaces was called after they were created and hence <a href -> was replaced with <anbsp;href.
- Fixed a problem with the size of the login form (introduced in the last commit).

Index: theme_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/themes/phpnet/theme_api.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- theme_api.php	22 Sep 2002 02:47:16 -0000	1.23
+++ theme_api.php	22 Sep 2002 04:17:38 -0000	1.24
@@ -91,24 +91,30 @@
 				if ( false === $p_page_data['preview'] ) {
 					if ( access_check_action( ACTION_NOTES_MODERATE ) ) {
 						$t_url = $p_page_data['url'];
-						$t_moderation = '<small>';
+						$t_moderation = '';
 
-						$t_moderation .= link_note_action( $t_note_info['id'], 'accept', $t_url, 
-							access_check_action( ACTION_NOTES_MODERATE_ACCEPT ) ) . ' ';
+						if ( $t_note_info['visible'] != NOTE_VISIBLE_ACCEPTED ) {
+							$t_moderation .= link_note_action( $t_note_info['id'], 'accept', $t_url, 
+								access_check_action( ACTION_NOTES_MODERATE_ACCEPT ) ) . ' ';
+						}
 
-						 $t_moderation .= link_note_action( $t_note_info['id'], 'decline', $t_url, 
-							access_check_action( ACTION_NOTES_MODERATE_DECLINE ) ) . ' ';
+						if ( $t_note_info['visible'] != NOTE_VISIBLE_DECLINED ) {
+							$t_moderation .= link_note_action( $t_note_info['id'], 'decline', $t_url, 
+								access_check_action( ACTION_NOTES_MODERATE_DECLINE ) ) . ' ';
+						}
 
-						 $t_moderation .= link_note_action( $t_note_info['id'], 'archive', $t_url, 
-							access_check_action( ACTION_NOTES_MODERATE_ARCHIVE ) ) . ' ';
+						if ( $t_note_info['visible'] != NOTE_VISIBLE_ARCHIVED ) {
+							$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, 
+						$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 ) );
-
-						$t_moderation .= '</small>';
+						if ( $t_note_info['visible'] != NOTE_VISIBLE_DELETED ) {
+							$t_moderation .= link_note_action( $t_note_info['id'], 'delete', $t_url, 
+								access_check_action( ACTION_NOTES_MODERATE_DELETE ) );
+						}
 					}
 				}
 
@@ -139,7 +145,7 @@
 				}
 
 				if ( isset( $t_note_info['note'] ) ) {
-					$t_note = nl2br(string_preserve_spaces('<tt>' . $t_note_info['note'] . '</tt>'));
+					$t_note = nl2br('<tt>' . $t_note_info['note'] . '</tt>');
 				} else {
 					$t_note = '&nbsp;';
 				}