aboutsummaryrefslogtreecommitdiff
path: root/h-source
diff options
context:
space:
mode:
Diffstat (limited to 'h-source')
-rw-r--r--h-source/Application/Controllers/AcquisitioncardsController.php2
-rw-r--r--h-source/Application/Controllers/BluetoothController.php2
-rw-r--r--h-source/Application/Controllers/EthernetcardsController.php2
-rw-r--r--h-source/Application/Controllers/FingerprintreadersController.php2
-rw-r--r--h-source/Application/Controllers/GenericController.php8
-rw-r--r--h-source/Application/Controllers/ModemsController.php2
-rw-r--r--h-source/Application/Controllers/NotebooksController.php8
-rw-r--r--h-source/Application/Controllers/PrintersController.php4
-rw-r--r--h-source/Application/Controllers/ScannersController.php2
-rw-r--r--h-source/Application/Controllers/SdcardreadersController.php2
-rw-r--r--h-source/Application/Controllers/SoundcardsController.php4
-rw-r--r--h-source/Application/Controllers/ThreegcardsController.php4
-rw-r--r--h-source/Application/Controllers/VideocardsController.php4
-rw-r--r--h-source/Application/Controllers/WebcamsController.php4
-rw-r--r--h-source/Application/Controllers/WifiController.php4
-rw-r--r--h-source/Application/Include/version.php28
-rw-r--r--h-source/Application/Models/GenericModel.php13
-rw-r--r--h-source/Application/Views/Desktop/Notebooks/catalogue.php92
-rw-r--r--h-source/Application/Views/Desktop/catalogue.php31
-rw-r--r--h-source/Application/Views/Mobile/bottom_left.php29
-rw-r--r--h-source/Application/Views/Mobile/catalogue.php84
-rw-r--r--h-source/Application/Views/Mobile/top_left.php47
-rw-r--r--h-source/Public/Css/mobile.css18
23 files changed, 258 insertions, 138 deletions
diff --git a/h-source/Application/Controllers/AcquisitioncardsController.php b/h-source/Application/Controllers/AcquisitioncardsController.php
index f908d8e..b248969 100644
--- a/h-source/Application/Controllers/AcquisitioncardsController.php
+++ b/h-source/Application/Controllers/AcquisitioncardsController.php
@@ -25,8 +25,6 @@ class AcquisitioncardsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
$worksOptions = Acquisitioncards::$select;
$worksField = 'compatibility';
diff --git a/h-source/Application/Controllers/BluetoothController.php b/h-source/Application/Controllers/BluetoothController.php
index 36751e8..f46a3f9 100644
--- a/h-source/Application/Controllers/BluetoothController.php
+++ b/h-source/Application/Controllers/BluetoothController.php
@@ -25,8 +25,6 @@ class BluetoothController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
$worksOptions = Bluetooth::$select;
$worksField = 'bluetooth_works';
diff --git a/h-source/Application/Controllers/EthernetcardsController.php b/h-source/Application/Controllers/EthernetcardsController.php
index 6df8c4f..baa8d1f 100644
--- a/h-source/Application/Controllers/EthernetcardsController.php
+++ b/h-source/Application/Controllers/EthernetcardsController.php
@@ -25,8 +25,6 @@ class EthernetcardsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
$worksOptions = Ethernetcards::$select;
$worksField = 'ethernet_card_works';
diff --git a/h-source/Application/Controllers/FingerprintreadersController.php b/h-source/Application/Controllers/FingerprintreadersController.php
index deba3f4..8d13b74 100644
--- a/h-source/Application/Controllers/FingerprintreadersController.php
+++ b/h-source/Application/Controllers/FingerprintreadersController.php
@@ -25,8 +25,6 @@ class FingerprintreadersController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
$worksOptions = Fingerprintreaders::$select;
$worksField = 'fingerprint_works';
diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index 3a8c1f0..adf2555 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -28,8 +28,11 @@ class GenericController extends BaseController
public $orderPopup;
public function __construct($model, $controller, $queryString) {
- parent::__construct($model, $controller, $queryString);
+
+ $this->_topMenuClasses['hardware'] = " class='currentitem ui-btn-active'";
+ parent::__construct($model, $controller, $queryString);
+
$this->model('UsersModel');
$popup = new Popup();
@@ -64,7 +67,7 @@ class GenericController extends BaseController
$data['howToCompileLabel'] = null;
$data['isApproved'] = true;
-
+
$this->append($data);
}
@@ -481,6 +484,7 @@ class GenericController extends BaseController
// echo $this->mod->getQuery();
$data['pageList'] = $this->h['Pages']->render($page-3,7);
+ $data['numberOfPages'] = $this->h['Pages']->getNumbOfPages();
$data['topNotice'] = $this->getModule(array('devices',$this->controller,'catalogue'));
diff --git a/h-source/Application/Controllers/ModemsController.php b/h-source/Application/Controllers/ModemsController.php
index 6917555..c306496 100644
--- a/h-source/Application/Controllers/ModemsController.php
+++ b/h-source/Application/Controllers/ModemsController.php
@@ -25,8 +25,6 @@ class ModemsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
$worksOptions = Modems::$select;
$worksField = 'compatibility';
diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php
index 45f8b17..6cac56e 100644
--- a/h-source/Application/Controllers/NotebooksController.php
+++ b/h-source/Application/Controllers/NotebooksController.php
@@ -25,9 +25,7 @@ class NotebooksController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
@@ -88,6 +86,10 @@ class NotebooksController extends GenericController
);
$this->setArgKeys($argKeys);
+
+ $data['worksField'] = 'compatibility';
+
+ $data['notFoundString'] = "No notebooks found";
$data['title'] = 'Notebooks';
$this->append($data);
diff --git a/h-source/Application/Controllers/PrintersController.php b/h-source/Application/Controllers/PrintersController.php
index 3ff195b..71ce9fb 100644
--- a/h-source/Application/Controllers/PrintersController.php
+++ b/h-source/Application/Controllers/PrintersController.php
@@ -25,9 +25,7 @@ class PrintersController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
diff --git a/h-source/Application/Controllers/ScannersController.php b/h-source/Application/Controllers/ScannersController.php
index 1cbfd09..4355f37 100644
--- a/h-source/Application/Controllers/ScannersController.php
+++ b/h-source/Application/Controllers/ScannersController.php
@@ -25,8 +25,6 @@ class ScannersController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
parent::__construct($model, $controller, $queryString);
diff --git a/h-source/Application/Controllers/SdcardreadersController.php b/h-source/Application/Controllers/SdcardreadersController.php
index d619b26..7b26375 100644
--- a/h-source/Application/Controllers/SdcardreadersController.php
+++ b/h-source/Application/Controllers/SdcardreadersController.php
@@ -25,8 +25,6 @@ class SdcardreadersController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
$worksOptions = Sdcardreaders::$select;
$worksField = 'sd_card_works';
diff --git a/h-source/Application/Controllers/SoundcardsController.php b/h-source/Application/Controllers/SoundcardsController.php
index dcbce1a..60dffed 100644
--- a/h-source/Application/Controllers/SoundcardsController.php
+++ b/h-source/Application/Controllers/SoundcardsController.php
@@ -25,9 +25,7 @@ class SoundcardsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
diff --git a/h-source/Application/Controllers/ThreegcardsController.php b/h-source/Application/Controllers/ThreegcardsController.php
index 1681158..c9ecfcb 100644
--- a/h-source/Application/Controllers/ThreegcardsController.php
+++ b/h-source/Application/Controllers/ThreegcardsController.php
@@ -25,9 +25,7 @@ class ThreegcardsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
diff --git a/h-source/Application/Controllers/VideocardsController.php b/h-source/Application/Controllers/VideocardsController.php
index 0d2272a..ad6c0ef 100644
--- a/h-source/Application/Controllers/VideocardsController.php
+++ b/h-source/Application/Controllers/VideocardsController.php
@@ -25,9 +25,7 @@ class VideocardsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
diff --git a/h-source/Application/Controllers/WebcamsController.php b/h-source/Application/Controllers/WebcamsController.php
index 6d51d3d..98bc2a7 100644
--- a/h-source/Application/Controllers/WebcamsController.php
+++ b/h-source/Application/Controllers/WebcamsController.php
@@ -25,9 +25,7 @@ class WebcamsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
diff --git a/h-source/Application/Controllers/WifiController.php b/h-source/Application/Controllers/WifiController.php
index b2bcd73..960d2c1 100644
--- a/h-source/Application/Controllers/WifiController.php
+++ b/h-source/Application/Controllers/WifiController.php
@@ -25,9 +25,7 @@ class WifiController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
diff --git a/h-source/Application/Include/version.php b/h-source/Application/Include/version.php
index 2930d78..928a8e1 100644
--- a/h-source/Application/Include/version.php
+++ b/h-source/Application/Include/version.php
@@ -30,6 +30,34 @@ class Version
'credits,index',
'project,index',
'hardware,catalogue',
+ 'wifi,catalogue',
+ 'wifi,view',
+ 'videocards,catalogue',
+ 'videocards,view',
+ 'printers,catalogue',
+ 'printers,view',
+ 'scanners,catalogue',
+ 'scanners,view',
+ 'threegcards,catalogue',
+ 'threegcards,view',
+ 'soundcards,catalogue',
+ 'soundcards,view',
+ 'webcams,catalogue',
+ 'webcams,view',
+ 'bluetooth,catalogue',
+ 'bluetooth,view',
+ 'acquisitioncards,catalogue',
+ 'acquisitioncards,view',
+ 'fingerprintreaders,catalogue',
+ 'fingerprintreaders,view',
+ 'ethernetcards,catalogue',
+ 'ethernetcards,view',
+ 'sdcardreaders,catalogue',
+ 'sdcardreaders,view',
+ 'modems,catalogue',
+ 'modems,view',
+ 'notebooks,catalogue',
+ 'notebooks,view',
);
//get the subfolder of the Views folder where to look for the view files
diff --git a/h-source/Application/Models/GenericModel.php b/h-source/Application/Models/GenericModel.php
index 64f24be..70bc816 100644
--- a/h-source/Application/Models/GenericModel.php
+++ b/h-source/Application/Models/GenericModel.php
@@ -81,13 +81,20 @@ class GenericModel extends Model_Tree {
{
$html = null;
$listArray = array('page','history_page');
+
+ $count = 0;
foreach ($viewArgs as $field => $value)
{
- if (!in_array($field,$listArray))
+ if ($count < 5)
{
- $value = getTranslationFunction($field) !== 'gtext' ? gtext(call_user_func(getTranslationFunction($field),$value)) : gtext($value);
- $html .= "<div class='viewall_popup_menu_status_item'>".$value."</div>\n";
+ if (!in_array($field,$listArray))
+ {
+ $value = getTranslationFunction($field) !== 'gtext' ? gtext(call_user_func(getTranslationFunction($field),$value)) : gtext($value);
+ $html .= "<div class='viewall_popup_menu_status_item'>".$value."</div>\n";
+
+ $count++;
+ }
}
}
return $html;
diff --git a/h-source/Application/Views/Desktop/Notebooks/catalogue.php b/h-source/Application/Views/Desktop/Notebooks/catalogue.php
deleted file mode 100644
index 4648b3d..0000000
--- a/h-source/Application/Views/Desktop/Notebooks/catalogue.php
+++ /dev/null
@@ -1,92 +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/>.
-?>
-
- <div class="viewall_popup_menu_box_external">
- <div class="viewall_popup_menu_box">
- <?php echo $popup;?>
- </div>
- <div class="viewall_popup_menu_status">
- <div class="viewall_popup_menu_status_item"><?php echo gtext(betterVendor($this->viewArgs['vendor']));?></div>
- <div class="viewall_popup_menu_status_item"><?php echo gtext($this->viewArgs['compatibility'])?></div>
- <div class="viewall_popup_menu_status_item"><?php echo gtext($this->viewArgs['comm_year'])?></div>
- <div class="viewall_popup_menu_status_item"><?php echo gtext($this->viewArgs['subtype'])?></div>
- <div class="viewall_popup_menu_status_item"><?php echo gtext($this->viewArgs['sort-by'])?></div>
- </div>
- </div>
-
- <div class="viewall_popup_menu_box_external more_filters">
- <div class="viewall_popup_menu_box">
- <?php echo $popupMore;?>
- </div>
- <div class="viewall_popup_menu_status">
- <div class="viewall_popup_menu_status_item"><?php echo gtext($this->viewArgs['bios'])?></div>
- <div class="viewall_popup_menu_status_item"><?php echo gtext(translate($this->viewArgs['architecture']));?></div>
- </div>
- </div>
-
- <!--if no notebooks found-->
- <?php if (strcmp($recordNumber,0) === 0) { ?>
- <div class="viewall_no_items_found">
- <?php echo gtext("No notebooks found");?>..
- </div>
- <?php } ?>
-
- <!--loop-->
- <?php foreach ($table as $item) {?>
- <div class="model_viewall">
-
- <div class="notebook_model">
- <img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"><span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
- </div>
-
- <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("subtype (notebook, netbook, tablet)");?></div>
- <div class="inner_value"><b><?php echo gtext($item['hardware']['subtype']);?></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 gtext($item['hardware']['comm_year']);?></b></div>
- </div>
-
- <div class="notebook_compatibility">
- <div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
- <div class="inner_value"><?php echo gtext($item['hardware']['compatibility']);?></div>
- </div>
-
- <div class="notebook_view_link">
- <a href="<?php echo $this->baseUrl."/notebooks/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?></a>
- </div>
-
- </div>
- <?php } ?>
-
- <?php if (strcmp($recordNumber,0) !== 0) { ?>
- <div class="history_page_list">
- <?php echo gtext("page list");?>: <?php echo $pageList;?>
- </div>
- <?php } ?> \ No newline at end of file
diff --git a/h-source/Application/Views/Desktop/catalogue.php b/h-source/Application/Views/Desktop/catalogue.php
index ca0d735..5bda414 100644
--- a/h-source/Application/Views/Desktop/catalogue.php
+++ b/h-source/Application/Views/Desktop/catalogue.php
@@ -28,6 +28,18 @@
<?php echo $popupLabel;?>
</div>
</div>
+
+ <?php if (strcmp($this->controller,'notebooks') === 0 ) { ?>
+ <div class="viewall_popup_menu_box_external more_filters">
+ <div class="viewall_popup_menu_box">
+ <?php echo $popupMore;?>
+ </div>
+ <div class="viewall_popup_menu_status">
+ <div class="viewall_popup_menu_status_item"><?php echo gtext($this->viewArgs['bios'])?></div>
+ <div class="viewall_popup_menu_status_item"><?php echo gtext(translate($this->viewArgs['architecture']));?></div>
+ </div>
+ </div>
+ <?php } ?>
<!--if no notebooks found-->
<?php if (strcmp($recordNumber,0) === 0) { ?>
@@ -44,7 +56,7 @@
<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span>
</div>
- <?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
+ <?php if ( strcmp($this->controller,'notebooks') !== 0 and strcmp($item['hardware']['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['hardware']['other_names']);?></div>
@@ -55,20 +67,29 @@
<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_value"><b><?php echo gtext($item['hardware']['subtype']);?></b></div>
+ </div>
+ <?php } ?>
<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>
-
+
+ <?php if (strcmp($this->controller,'notebooks') !== 0 ) { ?>
<div class="notebook_vendor">
<div class="inner_label"><?php echo gtext("interface");?>:</div>
<div class="inner_value"><b><?php echo gtext(translate($item['hardware']['interface']));?></b></div>
</div>
+ <?php } ?>
<div class="notebook_kernel">
- <?php if (strcmp($this->controller,'printers') === 0 or strcmp($this->controller,'scanners') === 0) { ?>
- <div class="inner_label"><?php echo gtext("compatibility with free software");?></div>
+ <?php if (strcmp($this->controller,'printers') === 0 or strcmp($this->controller,'scanners') === 0 or strcmp($this->controller,'notebooks') === 0) { ?>
+ <div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
<?php } else if (strcmp($this->controller,'videocards') === 0 ) { ?>
<div class="inner_label"><?php echo gtext("how does it work with free software?");?></div>
<?php } else { ?>
@@ -85,7 +106,7 @@
<?php } ?>
<div class="notebook_view_link">
- <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?>..</a>
+ <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>"><?php echo gtext("view the other specifications");?></a>
</div>
</div>
diff --git a/h-source/Application/Views/Mobile/bottom_left.php b/h-source/Application/Views/Mobile/bottom_left.php
new file mode 100644
index 0000000..545a6ea
--- /dev/null
+++ b/h-source/Application/Views/Mobile/bottom_left.php
@@ -0,0 +1,29 @@
+<?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($this->action,'talk') !== 0) { ?>
+ <div class="bottom_licence_notice">
+ <?php echo License::getBottom();?>
+ </div>
+ <?php } ?>
+
+ </div> \ No newline at end of file
diff --git a/h-source/Application/Views/Mobile/catalogue.php b/h-source/Application/Views/Mobile/catalogue.php
new file mode 100644
index 0000000..d848add
--- /dev/null
+++ b/h-source/Application/Views/Mobile/catalogue.php
@@ -0,0 +1,84 @@
+<?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/>.
+?>
+
+ <div class="ui-grid-a page_list">
+ <?php if ( $recordNumber > 10 ) { ?>
+ <?php if ($this->viewArgs['page'] > 1) { ?>
+ <div class="ui-block-a"><a rel="external" href="<?php echo $this->baseUrl."/".$this->controller."/catalogue/$lang/".($this->viewArgs['page']-1);?>" data-inline="true" data-icon="arrow-l" data-theme="b" data-role="button">previous</a></div>
+ <?php } ?>
+ <?php if ($this->viewArgs['page'] < $numberOfPages) { ?>
+ <div style="text-align:right;" class="ui-block-b"><a rel="external" href="<?php echo $this->baseUrl."/".$this->controller."/catalogue/$lang/".($this->viewArgs['page']+1);?>" data-inline="true" data-icon="arrow-r" data-iconpos="right" data-theme="b" data-role="button">next</a></div>
+ <?php } ?>
+ <?php } ?>
+ </div>
+
+ <!--if no device is found-->
+ <?php if (strcmp($recordNumber,0) === 0) { ?>
+ <div class="viewall_no_items_found">
+ <?php echo gtext($notFoundString);?>..
+ </div>
+ <?php } ?>
+
+ <!--loop-->
+ <ul class="devices_list" data-role="listview">
+ <?php foreach ($table as $item) {?>
+ <li><a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/".$item['hardware']['id_hard'].'/'.encodeUrl($item['hardware']['model']).$this->viewStatus;?>">
+ <img src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>" alt="France" class="ui-li-icon" />
+ <h3><?php echo $item['hardware']['model'];?></h3>
+
+ <?php if ( strcmp($this->controller,'notebooks') !== 0 and strcmp($item['hardware']['other_names'],'') !== 0 ) { ?>
+ <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>
+ </p>
+ <?php } ?>
+
+ <p><?php echo gtext("year of commercialization");?>: <b><?php echo gtext($item['hardware']['comm_year']);?></b></p>
+
+ <?php if (strcmp($this->controller,'notebooks') !== 0 ) { ?>
+ <p><?php echo gtext("interface");?>: <b><?php echo gtext(translate($item['hardware']['interface']));?></b></p>
+ <?php } ?>
+
+ <p>
+ <?php if (strcmp($this->controller,'printers') === 0 or strcmp($this->controller,'scanners') === 0 or strcmp($this->controller,'notebooks') === 0) { ?>
+ <?php echo gtext("compatibility with free software");?>:
+ <?php } else if (strcmp($this->controller,'videocards') === 0 ) { ?>
+ <?php echo gtext("how does it work with free software?");?>
+ <?php } else { ?>
+ <?php echo gtext("does it work with free software?");?>
+ <?php } ?>
+ <b><?php echo gtext(translate($item['hardware'][$worksField]));?></b>
+ </p>
+
+ <?php if (strcmp($this->controller,'printers') === 0 ) { ?>
+ <p><?php echo gtext("does it adopt any techniques to track users?");?> <b><?php echo gtext($item['hardware']['it_tracks_users']);?></b>
+ </p>
+ <?php } ?>
+ </a>
+ </li>
+ <?php } ?>
+ </ul> \ No newline at end of file
diff --git a/h-source/Application/Views/Mobile/top_left.php b/h-source/Application/Views/Mobile/top_left.php
new file mode 100644
index 0000000..0975d7b
--- /dev/null
+++ b/h-source/Application/Views/Mobile/top_left.php
@@ -0,0 +1,47 @@
+<?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/>.
+?>
+
+ <div data-role="content">
+
+ <div class="position_tree_box">
+ <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/hardware/catalogue/$lang";?>">Hardware</a> &raquo; <?php echo $tree;?>
+ </div>
+
+ <?php if (strcmp($this->action,'view') === 0) { ?>
+
+ <div class="notebook_view_title">
+ <?php echo singular($this->controller);?> <b><?php echo $ne_name;?></b>
+ </div>
+
+ <h4 class="view_page_back_button">
+ <a title="Back to the list of <?php echo plural($this->controller);?>" href="<?php echo $this->baseUrl."/".$this->controller."/catalogue/$lang".$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
+ </h4>
+
+ <?php } else if (strcmp($this->action,'catalogue') === 0) { ?>
+
+ <div class="notebook_view_title">
+ <?php echo gtext("List of");?> <b><?php echo plural($this->controller);?></b>
+ </div>
+
+ <?php echo $topNotice;?>
+
+ <?php } ?> \ No newline at end of file
diff --git a/h-source/Public/Css/mobile.css b/h-source/Public/Css/mobile.css
index e351ffc..6f5a84a 100644
--- a/h-source/Public/Css/mobile.css
+++ b/h-source/Public/Css/mobile.css
@@ -85,7 +85,23 @@ img
margin-top:20px;
margin-bottom:20px;
}
-
+.bottom_licence_notice
+{
+ clear:left;
+ clear:right;
+ font:normal 12px/1.2 sans-serif,arial;
+ padding:10px;
+ background:#E0FFFF;
+ margin:25px 0px 5px 0px;
+}
+.page_list
+{
+ margin-bottom:28px;
+}
+.notebook_view_title
+{
+ margin-bottom:28px;
+}
/*jquery mobile*/
.ui-header {
background: #B7F18C;