From 9a5338f565e600e618cc4546abbf18d30d942b3a Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Sun, 5 Jun 2011 11:09:40 +0000
Subject: improved the way deleted devices are managed

---
 h-source/Application/Views/Notebooks/page.php  |   2 +-
 h-source/Application/Views/climb.php           |   2 +-
 h-source/Application/Views/differences.php     |  38 ++---
 h-source/Application/Views/history.php         |  10 +-
 h-source/Application/Views/if_page_deleted.php |   2 +-
 h-source/Application/Views/page.php            |   2 +-
 h-source/Application/Views/talk.php            | 198 +++++++++++++------------
 h-source/Application/Views/top_left.php        |   8 +-
 8 files changed, 140 insertions(+), 122 deletions(-)

(limited to 'h-source/Application/Views')

diff --git a/h-source/Application/Views/Notebooks/page.php b/h-source/Application/Views/Notebooks/page.php
index 2af4468..fd8389a 100644
--- a/h-source/Application/Views/Notebooks/page.php
+++ b/h-source/Application/Views/Notebooks/page.php
@@ -20,7 +20,7 @@
 // along with h-source.  If not, see <http://www.gnu.org/licenses/>.
 ?>
 
-		<?php if (strcmp($isDeleted,'no') === 0) { ?>
+		<?php if (!$isDeleted) { ?>
 		
 			<?php
 			$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
diff --git a/h-source/Application/Views/climb.php b/h-source/Application/Views/climb.php
index ff898dc..ffcae52 100644
--- a/h-source/Application/Views/climb.php
+++ b/h-source/Application/Views/climb.php
@@ -26,7 +26,7 @@
 
 		<div class="climb_form_ext_box">
 			
-			<?php if (strcmp($isDeleted,'no') === 0 ) { ?>
+			<?php if (!$isDeleted) { ?>
 			<form action="<?php echo $this->currPage."/$lang/$id_rev/$token".$this->viewStatus;?>" method="POST">
 				I want to make this revision the current revision: <input type="submit" name="confirmAction" value="confirm">
 			</form>
diff --git a/h-source/Application/Views/differences.php b/h-source/Application/Views/differences.php
index 3ec5235..b3bb292 100644
--- a/h-source/Application/Views/differences.php
+++ b/h-source/Application/Views/differences.php
@@ -21,25 +21,29 @@
 ?>
 
 	<div class="notebooks_viewall">
-			
-		<div class="diff_color_notice">
-			<b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class="gray_text_notice">gray</span> has not been changed.
-		</div>
+
+		<?php if (!$isDeleted) { ?>
 		
-		<?php foreach ($diffArray as $label => $text) { ?>
-	
-		<div class="diff_ext_box">
-			
-			<div class="diff_item_label">
-				<?php echo gtext("differences in the entry");?>: <b><?php echo $label;?></b>
+			<div class="diff_color_notice">
+				<b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class="gray_text_notice">gray</span> has not been changed.
 			</div>
-			
-			<div class="diff_item_text">
-				<?php echo in_array($label,$fieldsWithBreaks) ? nl2br($text) : $text;?>
+
+			<?php foreach ($diffArray as $label => $text) { ?>
+
+			<div class="diff_ext_box">
+
+				<div class="diff_item_label">
+					<?php echo gtext("differences in the entry");?>: <b><?php echo $label;?></b>
+				</div>
+
+				<div class="diff_item_text">
+					<?php echo in_array($label,$fieldsWithBreaks) ? nl2br($text) : $text;?>
+				</div>
+
 			</div>
-			
-		</div>
-	
+
+			<?php } ?>
+
 		<?php } ?>
-	
+		
 	</div>
diff --git a/h-source/Application/Views/history.php b/h-source/Application/Views/history.php
index 55032f0..0dea6a6 100644
--- a/h-source/Application/Views/history.php
+++ b/h-source/Application/Views/history.php
@@ -20,6 +20,8 @@
 // along with h-source.  If not, see <http://www.gnu.org/licenses/>.
 ?>
 
+	<?php if (!$isDeleted) { ?>
+	
 		<div class="notebooks_viewall">
 			
 			<ul class="page_history">
@@ -52,4 +54,10 @@
 		
 		<div class="history_page_list">
 			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
\ No newline at end of file
+		</div>
+
+	<?php } else { ?>
+
+	<div style="clear:both;"></div>
+	
+	<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/if_page_deleted.php b/h-source/Application/Views/if_page_deleted.php
index 2d90632..1e2ab2d 100644
--- a/h-source/Application/Views/if_page_deleted.php
+++ b/h-source/Application/Views/if_page_deleted.php
@@ -20,7 +20,7 @@
 // along with h-source.  If not, see <http://www.gnu.org/licenses/>.
 ?>
 
-		<?php if (strcmp($isDeleted,'yes') === 0) { ?>
+		<?php if ($isDeleted) { ?>
 		
 		<div class="notebooks_viewall">
 			<div class="revision_alert">
diff --git a/h-source/Application/Views/page.php b/h-source/Application/Views/page.php
index 703f401..ef8b3a2 100644
--- a/h-source/Application/Views/page.php
+++ b/h-source/Application/Views/page.php
@@ -20,7 +20,7 @@
 // along with h-source.  If not, see <http://www.gnu.org/licenses/>.
 ?>
 
-	<?php if (strcmp($isDeleted,'no') === 0) { ?>
+	<?php if (!$isDeleted) { ?>
 	
 		<?php
 		$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
diff --git a/h-source/Application/Views/talk.php b/h-source/Application/Views/talk.php
index f578f8e..6197e24 100644
--- a/h-source/Application/Views/talk.php
+++ b/h-source/Application/Views/talk.php
@@ -29,118 +29,122 @@
 		});
 		
 	</script>
+
+	<?php if (!$isDeleted) { ?>
 	
-	<div class="notebooks_viewall">
-	
-		<?php foreach ($table as $message) { ?>
-		
-			<?php if (strcmp($message['talk']['deleted'],'no') === 0) { ?>
-			
-				<a name="talk-<?php echo $message['talk']['id_talk'];?>"></a>
-				<div class="talk_message_item">
-				
-					<div class="talk_message_item_title_date">
-						<?php if ($ismoderator) { ?>
-							<a id="<?php echo $message['talk']['id_talk'];?>" class="hide_talk hide_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_cancel.png">hide</a>
-						<?php } ?>
-						
-						<div class="talk_message_item_title">
-							<?php echo $message['talk']['title'];?>
-						</div>
-									
-						<div class="talk_message_item_date">
-							by <?php echo getLinkToUser($u->getUser($message['talk']['created_by']));?>, <?php echo smartDate($message['talk']['creation_date']);?>
+		<div class="notebooks_viewall">
+
+			<?php foreach ($table as $message) { ?>
+
+				<?php if (strcmp($message['talk']['deleted'],'no') === 0) { ?>
+
+					<a name="talk-<?php echo $message['talk']['id_talk'];?>"></a>
+					<div class="talk_message_item">
+
+						<div class="talk_message_item_title_date">
+							<?php if ($ismoderator) { ?>
+								<a id="<?php echo $message['talk']['id_talk'];?>" class="hide_talk hide_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_cancel.png">hide</a>
+							<?php } ?>
+
+							<div class="talk_message_item_title">
+								<?php echo $message['talk']['title'];?>
+							</div>
+
+							<div class="talk_message_item_date">
+								by <?php echo getLinkToUser($u->getUser($message['talk']['created_by']));?>, <?php echo smartDate($message['talk']['creation_date']);?>
+							</div>
 						</div>
-					</div>
-					
-					<div class="talk_message_item_content">
-						<?php echo decodeWikiText($message['talk']['message']);?>
-					</div>
-					
-					<?php if ($ismoderator) { ?>
-						<!--view details-->
-						<div class="show_hidden_box_ext">
-							<div class="md_type">talk</div>
-							<a id="<?php echo $message['talk']['id_talk'];?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
-							<div class="moderation_details_box"></div>
+
+						<div class="talk_message_item_content">
+							<?php echo decodeWikiText($message['talk']['message']);?>
 						</div>
-					<?php } ?>
-					
-				</div>
-			
-			<?php } else { ?>
-				
-				<?php if ($ismoderator) { ?>
-					<a name="talk-<?php echo $message['talk']['id_talk'];?>"></a>
-					<div class="talk_message_item_hidden">
-						this message has been deleted
-						
-							<a id="<?php echo $message['talk']['id_talk'];?>" class="show_talk hide_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_ok.png">make visible</a>
-							
+
+						<?php if ($ismoderator) { ?>
 							<!--view details-->
 							<div class="show_hidden_box_ext">
 								<div class="md_type">talk</div>
-								
 								<a id="<?php echo $message['talk']['id_talk'];?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
-								
-								<div class="details_of_hidden_message">
-									<div class="details_of_hidden_message_inner">
-										<div class="talk_message_item_date">
-											submitted by <?php echo getLinkToUser($u->getUser($message['talk']['created_by']));?>, <?php echo smartDate($message['talk']['creation_date']);?>
-										</div>
-										<div class="message_view_description_hidden">
-											<?php echo decodeWikiText($message['talk']['message']);?>
+								<div class="moderation_details_box"></div>
+							</div>
+						<?php } ?>
+
+					</div>
+
+				<?php } else { ?>
+
+					<?php if ($ismoderator) { ?>
+						<a name="talk-<?php echo $message['talk']['id_talk'];?>"></a>
+						<div class="talk_message_item_hidden">
+							this message has been deleted
+
+								<a id="<?php echo $message['talk']['id_talk'];?>" class="show_talk hide_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_ok.png">make visible</a>
+
+								<!--view details-->
+								<div class="show_hidden_box_ext">
+									<div class="md_type">talk</div>
+
+									<a id="<?php echo $message['talk']['id_talk'];?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
+
+									<div class="details_of_hidden_message">
+										<div class="details_of_hidden_message_inner">
+											<div class="talk_message_item_date">
+												submitted by <?php echo getLinkToUser($u->getUser($message['talk']['created_by']));?>, <?php echo smartDate($message['talk']['creation_date']);?>
+											</div>
+											<div class="message_view_description_hidden">
+												<?php echo decodeWikiText($message['talk']['message']);?>
+											</div>
 										</div>
+										<div class="moderation_details_box"></div>
 									</div>
-									<div class="moderation_details_box"></div>
 								</div>
-							</div>
-							
-						
-					</div>
+
+
+						</div>
+					<?php } ?>
+
 				<?php } ?>
-				
+
 			<?php } ?>
-			
-		<?php } ?>
-	</div>
+		</div>
+
+		<?php if ($islogged === 'yes') { ?>
+
+			<div class="talk_form_external_box">
+				<div class="talk_login_notice">
+					<a name="form">Add a message</a>
+				</div>
+
+				<?php echo $notice;?>
+
+				<div class="notebooks_insert_form">
+					<form action="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_hard/$token".$this->viewStatus;?>#form" method="POST">
+
+						<div class="edit_form">
+
+							<div class="form_entry">
+								<div class="entry_label">Title:</div>
+								<?php echo Html_Form::input('title',$values['title'],'talk_input_entry');?>
+							</div>
+
+							<div class="form_entry">
+								<div class="entry_label">Message:</div>
+								<?php echo Html_Form::textarea('message',$values['message'],'talk_textarea_entry','bb_code');?>
+							</div>
+
+							<input type="submit" name="insertAction" value="Save">
 
-	<?php if ($islogged === 'yes') { ?>
-		
-		<div class="talk_form_external_box">
-			<div class="talk_login_notice">
-				<a name="form">Add a message</a>
-			</div>
-			
-			<?php echo $notice;?>
-			
-			<div class="notebooks_insert_form">
-				<form action="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_hard/$token".$this->viewStatus;?>#form" method="POST">
-				
-					<div class="edit_form">
-					
-						<div class="form_entry">
-							<div class="entry_label">Title:</div>
-							<?php echo Html_Form::input('title',$values['title'],'talk_input_entry');?>
-						</div>
-						
-						<div class="form_entry">
-							<div class="entry_label">Message:</div>
-							<?php echo Html_Form::textarea('message',$values['message'],'talk_textarea_entry','bb_code');?>
 						</div>
-						
-						<input type="submit" name="insertAction" value="Save">
-						
-					</div>
 
-				</form>
+					</form>
+				</div>
 			</div>
-		</div>
-		
-	<?php } else { ?>
-	
-		<div class="talk_login_notice">
-			<a name="form"><?php echo gtext("You have to");?> <a href="<?php echo $this->baseUrl."/users/login/$lang?redirect=".$currPos.$queryString;?>">login</a> <?php echo gtext("in order to add a message");?></a>
-		</div>
+
+		<?php } else { ?>
+
+			<div class="talk_login_notice">
+				<a name="form"><?php echo gtext("You have to");?> <a href="<?php echo $this->baseUrl."/users/login/$lang?redirect=".$currPos.$queryString;?>">login</a> <?php echo gtext("in order to add a message");?></a>
+			</div>
+
+		<?php } ?>
 		
 	<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/top_left.php b/h-source/Application/Views/top_left.php
index 2f67c3d..07f3ad3 100644
--- a/h-source/Application/Views/top_left.php
+++ b/h-source/Application/Views/top_left.php
@@ -36,7 +36,8 @@
 				<div class="view_page_back_button">
 					<a title="Back to the list of <?php echo plural($this->controller);?>" href="<?php echo $this->baseUrl."/".$this->controller."/catalogue/$lang".$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
 				</div>
-				
+
+				<?php if (!$isDeleted) { ?>
 				<div class="view_page_history_button">
 					<a title="talk page" href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_hard/$token".$this->viewStatus;?>"><img class="top_left_note_image" src="<?php echo $this->baseUrl;?>/Public/Img/talk-60.png"></a>
 				</div>
@@ -44,8 +45,7 @@
 				<div class="view_page_history_button">
 					<a title="history page" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/$id_hard".$this->viewStatus;?>"><img class="top_left_note_image" src="<?php echo $this->baseUrl;?>/Public/Img/history-60.png"></a>
 				</div>
-				
-				<?php if (strcmp($isDeleted,'no') === 0) { ?>
+
 				<div class="view_page_update_button">
 					<form action="<?php echo $this->baseUrl."/".$this->controller."/update/$lang/$token".$this->viewStatus;?>" method="POST">
 						<input title="edit page" class="update_submit_class" type="image" src="<?php echo $this->baseUrl;?>/Public/Img/edit-60.png" value="xedit">
@@ -58,6 +58,8 @@
 			<div class="talk_numb_ext">
 				<a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_hard/$token".$this->viewStatus;?>">talk messages: <?php echo $talk_number;?></a>
 			</div>
+
+
 		
 		<?php } else if (strcmp($this->action,'catalogue') === 0) { ?>
 		
-- 
cgit v1.2.3