From f437a28638f7560fc49b141a1dd259d45560078a Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Tue, 16 Nov 2010 01:22:17 -0500
Subject: [PATCH] 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.
---
 kronolith/templates/mobile/day.html.php     | 16 ++++++++--------
 kronolith/templates/mobile/month.html.php   | 20 ++++++++++----------
 kronolith/templates/mobile/summary.html.php | 11 +++++++----
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/kronolith/templates/mobile/day.html.php b/kronolith/templates/mobile/day.html.php
index f8f280002..cb3b35539 100644
--- 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 41fd5d065..c7532f2c1 100644
--- 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 f75424811..57fdff1c0 100644
--- 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
-- 
2.11.0