From a855ea347f8668cefb04360b2d7158d8939e07ac Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Fri, 18 Feb 2011 02:19:48 +0000
Subject: improved wiki

---
 h-source/Application/Views/Wiki/page.php | 88 ++++++++++++++++----------------
 1 file changed, 45 insertions(+), 43 deletions(-)

(limited to 'h-source/Application/Views/Wiki/page.php')

diff --git a/h-source/Application/Views/Wiki/page.php b/h-source/Application/Views/Wiki/page.php
index da5b9d5..c0cfa8b 100644
--- a/h-source/Application/Views/Wiki/page.php
+++ b/h-source/Application/Views/Wiki/page.php
@@ -85,9 +85,7 @@
 					<?php echo gtext('This wiki page has been deleted'); ?>
 				</div>
 
-			<?php } ?>
-			
-			<?php if (!$isDeleted) { ?>
+			<?php } else { ?>
 			
 				<!--if revision-->
 				<?php if (strcmp($this->action,'revision') === 0) { ?>
@@ -99,8 +97,10 @@
 				<?php foreach ($table as $page) { ?>
 				<div class="wiki_page_title">
 					<?php echo $page[$tableName]['title']?>
-					<?php if ($isBlocked) { ?>
-						<span class="blocked_notice"><?php echo gtext('This wiki page has been blocked'); ?></span>
+					<?php if ( strcmp($this->action,'page') === 0 ) { ?>
+						<?php if ($isBlocked) { ?>
+							<span class="blocked_notice"><?php echo gtext('This wiki page has been blocked'); ?></span>
+						<?php } ?>
 					<?php } ?>
 				</div>
 				<div class="wiki_page_content">
@@ -112,57 +112,59 @@
 
 		</div>
 
-		<!--block the page-->
-		<?php if ($isadmin) { ?>
-		<div class="moderator_box">
-			<?php if ($isBlocked) { ?>
-				<?php echo gtext('This wiki page has been blocked'); ?>
+		<?php if ( strcmp($this->action,'page') === 0 ) { ?>
+			<!--block the page-->
+			<?php if ($isadmin) { ?>
+			<div class="moderator_box">
+				<?php if ($isBlocked) { ?>
+					<?php echo gtext('This wiki page has been blocked'); ?>
 
-				<a id="<?php echo $id_wiki;?>" class="pageunblock_page block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/unlock.png"><?php echo gtext('unblock the wiki page'); ?></a>
+					<a id="<?php echo $id_wiki;?>" class="pageunblock_page block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/unlock.png"><?php echo gtext('unblock the wiki page'); ?></a>
 
-			<?php } else {	?>
+				<?php } else {	?>
 
-				<a id="<?php echo $id_wiki;?>" class="pageblock_page block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/lock.png"><?php echo gtext('block the wiki page'); ?></a>
+					<a id="<?php echo $id_wiki;?>" class="pageblock_page block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/lock.png"><?php echo gtext('block the wiki page'); ?></a>
 
-			<?php } ?>
+				<?php } ?>
 
-			<!--view details-->
-			<div class="show_hidden_box_ext">
-				<div class="md_type">page</div>
-				<a id="<?php echo $id_wiki;?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
-				<div class="moderation_details_box"></div>
-			</div>
+				<!--view details-->
+				<div class="show_hidden_box_ext">
+					<div class="md_type">page</div>
+					<a id="<?php echo $id_wiki;?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
+					<div class="moderation_details_box"></div>
+				</div>
 
-		</div>
-		<?php } ?>
+			</div>
+			<?php } ?>
 
-		<!--delete the page-->
-		<?php if ($isadmin) { ?>
-		<div class="moderator_box_deleted">
-			<?php if ($isDeleted) { ?>
-				<?php echo gtext('This wiki page has been deleted'); ?>
+			<!--delete the page-->
+			<?php if ($isadmin) { ?>
+			<div class="moderator_box_deleted">
+				<?php if ($isDeleted) { ?>
+					<?php echo gtext('This wiki page has been deleted'); ?>
 
-				<a id="<?php echo $id_wiki;?>" class="pageshow_page_del block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_ok.png"><?php echo gtext('restore the wiki page'); ?></a>
+					<a id="<?php echo $id_wiki;?>" class="pageshow_page_del block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_ok.png"><?php echo gtext('restore the wiki page'); ?></a>
 
-			<?php } else {	?>
+				<?php } else {	?>
 
-				<a id="<?php echo $id_wiki;?>" class="pagehide_page_del block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_cancel.png"><?php echo gtext('delete the wiki page'); ?></a>
+					<a id="<?php echo $id_wiki;?>" class="pagehide_page_del block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_cancel.png"><?php echo gtext('delete the wiki page'); ?></a>
 
-			<?php } ?>
+				<?php } ?>
 
-			<!--view details-->
-			<div class="show_hidden_box_ext">
-				<div class="md_type">page_del</div>
-				<a id="<?php echo $id_wiki;?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
-				<div class="details_of_hidden_message">
-					<?php foreach ($table as $page) { ?>
-					<div class="wiki_page_content">
-						<?php echo decodeWikiText($page[$tableName]['page'])?>
+				<!--view details-->
+				<div class="show_hidden_box_ext">
+					<div class="md_type">page_del</div>
+					<a id="<?php echo $id_wiki;?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
+					<div class="details_of_hidden_message">
+						<?php foreach ($table as $page) { ?>
+						<div class="wiki_page_content">
+							<?php echo decodeWikiText($page[$tableName]['page'])?>
+						</div>
+						<?php } ?>
+						<div class="moderation_details_box"></div>
 					</div>
-					<?php } ?>
-					<div class="moderation_details_box"></div>
 				</div>
-			</div>
 
-		</div>
+			</div>
+			<?php } ?>
 		<?php } ?>
-- 
cgit v1.2.3