1 files changed, 67 insertions, 24 deletions
diff --git a/root/links b/root/links
index 40bfa51..210a7e9 100644
--- a/root/links
+++ b/root/links
@@ -1,25 +1,68 @@
-<html>
-<head>
-<title>links</title>
-</head>
-<body>
-<p>
-[% IF tagset.size() == 1 %]Tag:[% ELSE %]Tags:[% END %]
-[% FOR tag IN tagset.tags %]
- [% tag.name %] ( [% tag.descr %] ) - 
-[% END %]</p>
-<p>Related:</p>
-<ul>
-[% FOR rtag IN related %]
-<li><a href="[% base _ 'tag/' _ rtag.name %]">[% rtag.name %]</a></li>
-[% END %]
-</ul>
-<p>Links:</p>
-<ol>
-[% FOR link IN links %]
-<li><img src="[% base _ 'icon?link=' _ link.pk %]" /> <a href="[% base _ 'jump?link=' _ link.pk %]">»[% link.title %]«</a> (creato: [% link.add_date() %])
-[% FOR rtag IN link.tags %] <a href="[% base _ 'tag/' _ rtag.name %]">[% rtag.name %]</a> - [% END %]</li>
-[% END %]
-</ol>
-</body>
+<?xml version="1.0" encoding="utf-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>
+   Links for
+   [% FOR tag IN tagset.tags;
+    tag.name;
+    ', ' UNLESS loop.last;
+    END %]
+  </title>
+ </head>
+ <body>
+  <div id="tagset">
+   <h2>[% IF tagset.size() == 1 %]Tag:[% ELSE %]Tags:[% END %]</h2>
+   <ul>
+    [% FOR tag IN tagset.tags %]
+    <li>
+     <span class="tag name">
+      <a href="[% href.tag_info(tag) %]">[% tag.name %]</a>
+     </span>
+     [% IF tagset.size() > 1 %]
+     <span class="tag remove">
+      <a href="[% href.remove_tag(tagset,tag) %]">-</a>
+     </span>
+     [% END %]
+    </li>
+    [% END %]
+   </ul>
+  </div>
+  <div id="related">
+   <h2>Related:</h2>
+   <ul>
+    [% FOR rtag IN related %]
+    <li>
+     <span class="tag name"><a href="[% href.to_tag(rtag) %]">[% rtag.name %]</a></span>
+     <span class="tag add">
+      <a href="[% href.add_tag(tagset,rtag) %]">+</a>
+     </span>
+    </li>
+    [% END %]
+   </ul>
+  </div>
+  <div id="links">
+   <h2>Links:</h2>
+   <ol>
+    [% FOR link IN links %]
+    <li>
+     <span class="link icon">
+      <img src="[% href.link_icon(link) %]" />
+     </span>
+     <span class="link title">
+      <a href="[% href.link(link) %]">»[% link.title %]«</a>
+     </span>
+     <ul>
+      [% FOR rtag IN link.tags %]
+      <li>
+       <span class="tag name">
+        <a href="[% href.to_tag(rtag) %]">[% rtag.name %]</a>
+       </span>
+      </li>
+      [% END %]
+     </ul>
+    </li>
+    [% END %]
+   </ol>
+  </div>
+ </body>
 </html>