diff --git a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
index 63517644667fdd98dcdc30769351246ee8d641b7..e76b4a4ddb241fc4721106e16cb4e990e3295ed9 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
@@ -211,7 +211,7 @@ public class NamingServiceBean extends AddressbookBean
warn(e);
}
if( message.length() > 0 )
- message = "<p>" + message + "</p>";
+ message = "<p id=\"filtered\">" + message + "</p>";
return message;
}
diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp
index 5521c5252614bf84fa154676be9b888f88c1eddd..f4caa542c81a11fb32f70f3adfb6618cc3533014 100644
--- a/apps/susidns/src/jsp/addressbook.jsp
+++ b/apps/susidns/src/jsp/addressbook.jsp
@@ -59,18 +59,17 @@
<hr>
<div id="navi">
<p>
-<%=intl._t("Address books")%>:
-<a href="addressbook?book=private&filter=none&begin=0&end=49"><%=intl._t("private")%></a> |
-<a href="addressbook?book=master&filter=none&begin=0&end=49"><%=intl._t("master")%></a> |
-<a href="addressbook?book=router&filter=none&begin=0&end=49"><%=intl._t("router")%></a> |
-<a href="addressbook?book=published&filter=none&begin=0&end=49"><%=intl._t("published")%></a> *
-<a href="subscriptions"><%=intl._t("Subscriptions")%></a> *
-<a href="config"><%=intl._t("Configuration")%></a> *
-<a href="index"><%=intl._t("Overview")%></a>
+<a id="overview" href="index"><%=intl._t("Overview")%></a>
+<a class="abook" href="addressbook?book=private"><%=intl._t("Private")%></a>
+<a class="abook" href="addressbook?book=master"><%=intl._t("Master")%></a>
+<a class="abook" href="addressbook?book=router"><%=intl._t("Router")%></a>
+<a class="abook" href="addressbook?book=published"><%=intl._t("Published")%></a>
+<a id="subs" href="subscriptions"><%=intl._t("Subscriptions")%></a>
+<a id="config" href="config"><%=intl._t("Configuration")%></a>
</p>
</div>
<hr>
-<div id="headline">
+<div class="headline" id="addressbook">
<h3><%=intl._t("Address book")%>: <%=intl._t(book.getBook())%></h3>
<h4><%=intl._t("Storage")%>: ${book.displayName}</h4>
</div>
@@ -81,7 +80,14 @@ ${book.loadBookMessages}
<c:if test="${book.notEmpty}">
<div id="filter">
-<p><%=intl._t("Filter")%>:
+<c:if test="${book.hasFilter}">
+<span><%=intl._t("Current filter")%>: <b>${book.filter}</b>
+<a href="addressbook?filter=none&begin=0&end=49"><%=intl._t("clear filter")%></a></span>
+</c:if>
+<c:if test="${!book.hasFilter}">
+<span><%=intl._t("Filter")%></span>
+</c:if>
+<p>
<a href="addressbook?filter=a&begin=0&end=49">a</a>
<a href="addressbook?filter=b&begin=0&end=49">b</a>
<a href="addressbook?filter=c&begin=0&end=49">c</a>
@@ -111,10 +117,6 @@ ${book.loadBookMessages}
<a href="addressbook?filter=0-9&begin=0&end=49">0-9</a>
<a href="addressbook?filter=xn--&begin=0&end=49"><%=intl._t("other")%></a>
<a href="addressbook?filter=none&begin=0&end=49"><%=intl._t("all")%></a></p>
-<c:if test="${book.hasFilter}">
-<p><%=intl._t("Current filter")%>: <b>${book.filter}</b>
-<a href="addressbook?filter=none&begin=0&end=49"><%=intl._t("clear filter")%></a></p>
-</c:if>
</div>
<div id="search">
@@ -144,7 +146,7 @@ ${book.loadBookMessages}
<tr class="head">
<c:if test="${book.master || book.router || book.published || book.private}">
-<th> </th>
+<th></th>
</c:if>
<% if (book.getEntries().length > 0) { /* Don't show if no results. Can't figure out how to do this with c:if */ %>
diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp
index f63aae6be85920ada8ab0828042e23e3ad5a1dd6..8800dbd5aa2f3d5f67c456243aa7d648d60ebdf9 100644
--- a/apps/susidns/src/jsp/config.jsp
+++ b/apps/susidns/src/jsp/config.jsp
@@ -55,18 +55,19 @@
</div><hr>
<div id="navi">
<p>
-<%=intl._t("Address books")%>:
-<a href="addressbook?book=private"><%=intl._t("private")%></a> |
-<a href="addressbook?book=master"><%=intl._t("master")%></a> |
-<a href="addressbook?book=router"><%=intl._t("router")%></a> |
-<a href="addressbook?book=published"><%=intl._t("published")%></a> *
-<a href="subscriptions"><%=intl._t("Subscriptions")%></a> *
-<%=intl._t("Configuration")%> *
-<a href="index"><%=intl._t("Overview")%></a>
+<a id="overview" href="index"><%=intl._t("Overview")%></a>
+<a class="abook" href="addressbook?book=private"><%=intl._t("Private")%></a>
+<a class="abook" href="addressbook?book=master"><%=intl._t("Master")%></a>
+<a class="abook" href="addressbook?book=router"><%=intl._t("Router")%></a>
+<a class="abook" href="addressbook?book=published"><%=intl._t("Published")%></a>
+<a id="subs" href="subscriptions"><%=intl._t("Subscriptions")%></a>
+<a id="config" href="config"><%=intl._t("Configuration")%></a>
</p>
-</div><hr>
-<div id="headline">
-<h3>${cfg.fileName}</h3>
+</div>
+<hr>
+<div class="headline" id="config">
+<h3><%=intl._t("Configuration")%></h3>
+<h4><%=intl._t("Location:")%> ${cfg.fileName}</h4>
</div>
<div id="messages">${cfg.messages}</div>
<form method="POST" action="config">
@@ -79,7 +80,7 @@
<input class="accept" type="submit" name="action" value="<%=intl._t("Save")%>" >
</div>
</form>
-<div id="help">
+<div class="help" id="helpconfig">
<h3><%=intl._t("Hints")%></h3>
<ol>
<li>
diff --git a/apps/susidns/src/jsp/details.jsp b/apps/susidns/src/jsp/details.jsp
index d4f92e849bfe2eefd6ec381cca934a6ce256e84a..203b9b19720ad41904028ca80443c46430463b5d 100644
--- a/apps/susidns/src/jsp/details.jsp
+++ b/apps/susidns/src/jsp/details.jsp
@@ -53,18 +53,17 @@
<hr>
<div id="navi">
<p>
-<%=intl._t("Address books")%>:
-<a href="addressbook?book=private&filter=none&begin=0&end=49"><%=intl._t("private")%></a> |
-<a href="addressbook?book=master&filter=none&begin=0&end=49"><%=intl._t("master")%></a> |
-<a href="addressbook?book=router&filter=none&begin=0&end=49"><%=intl._t("router")%></a> |
-<a href="addressbook?book=published&filter=none&begin=0&end=49"><%=intl._t("published")%></a> *
-<a href="subscriptions"><%=intl._t("Subscriptions")%></a> *
-<a href="config"><%=intl._t("Configuration")%></a> *
-<a href="index"><%=intl._t("Overview")%></a>
+<a id="overview" href="index"><%=intl._t("Overview")%></a>
+<a class="abook" href="addressbook?book=private"><%=intl._t("Private")%></a>
+<a class="abook" href="addressbook?book=master"><%=intl._t("Master")%></a>
+<a class="abook" href="addressbook?book=router"><%=intl._t("Router")%></a>
+<a class="abook" href="addressbook?book=published"><%=intl._t("Published")%></a>
+<a id="subs" href="subscriptions"><%=intl._t("Subscriptions")%></a>
+<a id="config" href="config"><%=intl._t("Configuration")%></a>
</p>
</div>
<hr>
-<div id="headline">
+<div class="headline">
<h3><%=intl._t("Address book")%>: <%=intl._t(book.getBook())%></h3>
<h4><%=intl._t("Storage")%>: ${book.displayName}</h4>
</div>
diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp
index 5dbc268c7aaf0663af4ea5954edf29ac8c5ca723..345cec9cd863f070a9a5b3f76355f1049df09aa9 100644
--- a/apps/susidns/src/jsp/index.jsp
+++ b/apps/susidns/src/jsp/index.jsp
@@ -54,14 +54,13 @@
<hr>
<div id="navi">
<p>
-<%=intl._t("Address books")%>:
-<a href="addressbook?book=private"><%=intl._t("private")%></a> |
-<a href="addressbook?book=master"><%=intl._t("master")%></a> |
-<a href="addressbook?book=router"><%=intl._t("router")%></a> |
-<a href="addressbook?book=published"><%=intl._t("published")%></a> *
-<a href="subscriptions"><%=intl._t("Subscriptions")%></a> *
-<a href="config"><%=intl._t("Configuration")%></a> *
-<%=intl._t("Overview")%>
+<a id="overview" href="index"><%=intl._t("Overview")%></a>
+<a class="abook" href="addressbook?book=private"><%=intl._t("Private")%></a>
+<a class="abook" href="addressbook?book=master"><%=intl._t("Master")%></a>
+<a class="abook" href="addressbook?book=router"><%=intl._t("Router")%></a>
+<a class="abook" href="addressbook?book=published"><%=intl._t("Published")%></a>
+<a id="subs" href="subscriptions"><%=intl._t("Subscriptions")%></a>
+<a id="config" href="config"><%=intl._t("Configuration")%></a>
</p>
</div>
<hr>
diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp
index ced96834f656ceae86ffa8c87f8251eaaf7384a4..b1e979c0851011a4342622b8f3186c168de5d014 100644
--- a/apps/susidns/src/jsp/subscriptions.jsp
+++ b/apps/susidns/src/jsp/subscriptions.jsp
@@ -54,18 +54,19 @@
</div><hr>
<div id="navi">
<p>
-<%=intl._t("Address books")%>:
-<a href="addressbook?book=private"><%=intl._t("private")%></a> |
-<a href="addressbook?book=master"><%=intl._t("master")%></a> |
-<a href="addressbook?book=router"><%=intl._t("router")%></a> |
-<a href="addressbook?book=published"><%=intl._t("published")%></a> *
-<%=intl._t("Subscriptions")%> *
-<a href="config"><%=intl._t("Configuration")%></a> *
-<a href="index"><%=intl._t("Overview")%></a>
+<a id="overview" href="index"><%=intl._t("Overview")%></a>
+<a class="abook" href="addressbook?book=private"><%=intl._t("Private")%></a>
+<a class="abook" href="addressbook?book=master"><%=intl._t("Master")%></a>
+<a class="abook" href="addressbook?book=router"><%=intl._t("Router")%></a>
+<a class="abook" href="addressbook?book=published"><%=intl._t("Published")%></a>
+<a id="subs" href="subscriptions"><%=intl._t("Subscriptions")%></a>
+<a id="config" href="config"><%=intl._t("Configuration")%></a>
</p>
-</div><hr>
-<div id="headline">
-<h3>${subs.fileName}</h3>
+</div>
+<hr>
+<div class="headline" id="subscriptions">
+<h3><%=intl._t("Subscriptions")%></h3>
+<h4><%=intl._t("Location:")%> ${subs.fileName}</h4>
</div>
<div id="messages">${subs.messages}</div>
<form method="POST" action="subscriptions">
@@ -78,7 +79,7 @@
<input class="accept" type="submit" name="action" value="<%=intl._t("Save")%>" >
</div>
</form>
-<div id="help">
+<div class="help" id="helpsubs">
<p class="help">
<%=intl._t("The subscription file contains a list of i2p URLs.")%>
<%=intl._t("The addressbook application regularly checks this list for new eepsites.")%>