From 34e4f107596ac18147bb7c58865ca06d372ae493 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Tue, 16 Nov 2010 17:14:47 +0100
Subject: [PATCH] Consistent portal and log out links, indention.

---
 horde/templates/portal/mobile.inc           |  6 ++-
 imp/templates/mobile/folders.html.php       |  4 +-
 imp/templates/mobile/mailbox.html.php       |  2 +-
 kronolith/templates/mobile/day.html.php     | 32 ++++++++-------
 kronolith/templates/mobile/event.html.php   |  2 +-
 kronolith/templates/mobile/month.html.php   | 64 +++++++++++++++--------------
 kronolith/templates/mobile/summary.html.php | 24 ++++++-----
 nag/mobile.php                              |  6 ++-
 8 files changed, 75 insertions(+), 65 deletions(-)

diff --git a/horde/templates/portal/mobile.inc b/horde/templates/portal/mobile.inc
index 28e705bd6..fa0997c9f 100644
--- a/horde/templates/portal/mobile.inc
+++ b/horde/templates/portal/mobile.inc
@@ -3,12 +3,14 @@
 <div data-role="page">
   <div data-role="header">
     <h1><?php echo sprintf(_("Welcome, %s"), $fullname) ?></h1>
-    <a rel="external" class="ui-btn-right" href="<?php echo Horde::getServiceLink('logout', 'horde')?>"><?php echo _("Logout")?></a>
+    <?php if (Horde::getServiceLink('logout')): ?>
+    <a href="<?php echo Horde::getServiceLink('logout')->setRaw(false) ?>" rel="external" class="ui-btn-right" data-theme="e" data-icon="delete"><?php echo _("Log out") ?></a>
+    <?php endif ?>
   </div>
   <div data-role="content">
     <ul data-role="listview">
       <?php foreach ($links as $key => $val): ?>
-       <li class="extlink"><img class="ui-li-icon" src="<?php echo $val[1] ?>"><?php echo $val[0]->link(array('rel' => 'external')) ?><?php echo $key ?></a></li>
+      <li class="extlink"><img class="ui-li-icon" src="<?php echo $val[1] ?>"><?php echo $val[0]->link(array('rel' => 'external')) ?><?php echo $key ?></a></li>
       <?php endforeach; ?>
     </ul>
   </div>
diff --git a/imp/templates/mobile/folders.html.php b/imp/templates/mobile/folders.html.php
index 2f5fe0611..b1c40d366 100644
--- a/imp/templates/mobile/folders.html.php
+++ b/imp/templates/mobile/folders.html.php
@@ -1,9 +1,9 @@
 <div id="folders" data-role="page">
   <div data-role="header">
-    <a href="<?php echo $this->portal ?>" class="ui-btn-left"><?php echo _("Portal")?></a>
+    <a rel="external" href="<?php echo $this->portal ?>"><?php echo _("Portal")?></a>
     <h1><?php echo _("Folders") ?></h1>
     <?php if ($this->logout): ?>
-    <a href="<?php echo $this->logout ?>" rel="external" data-theme="e" data-icon="delete" class="ui-btn-right"><?php echo _("Log out") ?></a>
+    <a href="<?php echo $this->logout ?>" rel="external" data-theme="e" data-icon="delete"><?php echo _("Log out") ?></a>
     <?php endif ?>
   </div>
   <div data-role="content">
diff --git a/imp/templates/mobile/mailbox.html.php b/imp/templates/mobile/mailbox.html.php
index 1c30a0981..2598c5151 100644
--- a/imp/templates/mobile/mailbox.html.php
+++ b/imp/templates/mobile/mailbox.html.php
@@ -1,7 +1,7 @@
 <div id="mailbox" data-role="page">
   <div data-role="header">
     <?php if (!$this->allowFolders): ?>
-    <a href="<?php echo $this->portal ?>" class="ui-btn-left"><?php echo _("Portal")?></a>
+    <a rel="external" href="<?php echo $this->portal ?>"><?php echo _("Portal")?></a>
     <?php endif ?>
     <h1><?php echo _("Inbox") ?></h1>
     <?php if ($this->logout): ?>
diff --git a/kronolith/templates/mobile/day.html.php b/kronolith/templates/mobile/day.html.php
index cb3b35539..11b7bc66b 100644
--- a/kronolith/templates/mobile/day.html.php
+++ b/kronolith/templates/mobile/day.html.php
@@ -1,21 +1,23 @@
 <div data-role="page" id="dayview">
   <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" 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>
-    <a href="#" data-icon="arrow-r" data-iconpos="notext" class="kronolithNextDay"><?php echo _("Next")?></a></div>
+    <h1><?php echo _("Day")?></h1>
+    <a rel="external" href="<?php echo $this->portal ?>"><?php echo _("Portal")?></a>
+    <?php if ($this->logout): ?>
+    <a href="<?php echo $this->logout ?>" rel="external" data-theme="e" data-icon="delete"><?php echo _("Log out") ?></a>
+    <?php endif ?>
+    <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>
+      <a href="#" data-icon="arrow-r" data-iconpos="notext" class="kronolithNextDay"><?php echo _("Next")?></a></div>
   </div>
   <div data-role="content"></div>
   <div data-role="footer" data-position="fixed">
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/kronolith/templates/mobile/event.html.php b/kronolith/templates/mobile/event.html.php
index 898367359..16b8254ab 100644
--- a/kronolith/templates/mobile/event.html.php
+++ b/kronolith/templates/mobile/event.html.php
@@ -2,4 +2,4 @@
   <div data-role="header" data-theme="b"><h1><?php echo ("Event")?></h1></div>
   <div data-role="content" class="ui-body"></div>
   <div data-role="footer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/kronolith/templates/mobile/month.html.php b/kronolith/templates/mobile/month.html.php
