AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

susidns: rework top nav, consolidate filter section, misc markup

Browse Source
This commit is contained in:
str4d
2016-07-11 07:08:55 +00:00
parent e01fe689d0
commit ddf332e779
6 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
View File

@@ -211,7 +211,7 @@ public class NamingServiceBean extends AddressbookBean
warn(e); warn(e);
} }
if( message.length() > 0 ) if( message.length() > 0 )
message = "<p>" + message + "</p>"; message = "<p id=\"filtered\">" + message + "</p>";
return message; return message;
} }

32
apps/susidns/src/jsp/addressbook.jsp
View File

@@ -59,18 +59,17 @@
<hr> <hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._t("Address books")%>: <a id="overview" href="index"><%=intl._t("Overview")%></a>&nbsp;
<a href="addressbook?book=private&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._t("private")%></a> | <a class="abook" href="addressbook?book=private"><%=intl._t("Private")%></a>&nbsp;
<a href="addressbook?book=master&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._t("master")%></a> | <a class="abook" href="addressbook?book=master"><%=intl._t("Master")%></a>&nbsp;
<a href="addressbook?book=router&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._t("router")%></a> | <a class="abook" href="addressbook?book=router"><%=intl._t("Router")%></a>&nbsp;
<a href="addressbook?book=published&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._t("published")%></a> * <a class="abook" href="addressbook?book=published"><%=intl._t("Published")%></a>&nbsp;
<a href="subscriptions"><%=intl._t("Subscriptions")%></a> * <a id="subs" href="subscriptions"><%=intl._t("Subscriptions")%></a>&nbsp;
<a href="config"><%=intl._t("Configuration")%></a> * <a id="config" href="config"><%=intl._t("Configuration")%></a>
<a href="index"><%=intl._t("Overview")%></a>
</p> </p>
</div> </div>
<hr> <hr>
<div id="headline"> <div class="headline" id="addressbook">
<h3><%=intl._t("Address book")%>: <%=intl._t(book.getBook())%></h3> <h3><%=intl._t("Address book")%>: <%=intl._t(book.getBook())%></h3>
<h4><%=intl._t("Storage")%>: ${book.displayName}</h4> <h4><%=intl._t("Storage")%>: ${book.displayName}</h4>
</div> </div>
@@ -81,7 +80,14 @@ ${book.loadBookMessages}
<c:if test="${book.notEmpty}"> <c:if test="${book.notEmpty}">
<div id="filter"> <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&amp;begin=0&amp;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&amp;begin=0&amp;end=49">a</a> <a href="addressbook?filter=a&amp;begin=0&amp;end=49">a</a>
<a href="addressbook?filter=b&amp;begin=0&amp;end=49">b</a> <a href="addressbook?filter=b&amp;begin=0&amp;end=49">b</a>
<a href="addressbook?filter=c&amp;begin=0&amp;end=49">c</a> <a href="addressbook?filter=c&amp;begin=0&amp;end=49">c</a>
@@ -111,10 +117,6 @@ ${book.loadBookMessages}
<a href="addressbook?filter=0-9&amp;begin=0&amp;end=49">0-9</a> <a href="addressbook?filter=0-9&amp;begin=0&amp;end=49">0-9</a>
<a href="addressbook?filter=xn--&amp;begin=0&amp;end=49"><%=intl._t("other")%></a> <a href="addressbook?filter=xn--&amp;begin=0&amp;end=49"><%=intl._t("other")%></a>
<a href="addressbook?filter=none&amp;begin=0&amp;end=49"><%=intl._t("all")%></a></p> <a href="addressbook?filter=none&amp;begin=0&amp;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&amp;begin=0&amp;end=49"><%=intl._t("clear filter")%></a></p>
</c:if>
</div> </div>
<div id="search"> <div id="search">
@@ -144,7 +146,7 @@ ${book.loadBookMessages}
<tr class="head"> <tr class="head">
<c:if test="${book.master || book.router || book.published || book.private}"> <c:if test="${book.master || book.router || book.published || book.private}">
<th>&nbsp;</th> <th></th>
</c:if> </c:if>
<% if (book.getEntries().length > 0) { /* Don't show if no results. Can't figure out how to do this with c:if */ %> <% if (book.getEntries().length > 0) { /* Don't show if no results. Can't figure out how to do this with c:if */ %>

25
apps/susidns/src/jsp/config.jsp
View File

@@ -55,18 +55,19 @@
</div><hr> </div><hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._t("Address books")%>: <a id="overview" href="index"><%=intl._t("Overview")%></a>&nbsp;
<a href="addressbook?book=private"><%=intl._t("private")%></a> | <a class="abook" href="addressbook?book=private"><%=intl._t("Private")%></a>&nbsp;
<a href="addressbook?book=master"><%=intl._t("master")%></a> | <a class="abook" href="addressbook?book=master"><%=intl._t("Master")%></a>&nbsp;
<a href="addressbook?book=router"><%=intl._t("router")%></a> | <a class="abook" href="addressbook?book=router"><%=intl._t("Router")%></a>&nbsp;
<a href="addressbook?book=published"><%=intl._t("published")%></a> * <a class="abook" href="addressbook?book=published"><%=intl._t("Published")%></a>&nbsp;
<a href="subscriptions"><%=intl._t("Subscriptions")%></a> * <a id="subs" href="subscriptions"><%=intl._t("Subscriptions")%></a>&nbsp;
<%=intl._t("Configuration")%> * <a id="config" href="config"><%=intl._t("Configuration")%></a>
<a href="index"><%=intl._t("Overview")%></a>
</p> </p>
</div><hr> </div>
<div id="headline"> <hr>
<h3>${cfg.fileName}</h3> <div class="headline" id="config">
<h3><%=intl._t("Configuration")%></h3>
<h4><%=intl._t("Location:")%> ${cfg.fileName}</h4>
</div> </div>
<div id="messages">${cfg.messages}</div> <div id="messages">${cfg.messages}</div>
<form method="POST" action="config"> <form method="POST" action="config">
@@ -79,7 +80,7 @@
<input class="accept" type="submit" name="action" value="<%=intl._t("Save")%>" > <input class="accept" type="submit" name="action" value="<%=intl._t("Save")%>" >
</div> </div>
</form> </form>
<div id="help"> <div class="help" id="helpconfig">
<h3><%=intl._t("Hints")%></h3> <h3><%=intl._t("Hints")%></h3>
<ol> <ol>
<li> <li>

17
apps/susidns/src/jsp/details.jsp
View File

@@ -53,18 +53,17 @@
<hr> <hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._t("Address books")%>: <a id="overview" href="index"><%=intl._t("Overview")%></a>&nbsp;
<a href="addressbook?book=private&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._t("private")%></a> | <a class="abook" href="addressbook?book=private"><%=intl._t("Private")%></a>&nbsp;
<a href="addressbook?book=master&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._t("master")%></a> | <a class="abook" href="addressbook?book=master"><%=intl._t("Master")%></a>&nbsp;
<a href="addressbook?book=router&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._t("router")%></a> | <a class="abook" href="addressbook?book=router"><%=intl._t("Router")%></a>&nbsp;
<a href="addressbook?book=published&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._t("published")%></a> * <a class="abook" href="addressbook?book=published"><%=intl._t("Published")%></a>&nbsp;
<a href="subscriptions"><%=intl._t("Subscriptions")%></a> * <a id="subs" href="subscriptions"><%=intl._t("Subscriptions")%></a>&nbsp;
<a href="config"><%=intl._t("Configuration")%></a> * <a id="config" href="config"><%=intl._t("Configuration")%></a>
<a href="index"><%=intl._t("Overview")%></a>
</p> </p>
</div> </div>
<hr> <hr>
<div id="headline"> <div class="headline">
<h3><%=intl._t("Address book")%>: <%=intl._t(book.getBook())%></h3> <h3><%=intl._t("Address book")%>: <%=intl._t(book.getBook())%></h3>
<h4><%=intl._t("Storage")%>: ${book.displayName}</h4> <h4><%=intl._t("Storage")%>: ${book.displayName}</h4>
</div> </div>

15
apps/susidns/src/jsp/index.jsp
View File

@@ -54,14 +54,13 @@
<hr> <hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._t("Address books")%>: <a id="overview" href="index"><%=intl._t("Overview")%></a>&nbsp;
<a href="addressbook?book=private"><%=intl._t("private")%></a> | <a class="abook" href="addressbook?book=private"><%=intl._t("Private")%></a>&nbsp;
<a href="addressbook?book=master"><%=intl._t("master")%></a> | <a class="abook" href="addressbook?book=master"><%=intl._t("Master")%></a>&nbsp;
<a href="addressbook?book=router"><%=intl._t("router")%></a> | <a class="abook" href="addressbook?book=router"><%=intl._t("Router")%></a>&nbsp;
<a href="addressbook?book=published"><%=intl._t("published")%></a> * <a class="abook" href="addressbook?book=published"><%=intl._t("Published")%></a>&nbsp;
<a href="subscriptions"><%=intl._t("Subscriptions")%></a> * <a id="subs" href="subscriptions"><%=intl._t("Subscriptions")%></a>&nbsp;
<a href="config"><%=intl._t("Configuration")%></a> * <a id="config" href="config"><%=intl._t("Configuration")%></a>
<%=intl._t("Overview")%>
</p> </p>
</div> </div>
<hr> <hr>

25
apps/susidns/src/jsp/subscriptions.jsp
View File

@@ -54,18 +54,19 @@
</div><hr> </div><hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._t("Address books")%>: <a id="overview" href="index"><%=intl._t("Overview")%></a>&nbsp;
<a href="addressbook?book=private"><%=intl._t("private")%></a> | <a class="abook" href="addressbook?book=private"><%=intl._t("Private")%></a>&nbsp;
<a href="addressbook?book=master"><%=intl._t("master")%></a> | <a class="abook" href="addressbook?book=master"><%=intl._t("Master")%></a>&nbsp;
<a href="addressbook?book=router"><%=intl._t("router")%></a> | <a class="abook" href="addressbook?book=router"><%=intl._t("Router")%></a>&nbsp;
<a href="addressbook?book=published"><%=intl._t("published")%></a> * <a class="abook" href="addressbook?book=published"><%=intl._t("Published")%></a>&nbsp;
<%=intl._t("Subscriptions")%> * <a id="subs" href="subscriptions"><%=intl._t("Subscriptions")%></a>&nbsp;
<a href="config"><%=intl._t("Configuration")%></a> * <a id="config" href="config"><%=intl._t("Configuration")%></a>
<a href="index"><%=intl._t("Overview")%></a>
</p> </p>
</div><hr> </div>
<div id="headline"> <hr>
<h3>${subs.fileName}</h3> <div class="headline" id="subscriptions">
<h3><%=intl._t("Subscriptions")%></h3>
<h4><%=intl._t("Location:")%> ${subs.fileName}</h4>
</div> </div>
<div id="messages">${subs.messages}</div> <div id="messages">${subs.messages}</div>
<form method="POST" action="subscriptions"> <form method="POST" action="subscriptions">
@@ -78,7 +79,7 @@
<input class="accept" type="submit" name="action" value="<%=intl._t("Save")%>" > <input class="accept" type="submit" name="action" value="<%=intl._t("Save")%>" >
</div> </div>
</form> </form>
<div id="help"> <div class="help" id="helpsubs">
<p class="help"> <p class="help">
<%=intl._t("The subscription file contains a list of i2p URLs.")%> <%=intl._t("The subscription file contains a list of i2p URLs.")%>
<%=intl._t("The addressbook application regularly checks this list for new eepsites.")%> <%=intl._t("The addressbook application regularly checks this list for new eepsites.")%>