aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Gallo <tonicucoz@gmail.com>2011-10-27 06:16:03 +0000
committerAntonio Gallo <tonicucoz@gmail.com>2011-10-27 06:16:03 +0000
commit30302704689cdb2dd38d012f65bb0e5226b4ca3e (patch)
treed7e76daab3e9348a3cdb492e86a3972fe7c6ea38
parentd67f5736dfbec2b769e98dd17f34137b9feec1fc (diff)
added module inside insert and update pages - Luis Alberto issue
-rw-r--r--h-source/Application/Controllers/GenericController.php10
-rw-r--r--h-source/Application/Views/license_notice.php3
-rw-r--r--h-source/Application/Views/top_left.php4
-rw-r--r--h-source/Public/Css/main.css10
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'] = "<input type='hidden' name='id_hard' value='".$clean['id_hard']."'>\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 @@
<div class="not_logged_license">
<?php echo gtext("You are not a registered user or you have not logged in. Your contribution won't be published until an administrator approves it. If you want your contributions to be automatically published please log in or create an account.");?>
</div>
- <?php } ?> \ No newline at end of file
+ <?php } ?>
+ <div class="box_module_how_to_compile"><?php echo $howToCompileLabel;?></div> \ 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 @@
<div class="notebook_view_title">
<?php echo gtext("Insert");?> - <?php echo singular($this->controller);?>
</div>
-
+
<div class="notebook_insert_link">
<a title="Back to the list of <?php echo plural($this->controller);?>" href="<?php echo $this->baseUrl."/".$this->controller."/catalogue/$lang".$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
</div>
@@ -182,7 +182,7 @@
<div class="notebook_view_title">
<?php echo gtext("Talk page");?> - <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
</div>
-
+
<div class="notebook_insert_link">
<a title="Back to the <?php echo singular($this->controller);?> specifications" href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$id_hard."/$name".$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
</div>
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;