aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application/Views
diff options
context:
space:
mode:
authorAntonio Gallo <tonicucoz@gmail.com>2012-07-28 10:56:06 +0000
committerAntonio Gallo <tonicucoz@gmail.com>2012-07-28 10:56:06 +0000
commit3081877cf551efbf0da8a573f80606e04b629a38 (patch)
tree6534eb89b44346eec5037e98e864a53cbacf8438 /h-source/Application/Views
parenta214e6553572eaba8bab16e4234c6b0e345a2de1 (diff)
improved the way wiki pages are linked
Diffstat (limited to 'h-source/Application/Views')
-rw-r--r--h-source/Application/Views/Desktop/Wiki/history.php4
-rw-r--r--h-source/Application/Views/Desktop/Wiki/page.php2
-rw-r--r--h-source/Application/Views/Desktop/Wiki/talk.php2
3 files changed, 4 insertions, 4 deletions
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) { ?>