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

display cleanups

Browse Source
This commit is contained in:
zzz
2011-03-30 00:19:28 +00:00
parent 0fcf13ef73
commit 7020bfd521
7 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
View File

@@ -129,6 +129,11 @@ public class AddressbookBean
return filename; return filename;
} }
public String getDisplayName()
{
return getFileName();
}
protected AddressBean[] entries; protected AddressBean[] entries;
public AddressBean[] getEntries() public AddressBean[] getEntries()
@@ -306,6 +311,8 @@ public class AddressbookBean
message = _("Destination added for {0}.", displayHost); message = _("Destination added for {0}.", displayHost);
else else
message = _("Destination changed for {0}.", displayHost); message = _("Destination changed for {0}.", displayHost);
if (!host.endsWith(".i2p"))
message += "<br>" + _("Warning - host name does not end with \".i2p\"");
// clear form // clear form
hostname = null; hostname = null;
destination = null; destination = null;

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

@@ -96,6 +96,15 @@ public class NamingServiceBean extends AddressbookBean
return basename(filename); return basename(filename);
} }
@Override
public String getDisplayName()
{
if (isDirect())
return super.getDisplayName();
loadConfig();
return _("{0} address book in {1} database", getFileName(), getNamingService().getName());
}
/** depth-first search */ /** depth-first search */
private static NamingService searchNamingService(NamingService ns, String srch) private static NamingService searchNamingService(NamingService ns, String srch)
{ {
@@ -248,11 +257,13 @@ public class NamingServiceBean extends AddressbookBean
message = _("Destination added for {0}.", displayHost); message = _("Destination added for {0}.", displayHost);
else else
message = _("Destination changed for {0}.", displayHost); message = _("Destination changed for {0}.", displayHost);
if (!host.endsWith(".i2p"))
message += "<br>" + _("Warning - host name does not end with \".i2p\"");
// clear form // clear form
hostname = null; hostname = null;
destination = null; destination = null;
} else { } else {
message = _("Failed to add Destination for {0} to naming service {1}", displayHost, getNamingService()) + "<br>"; message = _("Failed to add Destination for {0} to naming service {1}", displayHost, getNamingService().getName()) + "<br>";
} }
} catch (DataFormatException dfe) { } catch (DataFormatException dfe) {
message = _("Invalid Base 64 destination."); message = _("Invalid Base 64 destination.");
@@ -276,7 +287,7 @@ public class NamingServiceBean extends AddressbookBean
String uni = AddressBean.toUnicode(n); String uni = AddressBean.toUnicode(n);
String displayHost = uni.equals(n) ? n : uni + " (" + n + ')'; String displayHost = uni.equals(n) ? n : uni + " (" + n + ')';
if (!success) { if (!success) {
message += _("Failed to delete Destination for {0} from naming service {1}", displayHost, getNamingService()) + "<br>"; message += _("Failed to delete Destination for {0} from naming service {1}", displayHost, getNamingService().getName()) + "<br>";
} else if (deleted++ == 0) { } else if (deleted++ == 0) {
changed = true; changed = true;
name = displayHost; name = displayHost;

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

@@ -54,19 +54,20 @@
<hr> <hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._("addressbooks")%> <%=intl._("Address books")%>:
<a href="addressbook.jsp?book=private&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("private")%></a> | <a href="addressbook.jsp?book=private&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("private")%></a> |
<a href="addressbook.jsp?book=master&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("master")%></a> | <a href="addressbook.jsp?book=master&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("master")%></a> |
<a href="addressbook.jsp?book=router&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("router")%></a> | <a href="addressbook.jsp?book=router&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("router")%></a> |
<a href="addressbook.jsp?book=published&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("published")%></a> * <a href="addressbook.jsp?book=published&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("published")%></a> *
<a href="subscriptions.jsp"><%=intl._("subscriptions")%></a> * <a href="subscriptions.jsp"><%=intl._("Subscriptions")%></a> *
<a href="config.jsp"><%=intl._("configuration")%></a> * <a href="config.jsp"><%=intl._("Configuration")%></a> *
<a href="index.jsp"><%=intl._("overview")%></a> <a href="index.jsp"><%=intl._("Overview")%></a>
</p> </p>
</div> </div>
<hr> <hr>
<div id="headline"> <div id="headline">
<h3><%=intl._(book.getBook())%> <%=intl._("addressbook")%>: ${book.fileName}</h3> <h3><%=intl._("Address book")%>: <%=intl._(book.getBook())%></h3>
<h4><%=intl._("Storage")%>: ${book.displayName}</h4>
</div> </div>
<div id="messages">${book.messages}</div> <div id="messages">${book.messages}</div>

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

@@ -49,14 +49,14 @@
</div><hr> </div><hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._("addressbooks")%> <%=intl._("Address books")%>:
<a href="addressbook.jsp?book=private"><%=intl._("private")%></a> | <a href="addressbook.jsp?book=private"><%=intl._("private")%></a> |
<a href="addressbook.jsp?book=master"><%=intl._("master")%></a> | <a href="addressbook.jsp?book=master"><%=intl._("master")%></a> |
<a href="addressbook.jsp?book=router"><%=intl._("router")%></a> | <a href="addressbook.jsp?book=router"><%=intl._("router")%></a> |
<a href="addressbook.jsp?book=published"><%=intl._("published")%></a> * <a href="addressbook.jsp?book=published"><%=intl._("published")%></a> *
<a href="subscriptions.jsp"><%=intl._("subscriptions")%></a> * <a href="subscriptions.jsp"><%=intl._("Subscriptions")%></a> *
<%=intl._("configuration")%> * <%=intl._("Configuration")%> *
<a href="index.jsp"><%=intl._("overview")%></a> <a href="index.jsp"><%=intl._("Overview")%></a>
</p> </p>
</div><hr> </div><hr>
<div id="headline"> <div id="headline">

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

@@ -51,19 +51,20 @@
<hr> <hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._("addressbooks")%> <%=intl._("Address books")%>:
<a href="addressbook.jsp?book=private&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("private")%></a> | <a href="addressbook.jsp?book=private&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("private")%></a> |
<a href="addressbook.jsp?book=master&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("master")%></a> | <a href="addressbook.jsp?book=master&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("master")%></a> |
<a href="addressbook.jsp?book=router&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("router")%></a> | <a href="addressbook.jsp?book=router&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("router")%></a> |
<a href="addressbook.jsp?book=published&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("published")%></a> * <a href="addressbook.jsp?book=published&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("published")%></a> *
<a href="subscriptions.jsp"><%=intl._("subscriptions")%></a> * <a href="subscriptions.jsp"><%=intl._("Subscriptions")%></a> *
<a href="config.jsp"><%=intl._("configuration")%></a> * <a href="config.jsp"><%=intl._("Configuration")%></a> *
<a href="index.jsp"><%=intl._("overview")%></a> <a href="index.jsp"><%=intl._("Overview")%></a>
</p> </p>
</div> </div>
<hr> <hr>
<div id="headline"> <div id="headline">
<h3><%=intl._(book.getBook())%> <%=intl._("addressbook")%>: ${book.fileName}</h3> <h3><%=intl._("Address book")%>: <%=intl._(book.getBook())%></h3>
<h4><%=intl._("Storage")%>: ${book.displayName}</h4>
</div> </div>
<div id="book"> <div id="book">

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

@@ -48,14 +48,14 @@
<hr> <hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._("addressbooks")%> <%=intl._("Address books")%>:
<a href="addressbook.jsp?book=private"><%=intl._("private")%></a> | <a href="addressbook.jsp?book=private"><%=intl._("private")%></a> |
<a href="addressbook.jsp?book=master"><%=intl._("master")%></a> | <a href="addressbook.jsp?book=master"><%=intl._("master")%></a> |
<a href="addressbook.jsp?book=router"><%=intl._("router")%></a> | <a href="addressbook.jsp?book=router"><%=intl._("router")%></a> |
<a href="addressbook.jsp?book=published"><%=intl._("published")%></a> * <a href="addressbook.jsp?book=published"><%=intl._("published")%></a> *
<a href="subscriptions.jsp"><%=intl._("subscriptions")%></a> * <a href="subscriptions.jsp"><%=intl._("Subscriptions")%></a> *
<a href="config.jsp"><%=intl._("configuration")%></a> * <a href="config.jsp"><%=intl._("Configuration")%></a> *
<%=intl._("overview")%> <%=intl._("Overview")%>
</p> </p>
</div> </div>
<hr> <hr>

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

@@ -49,14 +49,14 @@
</div><hr> </div><hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._("addressbooks")%> <%=intl._("Address books")%>:
<a href="addressbook.jsp?book=private"><%=intl._("private")%></a> | <a href="addressbook.jsp?book=private"><%=intl._("private")%></a> |
<a href="addressbook.jsp?book=master"><%=intl._("master")%></a> | <a href="addressbook.jsp?book=master"><%=intl._("master")%></a> |
<a href="addressbook.jsp?book=router"><%=intl._("router")%></a> | <a href="addressbook.jsp?book=router"><%=intl._("router")%></a> |
<a href="addressbook.jsp?book=published"><%=intl._("published")%></a> * <a href="addressbook.jsp?book=published"><%=intl._("published")%></a> *
<%=intl._("subscriptions")%> * <%=intl._("Subscriptions")%> *
<a href="config.jsp"><%=intl._("configuration")%></a> * <a href="config.jsp"><%=intl._("Configuration")%></a> *
<a href="index.jsp"><%=intl._("overview")%></a> <a href="index.jsp"><%=intl._("Overview")%></a>
</p> </p>
</div><hr> </div><hr>
<div id="headline"> <div id="headline">