From 9d3f161ae35d1413d18977bef6341456af6d6c7d Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Fri, 14 Oct 2011 22:21:05 +0000
Subject: added notice about printers that track users - part 2 - Stallman
suggestion
---
h-source/Application/Controllers/GenericController.php | 2 ++
h-source/Application/Views/top_left.php | 2 ++
h-source/Public/Css/main.css | 6 ++++++
3 files changed, 10 insertions(+)
(limited to 'h-source')
diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index d466d61..3724140 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -472,6 +472,8 @@ class GenericController extends BaseController
// echo $this->mod->getQuery();
$data['pageList'] = $this->h['Pages']->render($page-3,7);
+
+ $data['topNotice'] = $this->getModule(array('devices',$this->controller,'catalogue'));
$this->append($data);
diff --git a/h-source/Application/Views/top_left.php b/h-source/Application/Views/top_left.php
index ee735e6..2c1a73b 100644
--- a/h-source/Application/Views/top_left.php
+++ b/h-source/Application/Views/top_left.php
@@ -112,6 +112,8 @@
<div class="notebook_insert_link">
<a title="Insert a new <?php echo singular($this->controller);?>" href="<?php echo $this->baseUrl."/".$this->controller."/insert/$lang/$token".$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/new-60.png"></a>
</div>
+
+ <?php echo $topNotice;?>
<?php } else if (strcmp($this->action,'history') === 0) { ?>
diff --git a/h-source/Public/Css/main.css b/h-source/Public/Css/main.css
index cc1dd3e..1f6e597 100644
--- a/h-source/Public/Css/main.css
+++ b/h-source/Public/Css/main.css
@@ -2013,6 +2013,12 @@ div#description_tabs_content
padding:5px;
}
+.catalogue_top_notice
+{
+ clear:right;
+ margin:0 5px;
+}
+
/*
Start - temporarily added due to transformation of help pages
2011-05-29 joeko
--
cgit v1.2.3