Design tweaks.

diff --git a/kronolith/templates/index/edit.inc b/kronolith/templates/index/edit.inc
index 5e95332..69f0a28 100644 (file)
--- a/kronolith/templates/index/edit.inc
+++ b/kronolith/templates/index/edit.inc
@@ -6,19 +6,19 @@
 <input id="kronolithEventLocationLat" type="hidden" name="lat" />
 
 <div>
-  <label for="kronolithEventTitle"><?php echo _("Event title") ?>:</label><br />
+  <label for="kronolithEventTitle"><?php echo _("Event title") ?>:</label>
   <input type="text" name="title" id="kronolithEventTitle" class="kronolithLongField" />
 </div>
 
 <div>
 <table cellspacing="0" cellpadding="0" border="0"><tbody><tr>
   <td>
-    <label for="kronolithEventCalendar"><?php echo _("Calendar") ?>:</label><br />
+    <label for="kronolithEventCalendar"><?php echo _("Calendar") ?>:</label>
     <select name="targetcalendar" id="kronolithEventTarget">
     </select>
   </td>
   <td>
-    <label for="kronolithEventLocation"><?php echo _("Location") ?>:</label><br />
+    <label for="kronolithEventLocation"><?php echo _("Location") ?>:</label>
     <input type="text" name="location" id="kronolithEventLocation" size="40" />
     <?php if ($GLOBALS['conf']['maps']['driver']):?>
     &middot; <span><a class="kronolithEventGeo" href="#"><?php echo _("Find in Maps") ?></a></span>
@@ -28,24 +28,36 @@
 </div>
 
 <div>
-<table cellspacing="0" cellpadding="0" border="0"><tbody>
-  <tr>
-    <td><label for="kronolithEventStartDate"><?php echo _("From") ?>:</label></td>
-    <td><label for="kronolithEventEndDate"><?php echo _("To") ?>:</label></td>
-    <td>&nbsp;</td>
-  </tr>
+<table id="kronolithEventDates" cellspacing="0" cellpadding="0" border="0"><tbody>
   <tr>
     <td>
-      <input type="text" name="start_date" id="kronolithEventStartDate" size="10" />
-      <?php echo Horde::img('picker.png', _("Set start date"), 'id="kronolithEventStartPicker"') ?>
-      <label id="kronolithEventStartTimeLabel"><?php echo _("at") ?> <input type="text" name="start_time" id="kronolithEventStartTime" size="8" /></label>
+      <label for="kronolithEventStartDate">
+        <?php echo _("From") ?>:<br />
+        <input type="text" name="start_date" id="kronolithEventStartDate" size="10" />
+        <?php echo Horde::img('picker.png', _("Set start date"), 'id="kronolithEventStartPicker"') ?>
+      </label>
+      <label id="kronolithEventStartTimeLabel">
+        <?php echo _("at") ?>
+        <input type="text" name="start_time" id="kronolithEventStartTime" size="8" />
+      </label>
     </td>
     <td>
-      <input type="text" name="end_date" id="kronolithEventEndDate" size="10" />
-      <?php echo Horde::img('picker.png', _("Set end date"), 'id="kronolithEventEndPicker"') ?>
-      <label id="kronolithEventEndTimeLabel"><?php echo _("at") ?> <input type="text" name="end_time" id="kronolithEventEndTime" size="8" /></label>
+      <label for="kronolithEventEndDate"><?php echo _("To") ?>:<br />
+        <input type="text" name="end_date" id="kronolithEventEndDate" size="10" />
+        <?php echo Horde::img('picker.png', _("Set end date"), 'id="kronolithEventEndPicker"') ?>
+      </label>
+      <label id="kronolithEventEndTimeLabel">
+        <?php echo _("at") ?>
+        <input type="text" name="end_time" id="kronolithEventEndTime" size="8" />
+      </label>
+    </td>
+    <td>
+      <br />
+      <label>
+        <input type="checkbox" name="whole_day" id="kronolithEventAllday" />
+        <?php echo _("all-day event") ?>
+      </label>
     </td>
