dropped pcmcia controller, added generic host controller with subtype

11 files changed, 31 insertions, 36 deletions

diff --git a/h-source/Application/Views/Desktop/Download/index.php b/h-source/Application/Views/Desktop/Download/index.php
index 31aa3b0..2f37f81 100644
--- a/h-source/Application/Views/Desktop/Download/index.php
+++ b/h-source/Application/Views/Desktop/Download/index.php
@@ -102,8 +102,8 @@
 							<td><a href="<?php echo $this->baseUrl."/download/raidadapters/$lang";?>"><img src="<?php echo $this->baseUrl?>/Public/Img/H2O/download.png"></a></td>
 						</tr>
 						<tr>
-							<td><?php echo gtext("Download the xml file of all the <b>PCMCIA Controllers</b> in the database");?></td>
-							<td><a href="<?php echo $this->baseUrl."/download/pcmcia/$lang";?>"><img src="<?php echo $this->baseUrl?>/Public/Img/H2O/download.png"></a></td>
+							<td><?php echo gtext("Download the xml file of all the <b>Host Controllers</b> in the database");?></td>
+							<td><a href="<?php echo $this->baseUrl."/download/hostcontrollers/$lang";?>"><img src="<?php echo $this->baseUrl?>/Public/Img/H2O/download.png"></a></td>
 						</tr>
 					</table>
 				</div>
diff --git a/h-source/Application/Views/Desktop/Hardware/left.php b/h-source/Application/Views/Desktop/Hardware/left.php
index ffbb50e..738be2f 100644
--- a/h-source/Application/Views/Desktop/Hardware/left.php
+++ b/h-source/Application/Views/Desktop/Hardware/left.php
@@ -87,6 +87,6 @@
 		</div>
 		
 		<div class="hardware_element">
-			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/1282042718_hardware.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/pcmcia/catalogue/<?php echo $lang;?>"><?php echo gtext("PCMCIA Controllers");?></a>
+			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/1282042718_hardware.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/hostcontrollers/catalogue/<?php echo $lang;?>"><?php echo gtext("Host Controllers");?></a>
 		</div>
 	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/Desktop/Search/lspci_results.php b/h-source/Application/Views/Desktop/Search/lspci_results.php
index b74867b..970789b 100644
--- a/h-source/Application/Views/Desktop/Search/lspci_results.php
+++ b/h-source/Application/Views/Desktop/Search/lspci_results.php
@@ -53,27 +53,7 @@
 					</div>
 					<div class="lspci_item_found_compat">
 					<?php
-					switch ($row['hardware']['type'])
-					{
-						case 'wifi':
-							echo gtext("does it work with free software?"). " <b>".gtext($row['hardware']['wifi_works'])."</b>";
-							break;
-						case 'videocard':
-							echo gtext("does it work with free software?"). " <b>".gtext(Videocard::$videoReverse[$row['hardware']['video_card_works']])."</b>";
-							break;
-						case 'soundcard':
-							echo gtext("does it work with free software?"). " <b>".gtext($row['hardware']['sound_card_works'])."</b>";
-							break;
-						case 'ethernet-card':
-							echo gtext("does it work with free software?"). " <b>".gtext($row['hardware']['ethernet_card_works'])."</b>";
-							break;
-						case 'acquisition-card':
-							echo gtext("does it work with free software?"). " <b>".gtext($row['hardware']['compatibility'])."</b>";
-							break;
-						case 'sd-card-reader':
-							echo gtext("does it work with free software?"). " <b>".gtext($row['hardware']['sd_card_works'])."</b>";
-							break;
-					}
+					echo gtext("does it work with free software?"). " <b>".gtext($row['hardware'][Hardware::getWorksFieldFromType($row['hardware']['type'])])."</b>";
 					?>
 					</div>
 				</div>
@@ -94,6 +74,7 @@
 						<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromClass($device['classId']);?>"> <span class="search_result_model_name"><?php echo "<b>".Hardware::getTypeFromClass($device['classId'])."</b> - ".$device['deviceName'];?></span>
 						<div class="lspci_item_found_compat">
 							<ul>
