improved the way deleted devices are managed

1 files changed, 101 insertions, 97 deletions

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