diff options
Diffstat (limited to 'h-source/Application/Views/Desktop')
| -rw-r--r-- | h-source/Application/Views/Desktop/Notebooks/catalogue.php | 92 | ||||
| -rw-r--r-- | h-source/Application/Views/Desktop/catalogue.php | 31 |
2 files changed, 26 insertions, 97 deletions
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> |