From 7020bfd5211f919c291a9d14194ac3c1a75450eb Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 30 Mar 2011 00:19:28 +0000 Subject: [PATCH] display cleanups --- .../java/src/i2p/susi/dns/AddressbookBean.java | 7 +++++++ .../java/src/i2p/susi/dns/NamingServiceBean.java | 15 +++++++++++++-- apps/susidns/src/jsp/addressbook.jsp | 11 ++++++----- apps/susidns/src/jsp/config.jsp | 8 ++++---- apps/susidns/src/jsp/details.jsp | 11 ++++++----- apps/susidns/src/jsp/index.jsp | 8 ++++---- apps/susidns/src/jsp/subscriptions.jsp | 8 ++++---- 7 files changed, 44 insertions(+), 24 deletions(-) diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java index 52d67ab8e..931923a4d 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java @@ -129,6 +129,11 @@ public class AddressbookBean return filename; } + public String getDisplayName() + { + return getFileName(); + } + protected AddressBean[] entries; public AddressBean[] getEntries() @@ -306,6 +311,8 @@ public class AddressbookBean message = _("Destination added for {0}.", displayHost); else message = _("Destination changed for {0}.", displayHost); + if (!host.endsWith(".i2p")) + message += "
" + _("Warning - host name does not end with \".i2p\""); // clear form hostname = null; destination = null; 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 56e491c85..8b24e2ed6 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java @@ -96,6 +96,15 @@ public class NamingServiceBean extends AddressbookBean 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 */ private static NamingService searchNamingService(NamingService ns, String srch) { @@ -248,11 +257,13 @@ public class NamingServiceBean extends AddressbookBean message = _("Destination added for {0}.", displayHost); else message = _("Destination changed for {0}.", displayHost); + if (!host.endsWith(".i2p")) + message += "
" + _("Warning - host name does not end with \".i2p\""); // clear form hostname = null; destination = null; } else { - message = _("Failed to add Destination for {0} to naming service {1}", displayHost, getNamingService()) + "
"; + message = _("Failed to add Destination for {0} to naming service {1}", displayHost, getNamingService().getName()) + "
"; } } catch (DataFormatException dfe) { message = _("Invalid Base 64 destination."); @@ -276,7 +287,7 @@ public class NamingServiceBean extends AddressbookBean String uni = AddressBean.toUnicode(n); String displayHost = uni.equals(n) ? n : uni + " (" + n + ')'; if (!success) { - message += _("Failed to delete Destination for {0} from naming service {1}", displayHost, getNamingService()) + "
"; + message += _("Failed to delete Destination for {0} from naming service {1}", displayHost, getNamingService().getName()) + "
"; } else if (deleted++ == 0) { changed = true; name = displayHost; diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp index 103620ff3..83c37e8eb 100644 --- a/apps/susidns/src/jsp/addressbook.jsp +++ b/apps/susidns/src/jsp/addressbook.jsp @@ -54,19 +54,20 @@
-

<%=intl._(book.getBook())%> <%=intl._("addressbook")%>: ${book.fileName}

+

<%=intl._("Address book")%>: <%=intl._(book.getBook())%>

+

<%=intl._("Storage")%>: ${book.displayName}

${book.messages}
diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp index 4ad8b77db..c74d1a7ad 100644 --- a/apps/susidns/src/jsp/config.jsp +++ b/apps/susidns/src/jsp/config.jsp @@ -49,14 +49,14 @@
diff --git a/apps/susidns/src/jsp/details.jsp b/apps/susidns/src/jsp/details.jsp index 8ccb13221..3350d050c 100644 --- a/apps/susidns/src/jsp/details.jsp +++ b/apps/susidns/src/jsp/details.jsp @@ -51,19 +51,20 @@
-

<%=intl._(book.getBook())%> <%=intl._("addressbook")%>: ${book.fileName}

+

<%=intl._("Address book")%>: <%=intl._(book.getBook())%>

+

<%=intl._("Storage")%>: ${book.displayName}

diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp index 25529becf..3c7225a19 100644 --- a/apps/susidns/src/jsp/index.jsp +++ b/apps/susidns/src/jsp/index.jsp @@ -48,14 +48,14 @@
diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp index 27af71984..863948f57 100644 --- a/apps/susidns/src/jsp/subscriptions.jsp +++ b/apps/susidns/src/jsp/subscriptions.jsp @@ -49,14 +49,14 @@