From 30302704689cdb2dd38d012f65bb0e5226b4ca3e Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Thu, 27 Oct 2011 06:16:03 +0000 Subject: added module inside insert and update pages - Luis Alberto issue --- h-source/Application/Controllers/GenericController.php | 10 +++++----- h-source/Application/Views/license_notice.php | 3 ++- h-source/Application/Views/top_left.php | 4 ++-- h-source/Public/Css/main.css | 10 +++++++++- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php index 3724140..639faa5 100644 --- a/h-source/Application/Controllers/GenericController.php +++ b/h-source/Application/Controllers/GenericController.php @@ -56,7 +56,9 @@ class GenericController extends BaseController $this->orderPopup = $popup; + $data['howToCompileLabel'] = null; $data['isApproved'] = true; + $this->append($data); } @@ -113,10 +115,6 @@ class GenericController extends BaseController $data['submission_response'] = 'executed'; } -// if ($this->m['HardwareModel']->queryResult) -// { -// $data['submission_response'] = 'executed'; -// } $this->viewRedirect($this->m['HardwareModel']->lastId); } @@ -131,6 +129,7 @@ class GenericController extends BaseController $data['hiddenInput'] = null; $data['tracksHelpLabel'] = $this->getModule(array('devices',$this->controller,'form','it_tracks_users')); + $data['howToCompileLabel'] = $this->getModule(array('devices','all','form','how_to_compile')); $data['values'] = $this->m['HardwareModel']->getFormValues('insert','sanitizeHtml'); $this->append($data); @@ -292,7 +291,8 @@ class GenericController extends BaseController $data['hiddenInput'] = "\n"; $data['tracksHelpLabel'] = $this->getModule(array('devices',$this->controller,'form','it_tracks_users')); - + $data['howToCompileLabel'] = $this->getModule(array('devices','all','form','how_to_compile')); + $this->append($data); if (!isset($_POST['from_client'])) diff --git a/h-source/Application/Views/license_notice.php b/h-source/Application/Views/license_notice.php index 856ca6b..6aec78c 100644 --- a/h-source/Application/Views/license_notice.php +++ b/h-source/Application/Views/license_notice.php @@ -28,4 +28,5 @@
- \ No newline at end of file + +
\ 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 2c1a73b..33ef4d2 100644 --- a/h-source/Application/Views/top_left.php +++ b/h-source/Application/Views/top_left.php @@ -162,7 +162,7 @@
- controller);?>
- + @@ -182,7 +182,7 @@
- controller).' '.$ne_name.'';?>
- + diff --git a/h-source/Public/Css/main.css b/h-source/Public/Css/main.css index c06058e..f8cc166 100644 --- a/h-source/Public/Css/main.css +++ b/h-source/Public/Css/main.css @@ -2035,7 +2035,15 @@ div#description_tabs_content { clear:left; } - +.box_module_how_to_compile +{ +/* height:30px; */ + background-color:#F0E68C; +/* clear:left; */ + margin-top:5px; + padding:10px; + font-size:12px; +} .box_module_label a { color:#FF4500; -- cgit v1.2.3