+								<li><b><?php echo gtext("device type");?>:</b><?php echo $device['className'];?></li>
 								<li><b><?php echo gtext("vendor");?>:</b><?php echo $device['vendorName'];?></li>
 								<li><b><?php echo gtext("VendorID:ProductID code of the device");?></b>: <?php echo $device['vendorId'].":".$device['deviceId'];?></li>
 							</ul>
diff --git a/h-source/Application/Views/Desktop/catalogue.php b/h-source/Application/Views/Desktop/catalogue.php
index 4ab18f0..b89eed6 100644
--- a/h-source/Application/Views/Desktop/catalogue.php
+++ b/h-source/Application/Views/Desktop/catalogue.php
@@ -71,10 +71,14 @@
 			</div>
 			<?php } ?>
 			
-			<?php if (strcmp($this->controller,'notebooks') === 0 ) { ?>
+			<?php if (strcmp($this->controller,'notebooks') === 0 or strcmp($this->controller,'hostcontrollers') === 0) { ?>
 			<div class="notebook_vendor">
+				<?php if (strcmp($this->controller,'notebooks') === 0) { ?>
 				<div class="inner_label"><?php echo gtext("subtype");?> (<?php echo gtext("notebook");?>, <?php echo gtext("netbook");?>, <?php echo gtext("motherboard");?>, <?php echo gtext("tablet");?>):</div>
-				<div class="inner_value"><b><?php echo gtext($item['hardware']['subtype']);?></b></div>
+				<?php } else { ?>
+				<div class="inner_label"><?php echo gtext("subtype");?> (<?php echo $subtypeHelpLabel;?>):</div>
+				<?php } ?>
+				<div class="inner_value"><b><?php echo translate_and_gtext($item['hardware']['subtype']);?></b></div>
 			</div>
 			<?php } ?>
 			
diff --git a/h-source/Application/Views/Desktop/form.php b/h-source/Application/Views/Desktop/form.php
index 8213756..dd66614 100644
--- a/h-source/Application/Views/Desktop/form.php
+++ b/h-source/Application/Views/Desktop/form.php
@@ -54,6 +54,9 @@
 					<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 } else if (strcmp($this->controller,'hostcontrollers') === 0 ) { ?>
+					<div class="entry_label"><?php echo gtext("subtype");?> (<?php echo $subtypeHelpLabel;?>):</div>
+					<?php echo Html_Form::select('subtype',$values['subtype'],Hostcontrollers::$subtype,"select_entry");?>
 				<?php } ?>
 				
 				<div class="form_entry">
diff --git a/h-source/Application/Views/Desktop/if_page_deleted.php b/h-source/Application/Views/Desktop/if_page_deleted.php
index 3610716..932d0dd 100644
--- a/h-source/Application/Views/Desktop/if_page_deleted.php
+++ b/h-source/Application/Views/Desktop/if_page_deleted.php
@@ -52,6 +52,7 @@
 
 		<div class="notebooks_viewall">
 			<div class="revision_alert">
+				<?php echo gtext('Thanks for your contribution!'); ?><br />
 				<?php echo gtext('The device page has to be approved by an administrator of the website'); ?>
 			</div>
 		</div>
diff --git a/h-source/Application/Views/Desktop/page.php b/h-source/Application/Views/Desktop/page.php
index 8e90923..231975c 100644
--- a/h-source/Application/Views/Desktop/page.php
+++ b/h-source/Application/Views/Desktop/page.php
@@ -60,10 +60,10 @@
 				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
 			</div>
 
