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

1 files changed, 7 insertions, 7 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']))