aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application/Controllers
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/Controllers
parenta214e6553572eaba8bab16e4234c6b0e345a2de1 (diff)
improved the way wiki pages are linked
Diffstat (limited to 'h-source/Application/Controllers')
-rw-r--r--h-source/Application/Controllers/WikiController.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/h-source/Application/Controllers/WikiController.php b/h-source/Application/Controllers/WikiController.php
index 72f4220..7a0cd4d 100644
--- a/h-source/Application/Controllers/WikiController.php
+++ b/h-source/Application/Controllers/WikiController.php
@@ -313,7 +313,7 @@ class WikiController extends BaseController
$data['id_wiki'] = (int)$data['table'][0]['wiki_revisions']['id_wiki'];
$data['isDeleted'] = $this->m['WikiModel']->isDeleted($data['id_wiki']);
$data['tree_name'] = $this->m['WikiModel']->getTheModelName($data['id_wiki']);
- $data['tree'] = $this->getSpecPageLink() . " &raquo; " . $this->getViewLink($data['tree_name'])." &raquo; " . $this->getHistoryLink($data['id_wiki']) . " &raquo; ".gtext('Revision');
+ $data['tree'] = $this->getSpecPageLink() . " &raquo; " . "<a href='".$this->m['WikiModel']->toWikiPage($data['id_wiki'])."'>".$data['tree_name']."</a>"." &raquo; " . $this->getHistoryLink($data['id_wiki']) . " &raquo; ".gtext('Revision');
$data['created_by'] = $data['table'][0]['wiki_revisions']['created_by'];
$data['update_date'] = $data['table'][0]['wiki_revisions']['update_date'];
@@ -337,7 +337,7 @@ class WikiController extends BaseController
$data['id_wiki'] = $clean['id_wiki'];
$tree_name = $this->m['WikiModel']->getTheModelName((int)$clean['id_wiki']);
$data['tree_name'] = $tree_name;
- $data['tree'] = $this->getSpecPageLink() . " &raquo; " . $this->getViewLink($data['tree_name'])." &raquo; " . $this->getHistoryLink($data['id_wiki']) . " &raquo; ".gtext('Differences');
+ $data['tree'] = $this->getSpecPageLink() . " &raquo; " . "<a href='".$this->m['WikiModel']->toWikiPage($clean['id_wiki'])."'>".$data['tree_name']."</a>" ." &raquo; " . $this->getHistoryLink($data['id_wiki']) . " &raquo; ".gtext('Differences');
$data['isDeleted'] = $this->m['WikiModel']->isDeleted($clean['id_wiki']);
$data['showDiff'] = false;
@@ -420,7 +420,7 @@ class WikiController extends BaseController
$data['id_wiki'] = $clean['id_wiki'];
$data['tree_name'] = $this->m['WikiModel']->getTheModelName($clean['id_wiki']);
$data['name'] = $data['tree_name'];
- $data['tree'] = $this->getSpecPageLink() . " &raquo; " . $this->getViewLink($data['tree_name'])." &raquo; " . $this->getHistoryLink($clean['id_wiki']) . " &raquo; " . gtext('Make current');
+ $data['tree'] = $this->getSpecPageLink() . " &raquo; " . "<a href='".$this->m['WikiModel']->toWikiPage($clean['id_wiki'])."'>".$data['tree_name']."</a>"." &raquo; " . $this->getHistoryLink($clean['id_wiki']) . " &raquo; " . gtext('Make current');
$data['notice'] = null;
$this->s['registered']->checkStatus();
@@ -472,7 +472,7 @@ class WikiController extends BaseController
$data['isBlocked'] = $this->m['WikiModel']->isBlocked($clean['id_wiki']);
$data['isDeleted'] = $this->m['WikiModel']->isDeleted($clean['id_wiki']);
- $data['tree'] = $this->getSpecPageLink() . " &raquo; " . $this->getViewLink($data['tree_name'])." &raquo; ".gtext('Talk');
+ $data['tree'] = $this->getSpecPageLink() . " &raquo; " . "<a href='".$this->m['WikiModel']->toWikiPage($clean['id_wiki'])."'>".$data['tree_name']."</a>"." &raquo; ".gtext('Talk');
if (isset($_POST['insertAction']))
{
@@ -531,7 +531,7 @@ class WikiController extends BaseController
$this->m['WikiModel']->limit = $this->h['Pages']->getLimit($page,$recordNumber,30);
$data['table'] = $this->m['WikiModel']->send();
-
+
$data['pageList'] = $this->h['Pages']->render($page-7,15);
$this->append($data);