improved the way entry labels can be added - first step to move all the documentation to the wiki

4 files changed, 13 insertions, 13 deletions

diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index 3a9721a..5e42b3c 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -65,9 +65,15 @@ class GenericController extends BaseController
 		
 		$this->orderPopup = $popup;
 
-		$data['howToCompileLabel'] = null;
+// 		$data['howToCompileLabel'] = null;
 		$data['isApproved'] = true;
 
+		$data['tracksHelpLabel'] = $this->getModule(array('devices',$this->controller,'form','it_tracks_users'));
+		$data['howToCompileLabel'] = $this->getModule(array('devices','all','form','how_to_compile'));
+		$data['modelNameLabel'] = $this->getModule(array('devices','all','form','model_name_entry_help_label'));
+		$data['vendoridProductidLabel'] = $this->getModule(array('devices','not_notebook','form','vendorid_productid_label'));
+		$data['descriptionLabel'] = $this->getModule(array('devices','all','form','description_entry_help_label'));
+		
 		$this->append($data);
 	}
 
@@ -137,9 +143,6 @@ class GenericController extends BaseController
 			$data['submitName'] = "insertAction";
 			$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);
 
@@ -299,9 +302,6 @@ class GenericController extends BaseController
 					$data['values'] = $this->m['HardwareModel']->getFormValues('update','sanitizeHtml');
 					$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/Desktop/Notebooks/form.php b/h-source/Application/Views/Desktop/Notebooks/form.php
index 5743281..1bfd64f 100644
--- a/h-source/Application/Views/Desktop/Notebooks/form.php
+++ b/h-source/Application/Views/Desktop/Notebooks/form.php
@@ -46,7 +46,7 @@
 				</div>
 				
 				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div>
+					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><?php echo $modelNameLabel;?></div>
 					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
 				</div>
 				
@@ -124,7 +124,7 @@
 				</div>
 				
 				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("Description: (write here all the useful information)");?><br /><a href="<?php echo $this->baseUrl."/help/index/$lang#wiki-syntax";?>"><?php echo gtext("discover all the wiki tags");?></a></div>
+					<div class="entry_label"><?php echo gtext("Description: (write here all the useful information)");?><?php echo $descriptionLabel;?></div>
 
 					<?php if (isset($descriptionPreview)) { ?>
 					<div class="description_preview_title"><?php echo gtext("Description entry preview");?>:</div>
diff --git a/h-source/Application/Views/Desktop/form.php b/h-source/Application/Views/Desktop/form.php
index c18c0f6..5bef769 100644
--- a/h-source/Application/Views/Desktop/form.php
+++ b/h-source/Application/Views/Desktop/form.php
@@ -40,7 +40,7 @@
 			<div class="edit_form">
 			
 				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><a  target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#model-name";?>"><?php echo gtext("learn how to find it");?></a><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span></div>
+					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><?php echo $modelNameLabel;?><div class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></div></div>
 					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
 				</div>
 
@@ -57,7 +57,7 @@
 				<?php } ?>
 				
 				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("VendorID:ProductID code of the device");?>: <b>*</b><br /><a  target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#vendoridproductid";?>"><?php echo gtext("learn how to find it");?></a></div>
+					<div class="entry_label"><?php echo gtext("VendorID:ProductID code of the device");?>: <b>*</b><?php echo $vendoridProductidLabel;?></div>
 					<?php echo Html_Form::input('pci_id',$values['pci_id'],'input_entry');?>
 				</div>
 				
@@ -126,7 +126,7 @@
 				</div>
 
 				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("Description: (write here all the useful information)");?><br /><a href="<?php echo $this->baseUrl."/help/index/$lang#wiki-syntax";?>"><?php echo gtext("discover all the wiki tags");?></a></div>
+					<div class="entry_label"><?php echo gtext("Description: (write here all the useful information)");?><?php echo $descriptionLabel;?></div>
 					<?php if (strcmp($this->controller,'threegcards') === 0 ) { ?>
 					<!--if it is a 3G-card-->
 					<div class="isp_notice"><?php echo gtext("Please specify in the below description entry the Internet Service Provider (ISP) and the country where the service is provided");?></div>
diff --git a/h-source/Public/Css/main.css b/h-source/Public/Css/main.css
index ae313a8..0b8253b 100644
--- a/h-source/Public/Css/main.css
+++ b/h-source/Public/Css/main.css
@@ -1856,7 +1856,7 @@ td.text_item_date
 	font:normal 12px/1 sans-serif;
 	color:#000;
 }
-span.entry_label_small
+.entry_label_small
 {
 	font-weight:normal;
 	font-size:12px;