From a9b8327dca9e8079b442ce2e99222cc87a04745b Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Wed, 20 May 2009 00:22:32 +0200
Subject: [PATCH] Clean up new views.

---
 kronolith/templates/index/agenda.inc | 45 ++++++++++---------------
 kronolith/templates/index/tasks.inc  | 57 ++++++++++++-------------------
 kronolith/templates/index/year.inc   | 65 +++++++++++++++---------------------
 3 files changed, 65 insertions(+), 102 deletions(-)

diff --git a/kronolith/templates/index/agenda.inc b/kronolith/templates/index/agenda.inc
index 7740c44da..60bbff5e4 100644
--- a/kronolith/templates/index/agenda.inc
+++ b/kronolith/templates/index/agenda.inc
@@ -1,34 +1,25 @@
 <div id="kronolithViewAgenda" class="kronolithView kronolithViewAgenda" style="display:none">
-
 <table class="kronolithView kronolithViewAgenda">
-<caption>
+  <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>
+      <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>
-</caption>
-<tbody class="kronolithViewBody">
-<?php
-for ( $i = 1; $i < 8; $i++ ) {
-?>
-<tr class="kronolithRow kronolithRow<?= fmod($i,2) ? 'Even' : 'Odd' ?>">
-<td class="kronolithFirstCol">Mon, Apr <?= 6+$i ?></td>
-<td class="kronolithCol">
-
-    <div id="kronolithEventmonthinternal|filipe4b0da45c36b92f7e1b297becfadefdf0" calendar="internal|filipe" eventid="4b0da45c36b92f7e1b297becfadefdf0" class="kronolithEvent" style="color: rgb(255, 185, 18); -moz-user-select: none;"><span class="kronolithDate">10h00</span> <span class="kronolithSep">&middot;</span> assssssssssas</div>
-    <div id="kronolithEventmonthinternal|filipe4b0da45c36b92f7e1b297becfadefdf0" calendar="internal|filipe" eventid="4b0da45c36b92f7e1b297becfadefdf0" class="kronolithEvent" style="color: rgb(255, 185, 18); -moz-user-select: none;">assssssssssas</div>
-    <div id="kronolithEventmonthinternal|filipe4b0da45c36b92f7e1b297becfadefdf0" calendar="internal|filipe" eventid="4b0da45c36b92f7e1b297becfadefdf0" class="kronolithEvent" style="color: rgb(255, 185, 18); -moz-user-select: none;">assssssssssas</div>
-    <div id="kronolithEventmonthinternal|filipe4b0da45c36b92f7e1b297becfadefdf0" calendar="internal|filipe" eventid="4b0da45c36b92f7e1b297becfadefdf0" class="kronolithEvent" style="color: rgb(0, 136, 217); -moz-user-select: none;"><span class="kronolithDate">12h00</span> <span class="kronolithSep">&middot;</span> assssssssssas</div>
-			
-</td>
-</tr>
-<?php
-}
-?>
-
-</tbody>
+  </caption>
+  <tbody class="kronolithViewBody">
+    <?php for ($i = 1; $i < 8; $i++): ?>
+    <tr class="kronolithRow kronolithRow<?php echo $i % 2 ? 'Even' : 'Odd' ?>">
+      <td class="kronolithFirstCol">Mon, Apr <?php echo 6 + $i ?></td>
+      <td class="kronolithCol">
+        <div id="kronolithEventmonthinternal|filipe4b0da45c36b92f7e1b297becfadefdf0" calendar="internal|filipe" eventid="4b0da45c36b92f7e1b297becfadefdf0" class="kronolithEvent" style="color: rgb(255, 185, 18); -moz-user-select: none;"><span class="kronolithDate">10h00</span> <span class="kronolithSep">&middot;</span> assssssssssas</div>
+        <div id="kronolithEventmonthinternal|filipe4b0da45c36b92f7e1b297becfadefdf0" calendar="internal|filipe" eventid="4b0da45c36b92f7e1b297becfadefdf0" class="kronolithEvent" style="color: rgb(255, 185, 18); -moz-user-select: none;">assssssssssas</div>
+        <div id="kronolithEventmonthinternal|filipe4b0da45c36b92f7e1b297becfadefdf0" calendar="internal|filipe" eventid="4b0da45c36b92f7e1b297becfadefdf0" class="kronolithEvent" style="color: rgb(255, 185, 18); -moz-user-select: none;">assssssssssas</div>
+        <div id="kronolithEventmonthinternal|filipe4b0da45c36b92f7e1b297becfadefdf0" calendar="internal|filipe" eventid="4b0da45c36b92f7e1b297becfadefdf0" class="kronolithEvent" style="color: rgb(0, 136, 217); -moz-user-select: none;"><span class="kronolithDate">12h00</span> <span class="kronolithSep">&middot;</span> assssssssssas</div>
+      </td>
+    </tr>
+    <?php endfor; ?>
+  </tbody>
 </table>
