From 310356e1c7777c0e421af7c744a44827c4869a5e Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Sat, 4 Jun 2011 00:52:27 +0000
Subject: reduced the number of files to handle a device

---
 .../Application/Views/Acquisitioncards/page.php    | 101 ----------------
 h-source/Application/Views/Bluetooth/page.php      | 101 ----------------
 .../Application/Views/Fingerprintreaders/page.php  | 101 ----------------
 h-source/Application/Views/Help/index.php          |   6 +-
 h-source/Application/Views/Help/index_de.php       |   6 +-
 h-source/Application/Views/Help/index_es.php       |   6 +-
 h-source/Application/Views/Help/index_fr.php       |   6 +-
 h-source/Application/Views/Help/index_it.php       |   6 +-
 h-source/Application/Views/Printers/page.php       | 106 -----------------
 h-source/Application/Views/Scanners/page.php       | 101 ----------------
 h-source/Application/Views/Soundcards/page.php     | 101 ----------------
 h-source/Application/Views/Threegcards/page.php    | 101 ----------------
 h-source/Application/Views/Videocards/page.php     | 101 ----------------
 h-source/Application/Views/Webcams/page.php        | 101 ----------------
 h-source/Application/Views/Wifi/page.php           | 101 ----------------
 h-source/Application/Views/page.php                | 129 +++++++++++++++++++++
 16 files changed, 144 insertions(+), 1030 deletions(-)
 delete mode 100644 h-source/Application/Views/Acquisitioncards/page.php
 delete mode 100644 h-source/Application/Views/Bluetooth/page.php
 delete mode 100644 h-source/Application/Views/Fingerprintreaders/page.php
 delete mode 100644 h-source/Application/Views/Printers/page.php
 delete mode 100644 h-source/Application/Views/Scanners/page.php
 delete mode 100644 h-source/Application/Views/Soundcards/page.php
 delete mode 100644 h-source/Application/Views/Threegcards/page.php
 delete mode 100644 h-source/Application/Views/Videocards/page.php
 delete mode 100644 h-source/Application/Views/Webcams/page.php
 delete mode 100644 h-source/Application/Views/Wifi/page.php
 create mode 100644 h-source/Application/Views/page.php

(limited to 'h-source/Application/Views')

