From c45dc0c838a74cc13508ceffdff391cab681c65a Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Wed, 11 Jul 2012 21:20:35 +0000
Subject: [PATCH] Moved add and delete buttons into sidebar config table, and
 removed unnecessary ones

---
 .../src/net/i2p/router/web/SummaryHelper.java    | 16 +++++++++++-----
 apps/routerconsole/jsp/configsidebar.jsp         |  5 -----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index 800073b6e..b5d796041 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -848,9 +848,11 @@ public class SummaryHelper extends HelperBase {
             }
             buf.append("</td></tr>\n");
         }
-        buf.append("<tr><td align=\"center\"><b>")
-           .append(_("Add")).append(":</b>" +
-                   "</td><td align=\"left\">" +
+        buf.append("<tr><td align=\"center\">" +
+                   "<input type=\"submit\" name=\"action\" class=\"delete\" value=\"")
+           .append(_("Delete selected"))
+           .append("\"></td><td align=\"left\"><b>")
+           .append(_("Add")).append(":</b> " +
                    "<select name=\"name\">\n" +
                    "<option value=\"\" selected=\"selected\">")
            .append(_("Select a section to add"))
@@ -861,9 +863,13 @@ public class SummaryHelper extends HelperBase {
                .append(s).append("</option>\n");
         }
 
-        buf.append("</select></td>" +
-                   "<td align=\"center\" colspan=\"2\"><input type=\"hidden\" name=\"order\" value=\"")
+        buf.append("</select>\n" +
+                   "<input type=\"hidden\" name=\"order\" value=\"")
            .append(sections.size())
+           .append("\"></td>" +
+                   "<td align=\"center\" colspan=\"2\">" +
+                   "<input type=\"submit\" name=\"action\" class=\"add\" value=\"")
+           .append(_("Add item"))
            .append("\"></td></tr>")
            .append("</table>\n");
         return buf.toString();
diff --git a/apps/routerconsole/jsp/configsidebar.jsp b/apps/routerconsole/jsp/configsidebar.jsp
index cbb270d4f..4fe7ef3ec 100644
--- a/apps/routerconsole/jsp/configsidebar.jsp
+++ b/apps/routerconsole/jsp/configsidebar.jsp
@@ -55,13 +55,8 @@ input.default {
  <input type="hidden" name="group" value="2">
  <jsp:getProperty name="summaryhelper" property="configTable" />
  <div class="formaction">
-  <input type="submit" name="action" class="default" value="<%=intl._("Add item")%>" >
   <input type="submit" class="reload" name="action" value="<%=intl._("Restore full default")%>" >
   <input type="submit" class="reload" name="action" value="<%=intl._("Restore minimal default")%>" >
-  <input type="submit" name="action" class="delete" value="<%=intl._("Delete selected")%>" >
-  <input type="reset" class="cancel" value="<%=intl._("Cancel")%>" >
-  <input type="submit" name="action" class="reload" value="<%=intl._("Save order")%>" >
-  <input type="submit" name="action" class="add" value="<%=intl._("Add item")%>" >
  </div>
 </form>
 </div></body></html>