From b6856e81f7cd943c20c58d2c9a1410a542af7138 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Tue, 24 Aug 2010 17:46:51 +0200
Subject: [PATCH] Fix HTML

---
 chora/annotate.php                  |  1 +
 chora/templates/annotate/footer.inc |  2 ++
 chora/templates/diff/hr/header.inc  | 21 +++++++++++----------
 chora/templates/log/header.inc      | 12 ++++++------
 chora/templates/log/rev.inc         |  4 +++-
 chora/themes/ie6_or_less.css        |  2 +-
 chora/themes/ie7.css                |  2 +-
 chora/themes/screen.css             |  4 ++--
 8 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 chora/templates/annotate/footer.inc

diff --git a/chora/annotate.php b/chora/annotate.php
index 563673c2e..cb769cc69 100644
--- a/chora/annotate.php
+++ b/chora/annotate.php
@@ -76,4 +76,5 @@ while (list(,$line) = each($lines)) {
     include CHORA_TEMPLATES . '/annotate/line.inc';
 }
 
+require CHORA_TEMPLATES . '/annotate/footer.inc';
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff --git a/chora/templates/annotate/footer.inc b/chora/templates/annotate/footer.inc
new file mode 100644
index 000000000..02ee59fa5
--- /dev/null
+++ b/chora/templates/annotate/footer.inc
@@ -0,0 +1,2 @@
+</tbody>
+</table>
diff --git a/chora/templates/diff/hr/header.inc b/chora/templates/diff/hr/header.inc
index 14e547752..4f9b92f0f 100644
--- a/chora/templates/diff/hr/header.inc
+++ b/chora/templates/diff/hr/header.inc
@@ -1,5 +1,5 @@
 <div class="options">
- <span>
+ <div>
   <form method="get" action="diff.php">
    <?php echo Chora::formInputs() ?>
    <input type="hidden" name="f" value="<?php echo htmlspecialchars(Horde_Util::getFormData('f')) ?>" />
@@ -22,17 +22,9 @@
    </select>
    <input class="button" type="submit" value="<?php echo _("Get Diff") ?>" /><br />
   </form>
- </span>
+ </div>
 </div>
 
-<table cellspacing="0" class="hrdiff">
-<caption>
- <?php $blank = Horde_Themes::img('blank.gif') ?>
- <img class="unmodified" src="<?php echo $blank ?>" alt="<?php echo _("Unmodified") ?>" /> <?php echo _("Unmodified") ?>
- <img class="added" src="<?php echo $blank ?>" alt="<?php echo _("Added") ?>" /> <?php echo _("Added") ?>
- <img class="modified" src="<?php echo $blank ?>" alt="<?php echo _("Modified") ?>" /> <?php echo _("Modified") ?>
- <img class="removed" src="<?php echo $blank ?>" alt="<?php echo _("Removed") ?>" /> <?php echo _("Removed") ?>
-</caption>
 <?php if (!empty($log_messages)): ?>
 <h3 class="revision_log"><?php echo _("Log Message") ?></h3>
 <div class="revision_log">
@@ -57,6 +49,15 @@
 <?php endforeach; ?>
 </div>
 <?php endif; ?>
+
+<table cellspacing="0" class="hrdiff">
+<caption>
+ <?php $blank = Horde_Themes::img('blank.gif') ?>
+ <img class="unmodified" src="<?php echo $blank ?>" alt="<?php echo _("Unmodified") ?>" /> <?php echo _("Unmodified") ?>
+ <img class="added" src="<?php echo $blank ?>" alt="<?php echo _("Added") ?>" /> <?php echo _("Added") ?>
+ <img class="modified" src="<?php echo $blank ?>" alt="<?php echo _("Modified") ?>" /> <?php echo _("Modified") ?>
+ <img class="removed" src="<?php echo $blank ?>" alt="<?php echo _("Removed") ?>" /> <?php echo _("Removed") ?>
+</caption>
 <thead>
 <tr>
  <th><a href="<?php echo Chora::url('co', $where, array('r' => $r1)) ?>" title="<?php echo htmlspecialchars($r1) ?>"><?php printf(_("Version %s"), htmlspecialchars($abbrev_r1)) ?></a></th>