-    <td><label><input type="checkbox" name="whole_day" id="kronolithEventAllday"  /> <?php echo _("all-day event") ?></label></td>
   </tr>
 </tbody></table>
 </div>
@@ -151,10 +163,10 @@
 </div>
 
 <div id="kronolithEventTabAttendees" class="kronolithTabsOption" style="display:none">
-  <input type="text" name="attendees" id="kronolithEventAttendees" class="kronolithLongField" value="" /><br />
+  <textarea name="attendees" id="kronolithEventAttendees" rows="2" cols="100" class="kronolithLongField"></textarea><br />
   <label><input type="checkbox" name="sendupdates" value="1" /> <?php printf(_("send invites %s to all attendees"), '</label>') ?><br />
   <div id="kronolithFBLoading" style="display:none"></div>
-  <table width="100%" cellspacing="0" cellpadding="0" border="0">
+  <table cellspacing="0" cellpadding="0" border="0">
     <thead>
       <tr>
         <th><?php echo _("Availability") ?></th>
@@ -163,9 +175,13 @@
         <?php endfor; ?>
       </tr>
     </thead>
-    <tbody>
-    </tbody>
   </table>
+  <div id="kronolithEventAttendeesList">
+    <table cellspacing="0" cellpadding="0" border="0">
+      <tbody>
+      </tbody>
+    </table>
+  </div>
 </div>
 
 <div id="kronolithEventTabTags" class="kronolithTabsOption" style="display:none">

diff --git a/kronolith/templates/index/index.inc b/kronolith/templates/index/index.inc
index d16eba5..6e69bea 100644 (file)
--- a/kronolith/templates/index/index.inc
+++ b/kronolith/templates/index/index.inc
@@ -4,7 +4,14 @@
 
   <!-- begin services -->
   <div id="kronolithServices">
-    <span><a href="#" id="kronolithNotifications" class="kronolithNotifications"><?php echo _("0 notifications") ?></a> <span class="kronolithSeparator">&middot;</span></span>
+    <div id="kronolithApplications">
+       <ul>
+          <li><a href="#" id="appMail" title="<?php echo _("Mail") ?>"><?php echo _("Mail") ?></a></li>
+          <li class="selected"><a href="#" id="appKronolith" title="<?php echo _("Kronolith") ?>"><?php echo _("Kronolith") ?></a></li>
+          <li><a href="#" id="appTurba" title="<?php echo _("Turba") ?>"><?php echo _("Turba") ?></a></li>
+       </ul>
+       <span class="kronolithSeparator">|</span>
+    </div>
     <a href="#" id="kronolithOptions"><?php echo _("Options") ?></a><?php if ($help_link) echo ' <span class="kronolithSeparator">&middot;</span> ' . $help_link; if ($logout_link) echo ' <span class="kronolithSeparator">|</span> ' . $logout_link ?>
   </div>
   <!-- end services -->
@@ -14,16 +21,16 @@
   <div class="kronolithDateChoice" <?php $todayAccessKey = Horde::getAccessKey(_("_Today")); echo Horde::getAccessKeyAndTitle(_("_Today"), true) ?>>
     <div><?php echo $today->strftime('%a, %e %b %Y') ?></div>
   </div>
-
+  <a href="#" id="kronolithNotifications" class="kronolithNotifications"><?php echo _("no notifications") ?></a>
   <div id="kronolithNav">
-    <a id="kronolithNavDay" accesskey="1"><?php echo _("Day") ?></a>
-    <a id="kronolithNavWeek" accesskey="2"><?php echo _("Week") ?></a>
-    <a id="kronolithNavMonth" accesskey="3"><?php echo _("Month") ?></a>
-    <a id="kronolithNavYear" accesskey="4"><?php echo _("Year") ?></a>
+    <a id="kronolithNavDay" accesskey="1"><span><?php echo _("Day") ?></span></a>
+    <a id="kronolithNavWeek" accesskey="2"><span><?php echo _("Week") ?></span></a>
+    <a id="kronolithNavMonth" accesskey="3"><span><?php echo _("Month") ?></span></a>
+    <a id="kronolithNavYear" accesskey="4"><span><?php echo _("Year") ?></span></a>
     <?php if ($GLOBALS['registry']->hasInterface('tasks')): ?>
