h-source:improved the way forms are managed - part 2, improved help pages

14 files changed, 166 insertions, 647 deletions

diff --git a/h-source/Application/Controllers/AcquisitioncardsController.php b/h-source/Application/Controllers/AcquisitioncardsController.php
index 6979b0e..0a4090a 100644
--- a/h-source/Application/Controllers/AcquisitioncardsController.php
+++ b/h-source/Application/Controllers/AcquisitioncardsController.php
@@ -97,6 +97,10 @@ class AcquisitioncardsController extends GenericController
 		$this->setArgKeys($argKeys);
 		
 		$data['title'] = 'Acquisition cards';
+
+		$data['intefaceOptions'] = Acquisitioncards::$interface;
+		$data['worksOptions'] = Acquisitioncards::$select;
+		$data['worksField'] = 'compatibility';
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/BluetoothController.php b/h-source/Application/Controllers/BluetoothController.php
index 134edff..b452f61 100644
--- a/h-source/Application/Controllers/BluetoothController.php
+++ b/h-source/Application/Controllers/BluetoothController.php
@@ -97,6 +97,10 @@ class BluetoothController extends GenericController
 		$this->setArgKeys($argKeys);
 		
 		$data['title'] = 'Bluetooth';
+
+		$data['intefaceOptions'] = Bluetooth::$interface;
+		$data['worksOptions'] = Bluetooth::$select;
+		$data['worksField'] = 'bluetooth_works';
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/FingerprintreadersController.php b/h-source/Application/Controllers/FingerprintreadersController.php
index a1d264f..6b34fe1 100644
--- a/h-source/Application/Controllers/FingerprintreadersController.php
+++ b/h-source/Application/Controllers/FingerprintreadersController.php
@@ -97,6 +97,10 @@ class FingerprintreadersController extends GenericController
 		$this->setArgKeys($argKeys);
 		
 		$data['title'] = 'Fingerprint reader';
+
+		$data['intefaceOptions'] = Fingerprintreaders::$interface;
+		$data['worksOptions'] = Fingerprintreaders::$select;
+		$data['worksField'] = 'fingerprint_works';
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/PrintersController.php b/h-source/Application/Controllers/PrintersController.php
index 4a0b29e..06a0f93 100644
--- a/h-source/Application/Controllers/PrintersController.php
+++ b/h-source/Application/Controllers/PrintersController.php
@@ -99,6 +99,10 @@ class PrintersController extends GenericController
 		$this->setArgKeys($argKeys);
 		
 		$data['title'] = 'printers';
+
+		$data['intefaceOptions'] = Printer::$interface;
+		$data['worksOptions'] = Printer::$compatibility;
+		$data['worksField'] = 'compatibility';
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/ScannersController.php b/h-source/Application/Controllers/ScannersController.php
index bbdd350..24cd332 100644
--- a/h-source/Application/Controllers/ScannersController.php
+++ b/h-source/Application/Controllers/ScannersController.php
@@ -97,6 +97,10 @@ class ScannersController extends GenericController
 		$this->setArgKeys($argKeys);
 		
 		$data['title'] = 'scanners';
+
+		$data['intefaceOptions'] = Printer::$interface;
+		$data['worksOptions'] = Printer::$compatibility;
+		$data['worksField'] = 'compatibility';
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Controllers/WebcamsController.php b/h-source/Application/Controllers/WebcamsController.php
index 6d91eb2..562cc58 100644
--- a/h-source/Application/Controllers/WebcamsController.php
+++ b/h-source/Application/Controllers/WebcamsController.php
@@ -97,6 +97,10 @@ class WebcamsController extends GenericController
 		$this->setArgKeys($argKeys);
 		
 		$data['title'] = 'Webcam';
+
+		$data['intefaceOptions'] = Webcams::$interface;
+		$data['worksOptions'] = Webcams::$select;
+		$data['worksField'] = 'webcam_works';
 		$this->append($data);
 	}
 	
