Get captions into shape.

diff --git a/kronolith/templates/index/agenda.inc b/kronolith/templates/index/agenda.inc
index 6d5d727..7740c44 100644 (file)
--- a/kronolith/templates/index/agenda.inc
+++ b/kronolith/templates/index/agenda.inc
@@ -2,10 +2,12 @@
 
 <table class="kronolithView kronolithViewAgenda">
 <caption>
+    <span><?php echo _("Agenda") ?></span>
+    <span class="kronolithNavigation">
     <a title="<?php echo _("Today") ?>" class="kronolithToday"><?php echo _("Today") ?></a>
     <a title="<?php echo _("Previous") ?>" class="kronolithPrev">&lt;</a>
     <a title="<?php echo _("Next") ?>" class="kronolithNext">&gt;</a>
-    <span><?php echo _("Agenda") ?></span>
+    </span>
 </caption>
 <tbody class="kronolithViewBody">
 <?php

diff --git a/kronolith/templates/index/day.inc b/kronolith/templates/index/day.inc
index 3d1a8a3..83b43a6 100644 (file)
--- a/kronolith/templates/index/day.inc
+++ b/kronolith/templates/index/day.inc
@@ -2,15 +2,13 @@
 <div id="kronolithEventsDay"></div>
 <table class="kronolithView kronolithViewDay">
   <caption>
-    <a class="kronolithToday" 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><?php echo $today->format('l, F j, Y') ?></span>
+    <span></span>
+    <span class="kronolithNavigation">
+      <a class="kronolithToday" 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 class="kronolithViewHead"><tr>
-    <td class="kronolithFirstCol">&nbsp;</td>
-    <td class="kronolithCol"><span></span></td>
-  </tr></thead>
   <tbody id="kronolithViewDayBody" class="kronolithViewBody">
     <tr class="kronolithRow kronolithAllDay">
       <td class="kronolithFirstCol"><?php echo _("All day") ?></td>

diff --git a/kronolith/templates/index/month.inc b/kronolith/templates/index/month.inc
index da619e9..b47dcf1 100644 (file)
--- a/kronolith/templates/index/month.inc
+++ b/kronolith/templates/index/month.inc
@@ -1,11 +1,13 @@
 <div id="kronolithViewMonth" style="display:none">
 <table id="kronolithViewHead" class="kronolithView">
-<caption>
-<a class="kronolithToday" 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><?php echo $today->format('F Y') ?></span>
-</caption>
+  <caption>
+    <span></span>
+    <span class="kronolithNavigation">
+      <a class="kronolithToday" 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>
   <tr>
     <td class="kronolithFirstCol">&nbsp;</td>
     <?php for ($w = $prefs->getValue('week_start_monday'), $i = $w, $c = $i + 7; $i < $c; $i++): ?>

diff --git a/kronolith/templates/index/week.inc b/kronolith/templates/index/week.inc
index 21a72a4..85d5540 100644 (file)
--- a/kronolith/templates/index/week.inc
+++ b/kronolith/templates/index/week.inc
@@ -10,10 +10,12 @@
 </div>
 <table class="kronolithView kronolithViewDay">
   <caption>
-    <a class="kronolithToday" 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>Sun, April 5 - Sat, April 11 <!-- fmt: this should be the week span --></span>
+    <span></span>
+    <span class="kronolithNavigation">
+      <a class="kronolithToday" 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>
     <td class="kronolithFirstCol">&nbsp;</td>

diff --git a/kronolith/templates/index/year.inc b/kronolith/templates/index/year.inc
index ccc73d4..f408508 100644 (file)
--- a/kronolith/templates/index/year.inc
+++ b/kronolith/templates/index/year.inc
@@ -2,9 +2,11 @@
 
 <table class="kronolithView kronolithViewYear">
 <caption>
+    <span><?php echo $today->format("Y") ?></span>
+    <span class="kronolithNavigation">
     <a title="<?php echo _("Previous") ?>" class="kronolithPrev">&lt;</a>
     <a title="<?php echo _("Next") ?>" class="kronolithNext">&gt;</a>
-    <span><?php echo $today->format("Y") ?></span>
+    </span>
 </caption>
 </table>