diff options
Diffstat (limited to 'h-source/Application/Views')
| -rw-r--r-- | h-source/Application/Views/Wiki/history.php | 6 | ||||
| -rw-r--r-- | h-source/Application/Views/Wiki/not_found.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Wiki/page.php | 6 | ||||
| -rw-r--r-- | h-source/Application/Views/header.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/history.php | 4 | ||||
| -rw-r--r-- | h-source/Application/Views/right.php | 2 |
6 files changed, 12 insertions, 10 deletions
diff --git a/h-source/Application/Views/Wiki/history.php b/h-source/Application/Views/Wiki/history.php index b979063..5e5c041 100644 --- a/h-source/Application/Views/Wiki/history.php +++ b/h-source/Application/Views/Wiki/history.php @@ -27,7 +27,7 @@ </div> <div class="notebook_view_title"> - History of the wiki page <b><?php echo $tree_name;?></b> + <?php echo gtext('History of the wiki page'); ?> <b><?php echo $tree_name;?></b> </div> <div class="notebook_insert_link"> @@ -40,14 +40,14 @@ <?php if ($this->viewArgs['page'] === 1) { ?> <?php foreach ($rev1 as $rev) { ?> - <li class="page_history_current_item"><b><?php echo gtext("Current revision");?>:</b> <?php echo smartDate($rev['wiki']['update_date']);?> by <?php echo getLinkToUser($u->getUser($rev['wiki']['created_by']));?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff</a>)</li> + <li class="page_history_current_item"><b><?php echo gtext("Current revision");?>:</b> <?php echo smartDate($rev['wiki']['update_date']);?> by <?php echo $u->getLinkToUserFromId($rev['wiki']['created_by']);?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff</a>)</li> <?php } ?> <?php } ?> <?php foreach ($rev2 as $rev) { ?> <li class="page_history_item"> - <a href="<?php echo $this->baseUrl."/".$this->controller."/revision/$lang/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>"><?php echo smartDate($rev['wiki_revisions']['update_date']);?></a> by <?php echo getLinkToUser($u->getUser($rev['wiki_revisions']['created_by']));?> + <a href="<?php echo $this->baseUrl."/".$this->controller."/revision/$lang/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>"><?php echo smartDate($rev['wiki_revisions']['update_date']);?></a> by <?php echo $u->getLinkToUserFromId($rev['wiki_revisions']['created_by']);?> <?php if (strcmp($rev['wiki_revisions']['id_rev'],$firstRev) !== 0) {?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>">diff</a>) diff --git a/h-source/Application/Views/Wiki/not_found.php b/h-source/Application/Views/Wiki/not_found.php index dc95c21..cd435de 100644 --- a/h-source/Application/Views/Wiki/not_found.php +++ b/h-source/Application/Views/Wiki/not_found.php @@ -28,7 +28,7 @@ <div class="wiki_external_box"> <div> - <?php echo gtext('the wiki page has not been found');?> + <?php echo gtext('the wiki page has not been found');?>. <a href="<?php echo $this->baseUrl."/wiki/insert/$lang";?>"><?php echo gtext('Would you like to insert it?');?></a> </div> </div> diff --git a/h-source/Application/Views/Wiki/page.php b/h-source/Application/Views/Wiki/page.php index 92e3c9b..c690771 100644 --- a/h-source/Application/Views/Wiki/page.php +++ b/h-source/Application/Views/Wiki/page.php @@ -27,7 +27,7 @@ <?php if ( strcmp($this->action,'page') === 0 ) { ?> <div class="position_tree_box"> - <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/wiki/page/$lang";?>">Wiki</a> » <?php echo $tree_name;?> + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a> » <?php echo $tree_name;?> </div> <div class="notebook_insert_link"> @@ -49,7 +49,7 @@ <?php } ?> </div> - <div class="talk_numb_ext"> + <div class="talk_numb_ext_wiki"> <a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>">talk messages: <?php echo $talk_number;?></a> </div> @@ -84,7 +84,7 @@ <!--if revision--> <?php if (strcmp($this->action,'revision') === 0) { ?> <div class="revision_alert"> - This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($created_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>">current revision</a>. + This is an old revision of this page, as edited by <b><?php echo $u->getLinkToUserFromId($created_by);?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>">current revision</a>. </div> <?php } ?> diff --git a/h-source/Application/Views/header.php b/h-source/Application/Views/header.php index 8686221..625ebae 100644 --- a/h-source/Application/Views/header.php +++ b/h-source/Application/Views/header.php @@ -80,7 +80,7 @@ $currPos = $querySanitized ? $this->controller."/".$this->action : 'home/index'; <div id="top_menu_external"> <div id="top_menu"> <ul> - <li<?php echo $tm['home']; ?>><a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a></li><li<?php echo $tm['hardware']; ?>><a href="<?php echo $this->baseUrl."/hardware/catalogue/$lang";?>">Hardware</a></li><li<?php echo $tm['issues']; ?>><a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>">Issues</a></li><li<?php echo $tm['search']; ?>><a href="<?php echo $this->baseUrl."/search/form/$lang";?>">Search</a></li><li<?php echo $tm['news']; ?>><a href="<?php echo $this->baseUrl."/news/index/$lang";?>">News</a></li><li<?php echo $tm['download']; ?>><a href="<?php echo $this->baseUrl."/download/index/$lang";?>">Download</a></li><li<?php echo $tm['help']; ?>><a href="<?php echo $this->baseUrl."/help/index/$lang";?>">Help</a></li> + <li<?php echo $tm['home']; ?>><a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a></li><li<?php echo $tm['hardware']; ?>><a href="<?php echo $this->baseUrl."/hardware/catalogue/$lang";?>">Hardware</a></li><li<?php echo $tm['issues']; ?>><a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>">Issues</a></li><li<?php echo $tm['search']; ?>><a href="<?php echo $this->baseUrl."/search/form/$lang";?>">Search</a></li><li<?php echo $tm['news']; ?>><a href="<?php echo $this->baseUrl."/news/index/$lang";?>">News</a></li><li<?php echo $tm['download']; ?>><a href="<?php echo $this->baseUrl."/download/index/$lang";?>">Download</a></li><li<?php echo $tm['help']; ?>><a href="<?php echo $this->baseUrl."/help/index/$lang";?>">Help</a></li><li<?php echo $tm['wiki']; ?>><a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a></li> </ul> </div> </div> diff --git a/h-source/Application/Views/history.php b/h-source/Application/Views/history.php index a809596..55032f0 100644 --- a/h-source/Application/Views/history.php +++ b/h-source/Application/Views/history.php @@ -26,14 +26,14 @@ <?php if ($this->viewArgs['history_page'] === 1) { ?> <?php foreach ($rev1 as $rev) { ?> - <li class="page_history_current_item"><b><?php echo gtext("Current revision");?>:</b> <?php echo smartDate($rev['hardware']['update_date']);?> by <?php echo getLinkToUser($u->getUser($rev['hardware']['updated_by']));?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff</a>)</li> + <li class="page_history_current_item"><b><?php echo gtext("Current revision");?>:</b> <?php echo smartDate($rev['hardware']['update_date']);?> by <?php echo $u->getLinkToUserFromId($rev['hardware']['updated_by']);?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff</a>)</li> <?php } ?> <?php } ?> <?php foreach ($rev2 as $rev) { ?> <li class="page_history_item"> - <a href="<?php echo $this->baseUrl."/".$this->controller."/revision/$lang/".$rev['revisions']['id_rev'].$this->viewStatus;?>"><?php echo smartDate($rev['revisions']['update_date']);?></a> by <?php echo getLinkToUser($u->getUser($rev['revisions']['updated_by']));?> + <a href="<?php echo $this->baseUrl."/".$this->controller."/revision/$lang/".$rev['revisions']['id_rev'].$this->viewStatus;?>"><?php echo smartDate($rev['revisions']['update_date']);?></a> by <?php echo $u->getLinkToUserFromId($rev['revisions']['updated_by']);?> <?php if (strcmp($rev['revisions']['id_rev'],$firstRev) !== 0) {?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/".$rev['revisions']['id_rev'].$this->viewStatus;?>">diff</a>) diff --git a/h-source/Application/Views/right.php b/h-source/Application/Views/right.php index a6c7950..3bde69e 100644 --- a/h-source/Application/Views/right.php +++ b/h-source/Application/Views/right.php @@ -90,6 +90,7 @@ <a href="<?php echo $this->baseUrl."/download/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/download.png"></a> </div> + <?php if ( strcmp($this->controller,'wiki') !== 0 ) { ?> <div class="last_modifications"> <div class="last_modifications_title"> <?php echo gtext('last modifications');?> @@ -105,6 +106,7 @@ </span> </div> </div> + <?php } ?> <div class="statistics_ext_box"> <div class="statistics_int_title"> |