diff --git a/h-source/Application/Views/Acquisitioncards/page.php b/h-source/Application/Views/Acquisitioncards/page.php
deleted file mode 100644
index f163be2..0000000
--- a/h-source/Application/Views/Acquisitioncards/page.php
+++ /dev/null
@@ -1,101 +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/>.
-?>
-
-	<?php if (strcmp($isDeleted,'no') === 0) { ?>
-	
-		<?php
-		$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
-		?>
-		
-		<?php foreach ($table as $item) { ?>
-		<div class="notebooks_viewall">
-		
-			<!--if revision-->
-			<?php if (strcmp($this->action,'revision') === 0) { ?>
-			<div class="revision_alert">
-				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item[$tableName]['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item[$tableName]['model'];?></b><span class="model_id">(<?php echo gtext("model id");?>: <?php echo $id_hard;?>)</span></span>
-				<?php if (strcmp($islogged,'yes') === 0 and  strcmp($this->action,'view') === 0) { ?>
-				<span class="ask_for_removal_class"><a class="ask_for_removal_class_link" href="<?php echo $this->baseUrl;?>">ask for removal</a></span>
-				<?php } ?>
-			</div>
-
-			<?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("VendorID:ProductID code of the device");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['pci_id'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
-			</div>
-
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['interface'];?></b></div>
-			</div>
-			
-			<div class="model_tested_on">
-				<div class="inner_label"><?php echo gtext("tested on");?>:</div>
-				<div class="inner_value"><b><?php echo Distributions::getName($item[$tableName]['distribution']);?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['kernel'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['compatibility'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("free driver used");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['driver'];?></b></div>
-			</div>
-			
-			<div class="notebook_description">
-				<div class="notebook_description_label"><?php echo gtext("Description");?>:</div>
-				<div class="notebook_description_value"><?php echo decodeWikiText($item[$tableName]['description']);?></div>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-	<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Bluetooth/page.php b/h-source/Application/Views/Bluetooth/page.php
deleted file mode 100644
index 987a167..0000000
--- a/h-source/Application/Views/Bluetooth/page.php
+++ /dev/null
@@ -1,101 +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/>.
-?>
-
-	<?php if (strcmp($isDeleted,'no') === 0) { ?>
-	
-		<?php
-		$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
-		?>
-		
-		<?php foreach ($table as $item) { ?>
-		<div class="notebooks_viewall">
-		
-			<!--if revision-->
-			<?php if (strcmp($this->action,'revision') === 0) { ?>
-			<div class="revision_alert">
-				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item[$tableName]['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item[$tableName]['model'];?></b><span class="model_id">(<?php echo gtext("model id");?>: <?php echo $id_hard;?>)</span></span>
-				<?php if (strcmp($islogged,'yes') === 0 and  strcmp($this->action,'view') === 0) { ?>
-				<span class="ask_for_removal_class"><a class="ask_for_removal_class_link" href="<?php echo $this->baseUrl;?>">ask for removal</a></span>
-				<?php } ?>
-			</div>
-
-			<?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("VendorID:ProductID code of the device");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['pci_id'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
-			</div>
-
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['interface'];?></b></div>
-			</div>
-			
-			<div class="model_tested_on">
-				<div class="inner_label"><?php echo gtext("tested on");?>:</div>
-				<div class="inner_value"><b><?php echo Distributions::getName($item[$tableName]['distribution']);?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['kernel'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['bluetooth_works'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("free driver used");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['driver'];?></b></div>
-			</div>
-			
-			<div class="notebook_description">
-				<div class="notebook_description_label"><?php echo gtext("Description");?>:</div>
-				<div class="notebook_description_value"><?php echo decodeWikiText($item[$tableName]['description']);?></div>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-	<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Fingerprintreaders/page.php b/h-source/Application/Views/Fingerprintreaders/page.php
deleted file mode 100644
index ac8e800..0000000
--- a/h-source/Application/Views/Fingerprintreaders/page.php
+++ /dev/null
@@ -1,101 +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/>.
-?>
-
-	<?php if (strcmp($isDeleted,'no') === 0) { ?>
-	
-		<?php
-		$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
-		?>
-		
-		<?php foreach ($table as $item) { ?>
-		<div class="notebooks_viewall">
-		
-			<!--if revision-->
-			<?php if (strcmp($this->action,'revision') === 0) { ?>
-			<div class="revision_alert">
-				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item[$tableName]['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item[$tableName]['model'];?></b><span class="model_id">(<?php echo gtext("model id");?>: <?php echo $id_hard;?>)</span></span>
-				<?php if (strcmp($islogged,'yes') === 0 and  strcmp($this->action,'view') === 0) { ?>
-				<span class="ask_for_removal_class"><a class="ask_for_removal_class_link" href="<?php echo $this->baseUrl;?>">ask for removal</a></span>
-				<?php } ?>
-			</div>
-
-			<?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("VendorID:ProductID code of the device");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['pci_id'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
-			</div>
-
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['interface'];?></b></div>
-			</div>
-			
-			<div class="model_tested_on">
-				<div class="inner_label"><?php echo gtext("tested on");?>:</div>
-				<div class="inner_value"><b><?php echo Distributions::getName($item[$tableName]['distribution']);?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['kernel'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['fingerprint_works'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("free driver used");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['driver'];?></b></div>
-			</div>
-			
-			<div class="notebook_description">
-				<div class="notebook_description_label"><?php echo gtext("Description");?>:</div>
-				<div class="notebook_description_value"><?php echo decodeWikiText($item[$tableName]['description']);?></div>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-	<?php } ?>
\ 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 ad07957..d7b5347 100644
--- a/h-source/Application/Views/Help/index.php
+++ b/h-source/Application/Views/Help/index.php
@@ -206,7 +206,7 @@
 	
 	<h2 name="compatibility">Compatibility classes</h2>
 	
-	<h3 name="notebook-compatibility">Notebooks</h3>
+	<a name="notebook-compatibility"></a><h3>Notebooks</h3>
 	<dl>
 		<dt>Class A (Platinum)</dt>
 			<dd>All the notebook devices work with a very good performance. </dd>
@@ -223,7 +223,7 @@
 			<dd>The notebook does not work with free software</dd>
 	</dl>
 	
-	<h3 name="printer-compatibility">Printers</h3>
+	<a name="printer-compatibility"></a><h3>Printers</h3>
 	<dl>
 		<dt>Class A (Full)</dt>
 			<dd>All device functions and features are supported</dd>
@@ -234,7 +234,7 @@
 			<dd>The printer does not work with free software</dd>
 	</dl>
 	
-	<h3 name="scanner-compatibility">Scanners</h3>
+	<a name="scanner-compatibility"></a><h3>Scanners</h3>
 	<dl>
 		<dt>Class A (Full)</dt>
 			<dd>All device functions and features are supported</dd>
diff --git a/h-source/Application/Views/Help/index_de.php b/h-source/Application/Views/Help/index_de.php
index 9403ec2..cdee172 100644
--- a/h-source/Application/Views/Help/index_de.php
+++ b/h-source/Application/Views/Help/index_de.php
@@ -206,7 +206,7 @@
 	
 	<h2 name="compatibility">Kompatibilitätsklassen</h2>
 	
-	<h3 name="notebook-compatibility">Notebooks</h3>
+	<a name="notebook-compatibility"></a><h3>Notebooks</h3>
 	<dl title="Notebook-Kompatibilität">
 		<dt class="label">Klasse A (Platin)</dt>
 			<dd>Alle Notebook-Geräte arbeiten mit sehr guter Leistung.</dd>
@@ -226,7 +226,7 @@
 			<dd>Das Notebook kann von Freie Software nicht unterstützt werden.</dd>
 	</dl>
 	
-	<h3 name="printer-compatibility">Drucker</h3>
+	<a name="printer-compatibility"></a><h3>Drucker</h3>
 	<dl title="Drucker-Kompatibilität">
 		<dt>Klasse A (Vollständig)</dt>
 			<dd>Alle Gerätefunktionen und -merkmale werden unterstützt.</dd>
@@ -237,7 +237,7 @@
 			<dd>Der Drucker kann von Freie Software nicht unterstützt werden.</dd>
 	</dl>
 	
-	<h3 name="scanner-compatibility">Scanner</h3>
+	<a name="scanner-compatibility"></a><h3>Scanner</h3>
 	<dl title="Scanner-Kompatibilität">
 		<dt>Klasse A (Vollständig)</dt>
 			<dd>Alle Gerätefunktionen und -merkmale werden unterstützt.</dd>
diff --git a/h-source/Application/Views/Help/index_es.php b/h-source/Application/Views/Help/index_es.php
index c71f03f..9544d08 100644
--- a/h-source/Application/Views/Help/index_es.php
+++ b/h-source/Application/Views/Help/index_es.php
@@ -206,7 +206,7 @@
 	
 	<h2 name="compatibility">Clases de Compatibilidad</h2>
 	
-	<h3 name="notebook-compatibility">Laptops</h3>
+	<a name="notebook-compatibility"></a><h3>Laptops</h3>
 	<dl>
 		<dt>Clase A (Platino)</dt>
 			<dd>Todos los dispositivos funcionan con un buen desempeño. </dd>
@@ -224,7 +224,7 @@
 			<dd>El equipo no funciona con software libre</dd>
 	</dl>
 	
-	<h3 name="printer-compatibility">Impresoras</h3>
+	<a name="printer-compatibility"></a><h3>Impresoras</h3>
 	<dl>
 		<dt>Clase A (Completo)</dt>
 			<dd>Todos los dispositivos funcionan y las características soportadas</dd>
@@ -235,7 +235,7 @@
 			<dd>La impresora no funciona con software libre</dd>
 	</dl>
 	
-	<h3 name="scanner-compatibility">Scanners</h3>
+	<a name="scanner-compatibility"></a><h3>Scanners</h3>
 	<dl>
 		<dt>Class A (Full)</dt>
 			<dd>All device functions and features are supported</dd>
diff --git a/h-source/Application/Views/Help/index_fr.php b/h-source/Application/Views/Help/index_fr.php
index 909ab5a..5040703 100644
--- a/h-source/Application/Views/Help/index_fr.php
+++ b/h-source/Application/Views/Help/index_fr.php
@@ -204,7 +204,7 @@
 	
 	<h2><a name="compatibility">Niveau de compatibilitée</a> </h2>
 	
-	<h3><a name="notebook-compatibility2" id="notebook-compatibility2">Notebooks</a> </h3>
+	<a name="notebook-compatibility"></a><h3>Notebooks</h3>
 	<dl>
 		<dt>Classe A (Platinium)</dt>
 			<dd>Tout le matériel du notebook fonctionne avec du logiciel libre. </dd>
@@ -221,7 +221,7 @@
 			<dd>Aucun matériel ne fonctionne avec du logiciel libre</dd>
 	</dl>
 	
-	<h3><a name="printer-compatibility">Imprimantes</a> </h3>
+	<a name="printer-compatibility"></a><h3>Imprimantes</h3>
 	<dl>
 		<dt>Classe A (Complet)</dt>
 			<dd>Toutes les fonctionnalitées de l'imprimante fonctionne avec du logiciel libre</dd>
@@ -232,7 +232,7 @@
 			<dd>L'imprimante ne fonctionne pas avec du logiciel libre</dd>
 	</dl>
 	
-	<h3><a name="scanner-compatibility">Scanners</a> </h3>
+	<a name="scanner-compatibility"></a><h3>Scanners</h3>
 	<dl>
 		<dt>Classe A (Complet)</dt>
 			<dd>Toutes les fonctionnalitées du scanner sont supportées</dd>
diff --git a/h-source/Application/Views/Help/index_it.php b/h-source/Application/Views/Help/index_it.php
index da1fb92..e73f98c 100644
--- a/h-source/Application/Views/Help/index_it.php
+++ b/h-source/Application/Views/Help/index_it.php
@@ -204,7 +204,7 @@
 	
 	<h2 name="compatibility">Classi di compatibilità</h2>
 	
-	<h3 name="notebook-compatibility">Notebooks</h3>
+	<a name="notebook-compatibility"></a><h3>Notebooks</h3>
 	<dl>
 		<dt>Classe A (Platino)</dt>
 			<dd>Tutti i dispositivi del portatile funzionano ad alte prestazioni. </dd>
@@ -221,7 +221,7 @@
 			<dd>Il portatile non funziona con software libero.</dd>
 	</dl>
 	
-	<h3 name="printer-compatibility">Stampanti</h3>
+	<a name="printer-compatibility"></a><h3>Stampanti</h3>
 	<dl>
 		<dt>Classe A (Piena)</dt>
 			<dd>Sono supportate tutte le funzioni e le caratteristiche della stampante.</dd>
@@ -232,7 +232,7 @@
 			<dd>La stampante non funziona con software libero.</dd>
 	</dl>
 	
-	<h3 name="scanner-compatibility">Scanner</h3>
+	<a name="scanner-compatibility"></a><h3>Scanner</h3>
 	<dl>
 		<dt>Classe A (Piena)</dt>
 			<dd>Sono supportate tutte le funzioni e le caratteristiche dello scanner.</dd>
diff --git a/h-source/Application/Views/Printers/page.php b/h-source/Application/Views/Printers/page.php
deleted file mode 100644
index 5f3c6fd..0000000
--- a/h-source/Application/Views/Printers/page.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/>.
-?>
-
-	<?php if (strcmp($isDeleted,'no') === 0) { ?>
-	
-		<?php
-		$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
-		?>
-		
-		<?php foreach ($table as $item) { ?>
-		<div class="notebooks_viewall">
-		
-			<!--if revision-->
-			<?php if (strcmp($this->action,'revision') === 0) { ?>
-			<div class="revision_alert">
-				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item[$tableName]['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item[$tableName]['model'];?></b><span class="model_id">(<?php echo gtext("model id");?>: <?php echo $id_hard;?>)</span></span>
-				<?php if (strcmp($islogged,'yes') === 0 and  strcmp($this->action,'view') === 0) { ?>
-				<span class="ask_for_removal_class"><a class="ask_for_removal_class_link" href="<?php echo $this->baseUrl;?>">ask for removal</a></span>
-				<?php } ?>
-			</div>
-
-			<?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("subtype");?> (laser, inkjet, ..):</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['subtype'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("VendorID:ProductID code of the device");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['pci_id'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['interface'];?></b></div>
-			</div>
-			
-			<div class="model_tested_on">
-				<div class="inner_label"><?php echo gtext("tested on");?>:</div>
-				<div class="inner_value"><b><?php echo Distributions::getName($item[$tableName]['distribution']);?></b></div>
-			</div>
-			
-			<div class="notebook_compatibility">
-				<div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['compatibility'];?></b> <a class="open_help_window" target="blank" title="compatibility help page" 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>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['kernel'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("free driver used");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['driver'];?></b></div>
-			</div>
-			
-			<div class="notebook_description">
-				<div class="notebook_description_label"><?php echo gtext("Description");?>:</div>
-				<div class="notebook_description_value"><?php echo decodeWikiText($item[$tableName]['description']);?></div>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-	<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Scanners/page.php b/h-source/Application/Views/Scanners/page.php
deleted file mode 100644
index 9c86831..0000000
--- a/h-source/Application/Views/Scanners/page.php
+++ /dev/null
@@ -1,101 +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/>.
-?>
-
-	<?php if (strcmp($isDeleted,'no') === 0) { ?>
-	
-		<?php
-		$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
-		?>
-		
-		<?php foreach ($table as $item) { ?>
-		<div class="notebooks_viewall">
-		
-			<!--if revision-->
-			<?php if (strcmp($this->action,'revision') === 0) { ?>
-			<div class="revision_alert">
-				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item[$tableName]['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item[$tableName]['model'];?></b><span class="model_id">(<?php echo gtext("model id");?>: <?php echo $id_hard;?>)</span></span>
-				<?php if (strcmp($islogged,'yes') === 0 and  strcmp($this->action,'view') === 0) { ?>
-				<span class="ask_for_removal_class"><a class="ask_for_removal_class_link" href="<?php echo $this->baseUrl;?>">ask for removal</a></span>
-				<?php } ?>
-			</div>
-
-			<?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("VendorID:ProductID code of the device");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['pci_id'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['interface'];?></b></div>
-			</div>
-			
-			<div class="model_tested_on">
-				<div class="inner_label"><?php echo gtext("tested on");?>:</div>
-				<div class="inner_value"><b><?php echo Distributions::getName($item[$tableName]['distribution']);?></b></div>
-			</div>
-			
-			<div class="notebook_compatibility">
-				<div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['compatibility'];?></b> <a class="open_help_window" target="blank" title="compatibility help page" 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>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['kernel'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("free driver used");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['driver'];?></b></div>
-			</div>
-			
-			<div class="notebook_description">
-				<div class="notebook_description_label"><?php echo gtext("Description");?>:</div>
-				<div class="notebook_description_value"><?php echo decodeWikiText($item[$tableName]['description']);?></div>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-	<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Soundcards/page.php b/h-source/Application/Views/Soundcards/page.php
deleted file mode 100644
index 7286bf5..0000000
--- a/h-source/Application/Views/Soundcards/page.php
+++ /dev/null
@@ -1,101 +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/>.
-?>
-
-	<?php if (strcmp($isDeleted,'no') === 0) { ?>
-	
-		<?php
-		$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
-		?>
-		
-		<?php foreach ($table as $item) { ?>
-		<div class="notebooks_viewall">
-		
-			<!--if revision-->
-			<?php if (strcmp($this->action,'revision') === 0) { ?>
-			<div class="revision_alert">
-				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item[$tableName]['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item[$tableName]['model'];?></b><span class="model_id">(<?php echo gtext("model id");?>: <?php echo $id_hard;?>)</span></span>
-				<?php if (strcmp($islogged,'yes') === 0 and  strcmp($this->action,'view') === 0) { ?>
-				<span class="ask_for_removal_class"><a class="ask_for_removal_class_link" href="<?php echo $this->baseUrl;?>">ask for removal</a></span>
-				<?php } ?>
-			</div>
-
-			<?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("VendorID:ProductID code of the device");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['pci_id'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
-			</div>
-
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['interface'];?></b></div>
-			</div>
-			
-			<div class="model_tested_on">
-				<div class="inner_label"><?php echo gtext("tested on");?>:</div>
-				<div class="inner_value"><b><?php echo Distributions::getName($item[$tableName]['distribution']);?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['kernel'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['sound_card_works'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("free driver used");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['driver'];?></b></div>
-			</div>
-			
-			<div class="notebook_description">
-				<div class="notebook_description_label"><?php echo gtext("Description");?>:</div>
-				<div class="notebook_description_value"><?php echo decodeWikiText($item[$tableName]['description']);?></div>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-	<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Threegcards/page.php b/h-source/Application/Views/Threegcards/page.php
deleted file mode 100644
index f9328fb..0000000
--- a/h-source/Application/Views/Threegcards/page.php
+++ /dev/null
@@ -1,101 +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/>.
-?>
-
-	<?php if (strcmp($isDeleted,'no') === 0) { ?>
-	
-		<?php
-		$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
-		?>
-		
-		<?php foreach ($table as $item) { ?>
-		<div class="notebooks_viewall">
-		
-			<!--if revision-->
-			<?php if (strcmp($this->action,'revision') === 0) { ?>
-			<div class="revision_alert">
-				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item[$tableName]['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item[$tableName]['model'];?></b><span class="model_id">(<?php echo gtext("model id");?>: <?php echo $id_hard;?>)</span></span>
-				<?php if (strcmp($islogged,'yes') === 0 and  strcmp($this->action,'view') === 0) { ?>
-				<span class="ask_for_removal_class"><a class="ask_for_removal_class_link" href="<?php echo $this->baseUrl;?>">ask for removal</a></span>
-				<?php } ?>
-			</div>
-
-			<?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("VendorID:ProductID code of the device");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['pci_id'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
-			</div>
-
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo ThreeGcards::$interfaceReverse[$item[$tableName]['interface']];?></b></div>
-			</div>
-			
-			<div class="model_tested_on">
-				<div class="inner_label"><?php echo gtext("tested on");?>:</div>
-				<div class="inner_value"><b><?php echo Distributions::getName($item[$tableName]['distribution']);?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['kernel'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['wifi_works'];?></b></div>
-			</div>
-
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("free driver used");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['driver'];?></b></div>
-			</div>
-			
-			<div class="notebook_description">
-				<div class="notebook_description_label"><?php echo gtext("Description");?>:</div>
-				<div class="notebook_description_value"><?php echo decodeWikiText($item[$tableName]['description']);?></div>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-	<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Videocards/page.php b/h-source/Application/Views/Videocards/page.php
deleted file mode 100644
index c0d5914..0000000
--- a/h-source/Application/Views/Videocards/page.php
+++ /dev/null
@@ -1,101 +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/>.
-?>
-
-	<?php if (strcmp($isDeleted,'no') === 0) { ?>
-	
-		<?php
-		$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
-		?>
-		
-		<?php foreach ($table as $item) { ?>
-		<div class="notebooks_viewall">
-		
-			<!--if revision-->
-			<?php if (strcmp($this->action,'revision') === 0) { ?>
-			<div class="revision_alert">
-				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item[$tableName]['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item[$tableName]['model'];?></b><span class="model_id">(<?php echo gtext("model id");?>: <?php echo $id_hard;?>)</span></span>
-				<?php if (strcmp($islogged,'yes') === 0 and  strcmp($this->action,'view') === 0) { ?>
-				<span class="ask_for_removal_class"><a class="ask_for_removal_class_link" href="<?php echo $this->baseUrl;?>">ask for removal</a></span>
-				<?php } ?>
-			</div>
-
-			<?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("VendorID:ProductID code of the device");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['pci_id'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
-			</div>
-
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['interface'];?></b></div>
-			</div>
-			
-			<div class="model_tested_on">
-				<div class="inner_label"><?php echo gtext("tested on");?>:</div>
-				<div class="inner_value"><b><?php echo Distributions::getName($item[$tableName]['distribution']);?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['kernel'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("how does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo Videocard::$videoReverse[$item[$tableName]['video_card_works']];?></b></div>
-			</div>
-
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("free driver used");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['driver'];?></b></div>
-			</div>
-			
-			<div class="notebook_description">
-				<div class="notebook_description_label"><?php echo gtext("Description");?>:</div>
-				<div class="notebook_description_value"><?php echo decodeWikiText($item[$tableName]['description']);?></div>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-	<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Webcams/page.php b/h-source/Application/Views/Webcams/page.php
deleted file mode 100644
index 9cde78f..0000000
--- a/h-source/Application/Views/Webcams/page.php
+++ /dev/null
@@ -1,101 +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/>.
-?>
-
-	<?php if (strcmp($isDeleted,'no') === 0) { ?>
-	
-		<?php
-		$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
-		?>
-		
-		<?php foreach ($table as $item) { ?>
-		<div class="notebooks_viewall">
-		
-			<!--if revision-->
-			<?php if (strcmp($this->action,'revision') === 0) { ?>
-			<div class="revision_alert">
-				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item[$tableName]['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item[$tableName]['model'];?></b><span class="model_id">(<?php echo gtext("model id");?>: <?php echo $id_hard;?>)</span></span>
-				<?php if (strcmp($islogged,'yes') === 0 and  strcmp($this->action,'view') === 0) { ?>
-				<span class="ask_for_removal_class"><a class="ask_for_removal_class_link" href="<?php echo $this->baseUrl;?>">ask for removal</a></span>
-				<?php } ?>
-			</div>
-
-			<?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("VendorID:ProductID code of the device");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['pci_id'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
-			</div>
-
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['interface'];?></b></div>
-			</div>
-			
-			<div class="model_tested_on">
-				<div class="inner_label"><?php echo gtext("tested on");?>:</div>
-				<div class="inner_value"><b><?php echo Distributions::getName($item[$tableName]['distribution']);?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['kernel'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['webcam_works'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("free driver used");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['driver'];?></b></div>
-			</div>
-			
-			<div class="notebook_description">
-				<div class="notebook_description_label"><?php echo gtext("Description");?>:</div>
-				<div class="notebook_description_value"><?php echo decodeWikiText($item[$tableName]['description']);?></div>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-	<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Wifi/page.php b/h-source/Application/Views/Wifi/page.php
deleted file mode 100644
index a172a0c..0000000
--- a/h-source/Application/Views/Wifi/page.php
+++ /dev/null
@@ -1,101 +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/>.
-?>
-
-	<?php if (strcmp($isDeleted,'no') === 0) { ?>
-	
-		<?php
-		$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
-		?>
-		
-		<?php foreach ($table as $item) { ?>
-		<div class="notebooks_viewall">
-		
-			<!--if revision-->
-			<?php if (strcmp($this->action,'revision') === 0) { ?>
-			<div class="revision_alert">
-				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_model">
-				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item[$tableName]['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item[$tableName]['model'];?></b><span class="model_id">(<?php echo gtext("model id");?>: <?php echo $id_hard;?>)</span></span>
-				<?php if (strcmp($islogged,'yes') === 0 and  strcmp($this->action,'view') === 0) { ?>
-				<span class="ask_for_removal_class"><a class="ask_for_removal_class_link" href="<?php echo $this->baseUrl;?>">ask for removal</a></span>
-				<?php } ?>
-			</div>
-
-			<?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?>
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
-				<div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div>
-			</div>
-			<?php } ?>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("VendorID:ProductID code of the device");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['pci_id'];?></b></div>
-			</div>
-			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
-			</div>
-
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo Wifi::$interfaceReverse[$item[$tableName]['interface']];?></b></div>
-			</div>
-			
-			<div class="model_tested_on">
-				<div class="inner_label"><?php echo gtext("tested on");?>:</div>
-				<div class="inner_value"><b><?php echo Distributions::getName($item[$tableName]['distribution']);?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['kernel'];?></b></div>
-			</div>
-			
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['wifi_works'];?></b></div>
-			</div>
-
-			<div class="notebook_kernel">
-				<div class="inner_label"><?php echo gtext("free driver used");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['driver'];?></b></div>
-			</div>
-			
-			<div class="notebook_description">
-				<div class="notebook_description_label"><?php echo gtext("Description");?>:</div>
-				<div class="notebook_description_value"><?php echo decodeWikiText($item[$tableName]['description']);?></div>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-	<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/page.php b/h-source/Application/Views/page.php
new file mode 100644
index 0000000..703f401
--- /dev/null
+++ b/h-source/Application/Views/page.php
@@ -0,0 +1,129 @@
+<?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/>.
+?>
+
+	<?php if (strcmp($isDeleted,'no') === 0) { ?>
+	
+		<?php
+		$tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
+		?>
+		
+		<?php foreach ($table as $item) { ?>
+		<div class="notebooks_viewall">
+		
+			<!--if revision-->
+			<?php if (strcmp($this->action,'revision') === 0) { ?>
+			<div class="revision_alert">
+				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
+			</div>
+			<?php } ?>
+			
+			<div class="notebook_model">
+				<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item[$tableName]['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item[$tableName]['model'];?></b><span class="model_id">(<?php echo gtext("model id");?>: <?php echo $id_hard;?>)</span></span>
+				<?php if (strcmp($islogged,'yes') === 0 and  strcmp($this->action,'view') === 0) { ?>
+				<span class="ask_for_removal_class"><a class="ask_for_removal_class_link" href="<?php echo $this->baseUrl;?>">ask for removal</a></span>
+				<?php } ?>
+			</div>
+
+			<?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?>
+			<div class="notebook_vendor">
+				<div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div>
+				<div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div>
+			</div>
+			<?php } ?>
+
+			<div class="notebook_vendor">
+				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
+				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
+			</div>
+
+			<?php if (strcmp($this->controller,'printers') === 0 ) { ?>
+			<div class="notebook_vendor">
+				<div class="inner_label"><?php echo gtext("subtype");?> (laser, inkjet, ..):</div>
+				<div class="inner_value"><b><?php echo $item[$tableName]['subtype'];?></b></div>
+			</div>
+			<?php } ?>
+			
+			<div class="notebook_vendor">
+				<div class="inner_label"><?php echo gtext("VendorID:ProductID code of the device");?>:</div>
+				<div class="inner_value"><b><?php echo $item[$tableName]['pci_id'];?></b></div>
+			</div>
+			
+			<div class="notebook_vendor">
+				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
+				<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
+			</div>
+
+			<div class="notebook_vendor">
+				<div class="inner_label"><?php echo gtext("interface");?>:</div>
+				<div class="inner_value"><b><?php echo $item[$tableName]['interface'];?></b></div>
+			</div>
+			
+			<div class="model_tested_on">
+				<div class="inner_label"><?php echo gtext("tested on");?>:</div>
+				<div class="inner_value"><b><?php echo Distributions::getName($item[$tableName]['distribution']);?></b></div>
+			</div>
+			
+			<div class="notebook_kernel">
+				<div class="inner_label"><?php echo gtext("tested with the following kernel libre");?>:</div>
+				<div class="inner_value"><b><?php echo $item[$tableName]['kernel'];?></b></div>
+			</div>
+			
+			<div class="notebook_kernel">
+			
+				<?php if (strcmp($this->controller,'videocards') === 0 ) { ?>
+				
+					<div class="inner_label"><?php echo gtext("how does it work with free software?");?></div>
+					<div class="inner_value"><b><?php echo Videocard::$videoReverse[$item[$tableName][$worksField]];?></b></div>
+					
+				<?php } else if (strcmp($this->controller,'printers') === 0 ) { ?>
+				
+					<div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
+					<div class="inner_value"><b><?php echo $item[$tableName]['compatibility'];?></b> <a class="open_help_window" target="blank" title="compatibility help page" 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>
+					
+				<?php } else if (strcmp($this->controller,'scanners') === 0 ) { ?>
+				
+					<div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
+					<div class="inner_value"><b><?php echo $item[$tableName]['compatibility'];?></b> <a class="open_help_window" target="blank" title="compatibility help page" 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>
+					
+				<?php } else { ?>
+				
+					<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
+					<div class="inner_value"><b><?php echo $item[$tableName][$worksField];?></b></div>
+					
+				<?php } ?>
+				
+			</div>
+			
+			<div class="notebook_kernel">
+				<div class="inner_label"><?php echo gtext("free driver used");?>:</div>
+				<div class="inner_value"><b><?php echo $item[$tableName]['driver'];?></b></div>
+			</div>
+			
+			<div class="notebook_description">
+				<div class="notebook_description_label"><?php echo gtext("Description");?>:</div>
+				<div class="notebook_description_value"><?php echo decodeWikiText($item[$tableName]['description']);?></div>
+			</div>
+			
+		</div>
+		<?php } ?>
+		
+	<?php } ?>
\ No newline at end of file
-- 
cgit v1.2.3