-
 </div>
diff --git a/kronolith/templates/index/tasks.inc b/kronolith/templates/index/tasks.inc
index 606af8ae5..faba1e2e0 100644
--- a/kronolith/templates/index/tasks.inc
+++ b/kronolith/templates/index/tasks.inc
@@ -1,41 +1,26 @@
 <div id="kronolithViewTasks" class="kronolithView kronolithViewTasks" style="display:none">
-
 <table class="kronolithView kronolithViewTasks">
-<caption>
+  <caption>
     <span><?php echo _("Tasks") ?></span>
-</caption>
-
-<tbody class="kronolithViewBody">
-<?php
-for ( $i = 0; $i < 10; $i++ ) {
-?>
-<tr class="kronolithRow">
-<td class="kronolithCol kronolithTask<?php echo ($i == 1) ? 'Completed' : '' ?><?php echo ($i >= 8) ? ' kronolithTaskDue' : '' ?>">
-    Verify IE compatibility
-<?php
-if ( $i == 5 ) {
-?>
-    <span class="kronolithSep">&middot;</span>
-    <span class="kronolithDate">Apr 12, 2009</span>
-    <span class="kronolithSep">&middot;</span>
-<?php
-}
-if ( $i >= 8 ) {
-?>
-    <span class="kronolithSep">&middot;</span>
-    <span class="kronolithDate">Apr 8, 2009</span>
-    <span class="kronolithSep">&middot;</span>
-<?php
-}
-?>
-<span class="kronolithInfo">Probably there should be changes in IE's CSS so that it displays properly</span><br />
-</td>
-</tr>
-<?php
-}
-?>
-
-</tbody>
+  </caption>
+  <tbody class="kronolithViewBody">
+    <?php for ( $i = 0; $i < 10; $i++ ): ?>
+    <tr class="kronolithRow">
+      <td class="kronolithCol kronolithTask<?php echo ($i == 1) ? 'Completed' : '' ?><?php echo ($i >= 8) ? ' kronolithTaskDue' : '' ?>">
+        Verify IE compatibility
+        <?php if ($i == 5): ?>
+        <span class="kronolithSep">&middot;</span>
+        <span class="kronolithDate">Apr 12, 2009</span>
+        <span class="kronolithSep">&middot;</span>
+        <?php endif; if ($i >= 8): ?>
+        <span class="kronolithSep">&middot;</span>
+        <span class="kronolithDate">Apr 8, 2009</span>
+        <span class="kronolithSep">&middot;</span>
+        <?php endif; ?>
+        <span class="kronolithInfo">Probably there should be changes in IE's CSS so that it displays properly</span>
+      </td>
+    </tr>
+    <?php endfor; ?>
+  </tbody>
 </table>
-
 </div>
diff --git a/kronolith/templates/index/year.inc b/kronolith/templates/index/year.inc
index f40850878..58e7bbca5 100644
--- a/kronolith/templates/index/year.inc
+++ b/kronolith/templates/index/year.inc
@@ -1,52 +1,39 @@
 <div id="kronolithViewYear" class="kronolithView kronolithViewYear" style="display:none">
-
 <table class="kronolithView kronolithViewYear">
-<caption>
+  <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>
+      <a title="<?php echo _("Previous") ?>" class="kronolithPrev">&lt;</a>
+      <a title="<?php echo _("Next") ?>" class="kronolithNext">&gt;</a>
     </span>
-</caption>
+  </caption>
 </table>
 
