Author: toad
Date: 2008-04-18 20:55:39 +0000 (Fri, 18 Apr 2008)
New Revision: 19399
Modified:
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
Log:
Show a status summary box pointing to the real alerts.
Not finished yet.
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-04-18
20:28:48 UTC (rev 19398)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-04-18
20:55:39 UTC (rev 19399)
@@ -638,7 +638,7 @@
server.register(fproxy, "/", false,
"FProxyToadlet.welcomeTitle", "FProxyToadlet.welcome", false, null);
UserAlertsToadlet alerts = new UserAlertsToadlet(client, node,
core);
- server.register(alerts, "/status/", true,
"FProxyToadlet.alertsTitle", "FProxyToadlet.alerts", true, null);
+ server.register(alerts, "/alerts/", true,
"FProxyToadlet.alertsTitle", "FProxyToadlet.alerts", true, null);
PproxyToadlet pproxy = new PproxyToadlet(client, node, core);
server.register(pproxy, "/plugins/", true,
"FProxyToadlet.pluginsTitle", "FProxyToadlet.plugins", true, null);
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2008-04-18
20:28:48 UTC (rev 19398)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2008-04-18
20:55:39 UTC (rev 19399)
@@ -539,7 +539,7 @@
// Alerts
if (ctx.isAllowedFullAccess()) {
- contentNode.addChild(core.alerts.createAlerts());
+
contentNode.addChild(core.alerts.createAlertsShort(l10n("alertsSummary")));
}
// Bookmarks
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2008-04-18
20:28:48 UTC (rev 19398)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2008-04-18
20:55:39 UTC (rev 19399)
@@ -1136,6 +1136,7 @@
UserAlertsToadlet.titleWithName=Status alerts for ${name}
WelcomeToadlet.activityTitle=Current Activity
WelcomeToadlet.arkFetchCount=ARK Fetchers: ${total}
+WelcomeToadlet.alertsSummary=Status alerts summary
WelcomeToadlet.confirmAddBookmarkSubTitle=Confirm Bookmark Addition
WelcomeToadlet.confirmAddBookmarkTitle=Add a Bookmark
WelcomeToadlet.confirmAddBookmarkWithKey=Please confirm that you want to add
the key ${key} to your bookmarks and enter the description that you would
prefer:
Modified: trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
2008-04-18 20:28:48 UTC (rev 19398)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
2008-04-18 20:55:39 UTC (rev 19399)
@@ -112,6 +112,33 @@
}
/**
+ * Write each alert in uber-concise form as HTML, with a link to
+ * /alerts/[ anchor pointing to the real alert].
+ */
+ public HTMLNode createAlertsShort(String title) {
+ HTMLNode boxNode = new HTMLNode("div", "class", "infobox
infobox-alert infobox-summary-status-box");
+ boxNode.addChild("div", "class", "infobox-header infobox
summary-status-header", title);
+ HTMLNode contentNode = boxNode.addChild("div", "class",
"infobox-content infobox-summary-status-content");
+ HTMLNode alertsNode = contentNode.addChild("ul");
+ UserAlert[] alerts = getAlerts();
+ int totalNumber = 0;
+ for (int i = 0; i < alerts.length; i++) {
+ UserAlert alert = alerts[i];
+ if (!alert.isValid())
+ continue;
+ HTMLNode listItem = alertsNode.addChild("li");
+ HTMLNode linkToLongAlert = listItem.addChild("a",
"href", "/alerts/#"+alert.anchor(), alert.getTitle());
+ //listItem.addChild("#", ": ");
+ //listItem.addChild(alert.getReallyShortHTMLText());
+ totalNumber++;
+ }
+ if (totalNumber == 0) {
+ return new HTMLNode("#", "");
+ }
+ return boxNode;
+ }
+
+ /**
* Renders the given alert and returns the rendered HTML node.
*
* @param userAlert
