Tweaks to history display

diff --git a/chora/history.php b/chora/history.php
index 1571a03..d2ace39 100644 (file)
--- a/chora/history.php
+++ b/chora/history.php
@@ -20,13 +20,6 @@ if (!$VC->hasFeature('branches')) {
     exit;
 }
 
-/* Spawn the file object. */
-try {
-    $fl = $VC->getFileObject($where);
-} catch (Horde_Vcs_Exception $e) {
-    Chora::fatal($e);
-}
-
 $colset = array('#ccdeff', '#ecf', '#fec', '#efc', '#cfd', '#dcdba0');
 $branch_colors = $colStack = array();
 foreach ($branches as $brrev => $brcont) {
@@ -105,6 +98,15 @@ function _populateGrid($row, $col)
     }
 }
 
+/* Spawn the file object. */
+try {
+    $fl = $VC->getFileObject($where);
+} catch (Horde_Vcs_Exception $e) {
+    Chora::fatal($e);
+}
+
+$revlist = $fl->getBranchList();
+
 /* Start row at the bottom trunk revision.  Since branches always go
  * down, there can never be one above 1.1, and so this is a safe
  * location to start.  We will then work our way up, recursively

diff --git a/chora/templates/history/blank.inc b/chora/templates/history/blank.inc
index a5b0e25..d92265b 100644 (file)
--- a/chora/templates/history/blank.inc
+++ b/chora/templates/history/blank.inc
@@ -1 +1 @@
-<td<?php echo $bg ? " style=\"background:$bg\"":'' ?>>&nbsp;</td>
\ No newline at end of file
+<td class="historybg<?php echo $bg ?>">&nbsp;</td>

diff --git a/chora/templates/history/branch_cell.inc b/chora/templates/history/branch_cell.inc
index d8e2d69..7633a6e 100644 (file)
--- a/chora/templates/history/branch_cell.inc
+++ b/chora/templates/history/branch_cell.inc
@@ -1,4 +1,4 @@
-<td style="background:<?php echo $bg ?>; text-align:center">
+<td class="historybg<?php echo $bg ?>">
 <?php echo _("Branching to") ?>:<br />
 <a href="<?php echo Chora::url('browsefile', $where, array('onb' => $rev)); ?>">
  <?php echo $symname ?></a>

diff --git a/chora/templates/history/rev.inc b/chora/templates/history/rev.inc
index 3146f03..3f4535f 100644 (file)
--- a/chora/templates/history/rev.inc
+++ b/chora/templates/history/rev.inc
@@ -1,4 +1,4 @@
-<td id="rev<?php echo $rev ?>" style="background:<?php echo $bg ?>">
+<td id="rev<?php echo $rev ?>" class="historybg<?php echo $bg ?>">
  <a href="<?php echo Chora::url('browsefile', $where, array('r' => $rev), 'rev' . $rev) ?>">
  <?php echo $rev ?></a> <?php printf(_("by %s"), $author) ?>
  <br />

diff --git a/chora/themes/screen.css b/chora/themes/screen.css
index 31f8be1..4bbab1c 100644 (file)
--- a/chora/themes/screen.css
+++ b/chora/themes/screen.css
@@ -290,3 +290,26 @@ div.diffclear {
 td.browseLocation em {
     display: block;
 }
+
+.historybg {
+    background: #e9e9e9;
+    text-align: center;
+}
+.historybg1 {
+    background: #ccdeff;
+}
+.historybg2 {
+    background: #ecf;
+}
+.historybg3 {
+    background: #fec;
+}
+.historybg4 {
+    background: #efc;
+}
+.historybg5 {
+    background: #cfd;
+}
+.historybg6 {
+    background: #dcdba0;
+}