diff --git a/chora/templates/log/header.inc b/chora/templates/log/header.inc
index 4b34cf10e..f3883d9e4 100644
--- a/chora/templates/log/header.inc
+++ b/chora/templates/log/header.inc
@@ -1,10 +1,10 @@
 <div class="browsefileoptions">
- <span>
+ <div>
   <?php echo _("Search Revisions:") ?>
   <input type="text" for="revlog_body" size="20" />
- </span>
+ </div>
 
- <span>
+ <div>
 <?php if (!$browser->hasFeature('javascript')): ?>
   <form method="get" action="diff.php">
    <?php echo Chora::formInputs() ?>
@@ -16,10 +16,10 @@
   </form>
 <?php endif; ?>
    <em><?php printf(_("%1\$s shows diffs to the previous revision. If you select a revision by clicking its row, %1\$s will show the differences to the selected row."), Horde::img('diff.png', _("Show Differences"))) ?></em>
- </span>
+ </div>
 
 <?php if (!empty($selAllBranches)): ?>
- <span>
+ <div>
   <form method="get" action="<?php echo Chora::url('browsefile', Horde_Util::getFormData('f')) ?>">
    <?php echo _("Show Branch:") ?>
    <select name="onb" onchange="this.form.submit()">
@@ -28,7 +28,7 @@
    </select>
    <noscript><input class="button" type="submit" value="<?php echo _("View") ?>" /></noscript>
   </form>
- </span>
+ </div>
 <?php endif; ?>
 </div>
 
diff --git a/chora/templates/log/rev.inc b/chora/templates/log/rev.inc
index bfe47faa4..473f6d868 100644
--- a/chora/templates/log/rev.inc
+++ b/chora/templates/log/rev.inc
@@ -10,7 +10,9 @@
   <span class="branch">
 <?php foreach ($branchlist as $val): ?>
   <?php echo Chora::url('browsefile', $where, array('onb' => $val))->link() . htmlspecialchars($val) ?></a>
-<?php endforeach; endif; ?>
+<?php endforeach; ?>
+  </span>
+<?php endif; ?>
 <?php if (!empty($changedlines)): ?>
   <small class="difflines">(<?php printf('%s lines', htmlspecialchars($changedlines)) ?>)</small>
 <?php elseif (!is_null($added)): ?>
diff --git a/chora/themes/ie6_or_less.css b/chora/themes/ie6_or_less.css
index f9f8ac3f5..e1b764f1b 100644
--- a/chora/themes/ie6_or_less.css
+++ b/chora/themes/ie6_or_less.css
@@ -1,4 +1,4 @@
-div.options span, div.browsefileoptions span {
+div.options div, div.browsefileoptions div {
     zoom: 1;
     *display: inline;
 }
diff --git a/chora/themes/ie7.css b/chora/themes/ie7.css
index f9f8ac3f5..e1b764f1b 100644
--- a/chora/themes/ie7.css
+++ b/chora/themes/ie7.css
@@ -1,4 +1,4 @@
-div.options span, div.browsefileoptions span {
+div.options div, div.browsefileoptions div {
     zoom: 1;
     *display: inline;
 }
diff --git a/chora/themes/screen.css b/chora/themes/screen.css
index bdd0a72e8..afa6689b5 100644
--- a/chora/themes/screen.css
+++ b/chora/themes/screen.css
@@ -14,7 +14,7 @@ form#repository-picker {
 div.options, div.browsefileoptions {
     margin: 0 0 8px 5px;
 }
-div.options span, div.browsefileoptions span {
+div.options div, div.browsefileoptions div {
     display: -moz-inline-stack;
     display: inline-block;
     border: 1px solid #ccc;
@@ -22,7 +22,7 @@ div.options span, div.browsefileoptions span {
     background: #e9e9e9;
     vertical-align: top;
 }
-div.browsefileoptions span {
+div.browsefileoptions div {
     width: 31.3%;
 }
 div.options em, div.browsefileoptions em {
-- 
2.11.0