aboutsummaryrefslogtreecommitdiff
path: root/h-source
diff options
context:
space:
mode:
Diffstat (limited to 'h-source')
-rw-r--r--h-source/Application/Controllers/GenericController.php2
-rw-r--r--h-source/Application/Views/Desktop/catalogue.php4
-rw-r--r--h-source/Application/Views/Mobile/catalogue.php19
-rw-r--r--h-source/Application/Views/Mobile/footer.php1
-rw-r--r--h-source/Public/Css/main.css8
-rw-r--r--h-source/Public/Css/mobile.css15
6 files changed, 39 insertions, 10 deletions
diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index 117845a..b5bbb4c 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -506,7 +506,7 @@ class GenericController extends BaseController
//set search_string to undef to clean the model name filter
$this->viewArgs['search_string'] = "undef";
- $this->buildStatus();
+ $data['clearViewStatus'] = Url::createUrl($this->viewArgs);
$this->append($data);
diff --git a/h-source/Application/Views/Desktop/catalogue.php b/h-source/Application/Views/Desktop/catalogue.php
index 1e15e4c..25a79ef 100644
--- a/h-source/Application/Views/Desktop/catalogue.php
+++ b/h-source/Application/Views/Desktop/catalogue.php
@@ -42,9 +42,9 @@
<?php } ?>
<div class="model_string_search_form">
- <form action="<?php echo $this->currPage."/$lang".$this->viewStatus;?>">
+ <form action="<?php echo $this->currPage."/$lang".$clearViewStatus;?>" method="GET">
<input type="text" value="<?php echo $search_string_form_value;?>" name="search_string">
- <a href="<?php echo $this->currPage."/$lang".$this->viewStatus;?>"><img src="<?php echo $this->baseUrl."/Public/Img/Crystal/button_cancel.png";?>" /></a>
+ <a href="<?php echo $this->currPage."/$lang".$clearViewStatus;?>"><img src="<?php echo $this->baseUrl."/Public/Img/Crystal/button_cancel.png";?>" /></a>
<input type="submit" value="<?php echo gtext('Search');?>" name="submit">
</form>
</div>
diff --git a/h-source/Application/Views/Mobile/catalogue.php b/h-source/Application/Views/Mobile/catalogue.php
index 8d00d08..441de54 100644
--- a/h-source/Application/Views/Mobile/catalogue.php
+++ b/h-source/Application/Views/Mobile/catalogue.php
@@ -20,6 +20,19 @@
// along with h-source. If not, see <http://www.gnu.org/licenses/>.
?>
+ <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>
+
+ <div class="ui-body ui-body-c">
+ <form action="<?php echo $this->currPage."/$lang".$clearViewStatus;?>" method="GET">
+
+ <input type="search" name="search_string" id="basic" data-mini="true" value="<?php echo $search_string_form_value;?>"/>
+
+ <button type="submit" data-theme="d"><?php echo gtext('Search');?></button>
+ </form>
+ </div>
+
<!--if no device is found-->
<?php if (strcmp($recordNumber,0) === 0) { ?>
<div class="viewall_no_items_found">
@@ -27,13 +40,11 @@
</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">
+ <?php if (count($table) > 0) { ?>
<li data-role="list-divider"><h5><?php echo gtext("List of");?> <b><?php echo plural($this->controller);?></b></h5></li>
+ <?php } ?>
<?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" />
diff --git a/h-source/Application/Views/Mobile/footer.php b/h-source/Application/Views/Mobile/footer.php
index 489f53a..383bac1 100644
--- a/h-source/Application/Views/Mobile/footer.php
+++ b/h-source/Application/Views/Mobile/footer.php
@@ -49,7 +49,6 @@
<?php echo $language_links;?>
</div><!-- /content -->
-
<div data-role="footer">
<p><?php echo gtext('list of languages');?></p>
</div><!-- /footer -->
diff --git a/h-source/Public/Css/main.css b/h-source/Public/Css/main.css
index b6fd1d1..3b4612c 100644
--- a/h-source/Public/Css/main.css
+++ b/h-source/Public/Css/main.css
@@ -537,8 +537,11 @@ div.history_page_list_news a
.viewall_no_items_found
{
font:normal 14px/1 sans-serif,arial;
- margin:10px;
+ margin:20px 5px;
padding:5px;
+/* color: #FF4500; */
+ border-top:1px solid #FF4500;
+ border-bottom:1px solid #FF4500;
}
@@ -985,7 +988,7 @@ ins
{
clear:left;
clear:right;
- margin-bottom:20px;
+ margin-bottom:30px;
/* background:#E0FFFF; */
padding:0px 10px 10px 0px;
}
@@ -2089,6 +2092,7 @@ div#description_tabs_content
padding:8px;
background-color:#C7DAEF;
border: 1px solid #6495ED;
+ width:280px;
}
.model_string_search_form img
diff --git a/h-source/Public/Css/mobile.css b/h-source/Public/Css/mobile.css
index 78bd288..6dbd834 100644
--- a/h-source/Public/Css/mobile.css
+++ b/h-source/Public/Css/mobile.css
@@ -147,6 +147,21 @@ img
padding:5px;
}
+.viewall_no_items_found
+{
+ font:normal 14px/1 sans-serif,arial;
+ margin:20px 5px;
+ padding:5px;
+/* color: #FF4500; */
+ border-top:1px solid #FF4500;
+ border-bottom:1px solid #FF4500;
+}
+
+.ui-body {
+ padding-top: 0.8em;
+ margin-top:10px;
+}
+
.ui-li-desc { white-space: normal; }
.ui-li-heading { white-space: normal; }