From edb3ffcf4500e9d9a4bd325b8761f73ae556f59b Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 1 May 2016 04:06:28 +0000
Subject: [PATCH] Rework /configui forms for theming

---
 .../net/i2p/router/web/ConfigUIHelper.java    | 33 +++++++++++--------
 apps/routerconsole/jsp/configui.jsp           | 11 +++++--
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
index 9286072ae..f9ef17ec6 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
@@ -13,10 +13,16 @@ public class ConfigUIHelper extends HelperBase {
         String current = _context.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME);
         Set<String> themes = themeSet();
         for (String theme : themes) {
-            buf.append("<input type=\"radio\" class=\"optbox\" name=\"theme\" ");
+            buf.append("<div class=\"themechoice\">")
+               .append("<input type=\"radio\" class=\"optbox\" name=\"theme\" ");
             if (theme.equals(current))
                 buf.append(CHECKED);
-            buf.append("value=\"").append(theme).append("\">").append(_t(theme)).append("<br>\n");
+            buf.append("value=\"").append(theme).append("\">")
+               .append("<object height=\"48\" width=\"48\" data=\"/themes/console/").append(theme).append("/images/thumbnail.png\">")
+               .append("<img height=\"48\" width=\"48\" alt=\"\" src=\"/themes/console/images/thumbnail.png\">")
+               .append("</object><br>")
+               .append("<div class=\"themelabel\">").append(_t(theme)).append("</div>")
+               .append("</div>\n");
         }
         boolean universalTheming = _context.getBooleanProperty(CSSHelper.PROP_UNIVERSAL_THEMING);
         buf.append("</div><div id=\"themeoptions\">");
@@ -142,11 +148,12 @@ public class ConfigUIHelper extends HelperBase {
             if (lang.equals("xx") && !isAdvanced())
                 continue;
             // we use "lang" so it is set automagically in CSSHelper
-            buf.append("<input type=\"radio\" class=\"optbox\" name=\"lang\" ");
+            buf.append("<div class=\"langselect\"><input type=\"radio\" class=\"optbox\" name=\"lang\" ");
             if (lang.equals(current))
                 buf.append(CHECKED);
             buf.append("value=\"").append(lang).append("\">")
-               .append("<img height=\"11\" width=\"16\" alt=\"\" src=\"/flags.jsp?c=").append(langs[i][1]).append("\"> ");
+               .append("<img height=\"11\" width=\"16\" alt=\"\" src=\"/flags.jsp?c=").append(langs[i][1]).append("\">")
+               .append("<div class=\"ui_lang\">");
             int under = lang.indexOf('_');
             String slang = (under > 0) ? lang.substring(0, under) : lang;
             buf.append(Messages.getDisplayLanguage(slang, langs[i][2], _context));
@@ -156,7 +163,7 @@ public class ConfigUIHelper extends HelperBase {
                    .append(Messages.getString(name, _context, Messages.COUNTRY_BUNDLE_NAME))
                    .append(')');
             }
-            buf.append("<br>\n");
+            buf.append("</div></div>\n");
         }
         return buf.toString();
     }
@@ -175,7 +182,7 @@ public class ConfigUIHelper extends HelperBase {
             buf.append("<tr><th>")
                .append(_t("Remove"))
                .append("</th><th>")
-               .append(_t("User Name"))
+               .append(_t("Username"))
                .append("</th><th>&nbsp;</th></tr>\n");
             for (String name : userpw.keySet()) {
                 buf.append("<tr><td align=\"center\"><input type=\"checkbox\" class=\"optbox\" name=\"delete_")
@@ -185,13 +192,13 @@ public class ConfigUIHelper extends HelperBase {
                    .append("</td></tr>\n");
             }
         }
-        buf.append("<tr><td align=\"center\"><b>")
-           .append(_t("Add")).append(":</b>" +
-                   "</td><td align=\"left\"><input type=\"text\" name=\"name\">" +
-                   "</td><td align=\"left\"><b>");
-        buf.append(_t("Password")).append(":</b> " +
-                   "<input type=\"password\" size=\"40\" name=\"nofilter_pw\"></td></tr>" +
-                   "</table>\n");
+        buf.append("<tr><td id=\"pw_adduser\" align=\"left\" colspan=\"3\"><b>")
+           .append("<b>").append(_t("Username")).append(":</b> ")
+           .append("<input type=\"text\" name=\"name\">")
+           .append("<b>").append(_t("Password")).append(":</b> ")
+           .append("<input type=\"password\" size=\"40\" name=\"nofilter_pw\">")
+           .append("</td></tr>")
+           .append("</table>\n");
         return buf.toString();
     }
 }
diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp
index 7f993c5c2..bd7ac0a34 100644
--- a/apps/routerconsole/jsp/configui.jsp
+++ b/apps/routerconsole/jsp/configui.jsp
@@ -31,10 +31,10 @@ input.default {
 <%@include file="formhandler.jsi" %>
 <h3 id="themeheading"><%=uihelper._t("Router Console Theme")%></h3>
  <form action="" method="POST">
-<div id ="themesettings">
  <input type="hidden" name="consoleNonce" value="<%=net.i2p.router.web.CSSHelper.getNonce()%>" >
  <input type="hidden" name="nonce" value="<%=pageNonce%>" >
  <input type="hidden" name="action" value="blah" >
+<div id ="themesettings">
 <%
  String userAgent = request.getHeader("User-Agent");
  if (userAgent == null || userAgent.contains("Trident/6") || !userAgent.contains("MSIE")) {
@@ -46,8 +46,15 @@ input.default {
 <%=uihelper._t("If you're not using IE, it's likely that your browser is pretending to be IE; please configure your browser (or proxy) to use a different User Agent string if you'd like to access the console themes.")%>
 <% } %>
  <jsp:getProperty name="uihelper" property="forceMobileConsole" />
-</div>
+<hr><div class="formaction" id="themeui">
+<input type="reset" class="cancel" value="<%=intl._t("Cancel")%>" >
+<input type="submit" name="shouldsave" class="accept" value="<%=intl._t("Apply")%>" >
+</div></div></form>
 <h3 id="langheading"><%=uihelper._t("Router Console Language")%></h3>
+ <form action="" method="POST">
+ <input type="hidden" name="consoleNonce" value="<%=net.i2p.router.web.CSSHelper.getNonce()%>" >
+ <input type="hidden" name="nonce" value="<%=pageNonce%>" >
+ <input type="hidden" name="action" value="blah" >
 <div id="langsettings">
 <jsp:getProperty name="uihelper" property="langSettings" />
 <p id="helptranslate"><%=uihelper._t("Please contribute to the router console translation project! Contact the developers in #i2p-dev on IRC to help.")%>