aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application/Views
diff options
context:
space:
mode:
Diffstat (limited to 'h-source/Application/Views')
-rw-r--r--h-source/Application/Views/My/panel.php1
-rw-r--r--h-source/Application/Views/Special/pages_deleted.php4
-rw-r--r--h-source/Application/Views/if_page_deleted.php10
-rw-r--r--h-source/Application/Views/top_left.php5
4 files changed, 15 insertions, 5 deletions
diff --git a/h-source/Application/Views/My/panel.php b/h-source/Application/Views/My/panel.php
index 9c6424a..0f50f36 100644
--- a/h-source/Application/Views/My/panel.php
+++ b/h-source/Application/Views/My/panel.php
@@ -38,6 +38,7 @@
<ul>
<li><a href="<?php echo Url::getRoot('special/adminactions/'.$lang);?>"><?php echo gtext("Actions carried out by administrators");?></a></li>
<li><a href="<?php echo Url::getRoot('special/deleted/'.$lang);?>"><?php echo gtext("List of hidden device pages");?></a></li>
+ <li><a href="<?php echo Url::getRoot('special/notapproved/'.$lang);?>"><?php echo gtext("Device pages that have to be approved");?></a></li>
</ul>
</div>
<?php } ?>
diff --git a/h-source/Application/Views/Special/pages_deleted.php b/h-source/Application/Views/Special/pages_deleted.php
index d960d26..f0e69d5 100644
--- a/h-source/Application/Views/Special/pages_deleted.php
+++ b/h-source/Application/Views/Special/pages_deleted.php
@@ -23,11 +23,11 @@
<div id="left">
<div class="position_tree_box">
- <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/my/home/$lang/$token";?>"><?php echo gtext('panel');?></a> &raquo; <?php echo gtext('hidden device pages');?>
+ <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/my/home/$lang/$token";?>"><?php echo gtext('panel');?></a> &raquo; <?php echo gtext($titleString);?>
</div>
<div class="contrib_explain_box">
- <?php echo gtext('hidden device pages');?>
+ <?php echo gtext($titleString);?>
</div>
<div class="notebooks_viewall">
diff --git a/h-source/Application/Views/if_page_deleted.php b/h-source/Application/Views/if_page_deleted.php
index 1e2ab2d..e60eb78 100644
--- a/h-source/Application/Views/if_page_deleted.php
+++ b/h-source/Application/Views/if_page_deleted.php
@@ -20,7 +20,7 @@
// along with h-source. If not, see <http://www.gnu.org/licenses/>.
?>
- <?php if ($isDeleted) { ?>
+ <?php if ($isDeleted and $isApproved) { ?>
<div class="notebooks_viewall">
<div class="revision_alert">
@@ -47,5 +47,13 @@
<?php } ?>
</div>
</div>
+
+ <?php } else if ($isDeleted and !$isApproved) { ?>
+
+ <div class="notebooks_viewall">
+ <div class="revision_alert">
+ <?php echo gtext('The device page has to be approved by an administrator of the website'); ?>
+ </div>
+ </div>
<?php } ?> \ No newline at end of file
diff --git a/h-source/Application/Views/top_left.php b/h-source/Application/Views/top_left.php
index 148a863..73e8f80 100644
--- a/h-source/Application/Views/top_left.php
+++ b/h-source/Application/Views/top_left.php
@@ -39,7 +39,7 @@
<?php } else if ($isDeleted and !$isApproved) { ?>
<?php echo gtext("This device page has not been approved yet");?>
- <a id="<?php echo $id_hard;?>" class="deviceapprove_device_approved 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('approve the device page'); ?></a>
+ <a id="<?php echo $id_hard;?>" class="deviceapprove_device_app 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('approve the device page'); ?></a>
<?php } else { ?>
@@ -89,10 +89,11 @@
<?php } ?>
</div>
+ <?php if (!$isDeleted) { ?>
<div class="talk_numb_ext">
<a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_hard/$token".$this->viewStatus;?>">talk messages: <?php echo $talk_number;?></a>
</div>
-
+ <?php } ?>
<?php } else if (strcmp($this->action,'catalogue') === 0) { ?>