-<?php
-$month = array("January", "February","March","April","May","June","July","August","September","October","November","December");
-for ( $i = 0; $i < 12; $i++ ) {
-?>
+<?php foreach (array("January", "February","March","April","May","June","July","August","September","October","November","December") as $month): ?>
 <div class="kronolithMinical">
-
 <table cellspacing="1" cellpadding="0" border="0">
-<caption>
-    <span id="kronolithMinicalDate" date="20090401"><?= $month[$i] ?></span>
-</caption>
-<thead>
-<tr>
-   <th class="kronolithMinicalEmpty">&nbsp;</th>
-   <th title="<?php echo _("Sunday") ?>"><?php echo substr(_("Sunday"),0,1) ?></th>
-   <th title="<?php echo _("Monday") ?>"><?php echo substr(_("Monday"),0,1) ?></th>
-   <th title="<?php echo _("Tuesday") ?>"><?php echo substr(_("Tuesday"),0,1) ?></th>
-   <th title="<?php echo _("Wednesday") ?>"><?php echo substr(_("Wednesday"),0,1) ?></th>
-   <th title="<?php echo _("Thursday") ?>"><?php echo substr(_("Thursday"),0,1) ?></th>
-   <th title="<?php echo _("Friday") ?>"><?php echo substr(_("Friday"),0,1) ?></th>
-   <th title="<?php echo _("Saturday") ?>"><?php echo substr(_("Saturday"),0,1) ?></th>
-</tr>
-</thead>
-<tbody>
-
-<!-- this isn't right, needs to be the right month -->
-<tr><td class="kronolithMinicalWeek" date="20090329">13</td><td date="20090329" class="kronolithMinicalEmpty">29</td><td date="20090330" class="kronolithMinicalEmpty">30</td><td date="20090331" class="kronolithMinicalEmpty">31</td><td date="20090401" class="">1</td><td date="20090402" class="">2</td><td date="20090403" class="">3</td><td date="20090404" class="">4</td></tr>
-<tr><td class="kronolithMinicalWeek" date="20090405">14</td><td date="20090405">5</td><td date="20090406">6</td><td date="20090407">7</td><td date="20090408">8</td><td date="20090409">9</td><td date="20090410">10</td><td date="20090411">11</td></tr>
-<tr><td class="kronolithMinicalWeek" date="20090412">15</td><td date="20090412">12</td><td date="20090413">13</td><td date="20090414">14</td><td date="20090415">15</td><td date="20090416">16</td><td date="20090417">17</td><td date="20090418">18</td></tr>
-<tr><td class="kronolithMinicalWeek" date="20090419">16</td><td date="20090419">19</td><td date="20090420">20</td><td date="20090421">21</td><td date="20090422">22</td><td date="20090423">23</td><td date="20090424">24</td><td date="20090425">25</td></tr>
-<tr><td class="kronolithMinicalWeek" date="20090426">17</td><td date="20090426">26</td><td date="20090427">27</td><td date="20090428">28</td><td date="20090429">29</td><td date="20090430">30</td><td date="20090501" class="kronolithMinicalEmpty">1</td><td date="20090502" class="kronolithMinicalEmpty">2</td></tr>
-
-</tbody>
+  <caption>
+    <span date="20090401"><?php echo $month ?></span>
+  </caption>
+  <thead><tr>
+    <th class="kronolithMinicalEmpty">&nbsp;</th>
+    <th title="<?php echo _("Sunday") ?>"><?php echo substr(_("Sunday"),0,1) ?></th>
+    <th title="<?php echo _("Monday") ?>"><?php echo substr(_("Monday"),0,1) ?></th>
+    <th title="<?php echo _("Tuesday") ?>"><?php echo substr(_("Tuesday"),0,1) ?></th>
+    <th title="<?php echo _("Wednesday") ?>"><?php echo substr(_("Wednesday"),0,1) ?></th>
+    <th title="<?php echo _("Thursday") ?>"><?php echo substr(_("Thursday"),0,1) ?></th>
+    <th title="<?php echo _("Friday") ?>"><?php echo substr(_("Friday"),0,1) ?></th>
+    <th title="<?php echo _("Saturday") ?>"><?php echo substr(_("Saturday"),0,1) ?></th>
+  </tr></thead>
+  <tbody>
+    <tr><td class="kronolithMinicalWeek" date="20090329">13</td><td date="20090329" class="kronolithMinicalEmpty">29</td><td date="20090330" class="kronolithMinicalEmpty">30</td><td date="20090331" class="kronolithMinicalEmpty">31</td><td date="20090401" class="">1</td><td date="20090402" class="">2</td><td date="20090403" class="">3</td><td date="20090404" class="">4</td></tr>
+    <tr><td class="kronolithMinicalWeek" date="20090405">14</td><td date="20090405">5</td><td date="20090406">6</td><td date="20090407">7</td><td date="20090408">8</td><td date="20090409">9</td><td date="20090410">10</td><td date="20090411">11</td></tr>
+    <tr><td class="kronolithMinicalWeek" date="20090412">15</td><td date="20090412">12</td><td date="20090413">13</td><td date="20090414">14</td><td date="20090415">15</td><td date="20090416">16</td><td date="20090417">17</td><td date="20090418">18</td></tr>
+    <tr><td class="kronolithMinicalWeek" date="20090419">16</td><td date="20090419">19</td><td date="20090420">20</td><td date="20090421">21</td><td date="20090422">22</td><td date="20090423">23</td><td date="20090424">24</td><td date="20090425">25</td></tr>
+    <tr><td class="kronolithMinicalWeek" date="20090426">17</td><td date="20090426">26</td><td date="20090427">27</td><td date="20090428">28</td><td date="20090429">29</td><td date="20090430">30</td><td date="20090501" class="kronolithMinicalEmpty">1</td><td date="20090502" class="kronolithMinicalEmpty">2</td></tr>
+  </tbody>
 </table>
-
 </div>
-<?php
-}
-?>
+<?php endforeach; ?>
 
 </div>
-- 
2.11.0