diff --git a/h-source/Application/Views/Acquisitioncards/form.php b/h-source/Application/Views/Acquisitioncards/form.php
deleted file mode 100644
index 2172e6b..0000000
--- a/h-source/Application/Views/Acquisitioncards/form.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-	<script>
-	
-		$(document).ready(function() {
-			
-			dist_list_helper();
-			
-			$("#bb_code").markItUp(mySettings);
-			
-		});
-		
-	</script>
-
-	<?php echo $notice;?>
-
-	<div class="notebooks_insert_form">
-		<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
-		
-			<div class="edit_form">
-
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div>
-					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
-				</div>
-
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div>
-					<?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?>
-				</div>
-				
-				<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>
-					<?php echo Html_Form::input('pci_id',$values['pci_id'],'input_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("year of commercialization");?></div>
-					<?php echo Html_Form::select('comm_year',$values['comm_year'],Notebooks::$commYear,"select_entry");?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("interface");?> (<?php echo gtext("set not-specified if not sure");?>)</div>
-					<?php echo Html_Form::select('interface',$values['interface'],Acquisitioncards::$interface,"select_entry");?>
-				</div>
-				
-				<div class="form_entry td_with_distribution_checkboxes">
-					<div class="entry_label"><?php echo gtext("GNU/Linux distribution used for the test");?>: <b>*</b></div>
-					<?php include(ROOT . DS . APPLICATION_PATH . DS . 'Views' . DS . 'noscript_distributions.php');?>
-					<?php echo Html_Form::input('distribution',$values['distribution'],'input_entry input_distribution');?>
-					<?php echo Distributions::getFormHtml();?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-					<?php echo Html_Form::input('kernel',$values['kernel'],'input_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label hidden_x_explorer"><?php echo gtext("does it work with free software?");?></div>
-					<?php echo Html_Form::select('compatibility',$values['compatibility'],Acquisitioncards::$select,"select_entry hidden_x_explorer");?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label hidden_x_explorer"><?php echo gtext("free driver used");?> (<?php echo gtext("see the help page or leave blank if you are not sure");?>):</div>
-					<?php echo Html_Form::input('driver',$values['driver'],'input_entry');?>
-				</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>
-					<?php echo Html_Form::textarea('description',$values['description'],'textarea_entry','bb_code');?>
-				</div>
-				
-				<?php echo $hiddenInput;?>
-				
-				<input type="submit" name="<?php echo $submitName;?>" value="Save">
-				
-				<div class="mandatory_fields_notice">
-					<?php echo gtext("Fields marked with <b>*</b> are mandatory");?>
-				</div>
-				
-			</div>
-
-		</form>
-	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/Bluetooth/form.php b/h-source/Application/Views/Bluetooth/form.php
deleted file mode 100644
index 15c818c..0000000
--- a/h-source/Application/Views/Bluetooth/form.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-	<script>
-	
-		$(document).ready(function() {
-			
-			dist_list_helper();
-			
-			$("#bb_code").markItUp(mySettings);
-			
-		});
-		
-	</script>
-
-	<?php echo $notice;?>
-
-	<div class="notebooks_insert_form">
-		<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
-		
-			<div class="edit_form">
-
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div>
-					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
-				</div>
-
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div>
-					<?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?>
-				</div>
-				
-				<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>
-					<?php echo Html_Form::input('pci_id',$values['pci_id'],'input_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("year of commercialization");?></div>
-					<?php echo Html_Form::select('comm_year',$values['comm_year'],Notebooks::$commYear,"select_entry");?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("interface");?> (<?php echo gtext("set not-specified if not sure");?>)</div>
-					<?php echo Html_Form::select('interface',$values['interface'],Bluetooth::$interface,"select_entry");?>
-				</div>
-				
-				<div class="form_entry td_with_distribution_checkboxes">
-					<div class="entry_label"><?php echo gtext("GNU/Linux distribution used for the test");?>: <b>*</b></div>
-					<?php include(ROOT . DS . APPLICATION_PATH . DS . 'Views' . DS . 'noscript_distributions.php');?>
-					<?php echo Html_Form::input('distribution',$values['distribution'],'input_entry input_distribution');?>
-					<?php echo Distributions::getFormHtml();?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-					<?php echo Html_Form::input('kernel',$values['kernel'],'input_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label hidden_x_explorer"><?php echo gtext("does it work with free software?");?></div>
-					<?php echo Html_Form::select('bluetooth_works',$values['bluetooth_works'],Bluetooth::$select,"select_entry hidden_x_explorer");?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label hidden_x_explorer"><?php echo gtext("free driver used");?> (<?php echo gtext("see the help page or leave blank if you are not sure");?>):</div>
-					<?php echo Html_Form::input('driver',$values['driver'],'input_entry');?>
-				</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>
-					<?php echo Html_Form::textarea('description',$values['description'],'textarea_entry','bb_code');?>
-				</div>
-				
-				<?php echo $hiddenInput;?>
-				
-				<input type="submit" name="<?php echo $submitName;?>" value="Save">
-				
-				<div class="mandatory_fields_notice">
-					<?php echo gtext("Fields marked with <b>*</b> are mandatory");?>
-				</div>
-				
-			</div>
-
-		</form>
-	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/Fingerprintreaders/form.php b/h-source/Application/Views/Fingerprintreaders/form.php
deleted file mode 100644
index 3de6e82..0000000
--- a/h-source/Application/Views/Fingerprintreaders/form.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-	<script>
-	
-		$(document).ready(function() {
-			
-			dist_list_helper();
-			
-			$("#bb_code").markItUp(mySettings);
-			
-		});
-		
-	</script>
-
-	<?php echo $notice;?>
-
-	<div class="notebooks_insert_form">
-		<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
-		
-			<div class="edit_form">
-
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div>
-					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
-				</div>
-
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div>
-					<?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?>
-				</div>
-				
-				<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>
-					<?php echo Html_Form::input('pci_id',$values['pci_id'],'input_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("year of commercialization");?></div>
-					<?php echo Html_Form::select('comm_year',$values['comm_year'],Notebooks::$commYear,"select_entry");?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("interface");?> (<?php echo gtext("set not-specified if not sure");?>)</div>
-					<?php echo Html_Form::select('interface',$values['interface'],Fingerprintreaders::$interface,"select_entry");?>
-				</div>
-				
-				<div class="form_entry td_with_distribution_checkboxes">
-					<div class="entry_label"><?php echo gtext("GNU/Linux distribution used for the test");?>: <b>*</b></div>
-					<?php include(ROOT . DS . APPLICATION_PATH . DS . 'Views' . DS . 'noscript_distributions.php');?>
-					<?php echo Html_Form::input('distribution',$values['distribution'],'input_entry input_distribution');?>
-					<?php echo Distributions::getFormHtml();?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-					<?php echo Html_Form::input('kernel',$values['kernel'],'input_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label hidden_x_explorer"><?php echo gtext("does it work with free software?");?></div>
-					<?php echo Html_Form::select('fingerprint_works',$values['fingerprint_works'],Fingerprintreaders::$select,"select_entry hidden_x_explorer");?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label hidden_x_explorer"><?php echo gtext("free driver used");?> (<?php echo gtext("see the help page or leave blank if you are not sure");?>):</div>
-					<?php echo Html_Form::input('driver',$values['driver'],'input_entry');?>
-				</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>
-					<?php echo Html_Form::textarea('description',$values['description'],'textarea_entry','bb_code');?>
-				</div>
-				
-				<?php echo $hiddenInput;?>
-				
-				<input type="submit" name="<?php echo $submitName;?>" value="Save">
-				
-				<div class="mandatory_fields_notice">
-					<?php echo gtext("Fields marked with <b>*</b> are mandatory");?>
-				</div>
-				
-			</div>
-
-		</form>
-	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/Help/index.php b/h-source/Application/Views/Help/index.php
index aff2583..735a20e 100644
--- a/h-source/Application/Views/Help/index.php
+++ b/h-source/Application/Views/Help/index.php
@@ -36,7 +36,7 @@
 		</ul>
 	</div>
 	
-	<a name="wiki-syntax"><h1>Wiki syntax</h1></a>
+	<a name="wiki-syntax"></a><h1>Wiki syntax</h1></a>
 
 	<h3>List of <?php echo Website::$generalName;?> wiki tags</h3>
 
@@ -204,9 +204,9 @@
 		</tr>
 	</table>
 
-	<a name="compatibility"><h1>Compatibility classes</h1></a>
+	<a name="compatibility"></a><h1>Compatibility classes</h1></a>
 
-	<a name="notebook-compatibility"><h2>Notebooks</h2></a>
+	<a name="notebook-compatibility"></a><h2>Notebooks</h2></a>
 	
 	<h3>Class A (Platinum)</h3>
 	
@@ -229,7 +229,7 @@
 	<p>The notebook does not work with free software</p>
 
 	
-	<a name="printer-compatibility"><h2>Printers</h2></a>
+	<a name="printer-compatibility"></a><h2>Printers</h2></a>
 	
 	<h3>Class A (Full)</h3>
 	
@@ -244,7 +244,7 @@
 	<p>The printer does not work with free software</p>
 	
 	
-	<a name="scanner-compatibility"><h2>Scanners</h2></a>
+	<a name="scanner-compatibility"></a><h2>Scanners</h2></a>
 	
 	<h3>Class A (Full)</h3>
 	
@@ -258,7 +258,7 @@
 
 	<p>The scanner does not work with free software</p>
 	
-	<a name="discover-hardware"><h1>Discover your hardware</h1></a>
+	<a name="discover-hardware"></a><h1>Discover your hardware</h1></a>
 	<div>
 		(Thanks <a href="<?php echo $this->baseUrl;?>/issues/view/en/3/1/token">lluvia</a>)
 	</div>
@@ -268,6 +268,107 @@
 	<h3>How to discover the model name of your notebook</h3>
 	
 	<p>See below your notebook or netbook</p>
+
+	<a name="model-name"></a><h3>How to discover the model name of your device (if it is not a notebook)</h3>
+
+	<h4>If the device is integrated (example: a video card)</h4>
+
+	<p>Open a terminal and type the following command:</p>
+
+	<pre>
+		lspci -vmm
+	</pre>
+
+	<p>You will obtain the list of your PCI devices, similar to the one written below</p>
+
+	<pre>
+		Slot:	03:00.0
+		Class:	Network controller
+		Vendor:	Broadcom Corporation
+		Device:	<b>BCM4311 802.11b/g WLAN</b>
+		SVendor:	Hewlett-Packard Company
+		SDevice:	Device 1375
+		Rev:	02
+
+		Slot:	07:05.0
+		Class:	FireWire (IEEE 1394)
+		Vendor:	Ricoh Co Ltd
+		Device:	<b>R5C832 IEEE 1394 Controller</b>
+		SVendor:	Hewlett-Packard Company
+		SDevice:	Device 30cf
+		Rev:	05
+		ProgIf:	10
+	</pre>
+
+	<p>The name of each device is written at the "Device" row, after the colon (see the text in bold in the above list)</p>
+
+	<p>You can also write the output of the lspci command to a file by typing:</p>
+
+	<pre>
+		lspci -v > filename
+	</pre>
+
+	<p>where "filename" is the name of the file</p>
+
+	
+	<h4>If the device is an USB device (example: an external USB wifi card)</h4>
+
+	<p>Open a terminal and type the following command:</p>
+
+	<pre>
+		lsusb -vmm
+	</pre>
+
+	<p>You will obtain the list of your USB devices, similar to the one written below</p>
+
+	<pre>
+		Bus 001 Device 002: ID 0846:4260 NetGear, Inc. WG111v3 54 Mbps Wireless [realtek RTL8187B]
+		Device Descriptor:
+			bLength                18
+			bDescriptorType         1
+			bcdUSB               2.00
+			bDeviceClass            0 (Defined at Interface level)
+			bDeviceSubClass         0
+			bDeviceProtocol         0
+			bMaxPacketSize0        64
+			idVendor           0x0846 NetGear, Inc.
+			idProduct          0x4260 <b>WG111v3 54 Mbps Wireless [realtek RTL8187B]</b>
+			bcdDevice            2.00
+			iManufacturer           1
+			iProduct                2
+			iSerial                 3
+			...
+			...
+
+		Bus 002 Device 003: ID 08ff:2580 AuthenTec, Inc. AES2501 Fingerprint Sensor
+		Device Descriptor:
+			bLength                18
+			bDescriptorType         1
+			bcdUSB               1.10
+			bDeviceClass          255 Vendor Specific Class
+			bDeviceSubClass       255 Vendor Specific Subclass
+			bDeviceProtocol       255 Vendor Specific Protocol
+			bMaxPacketSize0         8
+			idVendor           0x08ff AuthenTec, Inc.
+			idProduct          0x2580 <b>AES2501 Fingerprint Sensor</b>
+			bcdDevice            6.23
+			iManufacturer           0
+			iProduct                1 Fingerprint Sensor
+			iSerial                 0
+			bNumConfigurations      1
+			...
+			...
+	</pre>
+
+	<p>The name of each device is written at the end of the row starting with "idProduct" (see the text in bold in the above list)</p>
+
+	<p>You can also write the output of the lsusb command to a file by typing:</p>
+
+	<pre>
+		lsusb -v > filename
+	</pre>
+
+	<p>where "filename" is the name of the file</p>
 	
 	<!--<h3>How to discover the year of commercialization of your notebook</h3>
 
@@ -305,7 +406,7 @@
 		lspci | grep "VGA"
 	</pre>
 
-	<a name="vendoridproductid"><h3>How to discover the VendorID and the ProductID of your device (VendorID:ProductID code)</h3>
+	<a name="vendoridproductid"></a><h3>How to discover the VendorID and the ProductID of your device (VendorID:ProductID code)</h3>
 
 	<div>
 		(Thanks <a href="http://trisquel.info/en/forum/h-nodecom-new-website-hardware-database#comment-5839">Michał Masłowski</a> and <a href="http://trisquel.info/en/forum/h-nodecom-new-website-hardware-database#comment-5837">Julius22</a>)
@@ -397,7 +498,7 @@
 	</pre>
 
 
-	<a name="fully-free"><h1>List of fully free GNU/Linux distributions</h1></a>
+	<a name="fully-free"></a><h1>List of fully free GNU/Linux distributions</h1></a>
 
 	<p>They are listed in alphabetical order</p>
 	
diff --git a/h-source/Application/Views/Printers/form.php b/h-source/Application/Views/Printers/form.php
deleted file mode 100644
index 3ea3e3c..0000000
--- a/h-source/Application/Views/Printers/form.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-	<script>
-	
-		$(document).ready(function() {
-			
-			dist_list_helper();
-			
-			$("#bb_code").markItUp(mySettings);
-			
-		});
-		
-	</script>
-
-	<?php echo $notice;?>
-
-	<div class="notebooks_insert_form">
-		<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
-		
-			<div class="edit_form">
-
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div>
-					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
-				</div>
-
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div>
-					<?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("subtype");?> (laser, inkjet, ..):</div>
-					<?php echo Html_Form::select('subtype',$values['subtype'],Printer::$subtype,"select_entry");?>
-				</div>
-				
-				<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>
-					<?php echo Html_Form::input('pci_id',$values['pci_id'],'input_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("year of commercialization");?></div>
-					<?php echo Html_Form::select('comm_year',$values['comm_year'],Printer::$commYear,"select_entry");?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("interface");?> (<?php echo gtext("set not-specified if not sure");?>)</div>
-					<?php echo Html_Form::select('interface',$values['interface'],Printer::$interface,"select_entry");?>
-				</div>
-				
-				<div class="form_entry td_with_distribution_checkboxes">
-					<div class="entry_label"><?php echo gtext("GNU/Linux distribution used for the test");?>: <b>*</b></div>
-					<?php include(ROOT . DS . APPLICATION_PATH . DS . 'Views' . DS . 'noscript_distributions.php');?>
-					<?php echo Html_Form::input('distribution',$values['distribution'],'input_entry input_distribution');?>
-					<?php echo Distributions::getFormHtml();?>
-				</div>
-				
-				<div class="form_entry hidden_x_explorer">
-					<div class="entry_label"><?php echo gtext("compatibility with free software");?>:</div>
-					<?php echo Html_Form::select('compatibility',$values['compatibility'],Printer::$compatibility,"select_entry");?>
-					<a class="open_help_window" title="compatibility help page" target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#printer-compatibility";?>"><img class="top_left_images_help" src="<?php echo $this->baseUrl;?>/Public/Img/Acun/help_hint.png"></a>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-					<?php echo Html_Form::input('kernel',$values['kernel'],'input_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label hidden_x_explorer"><?php echo gtext("free driver used");?> (example: cups-1.4.4) (<?php echo gtext("see the help page or leave blank if you are not sure");?>):</div>
-					<?php echo Html_Form::input('driver',$values['driver'],'input_entry');?>
-				</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>
-					<?php echo Html_Form::textarea('description',$values['description'],'textarea_entry','bb_code');?>
-				</div>
-				
-				<?php echo $hiddenInput;?>
-				
-				<input type="submit" name="<?php echo $submitName;?>" value="Save">
-				
-				<div class="mandatory_fields_notice">
-					<?php echo gtext("Fields marked with <b>*</b> are mandatory");?>
-				</div>
-				
-			</div>
-
-		</form>
-	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/Scanners/form.php b/h-source/Application/Views/Scanners/form.php
deleted file mode 100644
index bfb5f35..0000000
--- a/h-source/Application/Views/Scanners/form.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-	<script>
-	
-		$(document).ready(function() {
-			
-			dist_list_helper();
-			
-			$("#bb_code").markItUp(mySettings);
-			
-		});
-		
-	</script>
-
-	<?php echo $notice;?>
-
-	<div class="notebooks_insert_form">
-		<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
-		
-			<div class="edit_form">
-
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div>
-					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
-				</div>
-
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div>
-					<?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?>
-				</div>
-				
-				<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>
-					<?php echo Html_Form::input('pci_id',$values['pci_id'],'input_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("year of commercialization");?></div>
-					<?php echo Html_Form::select('comm_year',$values['comm_year'],Printer::$commYear,"select_entry");?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("interface");?> (<?php echo gtext("set not-specified if not sure");?>)</div>
-					<?php echo Html_Form::select('interface',$values['interface'],Printer::$interface,"select_entry");?>
-				</div>
-				
-				<div class="form_entry td_with_distribution_checkboxes">
-					<div class="entry_label"><?php echo gtext("GNU/Linux distribution used for the test");?>: <b>*</b></div>
-					<?php include(ROOT . DS . APPLICATION_PATH . DS . 'Views' . DS . 'noscript_distributions.php');?>
-					<?php echo Html_Form::input('distribution',$values['distribution'],'input_entry input_distribution');?>
-					<?php echo Distributions::getFormHtml();?>
-				</div>
-				
-				<div class="form_entry hidden_x_explorer">
-					<div class="entry_label"><?php echo gtext("compatibility with free software");?>:</div>
-					<?php echo Html_Form::select('compatibility',$values['compatibility'],Printer::$compatibility,"select_entry");?>
-					<a class="open_help_window" title="compatibility help page" target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#scanner-compatibility";?>"><img class="top_left_images_help" src="<?php echo $this->baseUrl;?>/Public/Img/Acun/help_hint.png"></a>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-					<?php echo Html_Form::input('kernel',$values['kernel'],'input_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label hidden_x_explorer"><?php echo gtext("free driver used");?> (<?php echo gtext("see the help page or leave blank if you are not sure");?>):</div>
-					<?php echo Html_Form::input('driver',$values['driver'],'input_entry');?>
-				</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>
-					<?php echo Html_Form::textarea('description',$values['description'],'textarea_entry','bb_code');?>
-				</div>
-				
-				<?php echo $hiddenInput;?>
-				
-				<input type="submit" name="<?php echo $submitName;?>" value="Save">
-				
-				<div class="mandatory_fields_notice">
-					<?php echo gtext("Fields marked with <b>*</b> are mandatory");?>
-				</div>
-				
-			</div>
-
-		</form>
-	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/Webcams/form.php b/h-source/Application/Views/Webcams/form.php
deleted file mode 100644
index adf92fe..0000000
--- a/h-source/Application/Views/Webcams/form.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-	<script>
-	
-		$(document).ready(function() {
-			
-			dist_list_helper();
-			
-			$("#bb_code").markItUp(mySettings);
-			
-		});
-		
-	</script>
-
-	<?php echo $notice;?>
-
-	<div class="notebooks_insert_form">
-		<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
-		
-			<div class="edit_form">
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div>
-					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
-				</div>
-
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div>
-					<?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?>
-				</div>
-				
-				<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>
-					<?php echo Html_Form::input('pci_id',$values['pci_id'],'input_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("year of commercialization");?></div>
-					<?php echo Html_Form::select('comm_year',$values['comm_year'],Webcams::$commYear,"select_entry");?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("interface");?> (<?php echo gtext("set not-specified if not sure");?>)</div>
-					<?php echo Html_Form::select('interface',$values['interface'],Webcams::$interface,"select_entry");?>
-				</div>
-				
-				<div class="form_entry td_with_distribution_checkboxes">
-					<div class="entry_label"><?php echo gtext("GNU/Linux distribution used for the test");?>: <b>*</b></div>
-					<?php include(ROOT . DS . APPLICATION_PATH . DS . 'Views' . DS . 'noscript_distributions.php');?>
-					<?php echo Html_Form::input('distribution',$values['distribution'],'input_entry input_distribution');?>
-					<?php echo Distributions::getFormHtml();?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-					<?php echo Html_Form::input('kernel',$values['kernel'],'input_entry');?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label hidden_x_explorer"><?php echo gtext("does it work with free software?");?></div>
-					<?php echo Html_Form::select('webcam_works',$values['webcam_works'],Webcams::$select,"select_entry hidden_x_explorer");?>
-				</div>
-				
-				<div class="form_entry">
-					<div class="entry_label hidden_x_explorer"><?php echo gtext("free driver used");?> (<?php echo gtext("see the help page or leave blank if you are not sure");?>):</div>
-					<?php echo Html_Form::input('driver',$values['driver'],'input_entry');?>
-				</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>
-					<?php echo Html_Form::textarea('description',$values['description'],'textarea_entry','bb_code');?>
-				</div>
-				
-				<?php echo $hiddenInput;?>
-				
-				<input type="submit" name="<?php echo $submitName;?>" value="Save">
-				
-				<div class="mandatory_fields_notice">
-					<?php echo gtext("Fields marked with <b>*</b> are mandatory");?>
-				</div>
-				
-			</div>
-
-		</form>
-	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/form.php b/h-source/Application/Views/form.php
index c6f532c..737a263 100644
--- a/h-source/Application/Views/form.php
+++ b/h-source/Application/Views/form.php
@@ -48,6 +48,13 @@
 					<div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div>
 					<?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?>
 				</div>
+
+				<?php if (strcmp($this->controller,'printers') === 0 ) { ?>
+				<div class="form_entry">
+					<div class="entry_label"><?php echo gtext("subtype");?> (laser, inkjet, ..):</div>
+					<?php echo Html_Form::select('subtype',$values['subtype'],Printer::$subtype,"select_entry");?>
+				</div>
+				<?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>
@@ -58,7 +65,6 @@
 					<div class="entry_label"><?php echo gtext("year of commercialization");?></div>
 					<?php echo Html_Form::select('comm_year',$values['comm_year'],Notebooks::$commYear,"select_entry");?>
 				</div>
-
 				
 				<div class="form_entry">
 					<div class="entry_label"><?php echo gtext("interface");?> (<?php echo gtext("set not-specified if not sure");?>)</div>
@@ -78,8 +84,33 @@
 				</div>
 				
 				<div class="form_entry">
-					<div class="entry_label hidden_x_explorer"><?php echo gtext("does it work with free software?");?></div>
+					<div class="entry_label hidden_x_explorer">
+						<?php
+						if (strcmp($this->controller,'printers') === 0  or strcmp($this->controller,'scanners') === 0 )
+						{
+							echo gtext("compatibility with free software").":";
+						}
+						else
+						{
+							echo gtext("does it work with free software?");
+						}
+						?>
+					</div>
 					<?php echo Html_Form::select($worksField,$values[$worksField],$worksOptions,"select_entry hidden_x_explorer");?>
+					<?php if (strcmp($this->controller,'printers') === 0 or strcmp($this->controller,'scanners') === 0) {
+						switch ($this->controller)
+						{
+							case 'printers':
+								$fragment = 'printer-compatibility';
+								break;
+							case 'scanners':
+								$fragment = 'scanner-compatibility';
+								break;
+						}
+					?>
+					<!--if it is a printer-->
+					<a class="open_help_window" title="compatibility help page" target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#$fragment";?>"><img class="top_left_images_help" src="<?php echo $this->baseUrl;?>/Public/Img/Acun/help_hint.png"></a>
+					<?php } ?>
 				</div>
 
 				<div class="form_entry">