index c7532f2c1..118eb7a48 100644
--- a/kronolith/templates/mobile/month.html.php
+++ b/kronolith/templates/mobile/month.html.php
@@ -1,36 +1,38 @@
 <!-- Month View -->
 <div data-role="page" id="monthview" class="monthview">
- <div data-role="header">
-   <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" 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">
-    <table>
-    <caption>
-      <a href="#" id="kronolithMinicalPrev" title="<?php echo _("Previous month") ?>">&lt;</a>
-      <a href="#" id="kronolithMinicalNext" title="<?php echo _("Next month") ?>">&gt;</a>
-      <span id="kronolithMinicalDate"><?php echo $this->today->format('F Y') ?></span>
-    </caption>
-    <thead>
-      <tr>
-        <?php for ($i = $GLOBALS['prefs']->getValue('week_start_monday'), $c = $i + 7; $i < $c; $i++): ?>
-        <th title="<?php echo Horde_Nls::getLangInfo(constant('DAY_' . ($i % 7 + 1))) ?>"><?php echo substr(Horde_Nls::getLangInfo(constant('DAY_' . ($i % 7 + 1))), 0, 1) ?></th>
-        <?php endfor; ?>
-      </tr>
-    </thead>
-    <tbody><tr><td></td></tr></tbody>
-    </table>
+  <div data-role="header">
+    <h1><?php echo _("Month")?></h1>
+    <a rel="external" href="<?php echo $this->portal ?>"><?php echo _("Portal")?></a>
+    <?php if ($this->logout): ?>
+    <a href="<?php echo $this->logout ?>" rel="external" data-theme="e" data-icon="delete"><?php echo _("Log out") ?></a>
+    <?php endif ?>
+    <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">
+      <table>
+        <caption>
+          <a href="#" id="kronolithMinicalPrev" title="<?php echo _("Previous month") ?>">&lt;</a>
+          <a href="#" id="kronolithMinicalNext" title="<?php echo _("Next month") ?>">&gt;</a>
+          <span id="kronolithMinicalDate"><?php echo $this->today->format('F Y') ?></span>
+        </caption>
+        <thead>
+          <tr>
+            <?php for ($i = $GLOBALS['prefs']->getValue('week_start_monday'), $c = $i + 7; $i < $c; $i++): ?>
+            <th title="<?php echo Horde_Nls::getLangInfo(constant('DAY_' . ($i % 7 + 1))) ?>"><?php echo substr(Horde_Nls::getLangInfo(constant('DAY_' . ($i % 7 + 1))), 0, 1) ?></th>
+            <?php endfor; ?>
+          </tr>
+        </thead>
+        <tbody><tr><td></td></tr></tbody>
+      </table>
+    </div>
   </div>
- </div>
   <div data-role="footer">
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/kronolith/templates/mobile/summary.html.php b/kronolith/templates/mobile/summary.html.php
index 57fdff1c0..74406ff40 100644
--- a/kronolith/templates/mobile/summary.html.php
+++ b/kronolith/templates/mobile/summary.html.php
@@ -1,16 +1,18 @@
 <div data-role="page" id="overview">
   <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>
-     <li><a href="#" class="ui-btn-active"><?php echo _("Summary")?></a></li>
-    </ul>
-   </div>
+    <h1><?php echo _("Summary")?></h1>
+    <a rel="external" href="<?php echo $this->portal ?>"><?php echo _("Portal")?></a>
+    <?php if ($this->logout): ?>
+    <a href="<?php echo $this->logout ?>" rel="external" data-theme="e" data-icon="delete"><?php echo _("Log out") ?></a>
+    <?php endif ?>
+    <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>
+        <li><a href="#" class="ui-btn-active"><?php echo _("Summary")?></a></li>
+      </ul>
+    </div>
   </div>
   <div data-role="content" class="ui-body"></div>
   <div data-role="footer"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/nag/mobile.php b/nag/mobile.php
index 59789e310..0c6f9eaea 100644
--- a/nag/mobile.php
+++ b/nag/mobile.php
@@ -42,8 +42,10 @@ require $registry->get('templates', 'horde') . '/common-header-mobile.inc';
 
 <div data-role="header">
  <h1>My Tasks</h1>
- <a class="ui-btn-left" href="<?php echo Horde::getServiceLink('portal', 'horde')?>"><?php echo _("Home")?></a>
- <a rel="external" class="ui-btn-right" href="<?php echo Horde::getServiceLink('logout', 'horde')?>"><?php echo _("Logout")?></a>
+ <a rel="external" href="<?php echo Horde::getServiceLink('portal', 'horde')?>"><?php echo _("Portal")?></a>
+ <?php if (Horde::getServiceLink('logout')): ?>
+ <a href="<?php echo Horde::getServiceLink('logout')->setRaw(false) ?>" rel="external" data-theme="e" data-icon="delete"><?php echo _("Log out") ?></a>
+ <?php endif ?>
 </div>
 <div data-role="content">
  <ul data-role="listview">
-- 
2.11.0