Start adding a bunch of design updates.
authorJan Schneider <jan@horde.org>
Mon, 2 Nov 2009 18:23:57 +0000 (19:23 +0100)
committerJan Schneider <jan@horde.org>
Mon, 2 Nov 2009 18:23:57 +0000 (19:23 +0100)
kronolith/js/kronolith.js
kronolith/templates/index/agenda.inc
kronolith/templates/index/day.inc
kronolith/templates/index/index.inc
kronolith/templates/index/month.inc
kronolith/templates/index/week.inc
kronolith/templates/index/year.inc

index 62c1820..0e57fea 100644 (file)
@@ -356,7 +356,7 @@ KronolithCore = {
             this.allDayEvents = [];
             var div = $('kronolithEventsWeek').down('div'),
                 th = $('kronolithViewWeekHead').down('.kronolithWeekDay'),
-                td = $('kronolithViewWeekBody').down('td').next('td'),
+                td = $('kronolithViewWeekHead').down('tbody').down('td').next('td'),
                 dates = this.viewDates(date, view),
                 day = dates[0].clone();
 
@@ -621,7 +621,7 @@ KronolithCore = {
             divA = trA.down('.kronolithAllDayContainer'),
             divATop = divA.cumulativeOffset().top,
             divAHeight = divA.getHeight(),
-            tr = trA.next('tr'),
+            tr = $(view).down('.fixme').down('.kronolithRow'),
             td = tr.down('td').next('td'), tdTop, tdHeight,
             tdAlign = td.getStyle('verticalAlign'),
             tr2 = tr.next('tr'),
index 0d3ef3f..70449ca 100644 (file)
@@ -4,7 +4,7 @@
     <span id="kronolithLoadingagenda" class="kronolithLoading"></span>
     <span id="kronolithAgendaDate"></span>
     <span class="kronolithNavigation">
-      <a class="kronolithGotoToday"><?php echo _("Today") ?></a>
+      <a class="kronolithGotoToday"><?php echo _("_Today") ?></a>
       <a title="<?php echo _("Previous") ?>" class="kronolithPrev">&lt;</a>
       <a title="<?php echo _("Next") ?>" class="kronolithNext">&gt;</a>
     </span>
index 76bf296..b368ede 100644 (file)
@@ -1,33 +1,47 @@
 <div id="kronolithViewDay" class="kronolithView kronolithViewDay" style="display:none">
 <div id="kronolithLoadingday" class="kronolithLoading"></div>
 <div id="kronolithEventsDay"></div>
+
 <table class="kronolithView kronolithViewDay">
   <caption>
     <span>&nbsp;</span>
     <span class="kronolithNavigation">
-      <a class="kronolithGotoToday" title="<?php echo _("Today") ?>"><?php echo _("Today") ?></a>
+      <a class="kronolithGotoToday" title="<?php echo _("_Today") ?>"><?php echo _("Today") ?></a>
       <a class="kronolithPrev" title="<?php echo _("Previous") ?>">&lt;</a>
       <a class="kronolithNext" title="<?php echo _("Next") ?>">&gt;</a>
     </span>
   </caption>
+</table>
+
+<div style="position: relative; margin-right: 15px;">
+<table class="kronolithView kronolithViewDay">
   <thead class="kronolithViewHead">
     <tr>
       <td class="kronolithFirstCol">&nbsp;</td>
       <td class="kronolithCol"><span><?php echo _("Events for this day") ?></span></td>
     </tr>
   </thead>
-  <tbody id="kronolithViewDayBody" class="kronolithViewBody">
+  <tbody class="kronolithViewBody">
     <tr class="kronolithRow kronolithAllDay">
       <td class="kronolithFirstCol"><?php echo _("All day") ?></td>
       <td class="kronolithCol"><div class="kronolithAllDayContainer">
       </div></td>
     </tr>
+  </tbody>
+</table>
+</div>
+
+<div style="position: absolute; top: 150px; right: 0; bottom: 0; left: 0; overflow-x: hidden; overflow-y: scroll">
+<table class="kronolithView kronolithViewDay">
+  <tbody id="kronolithViewDayBody" class="kronolithViewBody fixme">
     <?php for ($i = 0; $i < 24; $i++): ?>
     <tr class="kronolithRow<?php if ($i < 9 || $i > 19) echo ' kronolithNight' ?>">
-      <td class="kronolithFirstCol"><?php printf('%02d', $i) ?></td>
+      <td class="kronolithFirstCol"><?php echo $i ?>:00</td>
       <td class="kronolithCol"></td>
     </tr>
     <?php endfor; ?>
   </tbody>
 </table>
 </div>
+
+</div>
index fb3a05d..8c497c2 100644 (file)
@@ -8,34 +8,35 @@
    <span class="kronolithUserName"><?php echo $identity->getName(); ?></span><br />
   </div>
   <!-- end user zone -->
-</div>
-<!-- end header -->
 
 <!-- ini bar -->
 <div id="kronolithBar">
   <div class="kronolithDateChoice" title="<?php echo _("Today") ?>">
-    <div><?php echo $today->format('l, j F Y') ?></div>
+    <div><?php echo $today->format('D, j M Y') ?></div>
   </div>
 
   <div id="kronolithNav">
-    <a id="kronolithNavDay"><?php echo _("Day") ?></a>
-    <a id="kronolithNavWeek"><?php echo _("Week") ?></a>
-    <a id="kronolithNavMonth"><?php echo _("Month") ?></a>
-    <a id="kronolithNavYear"><?php echo _("Year") ?></a>
-    <a id="kronolithNavTasks"><?php echo _("Tasks") ?></a>
-    <a id="kronolithNavAgenda"><?php echo _("Agenda") ?></a>
+    <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="kronolithNavTasks" accesskey="5"><?php echo _("Tasks") ?></a>
+    <a id="kronolithNavAgenda" accesskey="6"><?php echo _("Agenda") ?></a>
   </div>
 </div>
 <!-- end bar -->
 
+</div>
+<!-- end header -->
+
 <!-- ini main area -->
 <div id="kronolithMain">
 
 <!-- ini menu -->
 <div id="kronolithMenu">
   <div id="kronolithAddEvents">
-    <span id="kronolithNewEvent"><?php echo _("New event") ?></span>
-    <span id="kronolithQuickEvent">+</span>
+    <span id="kronolithNewEvent"><?php echo _("_New event") ?></span>
+    <span id="kronolithQuickEvent" title="<?php echo _("Quick _insert") ?>">+</span>
   </div>
 
   <div id="kronolithMenuCalendars">
index 3b10e56..4afbb81 100644 (file)
@@ -3,7 +3,7 @@
   <caption>
     <span>&nbsp;</span>
     <span class="kronolithNavigation">
-      <a class="kronolithGotoToday" title="<?php echo _("Today") ?>"><?php echo _("Today") ?></a>
+      <a class="kronolithGotoToday" title="<?php echo _("Today") ?>"><?php echo _("_Today") ?></a>
       <a class="kronolithPrev" title="<?php echo _("Previous") ?>">&lt;</a>
       <a class="kronolithNext" title="<?php echo _("Next") ?>">&gt;</a>
     </span>
index 7279833..9e3f870 100644 (file)
@@ -1,4 +1,5 @@
 <div id="kronolithViewWeek" class="kronolithView kronolithViewWeek" style="display:none">
+
 <div id="kronolithEventsWeek">
   <div class="kronolithEventsWeek"></div>
   <div class="kronolithEventsWeek"></div>
@@ -8,16 +9,21 @@
   <div class="kronolithEventsWeek"></div>
   <div class="kronolithEventsWeek"></div>
 </div>
+
 <table class="kronolithView kronolithViewDay">
   <caption>
     <span>&nbsp;</span>
     <span class="kronolithNavigation">
-      <a class="kronolithGotoToday" title="<?php echo _("Today") ?>"><?php echo _("Today") ?></a>
+      <a class="kronolithGotoToday" title="<?php echo _("_Today") ?>"><?php echo _("Today") ?></a>
       <a class="kronolithPrev" title="<?php echo _("Previous") ?>">&lt;</a>
       <a class="kronolithNext" title="<?php echo _("Next") ?>">&gt;</a>
     </span>
   </caption>
-  <thead id="kronolithViewWeekHead" class="kronolithViewHead"><tr>
+</table>
+
+<div style="position: relative; margin-right: 15px;">
+<table id="kronolithViewWeekHead" class="kronolithView kronolithViewDay">
+  <thead class="kronolithViewHead"><tr>
     <td class="kronolithFirstCol"><div id="kronolithLoadingweek" class="kronolithLoading"></div></td>
     <td class="kronolithCol kronolithWeekDay"><span>&nbsp;</span></td>
     <td class="kronolithCol kronolithWeekDay"><span>&nbsp;</span></td>
@@ -27,7 +33,7 @@
     <td class="kronolithCol kronolithWeekDay"><span>&nbsp;</span></td>
     <td class="kronolithCol kronolithWeekDay"><span>&nbsp;</span></td>
   </tr></thead>
-  <tbody id="kronolithViewWeekBody" class="kronolithViewBody">
+  <tbody class="kronolithViewBody">
     <tr class="kronolithRow kronolithAllDay">
       <td class="kronolithFirstCol"><?php echo _("All day") ?></td>
       <td class="kronolithCol<?php if ($w == 6 || $w == 0) echo ' kronolithWeekend' ?>"><div class="kronolithAllDayContainer">
       <td class="kronolithCol<?php if ($w == 0 || $w == 1) echo ' kronolithWeekend' ?>"><div class="kronolithAllDayContainer">
       </div></td>
     </tr>
+  </tbody>
+</table>
+</div>
+
+<div style="position: absolute; top: 150px; right: 0; bottom: 0; left: 0; overflow-x: hidden; overflow-y: scroll;">
+<table class="kronolithView kronolithViewDay">
+  <tbody id="kronolithViewWeekBody" class="kronolithViewBody fixme">
     <?php for ($i = 0; $i < 24; $i++): ?>
     <tr class="kronolithRow<?php if ($i < 9 || $i > 19) echo ' kronolithNight' ?>">
-      <td class="kronolithFirstCol"><?php printf('%02d', $i) ?></td>
+      <td class="kronolithFirstCol"><?php echo $i ?>:00</td>
       <td class="kronolithCol<?php if ($w == 6 || $w == 0) echo ' kronolithWeekend' ?>">
       </td>
       <td class="kronolithCol<?php if ($w == 5 || $w == 6) echo ' kronolithWeekend' ?>">
@@ -67,3 +80,5 @@
   </tbody>
 </table>
 </div>
+
+</div>
index 7cafbe4..9a92eca 100644 (file)
@@ -4,7 +4,7 @@
     <span id="kronolithLoadingyear" class="kronolithLoading"></span>
     <span id="kronolithYearDate"></span>
     <span class="kronolithNavigation">
-      <a class="kronolithGotoToday"><?php echo _("Today") ?></a>
+      <a class="kronolithGotoToday"><?php echo _("_Today") ?></a>
       <a title="<?php echo _("Previous") ?>" class="kronolithPrev">&lt;</a>
       <a title="<?php echo _("Next") ?>" class="kronolithNext">&gt;</a>
     </span>