diff options
author | Antonio Gallo <tonicucoz@gmail.com> | 2011-08-22 06:13:52 +0000 |
---|---|---|
committer | Antonio Gallo <tonicucoz@gmail.com> | 2011-08-22 06:13:52 +0000 |
commit | 0721f5e55bf8ae501e15880f9ae243a58eadd00b (patch) | |
tree | a57f95c36c57af8c192efe6f7e31b45482786303 /h-source | |
parent | af545a1469350e9cd6ce6ca3925184b601bae27d (diff) |
chenged label for architecture
Diffstat (limited to 'h-source')
-rw-r--r-- | h-source/Application/Controllers/DownloadController.php | 4 | ||||
-rw-r--r-- | h-source/Application/Controllers/NotebooksController.php | 4 | ||||
-rw-r--r-- | h-source/Application/Include/hardware.php | 14 | ||||
-rw-r--r-- | h-source/Application/Views/header.php | 4 |
4 files changed, 18 insertions, 8 deletions
diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php index 99fb06a..20d00a3 100644 --- a/h-source/Application/Controllers/DownloadController.php +++ b/h-source/Application/Controllers/DownloadController.php @@ -48,12 +48,12 @@ class DownloadController extends BaseController $xml = null; $xml = "<?xml version='1.0' encoding='UTF-8'?>\n"; $xml .= "<hardware>\n"; - $xml .= "\t<general_informations>\n"; + $xml .= "\t<general_information>\n"; $xml .= "\t\t<credits>h-node project</credits>\n"; $xml .= "\t\t<link>www.h-node.com</link>\n"; $xml .= "\t\t<date>".date("Y-m-d H:i:s")."</date>\n"; $xml .= "\t\t<license>".License::getInsideXml()."</license>\n"; - $xml .= "\t</general_informations>\n"; + $xml .= "\t</general_information>\n"; foreach ($res as $row) { diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php index 470edc2..103ac05 100644 --- a/h-source/Application/Controllers/NotebooksController.php +++ b/h-source/Application/Controllers/NotebooksController.php @@ -55,7 +55,7 @@ class NotebooksController extends GenericController "+++++checkIsStrings|".Notebooks::videoList() => "video_card_works", "++++++checkIsStrings|".Notebooks::$biosSelect => "bios", "+++++++checkIsStrings|".Notebooks::webcamList() => "webcam_works", - "++++++++checkIsStrings|".Notebooks::$architectureSelect => "architecture", + "++++++++checkIsStrings|".Notebooks::architectureList() => "architecture", ); $this->m['HardwareModel']->strongConditions['insert'] = array( @@ -71,7 +71,7 @@ class NotebooksController extends GenericController "+++++checkIsStrings|".Notebooks::videoList() => "video_card_works", "++++++checkIsStrings|".Notebooks::$biosSelect => "bios", "+++++++checkIsStrings|".Notebooks::webcamList() => "webcam_works", - "++++++++checkIsStrings|".Notebooks::$architectureSelect => "architecture", + "++++++++checkIsStrings|".Notebooks::architectureList() => "architecture", ); $this->m['HardwareModel']->softConditions['update'] = array( diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php index 999a540..8306417 100644 --- a/h-source/Application/Include/hardware.php +++ b/h-source/Application/Include/hardware.php @@ -249,7 +249,13 @@ class Notebooks extends Hardware public static $subtypeSelect = 'notebook,netbook,not-specified'; - public static $architectureSelect = 'not-specified,x86,amd64,MIPS,ARM'; + public static $architectureSelect = array( + "not specified" => 'not-specified', + "x86" => 'x86', + "x86-64/amd64" => 'amd64', + "MIPS" => 'MIPS', + "ARM" => 'ARM', + ); public static $biosSelect = 'not-specified,no,yes'; @@ -321,7 +327,11 @@ class Notebooks extends Hardware { return implode(',',array_values(self::$compatibility)); } - + + public static function architectureList() + { + return implode(',',array_values(self::$architectureSelect)); + } } class ThreeGcards extends Wifi diff --git a/h-source/Application/Views/header.php b/h-source/Application/Views/header.php index 96f1a8c..c70ba59 100644 --- a/h-source/Application/Views/header.php +++ b/h-source/Application/Views/header.php @@ -31,8 +31,8 @@ $currPos = $querySanitized ? $this->controller."/".$this->action : 'home/index'; <title><?php echo $title;?></title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <meta name="description" content="free software project with the aim of collecting informations about the hardware that work with a fully free operating system" /> - <meta name="keywords" content="free software GNU Linux distribution hardware wiki users freedom" /> + <meta name="description" content="free software project with the aim of collecting information about the hardware that works with a fully free operating system" /> + <meta name="keywords" content="hardware database free software GNU Linux distribution wiki users freedom" /> <link rel="stylesheet" type="text/css" href="<?php echo $this->baseUrl?>/Public/Css/main.css"> <link rel="Shortcut Icon" href="<?php echo $this->baseUrl?>/Public/Img/tab_icon_2.ico" type="image/x-icon"> |