improved wiki

1 files changed, 87 insertions, 83 deletions

diff --git a/h-source/Application/Views/Wiki/talk.php b/h-source/Application/Views/Wiki/talk.php
index 724b273..3e26527 100644
--- a/h-source/Application/Views/Wiki/talk.php
+++ b/h-source/Application/Views/Wiki/talk.php
@@ -44,126 +44,130 @@
 			<a title="Back to the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/page/$lang/".encodeUrl($tree_name);?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
 		</div>
 
-		<?php if (!$isBlocked) { ?>
-		
-			<div class="wiki_external_box">
+		<?php if (!$isDeleted) { ?>
+			<?php if (!$isBlocked) { ?>
 
-				<?php foreach ($table as $message) { ?>
+				<div class="wiki_external_box">
 
-					<?php if (strcmp($message['wiki_talk']['deleted'],'no') === 0) { ?>
+					<?php foreach ($table as $message) { ?>
 
-						<a name="wiki-talk-<?php echo $message['wiki_talk']['id_talk'];?>"></a>
-						<div class="talk_message_item">
+						<?php if (strcmp($message['wiki_talk']['deleted'],'no') === 0) { ?>
 
-							<div class="talk_message_item_title_date">
-								<?php if ($ismoderator) { ?>
-									<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hide_wiki_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 } ?>
+							<a name="wiki-talk-<?php echo $message['wiki_talk']['id_talk'];?>"></a>
+							<div class="talk_message_item">
+
+								<div class="talk_message_item_title_date">
+									<?php if ($ismoderator) { ?>
+										<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hide_wiki_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['wiki_talk']['title'];?>
+									</div>
 
-								<div class="talk_message_item_title">
-									<?php echo $message['wiki_talk']['title'];?>
+									<div class="talk_message_item_date">
+										by <?php echo getLinkToUser($u->getUser($message['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?>
+									</div>
 								</div>
 
-								<div class="talk_message_item_date">
-									by <?php echo getLinkToUser($u->getUser($message['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?>
+								<div class="talk_message_item_content">
+									<?php echo decodeWikiText($message['wiki_talk']['message']);?>
 								</div>
-							</div>
 
-							<div class="talk_message_item_content">
-								<?php echo decodeWikiText($message['wiki_talk']['message']);?>
-							</div>
+								<?php if ($ismoderator) { ?>
+								<!--view details-->
+								<div class="show_hidden_box_ext">
+									<div class="md_type">wiki_talk</div>
+									<a id="<?php echo $message['wiki_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>
+							<?php } ?>
 
-							<?php if ($ismoderator) { ?>
-							<!--view details-->
-							<div class="show_hidden_box_ext">
-								<div class="md_type">wiki_talk</div>
-								<a id="<?php echo $message['wiki_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>
-						<?php } ?>
-
-						</div>
-
-					<?php } else { ?>
-
-						<?php if ($ismoderator) { ?>
-							<a name="wiki-talk-<?php echo $message['wiki_talk']['id_talk'];?>"></a>
-							<div class="talk_message_item_hidden">
-								this message has been deleted
 
-									<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="show_wiki_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 } else { ?>
 
-									<!--view details-->
-									<div class="show_hidden_box_ext">
-										<div class="md_type">wiki_talk</div>
-
-										<a id="<?php echo $message['wiki_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['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?>
-												</div>
-												<div class="message_view_description_hidden">
-													<?php echo decodeWikiText($message['wiki_talk']['message']);?>
+							<?php if ($ismoderator) { ?>
+								<a name="wiki-talk-<?php echo $message['wiki_talk']['id_talk'];?>"></a>
+								<div class="talk_message_item_hidden">
+									this message has been deleted
+
+										<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="show_wiki_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">wiki_talk</div>
+
+											<a id="<?php echo $message['wiki_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['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?>
+													</div>
+													<div class="message_view_description_hidden">
+														<?php echo decodeWikiText($message['wiki_talk']['message']);?>
+													</div>
 												</div>
+												<div class="moderation_details_box"></div>
 											</div>
-											<div class="moderation_details_box"></div>
 										</div>
-									</div>
 
 
-							</div>
+								</div>
+							<?php } ?>
+
 						<?php } ?>
 
 					<?php } ?>
+				</div>
 
-				<?php } ?>
-			</div>
+				<?php if ($islogged === 'yes') { ?>
 
-			<?php if ($islogged === 'yes') { ?>
+					<div class="talk_form_external_box">
+						<div class="talk_login_notice">
+							<a name="form">Add a message</a>
+						</div>
 
-				<div class="talk_form_external_box">
-					<div class="talk_login_notice">
-						<a name="form">Add a message</a>
-					</div>
+						<?php echo $notice;?>
 
-					<?php echo $notice;?>
+						<div class="notebooks_insert_form">
+							<form action="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>#form" method="POST">
 
-					<div class="notebooks_insert_form">
-						<form action="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>#form" method="POST">
+								<div class="edit_form">
 
-							<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">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 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">
+							</form>
+						</div>
+					</div>
 
-							</div>
+				<?php } else { ?>
 
-						</form>
+					<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>
-				</div>
 
-			<?php } else { ?>
+				<?php } ?>
 
-				<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>
+			<?php } else { ?>
+				<!--is blocked-->
+				<div class="wiki_external_box">
+					<?php echo gtext('This wiki page has been blocked'); ?>
 				</div>
-
 			<?php } ?>
-
-		<?php } else { ?>
-			<div class="wiki_external_box">
-				<?php echo gtext('This wiki page has been blocked'); ?>
-			</div>
+			<!--close deleted-->
 		<?php } ?>
 	</div>
\ No newline at end of file