\n");
}
long age = _context.clock().now() - info.getPublished();
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java
index 152764831..a1dce2534 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java
@@ -23,16 +23,21 @@ import net.i2p.stat.RateStat;
*
*/
class ProfileOrganizerRenderer {
- private RouterContext _context;
- private ProfileOrganizer _organizer;
- private ProfileComparator _comparator;
+ private final RouterContext _context;
+ private final ProfileOrganizer _organizer;
+ private final ProfileComparator _comparator;
public ProfileOrganizerRenderer(ProfileOrganizer organizer, RouterContext context) {
_context = context;
_organizer = organizer;
_comparator = new ProfileComparator();
}
- public void renderStatusHTML(Writer out, boolean full) throws IOException {
+
+ /**
+ * @param mode 0 = high cap; 1 = all; 2 = floodfill
+ */
+ public void renderStatusHTML(Writer out, int mode) throws IOException {
+ boolean full = mode == 1;
Set peers = _organizer.selectAllPeers();
long now = _context.clock().now();
@@ -68,7 +73,13 @@ class ProfileOrganizerRenderer {
int reliable = 0;
int integrated = 0;
StringBuilder buf = new StringBuilder(16*1024);
- buf.append("").append(_("Peer Profiles")).append("\n");
+
+ ////
+ //// don't bother reindenting
+ ////
+ if (mode < 2) {
+
+ //buf.append(" ").append(_("Peer Profiles")).append("\n");
buf.append(ngettext("Showing 1 recent profile.", "Showing {0} recent profiles.", order.size())).append('\n');
if (older > 0)
buf.append(ngettext("Hiding 1 older profile.", "Hiding {0} older profiles.", older)).append('\n');
@@ -181,8 +192,13 @@ class ProfileOrganizerRenderer {
}
buf.append("");
- buf.append(" ").append(_("Floodfill and Integrated Peers"))
- .append(" (").append(integratedPeers.size()).append(")\n");
+ ////
+ //// don't bother reindenting
+ ////
+ } else {
+
+ //buf.append("").append(_("Floodfill and Integrated Peers"))
+ // .append(" (").append(integratedPeers.size()).append(")\n");
buf.append("");
buf.append("");
buf.append("| ").append(_("Peer")).append(" | ");
@@ -247,6 +263,12 @@ class ProfileOrganizerRenderer {
}
buf.append(" ");
+ ////
+ //// don't bother reindenting
+ ////
+ }
+ if (mode < 2) {
+
buf.append("").append(_("Thresholds")).append("");
buf.append("").append(_("Speed")).append(": ").append(num(_organizer.getSpeedThreshold()))
.append(" (").append(fast).append(' ').append(_("fast peers")).append(")
");
@@ -262,6 +284,12 @@ class ProfileOrganizerRenderer {
buf.append(" ").append(_("integration")).append(": ").append(_("how many new peers have they told us about lately?")).append("");
buf.append("").append(_("status")).append(": ").append(_("is the peer banned, or unreachable, or failing tunnel tests?")).append("");
buf.append("");
+
+ ////
+ //// don't bother reindenting
+ ////
+ } // mode < 2
+
out.write(buf.toString());
out.flush();
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java
index 3e68c3169..2aa1c2afd 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java
@@ -4,12 +4,52 @@ import java.io.IOException;
public class ProfilesHelper extends HelperBase {
- private boolean _full;
+ private int _full;
+ private boolean _graphical;
+
+ private static final String titles[] =
+ {_x("High Capacity"), // 0
+ _x("Floodfill "), // 1
+ _x("Banned"), // 2
+ _x("All"), }; // 3
+
+ private static final String links[] =
+ {"", // 0
+ "?f=2", // 1
+ "?f=3", // 2
+ "?f=1" }; // 3
- public ProfilesHelper() {}
-
public void setFull(String f) {
- _full = f != null;
+ if (f != null) {
+ try {
+ _full = Integer.parseInt(f);
+ if (_full < 0 || _full > 3)
+ _full = 0;
+ } catch (NumberFormatException nfe) {}
+ }
+ }
+
+ /**
+ * call for non-text-mode browsers
+ * @since 0.9.1
+ */
+ public void allowGraphical() {
+ _graphical = true;
+ }
+
+ /**
+ * @return empty string, writes directly to _out
+ * @since 0.9.1
+ */
+ public String getSummary() {
+ try {
+ renderNavBar();
+ } catch (IOException ioe) {}
+ if (_full == 3)
+ getShitlistSummary();
+ else
+ getProfileSummary();
+ return "";
}
/** @return empty string, writes directly to _out */
@@ -33,4 +73,52 @@ public class ProfilesHelper extends HelperBase {
}
return "";
}
+
+ /**
+ * @since 0.9.1
+ */
+ private int getTab() {
+ if (_full == 2)
+ return 1;
+ if (_full == 3)
+ return 2;
+ if (_full == 1)
+ return 3;
+ return 0;
+ }
+
+ /**
+ * @since 0.9.1
+ */
+ private void renderNavBar() throws IOException {
+ StringBuilder buf = new StringBuilder(1024);
+ buf.append("");
+ // TODO fix up the non-light themes
+ String theme = _context.getProperty(CSSHelper.PROP_THEME_NAME);
+ boolean span = _graphical && (theme == null || theme.equals(CSSHelper.DEFAULT_THEME));
+ if (!span)
+ buf.append(" ");
+ int tab = getTab();
+ for (int i = 0; i < titles.length; i++) {
+ if (i == tab) {
+ // we are there
+ if (span)
+ buf.append("");
+ buf.append(_(titles[i]));
+ } else {
+ // we are not there, make a link
+ if (span)
+ buf.append("");
+ buf.append("").append(_(titles[i])).append("");
+ }
+ if (span)
+ buf.append(" \n");
+ else if (i != titles.length - 1)
+ buf.append(" |\n");
+ }
+ if (!span)
+ buf.append("");
+ buf.append(" <%=intl._("I2P Network Database Summary")%>
+<%=intl._("I2P Network Database")%>
" />
- <% netdbHelper.storeWriter(out); %>
+<%
+ netdbHelper.storeWriter(out);
+ if (allowIFrame)
+ netdbHelper.allowGraphical();
+%>
" />
" />
" />
diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp
index 8441838e2..4c33bb1fe 100644
--- a/apps/routerconsole/jsp/profiles.jsp
+++ b/apps/routerconsole/jsp/profiles.jsp
@@ -11,9 +11,11 @@
" />
- <% profilesHelper.storeWriter(out); %>
+<%
+ profilesHelper.storeWriter(out);
+ if (allowIFrame)
+ profilesHelper.allowGraphical();
+%>
" />
-
- <%=intl._("Banned Peers")%>
-
+
|