adding motherboards - part 1

6 files changed, 18 insertions, 23 deletions

diff --git a/h-source/Application/Views/Desktop/Hardware/left.php b/h-source/Application/Views/Desktop/Hardware/left.php
index cc92aa8..ffbb50e 100644
--- a/h-source/Application/Views/Desktop/Hardware/left.php
+++ b/h-source/Application/Views/Desktop/Hardware/left.php
@@ -27,7 +27,7 @@
 		</div>
 	
 		<div class="hardware_element">
-			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/computer-laptop.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/notebooks/catalogue/<?php echo $lang;?>"><?php echo gtext("Notebooks, netbooks, tablet PC");?></a>
+			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/computer-laptop.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/notebooks/catalogue/<?php echo $lang;?>"><?php echo gtext("Notebooks");?>, <?php echo gtext("netbooks");?>, <?php echo gtext("motherboards");?>, <?php echo gtext("tablet PC");?></a>
 		</div>
 		
 		<div class="hardware_element">
diff --git a/h-source/Application/Views/Desktop/Notebooks/page.php b/h-source/Application/Views/Desktop/Notebooks/page.php
index 98b13cd..174bad3 100644
--- a/h-source/Application/Views/Desktop/Notebooks/page.php
+++ b/h-source/Application/Views/Desktop/Notebooks/page.php
@@ -45,13 +45,13 @@
 				</div>
 
 				<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 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[$tableName]['subtype']);?></b></div>
 				</div>
 				
 				<div class="notebook_vendor">
-					<div class="inner_label"><?php echo gtext("subtype (notebook, netbook, tablet)");?>:</div>
-					<div class="inner_value"><b><?php echo gtext($item[$tableName]['subtype']);?></b></div>
+					<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">
diff --git a/h-source/Application/Views/Desktop/catalogue.php b/h-source/Application/Views/Desktop/catalogue.php
index ad00222..9b441a2 100644
--- a/h-source/Application/Views/Desktop/catalogue.php
+++ b/h-source/Application/Views/Desktop/catalogue.php
@@ -71,19 +71,19 @@
 			</div>
 			<?php } ?>
 			
-			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
-			</div>
-
 			<?php if (strcmp($this->controller,'notebooks') === 0 ) { ?>
 			<div class="notebook_vendor">
-				<div class="inner_label"><?php echo gtext("subtype (notebook, netbook, tablet)");?>:</div>
+				<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>
 			</div>
 			<?php } ?>
 			
 			<div class="notebook_vendor">
+				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
+				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
+			</div>
+			
+			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
 				<div class="inner_value"><b><?php echo gtext($item['hardware']['comm_year']);?></b></div>
 			</div>
diff --git a/h-source/Application/Views/Mobile/Hardware/left.php b/h-source/Application/Views/Mobile/Hardware/left.php
index 4806d4d..4fbb0e4 100644
--- a/h-source/Application/Views/Mobile/Hardware/left.php
+++ b/h-source/Application/Views/Mobile/Hardware/left.php
@@ -29,7 +29,7 @@
 		<ul id="hardware_list" data-role="listview" data-theme="c" style="overflow:hidden;">
 			<li>
 				<a href="<?php echo $this->baseUrl?>/notebooks/catalogue/<?php echo $lang;?>">
-					<?php echo gtext("Notebooks, netbooks, tablet PC");?>
+					<?php echo gtext("Notebooks");?>, <?php echo gtext("netbooks");?>, <?php echo gtext("motherboards");?>, <?php echo gtext("tablet PC");?>
 					<img class="image_thumb_list" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/computer-laptop.png" />
 				</a>
 			</li>
diff --git a/h-source/Application/Views/Mobile/Notebooks/page.php b/h-source/Application/Views/Mobile/Notebooks/page.php
index bd139cc..5e10009 100644
--- a/h-source/Application/Views/Mobile/Notebooks/page.php
+++ b/h-source/Application/Views/Mobile/Notebooks/page.php
@@ -44,20 +44,15 @@
 				<div class="model_id">(<?php echo gtext("model id");?>: <b><?php echo $id_hard;?>)</b></div>
 
 				<div class="ui-grid-a main_content_element">
-					<div class="ui-block-a"><?php echo gtext("type");?>:</div>
-					<div class="ui-block-b"><b><?php echo singular($this->controller);?></b></div>
+					<div class="ui-block-a"><?php echo gtext("subtype");?> (<?php echo gtext("notebook");?>, <?php echo gtext("netbook");?>, <?php echo gtext("motherboard");?>, <?php echo gtext("tablet");?>):</div>
+					<div class="ui-block-b"><b><?php echo gtext($item[$tableName]['subtype']);?></b></div>
 				</div>
 
 				<div class="ui-grid-a main_content_element">
 					<div class="ui-block-a"><?php echo gtext("vendor");?>:</div>
 					<div class="ui-block-b"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
 				</div>
-
-				<div class="ui-grid-a main_content_element">
-					<div class="ui-block-a"><?php echo gtext("subtype (notebook, netbook, tablet)");?>:</div>
-					<div class="ui-block-b"><b><?php echo gtext($item[$tableName]['subtype']);?></b></div>
-				</div>
-
+				
 				<div class="ui-grid-a main_content_element">
 					<div class="ui-block-a"><?php echo gtext("architecture");?>:</div>
 					<div class="ui-block-b"><b><?php echo gtext(translate($item[$tableName]['architecture']));?></b></div>
diff --git a/h-source/Application/Views/Mobile/catalogue.php b/h-source/Application/Views/Mobile/catalogue.php
index 0ad2a1f..b1b239e 100644
--- a/h-source/Application/Views/Mobile/catalogue.php
+++ b/h-source/Application/Views/Mobile/catalogue.php
@@ -54,13 +54,13 @@
 						<p><?php echo gtext("possible other names of the device");?>: <b><?php echo nl2br($item['hardware']['other_names']);?></b></p>
 					<?php } ?>
 
-					<p><?php echo gtext("vendor");?>: <b><?php echo betterVendor($item['hardware']['vendor']);?></b></p>
-
 					<?php if (strcmp($this->controller,'notebooks') === 0 ) { ?>
 					<p>
-						<?php echo gtext("subtype (notebook, netbook, tablet)");?>: <b><?php echo gtext($item['hardware']['subtype']);?></b>
+						<?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>
 					</p>
 					<?php } ?>
+					
+					<p><?php echo gtext("vendor");?>: <b><?php echo betterVendor($item['hardware']['vendor']);?></b></p>
 			
 					<p><?php echo gtext("year of commercialization");?>: <b><?php echo gtext($item['hardware']['comm_year']);?></b></p>