aboutsummaryrefslogtreecommitdiff
path: root/h-source
diff options
context:
space:
mode:
Diffstat (limited to 'h-source')
-rw-r--r--h-source/Application/Include/languages.php4
-rw-r--r--h-source/Application/Views/Mobile/catalogue.php8
-rw-r--r--h-source/Application/Views/Mobile/dialog.php22
-rw-r--r--h-source/Application/Views/Mobile/header.php14
-rw-r--r--h-source/Application/Views/Mobile/if_page_deleted.php59
-rw-r--r--h-source/Application/Views/Mobile/moderator_dialog.php21
-rw-r--r--h-source/Application/Views/Mobile/page.php134
-rw-r--r--h-source/Application/Views/Mobile/top_left.php12
-rw-r--r--h-source/Public/Css/mobile.css38
-rwxr-xr-xh-source/Public/Img/Crystal/hardware.pngbin0 -> 3478 bytes
-rwxr-xr-xh-source/Public/Img/Crystal/home.pngbin0 -> 867 bytes
11 files changed, 302 insertions, 10 deletions
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index b519010..9e9f98a 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -371,6 +371,10 @@ class Lang
/*0312*/"works_with_3D" => "funziona con 3D",
/*0313*/"list of languages" => "elenco delle lingue",
/*0314*/"Choose the language" => "Scegli la lingua",
+ /*0315*/"back" => "indietro",
+ /*0316*/"next" => "successivi",
+ /*0317*/"previous" => "precedenti",
+ /*0318*/"type" => "tipo",
),
'es' => array
(
diff --git a/h-source/Application/Views/Mobile/catalogue.php b/h-source/Application/Views/Mobile/catalogue.php
index 9113311..8d00d08 100644
--- a/h-source/Application/Views/Mobile/catalogue.php
+++ b/h-source/Application/Views/Mobile/catalogue.php
@@ -26,6 +26,10 @@
<?php echo gtext($notFoundString);?>..
</div>
<?php } ?>
+
+ <div class="back_button">
+ <a rel="external" href="<?php echo $this->baseUrl."/hardware/catalogue/$lang/"?>" data-inline="true" data-icon="arrow-l" data-iconpos="left" data-theme="b" data-role="button"><?php echo gtext('back');?></a>
+ </div>
<!--loop-->
<ul class="devices_list" data-dividertheme="b" data-role="listview">
@@ -76,10 +80,10 @@
<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>
+ <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"><?php echo gtext('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>
+ <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"><?php echo gtext('next');?></a></div>
<?php } ?>
<?php } ?>
</div> \ No newline at end of file
diff --git a/h-source/Application/Views/Mobile/dialog.php b/h-source/Application/Views/Mobile/dialog.php
new file mode 100644
index 0000000..55225a6
--- /dev/null
+++ b/h-source/Application/Views/Mobile/dialog.php
@@ -0,0 +1,22 @@
+<?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/>.
+?>
+
diff --git a/h-source/Application/Views/Mobile/header.php b/h-source/Application/Views/Mobile/header.php
index e3340b0..deb1782 100644
--- a/h-source/Application/Views/Mobile/header.php
+++ b/h-source/Application/Views/Mobile/header.php
@@ -56,6 +56,16 @@ $currPos = $querySanitized ? $this->controller."/".$this->action : 'home/index';
background-image: url(<?php echo $this->baseUrl;?>/Public/Img/Famfamfam/<?php echo $langIcon;?>);
background-position:1px 4px;
}
+ .ui-icon-go-to-hardware
+ {
+ background-image: url(<?php echo $this->baseUrl;?>/Public/Img/Crystal/hardware.png);
+ background-position:1px 0px;
+ }
+ .ui-icon-go-to-home
+ {
+ background-image: url(<?php echo $this->baseUrl;?>/Public/Img/Crystal/home.png);
+ background-position:1px 1px;
+ }
</style>
<script type="text/javascript">
@@ -82,8 +92,8 @@ $currPos = $querySanitized ? $this->controller."/".$this->action : 'home/index';
<div data-theme='b' data-role="navbar" data-iconpos="left">
<ul>
- <li><a <?php echo $tm['home']; ?> href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a></li>
- <li><a <?php echo $tm['hardware']; ?> href="<?php echo $this->baseUrl."/hardware/catalogue/$lang";?>">Hardware</a></li>
+ <li><a data-icon="go-to-home" <?php echo $tm['home']; ?> href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a></li>
+ <li><a data-icon="go-to-hardware" <?php echo $tm['hardware']; ?> href="<?php echo $this->baseUrl."/hardware/catalogue/$lang";?>">Hardware</a></li>
<li><a data-icon="current-lang" data-rel="dialog" href="#language-dialog"><?php echo $langLabel;?></a></li>
</ul>
</div><!-- /navbar -->
diff --git a/h-source/Application/Views/Mobile/if_page_deleted.php b/h-source/Application/Views/Mobile/if_page_deleted.php
new file mode 100644
index 0000000..3610716
--- /dev/null
+++ b/h-source/Application/Views/Mobile/if_page_deleted.php
@@ -0,0 +1,59 @@
+<?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 ($isDeleted and $isApproved) { ?>
+
+ <div class="notebooks_viewall">
+ <div class="revision_alert">
+ <div>
+ This page has been deleted as requested by:
+ <?php foreach ($deletionUsers as $user) { ?>
+ <?php echo $u->getLinkToUserFromId($user);?>
+ <?php } ?>
+ </div>
+ </div>
+ <div class="deletion_motivations_title">
+ With the following motivations:
+ </div>
+ <div class="deletion_motivations_external">
+ <?php foreach ($deletion as $row) { ?>
+ <div class="deletion_motivations_iternal">
+ <div class="deletion_motivations_iternal_title">
+ motivation of <?php echo $u->getLinkToUserFromId($row['deletion']['created_by']);?>: <?php echo getMotivation($row,$this->controller);?>
+ </div>
+ <div class="deletion_motivations_iternal_message">
+ message: <i><?php echo $row['deletion']['message'];?></i>
+ </div>
+ </div>
+ <?php } ?>
+ </div>
+ </div>
+
+ <?php } else if ($isDeleted and !$isApproved) { ?>
+
+ <div class="notebooks_viewall">
+ <div class="revision_alert">
+ <?php echo gtext('The device page has to be approved by an administrator of the website'); ?>
+ </div>
+ </div>
+
+ <?php } ?> \ No newline at end of file
diff --git a/h-source/Application/Views/Mobile/moderator_dialog.php b/h-source/Application/Views/Mobile/moderator_dialog.php
new file mode 100644
index 0000000..47e9af9
--- /dev/null
+++ b/h-source/Application/Views/Mobile/moderator_dialog.php
@@ -0,0 +1,21 @@
+<?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/>.
+?> \ No newline at end of file
diff --git a/h-source/Application/Views/Mobile/page.php b/h-source/Application/Views/Mobile/page.php
new file mode 100644
index 0000000..773ed12
--- /dev/null
+++ b/h-source/Application/Views/Mobile/page.php
@@ -0,0 +1,134 @@
+<?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 (!$isDeleted or $isadmin) { ?>
+
+ <?php
+ $tableName = (strcmp($this->action,'view') === 0) ? 'hardware' : 'revisions';
+ $displayClass = ($isDeleted) ? 'display_none' : null;
+ ?>
+
+ <?php foreach ($table as $item) { ?>
+ <div class="notebooks_viewall <?php echo $displayClass;?>">
+
+ <!--if revision-->
+ <?php if (strcmp($this->action,'revision') === 0) { ?>
+ <div class="revision_alert">
+ <?php echo gtext("This is an old revision of this page, as edited by");?> <b><?php echo $u->getLinkToUserFromId($updated_by);?></b> <?php echo gtext('at');?> <b><?php echo smartDate($update_date); ?></b>. <?php echo gtext("It may differ significantly from the");?> <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>"><?php echo gtext("Current revision");?></a>.
+ </div>
+ <?php } ?>
+
+ <?php if ( strcmp($item[$tableName]['it_tracks_users'],'yes') === 0 ) { ?>
+ <?php echo $tracksHelpTop;?>
+ <?php } ?>
+
+ <h3 class="model_name">
+ <img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item[$tableName]['type']);?>"> <b><?php echo $item[$tableName]['model'];?></b>
+ </h3>
+
+ <div class="model_id">(<?php echo gtext("model id");?>: <?php echo $id_hard;?>)</div>
+
+ <?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?>
+ <div class="ui-grid-a main_content_element">
+ <div class="ui-block-a"><?php echo gtext("possible other names of the device");?>:</div>
+ <div class="ui-block-b"><b><?php echo nl2br($item[$tableName]['other_names']);?></b></div>
+ </div>
+ <?php } ?>
+
+ <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>
+
+ <?php if (strcmp($this->controller,'printers') === 0 ) { ?>
+ <div class="ui-grid-a main_content_element">
+ <div class="ui-block-a"><?php echo gtext("subtype");?> (laser, inkjet, ..):</div>
+ <div class="ui-block-b"><b><?php echo gtext($item[$tableName]['subtype']);?></b></div>
+ </div>
+ <?php } ?>
+
+ <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("VendorID:ProductID code of the device");?>:</div>
+ <div class="ui-block-b"><b><?php echo $item[$tableName]['pci_id'];?></b></div>
+ </div>
+
+ <div class="ui-grid-a main_content_element">
+ <div class="ui-block-a"><?php echo gtext("year of commercialization");?>:</div>
+ <div class="ui-block-b"><b><?php echo gtext($item[$tableName]['comm_year']);?></b></div>
+ </div>
+
+ <div class="ui-grid-a main_content_element">
+ <div class="ui-block-a"><?php echo gtext("interface");?>:</div>
+ <div class="ui-block-b"><b><?php echo gtext(translate($item[$tableName]['interface']));?></b></div>
+ </div>
+
+ <div class="ui-grid-a main_content_element">
+ <div class="ui-block-a"><?php echo gtext("tested on");?>:</div>
+ <div class="ui-block-b"><b><?php echo Distributions::getName($item[$tableName]['distribution']);?></b></div>
+ </div>
+
+ <div class="ui-grid-a main_content_element">
+ <div class="ui-block-a"><?php echo gtext("tested with the following kernel libre");?>:</div>
+ <div class="ui-block-b"><b><?php echo $item[$tableName]['kernel'];?></b></div>
+ </div>
+
+ <div class="ui-grid-a main_content_element">
+ <?php if (strcmp($this->controller,'videocards') === 0 ) { ?>
+ <div class="ui-block-a"><?php echo gtext("tested with the following kernel libre");?>:</div>
+ <?php } else if (strcmp($this->controller,'printers') === 0 ) { ?>
+ <div class="ui-block-a"><?php echo gtext("compatibility with free software");?>:</div>
+ <?php } else if (strcmp($this->controller,'scanners') === 0 ) { ?>
+ <div class="ui-block-a"><?php echo gtext("compatibility with free software");?>:</div>
+ <?php } else { ?>
+ <div class="ui-block-a"><?php echo gtext("does it work with free software?");?></div>
+ <?php } ?>
+ <div class="ui-block-b"><b><?php echo gtext(translate($item[$tableName][$worksField]));?></b></div>
+ </div>
+
+ <?php if (strcmp($this->controller,'printers') === 0 ) { ?>
+ <div class="ui-grid-a main_content_element">
+ <div class="ui-block-a"><?php echo gtext("does it adopt any techniques to track users?");?><div class="box_module_label"><?php echo $tracksHelpLabel;?></div></div>
+ <div class="ui-block-b"><b><?php echo gtext($item[$tableName]['it_tracks_users']);?></b></div>
+ </div>
+ <?php } ?>
+
+ <div class="ui-grid-a main_content_element">
+ <div class="ui-block-a"><?php echo gtext("free driver used");?>:</div>
+ <div class="ui-block-b"><b><?php echo $item[$tableName]['driver'];?></b></div>
+ </div>
+
+ <?php if (strcmp($item[$tableName]['description'],'') !== 0) { ?>
+ <h4><?php echo gtext("Description");?></h4>
+ <div class="device_description"><?php echo decodeWikiText($item[$tableName]['description']);?></div>
+ <?php } ?>
+
+
+
+ </div>
+ <?php } ?>
+
+ <?php } ?> \ 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
index 3dea039..7bfcf27 100644
--- a/h-source/Application/Views/Mobile/top_left.php
+++ b/h-source/Application/Views/Mobile/top_left.php
@@ -28,14 +28,14 @@
<?php if (strcmp($this->action,'view') === 0) { ?>
- <div class="notebook_view_title">
- <?php echo singular($this->controller);?> <b><?php echo $ne_name;?></b>
+ <div class="back_button">
+ <a rel="external" href="<?php echo $this->baseUrl."/".$this->controller."/catalogue/$lang".$this->viewStatus;?>" data-inline="true" data-icon="arrow-l" data-iconpos="left" data-theme="b" data-role="button"><?php echo gtext('back');?></a>
</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>
+ <!--<div class="device_view_title">
+ <?php echo singular($this->controller);?> <b><?php echo $ne_name;?></b>
+ </div>-->
+
<?php } else if (strcmp($this->action,'catalogue') === 0) { ?>
<?php echo $topNotice;?>
diff --git a/h-source/Public/Css/mobile.css b/h-source/Public/Css/mobile.css
index 9ca6693..2550056 100644
--- a/h-source/Public/Css/mobile.css
+++ b/h-source/Public/Css/mobile.css
@@ -120,7 +120,45 @@ img
margin: 15px -15px;
}
+#language-dialog .ui-header .ui-title
+{
+ display: block;
+ font-size: 16px;
+ margin: 0.7em 0;
+ margin-left:30px;
+ margin-top:0.8em;
+ text-align: left;
+}
+.main_content_element
+{
+ padding:5px 0;
+ border-top:1px dashed #000;
+}
+
+.track_alert
+{
+ border:10px solid red;
+ padding:5px;
+}
+
+.device_description
+{
+ background-color:#E6E6FA;
+ padding:5px;
+}
+
+.ui-li-desc { white-space: normal; }
+.ui-li-heading { white-space: normal; }
+
+.devices_list .ui-li-desc
+{
+/* border-bottom:1px dashed #A9A9A9; */
+}
+
+.ui-listview .ui-li-icon {
+ top: 1.3em;
+}
/*.ui-icon, .ui-icon-searchfield:after {
-moz-border-radius: 0px;
diff --git a/h-source/Public/Img/Crystal/hardware.png b/h-source/Public/Img/Crystal/hardware.png
new file mode 100755
index 0000000..7e90419
--- /dev/null
+++ b/h-source/Public/Img/Crystal/hardware.png
Binary files differ
diff --git a/h-source/Public/Img/Crystal/home.png b/h-source/Public/Img/Crystal/home.png
new file mode 100755
index 0000000..816a0c3
--- /dev/null
+++ b/h-source/Public/Img/Crystal/home.png
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 06:10:55 +0000