aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application
diff options
context:
space:
mode:
authorAntonio Gallo <tonicucoz@gmail.com>2011-10-24 14:10:40 +0000
committerAntonio Gallo <tonicucoz@gmail.com>2011-10-24 14:10:40 +0000
commitc7c3e14d0b007659666745552999fcab8817b625 (patch)
treeb5f520642dae1a71568720e06c010303f51105be /h-source/Application
parent0cc7100dcf9abbab90cd49930074e3b9eaf15095 (diff)
added vendor
Diffstat (limited to 'h-source/Application')
-rw-r--r--h-source/Application/Include/hardware.php1
-rw-r--r--h-source/Application/Include/vendorTranslations.php1
-rw-r--r--h-source/Application/Models/NotebooksModel.php4
-rw-r--r--h-source/Application/Views/Notebooks/catalogue.php4
-rw-r--r--h-source/Application/Views/Notebooks/page.php2
5 files changed, 9 insertions, 3 deletions
diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index 8caff1a..e5dccea 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -259,6 +259,7 @@ class Notebooks extends Hardware
"Lenovo" => "Lenovo",
"LG" => "LG",
"msi" => "msi",
+ "One Laptop per Child (Non-Profit)" => "One-Laptop-per-Child-Non-Profit",
"Philco" => "Philco",
"Philips" => "Philips",
"Panasonic" => "Panasonic",
diff --git a/h-source/Application/Include/vendorTranslations.php b/h-source/Application/Include/vendorTranslations.php
index b6c2093..4c6cca7 100644
--- a/h-source/Application/Include/vendorTranslations.php
+++ b/h-source/Application/Include/vendorTranslations.php
@@ -24,6 +24,7 @@ if (!defined('EG')) die('Direct access not allowed!');
function betterVendor($string)
{
$names = array(
+ "One-Laptop-per-Child-Non-Profit" => "One Laptop per Child (Non-Profit)",
"AT-T" => "AT&T",
"Franklin-Wireless-Corporation" => "Franklin Wireless Corporation",
"Novatel-Wireless" => "Novatel Wireless",
diff --git a/h-source/Application/Models/NotebooksModel.php b/h-source/Application/Models/NotebooksModel.php
index b9f4b80..cc1b9eb 100644
--- a/h-source/Application/Models/NotebooksModel.php
+++ b/h-source/Application/Models/NotebooksModel.php
@@ -41,6 +41,10 @@ class NotebooksModel extends GenericModel {
'subtype' => gtext("subtype"),
);
+ $this->_popupFunctions = array(
+ 'vendor' => 'betterVendor',
+ );
+
$this->createPopupWhere('vendor,compatibility,comm_year,subtype');
$this->diffFields = array(
diff --git a/h-source/Application/Views/Notebooks/catalogue.php b/h-source/Application/Views/Notebooks/catalogue.php
index 7538e6f..d2d1125 100644
--- a/h-source/Application/Views/Notebooks/catalogue.php
+++ b/h-source/Application/Views/Notebooks/catalogue.php
@@ -25,7 +25,7 @@
<?php echo $popup;?>
</div>
<div class="viewall_popup_menu_status">
- <div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['vendor']?></div>
+ <div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor']);?></div>
<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['compatibility']?></div>
<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['subtype']?></div>
@@ -60,7 +60,7 @@
<div class="notebook_vendor">
<div class="inner_label"><?php echo gtext("vendor");?>:</div>
- <div class="inner_value"><?php echo $item['hardware']['vendor'];?></div>
+ <div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
</div>
<div class="notebook_vendor">
diff --git a/h-source/Application/Views/Notebooks/page.php b/h-source/Application/Views/Notebooks/page.php
index 6c7a97f..6e3db82 100644
--- a/h-source/Application/Views/Notebooks/page.php
+++ b/h-source/Application/Views/Notebooks/page.php
@@ -46,7 +46,7 @@
<div class="notebook_vendor">
<div class="inner_label"><?php echo gtext("vendor");?>:</div>
- <div class="inner_value"><b><?php echo $item[$tableName]['vendor'];?></b></div>
+ <div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
</div>
<div class="notebook_vendor">