Move the navbar to below the top header

data-position="fixed" for footers seems to be pretty hit or miss
at the moment, with the footer just outright not displaying at times.
Move navbar to the top to give consistent placement.

diff --git a/kronolith/templates/mobile/day.html.php b/kronolith/templates/mobile/day.html.php
index f8f2800..cb3b355 100644 (file)
--- a/kronolith/templates/mobile/day.html.php
+++ b/kronolith/templates/mobile/day.html.php
@@ -2,7 +2,14 @@
   <div data-role="header">
    <h1><?php echo _("Day")?></h1>
    <a class="ui-btn-left" href="<?php echo $this->portal ?>"><?php echo _("Portal")?></a>
-   <a rel="external" class="ui-btn-right" href="<?php echo $this->logout?>"><?php echo _("Logout")?></a>
+   <a rel="external" class="ui-btn-right" data-icon="delete" href="<?php echo $this->logout?>"><?php echo _("Logout")?></a>
+   <div data-role="navbar" class="ui-bar-b">
+    <ul>
+     <li><a href="#" class="ui-btn-active"><?php echo _("Day")?></a></li>
+     <li><a href="#monthview"><?php echo _("Month")?></a></li>
+     <li><a href="#overview"><?php echo _("Summary")?></a></li>
+    </ul>
+   </div>
    <div class="ui-bar-b kronolithDayHeader">
     <a href="#" class="kronolithPrevDay" data-icon="arrow-l" data-iconpos="notext"><?php echo _("Previous")?></a>
     <span class="kronolithDayDate"></span>
@@ -10,12 +17,5 @@
   </div>
   <div data-role="content"></div>
   <div data-role="footer" data-position="fixed">
-   <div data-role="navbar">
-    <ul>
-     <li><a href="#" class="ui-btn-active">Day</a></li>
-     <li><a href="#monthview">Month</a></li>
-     <li><a href="#overview">Summary</a></li>
-    </ul>
-   </div>
   </div>
 </div>
\ No newline at end of file

diff --git a/kronolith/templates/mobile/month.html.php b/kronolith/templates/mobile/month.html.php
index 41fd5d0..c7532f2 100644 (file)
--- a/kronolith/templates/mobile/month.html.php
+++ b/kronolith/templates/mobile/month.html.php
@@ -1,9 +1,16 @@
 <!-- Month View -->
 <div data-role="page" id="monthview" class="monthview">
  <div data-role="header">
-   <h1>Month</h1>
+   <h1><?php echo _("Month")?></h1>
    <a class="ui-btn-left" href="<?php echo $this->portal?>"><?php echo _("Home")?></a>
-   <a rel="external" class="ui-btn-right" href="<?php echo $this->logout?>"><?php echo _("Logout")?></a>
+   <a rel="external" class="ui-btn-right" data-icon="delete" href="<?php echo $this->logout?>"><?php echo _("Logout")?></a>
+   <div data-role="navbar" class="ui-bar-b">
+    <ul>
+     <li><a href="#dayview"><?php echo _("Day")?></a></li>
+     <li><a href="#" class="ui-btn-active"><?php echo _("Month")?></a></li>
+     <li><a href="#overview"><?php echo _("Summary")?></a></li>
+    </ul>
+   </div>
  </div>
  <div data-role="content" class="ui-body" id="monthcontent">
   <div id="kronolithMinical" class="kronolithMinical">
@@ -24,13 +31,6 @@
     </table>
   </div>
  </div>
-  <div data-role="footer" data-position="fixed">
-   <div data-role="navbar">
-    <ul>
-     <li><a href="#dayview"><?php echo _("Day")?></a></li>
-     <li><a href="#" class="ui-btn-active"><?php echo _("Month")?></a></li>
-     <li><a href="#overview"><?php echo _("Summary")?></a></li>
-    </ul>
-   </div>
+  <div data-role="footer">
   </div>
 </div>
\ No newline at end of file

diff --git a/kronolith/templates/mobile/summary.html.php b/kronolith/templates/mobile/summary.html.php
index f754248..57fdff1 100644 (file)
--- a/kronolith/templates/mobile/summary.html.php
+++ b/kronolith/templates/mobile/summary.html.php
@@ -1,8 +1,9 @@
 <div data-role="page" id="overview">
-  <div data-role="header"><h1><?php echo _("Summary")?></h1></div>
-  <div data-role="content" class="ui-body"></div>
-  <div data-role="footer" data-position="fixed">
-   <div data-role="navbar">
+  <div data-role="header">
+   <h1><?php echo _("Summary")?></h1>
+   <a class="ui-btn-left" href="<?php echo $this->portal?>"><?php echo _("Home")?></a>
+   <a rel="external" class="ui-btn-right" data-icon="delete" href="<?php echo $this->logout?>"><?php echo _("Logout")?></a>
+   <div data-role="navbar" class="ui-bar-b">
     <ul>
      <li><a href="#dayview"><?php echo _("Day")?></a></li>
      <li><a href="#monthview"><?php echo _("Month")?></a></li>
@@ -10,4 +11,6 @@
     </ul>
    </div>
   </div>
+  <div data-role="content" class="ui-body"></div>
+  <div data-role="footer"></div>
 </div>
\ No newline at end of file