diff options
| -rw-r--r-- | h-source/Application/Include/languages.php | 1 | ||||
| -rw-r--r-- | h-source/Application/Views/My/panel.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Notebooks/page.php | 5 | ||||
| -rw-r--r-- | h-source/Application/Views/moderator_dialog.php | 5 | ||||
| -rw-r--r-- | h-source/Application/Views/page.php | 5 | ||||
| -rw-r--r-- | h-source/Application/Views/top_left.php | 3 | ||||
| -rw-r--r-- | h-source/Public/Css/main.css | 7 |
7 files changed, 22 insertions, 6 deletions
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php index 6bdfc51..43d0a05 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -234,6 +234,7 @@ class Lang /*0196*/"Download the xml file of all the <b>scanners</b> in the database" => "Scarica il file xml di tutte le <b>scanner</b> presenti nel database", /*0197*/"Special pages for administrators" => "Pagine speciali per gli amministratori", /*0198*/"Special pages for moderators" => "Pagine speciali per i moderatori", + /*0199*/"see the page" => "guarda la pagina", ), 'es' => array ( diff --git a/h-source/Application/Views/My/panel.php b/h-source/Application/Views/My/panel.php index d23d0bd..fd70a98 100644 --- a/h-source/Application/Views/My/panel.php +++ b/h-source/Application/Views/My/panel.php @@ -28,7 +28,7 @@ <?php if ($userBlocked) { ?> <div class="moderator_box"> - Your account has been blocked by a moderator of the website. You can neither insert/modify devices nor submit new issues or messages until some other moderator un-block your account. + Your account has been blocked by an administrator of the website. You can neither insert/modify devices nor submit new issues or messages until some other moderator un-block your account. </div> <?php } ?> diff --git a/h-source/Application/Views/Notebooks/page.php b/h-source/Application/Views/Notebooks/page.php index fd8389a..66c7506 100644 --- a/h-source/Application/Views/Notebooks/page.php +++ b/h-source/Application/Views/Notebooks/page.php @@ -20,14 +20,15 @@ // along with h-source. If not, see <http://www.gnu.org/licenses/>. ?> - <?php if (!$isDeleted) { ?> + <?php if (!$isDeleted or $isadmin) { ?> <?php $tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions'; + $displayClass = ($isDeleted and $isadmin) ? 'display_none' : null; ?> <?php foreach ($table as $item) { ?> - <div class="notebooks_viewall"> + <div class="notebooks_viewall <?php echo $displayClass;?>"> <!--if revision--> <?php if (strcmp($this->action,'revision') === 0) { ?> diff --git a/h-source/Application/Views/moderator_dialog.php b/h-source/Application/Views/moderator_dialog.php index 94b581c..3b76c4b 100644 --- a/h-source/Application/Views/moderator_dialog.php +++ b/h-source/Application/Views/moderator_dialog.php @@ -38,6 +38,11 @@ $(document).ready(function() { <?php echo $md_javascript;?> + + $(".hidden_message_view_page").click(function(){ + $(".display_none").css("display","block"); + return false; + }); $(".hidden_message_view_details").click(function(){ diff --git a/h-source/Application/Views/page.php b/h-source/Application/Views/page.php index ef8b3a2..6fe3c2f 100644 --- a/h-source/Application/Views/page.php +++ b/h-source/Application/Views/page.php @@ -20,14 +20,15 @@ // along with h-source. If not, see <http://www.gnu.org/licenses/>. ?> - <?php if (!$isDeleted) { ?> + <?php if (!$isDeleted or $isadmin) { ?> <?php $tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions'; + $displayClass = ($isDeleted) ? 'display_none' : null; ?> <?php foreach ($table as $item) { ?> - <div class="notebooks_viewall"> + <div class="notebooks_viewall <?php echo $displayClass;?>"> <!--if revision--> <?php if (strcmp($this->action,'revision') === 0) { ?> diff --git a/h-source/Application/Views/top_left.php b/h-source/Application/Views/top_left.php index e547f08..42e621f 100644 --- a/h-source/Application/Views/top_left.php +++ b/h-source/Application/Views/top_left.php @@ -45,6 +45,9 @@ <!--view details--> <div class="show_hidden_box_ext"> <div class="md_type">device</div> + <?php if ($isDeleted) { ?> + <a class="hidden_message_view_page" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><?php echo gtext("see the page");?></a> | + <?php } ?> <a id="<?php echo $id_hard;?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a> <div class="details_of_hidden_message"> <div class="moderation_details_box"></div> diff --git a/h-source/Public/Css/main.css b/h-source/Public/Css/main.css index e8c008c..a0217cd 100644 --- a/h-source/Public/Css/main.css +++ b/h-source/Public/Css/main.css @@ -1485,7 +1485,7 @@ ins { display:none; } -.hidden_message_view_details +.hidden_message_view_details, .hidden_message_view_page { font:normal 12px/1 sans-serif,arial; } @@ -1800,6 +1800,11 @@ span.entry_label_small { color:#FF4500; } +.display_none +{ + display:none; +} + /* Start - temporarily added due to transformation of help pages 2011-05-29 joeko |