From 3081877cf551efbf0da8a573f80606e04b629a38 Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Sat, 28 Jul 2012 10:56:06 +0000
Subject: improved the way wiki pages are linked

---
 h-source/Application/Views/Desktop/Wiki/history.php | 4 ++--
 h-source/Application/Views/Desktop/Wiki/page.php    | 2 +-
 h-source/Application/Views/Desktop/Wiki/talk.php    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/h-source/Application/Views/Desktop/Wiki/history.php b/h-source/Application/Views/Desktop/Wiki/history.php
index e8180f5..08fa4ac 100644
--- a/h-source/Application/Views/Desktop/Wiki/history.php
+++ b/h-source/Application/Views/Desktop/Wiki/history.php
@@ -25,7 +25,7 @@
 		<?php if (!$isDeleted) { ?>
 		
 			<div class="position_tree_box">
-				<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang";?>">Wiki</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>"><?php echo $tree_name;?></a> &raquo; <?php echo gtext('History');?>
+				<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang";?>">Wiki</a> &raquo; <a href="<?php echo $wiki->toWikiPage($id);?>"><?php echo $tree_name;?></a> &raquo; <?php echo gtext('History');?>
 			</div>
 
 			<div class="notebook_view_title">
@@ -33,7 +33,7 @@
 			</div>
 
 			<div class="notebook_insert_link">
-				<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>
+				<a title="Back to the page <?php echo $tree_name;?>" href="<?php echo $wiki->toWikiPage($id);?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
 			</div>
 
 			<div class="wiki_external_box">
diff --git a/h-source/Application/Views/Desktop/Wiki/page.php b/h-source/Application/Views/Desktop/Wiki/page.php
index 1716edc..6e016e2 100644
--- a/h-source/Application/Views/Desktop/Wiki/page.php
+++ b/h-source/Application/Views/Desktop/Wiki/page.php
@@ -125,7 +125,7 @@
 				<!--if revision-->
 				<?php if (strcmp($this->action,'revision') === 0) { ?>
 				<div class="revision_alert">
-					<?php echo gtext("This is an old revision of this page, as edited by");?> <b><?php echo $u->getLinkToUserFromId($created_by);?></b> <?php echo gtext('at');?> <b><?php echo smartDate($update_date); ?></b>. <?php echo gtext("It may differ significantly from the");?> <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>"><?php echo gtext("Current revision");?></a></a>.
+					<?php echo gtext("This is an old revision of this page, as edited by");?> <b><?php echo $u->getLinkToUserFromId($created_by);?></b> <?php echo gtext('at');?> <b><?php echo smartDate($update_date); ?></b>. <?php echo gtext("It may differ significantly from the");?> <a href="<?php echo $wiki->toWikiPage($id_wiki);?>"><?php echo gtext("Current revision");?></a></a>.
 				</div>
 				<?php } ?>
 
diff --git a/h-source/Application/Views/Desktop/Wiki/talk.php b/h-source/Application/Views/Desktop/Wiki/talk.php
index 67947d2..4e93798 100644
--- a/h-source/Application/Views/Desktop/Wiki/talk.php
+++ b/h-source/Application/Views/Desktop/Wiki/talk.php
@@ -41,7 +41,7 @@
 		</div>
 
 		<div class="notebook_insert_link">
-			<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>
+			<a title="Back to the page <?php echo $tree_name;?>" href="<?php echo $wiki->toWikiPage($id_wiki);?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
 		</div>
 
 		<?php if (!$isDeleted) { ?>
-- 
cgit v1.2.3