From 94c1ba11d1e78ccdf112e335acb7c0e8affaa358 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Fri, 26 Feb 2010 13:34:32 +0000
Subject: [PATCH] Separate export tabs a bit.

---
 kronolith/js/kronolith.js               | 10 +++++-----
 kronolith/templates/chunks/calendar.php | 14 ++++++++++++--
 kronolith/templates/index/edit.inc      | 11 ++++++++---
 kronolith/themes/screen.css             |  4 ++++
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
index c5c0226ba..4d087f1d8 100644
--- a/kronolith/js/kronolith.js
+++ b/kronolith/js/kronolith.js
@@ -2107,7 +2107,7 @@ KronolithCore = {
             switch (type) {
             case 'internal':
             case 'tasklists':
-                $('kronolithCalendar' + type + 'LinkImportExport').up().hide();
+                $('kronolithCalendar' + type + 'LinkImportExport').up('span').hide();
                 fields.push('Description');
                 break;
             case 'remote':
@@ -2134,12 +2134,12 @@ KronolithCore = {
         switch (type) {
         case 'internal':
             $('kronolithCalendarinternalDescription').setValue(info.desc);
-            $('kronolithCalendarinternalLinkImportExport').up().show();
+            $('kronolithCalendarinternalLinkImportExport').up('span').show();
             $('kronolithCalendarinternalExport').href = Kronolith.conf.URI_CALENDAR_EXPORT + '=' + calendar;
             break;
         case 'tasklists':
             $('kronolithCalendartasklistsDescription').setValue(info.desc);
-            $('kronolithCalendartasklistsLinkImportExport').up().show();
+            $('kronolithCalendartasklistsLinkImportExport').up('span').show();
             $('kronolithCalendartasklistsExport').href = Kronolith.conf.tasks.URI_TASKLIST_EXPORT + '=' + calendar.substring(6);
             break;
         case 'remote':
@@ -3397,7 +3397,7 @@ KronolithCore = {
             d.add(1).hour();
             $('kronolithEventEndDate').setValue(d.toString(Kronolith.conf.date_format));
             $('kronolithEventEndTime').setValue(d.toString(Kronolith.conf.time_format));
-            $('kronolithEventLinkExport').up().hide();
+            $('kronolithEventLinkExport').up('span').hide();
             RedBox.showHtml($('kronolithEventDialog').show());
         }
     },
@@ -3513,7 +3513,7 @@ KronolithCore = {
         $('kronolithEventEndTime').setValue(ev.et);
         $('kronolithEventStatus').setValue(ev.x);
         $('kronolithEventDescription').setValue(ev.d);
-        $('kronolithEventLinkExport').up().show();
+        $('kronolithEventLinkExport').up('span').show();
         $('kronolithEventExport').href = Kronolith.conf.URI_EVENT_EXPORT.interpolate({ id: ev.id, calendar: ev.c, type: ev.ty });
 
         /* Alarm */
diff --git a/kronolith/templates/chunks/calendar.php b/kronolith/templates/chunks/calendar.php
index aed020082..e39f4ca55 100644
--- a/kronolith/templates/chunks/calendar.php
+++ b/kronolith/templates/chunks/calendar.php
@@ -24,8 +24,13 @@
     <li class="activeTab"><a href="#" class="kronolithTabLink" id="kronolithCalendarinternalLinkDescription"><?php echo _("Description") ?></a></li>
     <li><a href="#" class="kronolithTabLink" id="kronolithCalendarinternalLinkTags"><?php echo _("Tags") ?></a></li>
     <li><a href="#" class="kronolithTabLink" id="kronolithCalendarinternalLinkPerms"><?php echo _("Permissions") ?></a></li>
-    <li><a href="#" class="kronolithTabLink" id="kronolithCalendarinternalLinkImportExport"><?php echo _("Export") /*_("Import/Export")*/ ?></a></li>
   </ul>
+  <span>
+    <span class="kronolithSeparator">|</span>
+    <ul>
+      <li><a href="#" class="kronolithTabLink" id="kronolithCalendarinternalLinkImportExport"><?php echo _("Export") /*_("Import/Export")*/ ?></a></li>
+    </ul>
+  </span>
 </div>
 <br class="clear" />
 
@@ -290,8 +295,13 @@
   <ul>
     <li class="activeTab"><a href="#" class="kronolithTabLink" id="kronolithCalendartasklistsLinkDescription"><?php echo _("Description") ?></a></li>
     <li><a href="#" class="kronolithTabLink" id="kronolithCalendartasklistsLinkPerms"><?php echo _("Permissions") ?></a></li>
-    <li><a href="#" class="kronolithTabLink" id="kronolithCalendartasklistsLinkImportExport"><?php echo _("Export") /*_("Import/Export")*/ ?></a></li>
   </ul>
+  <span>
+    <span class="kronolithSeparator">|</span>
+    <ul>
+      <li><a href="#" class="kronolithTabLink" id="kronolithCalendartasklistsLinkImportExport"><?php echo _("Export") /*_("Import/Export")*/ ?></a></li>
+    </ul>
+  </span>
 </div>
 <br class="clear" />
 
diff --git a/kronolith/templates/index/edit.inc b/kronolith/templates/index/edit.inc
index 20ab167ee..510035a3d 100644
--- a/kronolith/templates/index/edit.inc
+++ b/kronolith/templates/index/edit.inc
@@ -71,11 +71,16 @@
     <li><a href="#" class="kronolithTabLink" id="kronolithEventLinkUrl"><?php echo _("URL") ?></a></li>
     <li><a href="#" class="kronolithTabLink" id="kronolithEventLinkAttendees"><?php echo _("Attendees") ?></a></li>
     <li><a href="#" class="kronolithTabLink" id="kronolithEventLinkTags"><?php echo _("Tags") ?></a></li>
-<?php if ($GLOBALS['conf']['maps']['driver']): ?>
+    <?php if ($GLOBALS['conf']['maps']['driver']): ?>
     <li><a href="#" class="kronolithTabLink" id="kronolithEventLinkMap"><?php echo _("Map") ?></a></li>
-<?php endif; ?>
-    <li><a href="#" class="kronolithTabLink" id="kronolithEventLinkExport"><?php echo _("Export") ?></a></li>
+    <?php endif; ?>
   </ul>
+  <span>
+    <span class="kronolithSeparator">|</span>
+    <ul>
+      <li><a href="#" class="kronolithTabLink" id="kronolithEventLinkExport"><?php echo _("Export") ?></a></li>
+    </ul>
+  </span>
 </div>
 <br class="clear" />
 
diff --git a/kronolith/themes/screen.css b/kronolith/themes/screen.css
index 01d18ba60..d636d5c99 100644
--- a/kronolith/themes/screen.css
+++ b/kronolith/themes/screen.css
@@ -784,9 +784,13 @@ div.kronolithFormActions {
     margin: 15px 0;
 }
 .kronolithDialog .tabset ul {
+    float: left;
     padding-left: 0;
     margin: 0;
 }
+.kronolithDialog .tabset .kronolithSeparator {
+    float: left;
+}
 
 .kronolithTabsOption {
     position: relative;
-- 
2.11.0