From 79c1d4a2448de9a8b09bc4f03cfda8fd6e0877a6 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Thu, 28 May 2009 10:49:06 +0200
Subject: [PATCH] Fix HTML validity of generated tags code.

---
 kronolith/templates/panel.inc | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/kronolith/templates/panel.inc b/kronolith/templates/panel.inc
index 174865147..8f0022d64 100644
--- a/kronolith/templates/panel.inc
+++ b/kronolith/templates/panel.inc
@@ -58,15 +58,22 @@ $tagger = Kronolith::getTagger();
     <div id="tagnode_<?php echo $id?>" style="display:none;">
       <ul id="tags_<?php echo $id?>">
         <?php foreach ($tags as $tag_id => $tag): ?>
-         <li class="panel-tags"><?php echo $tag . ($cal->hasPermission(Auth::getAuth(), PERMS_EDIT) ? '<a href="#" id="remove' . md5($id . $tag_id) . '">' . Horde::img('delete-small.png', _("Remove Tag"), '', $registry->getImageDir('horde')) . '</a>' : '') . '</li>'?>
-        <?php
-         Kronolith_Imple::factory('TagActions', array('triggerId' => 'remove' . md5($id . $tag_id),
-                                                      'action' => 'delete',
-                                                      'resource' => $id,
-                                                      'type' => 'calendar',
-                                                      'tagId' => $tag_id));
-       ?>
-       <?php endforeach;?>
+         <li class="panel-tags">
+<?php
+Kronolith_Imple::factory('TagActions', array('triggerId' => 'remove' . md5($id . $tag_id),
+                                             'action' => 'delete',
+                                             'resource' => $id,
+                                             'type' => 'calendar',
+                                             'tagId' => $tag_id));
+echo $tag;
+if ($cal->hasPermission(Auth::getAuth(), PERMS_EDIT)) {
+    echo '<a href="#" id="remove' . md5($id . $tag_id) . '">'
+        . Horde::img('delete-small.png', _("Remove Tag"), '', $registry->getImageDir('horde'))
+        . '</a>';
+}
+?>
+        </li>
+        <?php endforeach;?>
       </ul>
       <div class="clear">&nbsp;</div>
       <input type="text" name="newtags-input_<?php echo $id?>" id="newtags-input_<?php echo $id?>" size="10" /><input type="button" class="button" value="add" name="newtags-button_<?php echo $id?>" id="newtags-button_<?php echo $id?>" />
-- 
2.11.0