-    <a id="kronolithNavTasks" accesskey="5"><?php echo _("Tasks") ?></a>
+    <a id="kronolithNavTasks" accesskey="5"><span><?php echo _("Tasks") ?></span></a>
     <?php endif; ?>
-    <a id="kronolithNavAgenda" accesskey="<?php echo $GLOBALS['registry']->hasInterface('tasks') ? 6 : 5 ?>"><?php echo _("Agenda") ?></a>
+    <a id="kronolithNavAgenda" accesskey="<?php echo $GLOBALS['registry']->hasInterface('tasks') ? 6 : 5 ?>"><span><?php echo _("Agenda") ?></span></a>
   </div>
 </div>
 <!-- end top bar -->
@@ -64,7 +71,7 @@
 
   <form id="kronolithSearchForm" action="">
     <input type="text" id="kronolithSearchTerm" value="<?php echo _("Search") ?>" default="<?php echo _("Search") ?>" />
-    <input id="kronolithSearchButton" type="image" src="<?php echo $GLOBALS['registry']->getImageDir() ?>/search-button.png" />
+    <input id="kronolithSearchButton" type="image" src="<?php echo $GLOBALS['registry']->getImageDir() ?>/search.png" />
   </form>
 
   <div id="kronolithMenuCalendars">

diff --git a/kronolith/themes/screen.css b/kronolith/themes/screen.css
index e9b55cb..02321d0 100644 (file)
--- a/kronolith/themes/screen.css
+++ b/kronolith/themes/screen.css
@@ -186,9 +186,11 @@ a.newEvent img {
     color: #fff;
 }
 .kronolithAjax .kronolithFBFree {
+    /*position: static;*/
     position: relative;
 }
 .kronolithAjax .kronolithFBBusy {
+    /*position: static;*/
     position: absolute;
 }
 div.fbgrid {
@@ -394,6 +396,9 @@ body.kronolithAjax {
 }
 
 /* User data and options */
+#kronolithApplications {
+    display: none;
+}
 #kronolithServices {
     float: right;
     margin-top: 10px;
@@ -401,14 +406,18 @@ body.kronolithAjax {
     text-align: right;
 }
 #kronolithNotifications {
-    padding: 3px 5px;
+    float: left;
+    padding: 0 10px;
     height: 25px;
     line-height: 25px;
+    -moz-border-radius: 0 5px 5px 0;
+    -webkit-border-radius: 0 5px 5px 0;
 }
 .kronolithNotifications {
     background-color: #d9d9d9;
-    opacity: .3;
-    filter: alpha(opacity=30);
+}
+#kronolithNotifications.kronolithNotifications {
+    background-color: #f0f0f0;
 }
 
 /* Main area */
@@ -570,8 +579,8 @@ a.kronolithFormCancel {
     float: left;
     margin: 0 2px 0 0;
     background: #d6d6d6;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px 0 0 5px;
+    -webkit-border-radius: 5px 0 0 5px;
     font-weight: bold;
     cursor: pointer;
 }
@@ -714,7 +723,7 @@ div.kronolithFormActions {
     line-height: 140%;
 }
 #kronolithEventTabAttendees td:first-child, #kronolithEventTabAttendees th:first-child {
-    width: 100px;
+    width: 170px;
     overflow: hidden;
 }
 #kronolithEventTabAttendees th {
@@ -727,6 +736,10 @@ div.kronolithFormActions {
     background-color: #ccc;
 }
 
+#kronolithEventAttendeesList {
+    max-height: 150px;
+    overflow-y: auto;
+}
 #kronolithEventTabAttendees td div {
     margin: 0;
     height: 100%;
@@ -734,6 +747,7 @@ div.kronolithFormActions {
 #kronolithEventACBox {
     line-height: 100%;
 }
+
 /* Map */
 #kronolithEventMap {
        height: 300px;