improved mobile

3 files changed, 22 insertions, 20 deletions

diff --git a/h-source/Application/Views/Mobile/catalogue.php b/h-source/Application/Views/Mobile/catalogue.php
index d848add..9113311 100644
--- a/h-source/Application/Views/Mobile/catalogue.php
+++ b/h-source/Application/Views/Mobile/catalogue.php
@@ -20,17 +20,6 @@
 // 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">
@@ -39,7 +28,8 @@
 		<?php } ?>
 		
 		<!--loop-->
-		<ul class="devices_list" data-role="listview">
+		<ul class="devices_list" data-dividertheme="b" data-role="listview">
+			<li data-role="list-divider"><h5><?php echo gtext("List of");?> <b><?php echo plural($this->controller);?></b></h5></li>
 			<?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" />
@@ -81,4 +71,15 @@
 				</a>
 			</li>
 			<?php } ?>
-		</ul>
\ No newline at end of file
+		</ul>
+
+		<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>
\ 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 0975d7b..3dea039 100644
--- a/h-source/Application/Views/Mobile/top_left.php
+++ b/h-source/Application/Views/Mobile/top_left.php
@@ -37,11 +37,7 @@
 			</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 6f5a84a..37a43c3 100644
--- a/h-source/Public/Css/mobile.css
+++ b/h-source/Public/Css/mobile.css
@@ -96,8 +96,9 @@ img
 }
 .page_list
 {
-	margin-bottom:28px;
+	margin-top:28px;
 }
+
 .notebook_view_title
 {
 	margin-bottom:28px;
@@ -115,6 +116,10 @@ img
     top: 5px;
 }
 
+.ui-content .ui-listview {
+    margin: 15px -15px;
+}
+
 /*.ui-icon, .ui-icon-searchfield:after {
     -moz-border-radius: 0px;
     -webkit-border-radius: 0px;