-			<?php if (strcmp($this->controller,'printers') === 0 ) { ?>
+			<?php if (strcmp($this->controller,'printers') === 0 or strcmp($this->controller,'hostcontrollers') === 0) { ?>
 			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("subtype");?> (laser, inkjet, ..):</div>
-				<div class="inner_value"><b><?php echo gtext($item[$tableName]['subtype']);?></b></div>
+				<div class="inner_label"><?php echo gtext("subtype");?> (<?php echo $subtypeHelpLabel;?>):</div>
+				<div class="inner_value"><b><?php echo translate_and_gtext($item[$tableName]['subtype']);?></b></div>
 			</div>
 			<?php } ?>
 			
diff --git a/h-source/Application/Views/Mobile/Hardware/left.php b/h-source/Application/Views/Mobile/Hardware/left.php
index 4fbb0e4..d93f72d 100644
--- a/h-source/Application/Views/Mobile/Hardware/left.php
+++ b/h-source/Application/Views/Mobile/Hardware/left.php
@@ -118,8 +118,8 @@
 				</a>
 			</li>
 			<li>
-				<a href="<?php echo $this->baseUrl?>/pcmcia/catalogue/<?php echo $lang;?>">
-					<?php echo gtext("PCMCIA Controllers");?>
+				<a href="<?php echo $this->baseUrl?>/hostcontrollers/catalogue/<?php echo $lang;?>">
+					<?php echo gtext("Host Controllers");?>
 					<img class="image_thumb_list" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/1282042718_hardware.png" />
 				</a>
 			</li>
diff --git a/h-source/Application/Views/Mobile/catalogue.php b/h-source/Application/Views/Mobile/catalogue.php
index 6091c05..199d661 100644
--- a/h-source/Application/Views/Mobile/catalogue.php
+++ b/h-source/Application/Views/Mobile/catalogue.php
@@ -54,9 +54,14 @@
 						<p><?php echo gtext("possible other names of the device");?>: <b><?php echo nl2br($item['hardware']['other_names']);?></b></p>
 					<?php } ?>
 
-					<?php if (strcmp($this->controller,'notebooks') === 0 ) { ?>
+					<?php if (strcmp($this->controller,'notebooks') === 0 or strcmp($this->controller,'hostcontrollers') === 0) { ?>
 					<p>
-						<?php echo gtext("subtype");?> (<?php echo gtext("notebook");?>, <?php echo gtext("netbook");?>, <?php echo gtext("motherboard");?>, <?php echo gtext("tablet");?>): <b><?php echo gtext($item['hardware']['subtype']);?></b>
+						<?php if (strcmp($this->controller,'notebooks') === 0) { ?>
+						<?php echo gtext("subtype");?> (<?php echo gtext("notebook");?>, <?php echo gtext("netbook");?>, <?php echo gtext("motherboard");?>, <?php echo gtext("tablet");?>)
+						<?php } else { ?>
+						<?php echo gtext("subtype");?> (<?php echo $subtypeHelpLabel;?>)
+						<?php } ?>
+						: <b><?php echo translate_and_gtext($item['hardware']['subtype']);?></b>
 					</p>
 					<?php } ?>
 					
diff --git a/h-source/Application/Views/Mobile/if_page_deleted.php b/h-source/Application/Views/Mobile/if_page_deleted.php
index 3610716..932d0dd 100644
--- a/h-source/Application/Views/Mobile/if_page_deleted.php
+++ b/h-source/Application/Views/Mobile/if_page_deleted.php
@@ -52,6 +52,7 @@
 
 		<div class="notebooks_viewall">
 			<div class="revision_alert">
+				<?php echo gtext('Thanks for your contribution!'); ?><br />
 				<?php echo gtext('The device page has to be approved by an administrator of the website'); ?>
 			</div>
 		</div>
diff --git a/h-source/Application/Views/Mobile/page.php b/h-source/Application/Views/Mobile/page.php
index c692477..9d994b4 100644
--- a/h-source/Application/Views/Mobile/page.php
+++ b/h-source/Application/Views/Mobile/page.php
@@ -59,10 +59,10 @@
 				<div class="ui-block-b"><b><?php echo singular($this->controller);?></b></div>
 			</div>
 			
-			<?php if (strcmp($this->controller,'printers') === 0 ) { ?>
+			<?php if (strcmp($this->controller,'printers') === 0 or strcmp($this->controller,'hostcontrollers') === 0) { ?>
 			<div class="ui-grid-a main_content_element">
-				<div class="ui-block-a"><?php echo gtext("subtype");?> (laser, inkjet, ..):</div>
-				<div class="ui-block-b"><b><?php echo gtext($item[$tableName]['subtype']);?></b></div>
+				<div class="ui-block-a"><?php echo gtext("subtype");?> (<?php echo $subtypeHelpLabel;?>):</div>
+				<div class="ui-block-b"><b><?php echo translate_and_gtext($item[$tableName]['subtype']);?></b></div>
 			</div>
 			<?php } ?>