UI cleanup

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@445 b35dd754-fafc-0310-a699-88a17e54d16e

src/web/muc-create-permission.jsp

@@ -94,7 +94,7 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Use the form below to set the policy for who can create chat rooms.
+Use the form below to configure the policy for who can create group chat rooms.
 </p>
 
 <%  if (errors.size() > 0) { %>
@@ -137,7 +137,7 @@ Use the form below to set the policy for who can create chat rooms.
 
 <%  } %>
 
-<form action="muc-create-permission.jsp" method="post">
+<form action="muc-create-permission.jsp?save" method="post">
 
 <fieldset>
     <legend>Permission Policy</legend>
@@ -166,7 +166,7 @@ Use the form below to set the policy for who can create chat rooms.
         </tbody>
         </table>
         <br>
-        <input type="submit" name="save" value="Save Settings">
+        <input type="submit" value="Save Settings">
     </div>
 </fieldset>
 
@@ -176,16 +176,16 @@ Use the form below to set the policy for who can create chat rooms.
 
 <%  if (mucServer.isRoomCreationRestricted()) { %>
 
-    <form action="muc-create-permission.jsp" method="post">
+    <form action="muc-create-permission.jsp?add" method="post">
 
     <fieldset>
         <legend>Allowed Users</legend>
         <div>
         <p>
-        Add User (enter JID):
+        <label for="userJIDtf">Add User (JID):</label>
         <input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>"
-         onclick="this.form.openPerms[1].checked=true;">
-        <input type="submit" name="add" value="Add">
+         onclick="this.form.openPerms[1].checked=true;" id="userJIDtf">
+        <input type="submit" value="Add">
         </p>
 
         <div class="jive-table" style="width:400px;">

src/web/muc-server-props-edit-form.jsp

@@ -11,12 +11,11 @@
 
 <%@ page import="org.jivesoftware.util.ParamUtils,
                  java.text.DateFormat,
-                 java.util.HashMap,
-                 java.util.Map,
                  org.jivesoftware.messenger.XMPPServerInfo,
                  org.jivesoftware.messenger.muc.MultiUserChatServer,
                  org.jivesoftware.admin.*,
-                 org.jivesoftware.messenger.JiveGlobals"
+                 org.jivesoftware.messenger.JiveGlobals,
+                 java.util.*"
     errorPage="error.jsp"
 %>
 
@@ -45,7 +44,6 @@
     Map errors = new HashMap();
     if (save) {
         // do validation
-        System.err.println("muc: " + muc);
         if (muc == null  || muc.indexOf('.') >= 0) {
             errors.put("mucname","mucname");
         }
@@ -118,13 +116,12 @@ a server restart.
 
 <%  } %>
 
-<input type="hidden" name="save" value="true">
+<form action="muc-server-props-edit-form.jsp?save" method="post">
 
 <fieldset>
     <legend>Set Conflict Policy</legend>
     <div>
     <table cellpadding="3" cellspacing="0" border="0">
-    <form action="muc-server-props-edit-form.jsp" method="post">
     <tr>
         <td class="c1">
             Server name:
@@ -153,9 +150,9 @@ a server restart.
     </div>
 </fieldset>
 
-<br>
+<br><br>
 
-<input type="submit" name="save" value="Save Properties">
+<input type="submit" value="Save Properties">
 
 </form>
 

src/web/muc-sysadmins.jsp

@@ -67,7 +67,7 @@
 
 <p>
 Below is the list of system administrators of the group chat service. System administrators can
-enter any groupchat room and their permissions are the same as the room owner.
+enter any group chat room and their permissions are the same as the room owner.
 </p>
 
 <%  if ("true".equals(request.getParameter("deletesuccess"))) { %>
@@ -83,9 +83,7 @@ enter any groupchat room and their permissions are the same as the room owner.
     </table>
     </div><br>
 
-<%  } %>
-
-<%  if ("true".equals(request.getParameter("addsuccess"))) { %>
+<%  } else if ("true".equals(request.getParameter("addsuccess"))) { %>
 
     <div class="jive-success">
     <table cellpadding="0" cellspacing="0" border="0">
@@ -98,26 +96,32 @@ enter any groupchat room and their permissions are the same as the room owner.
     </table>
     </div><br>
 
-<%  } %>
+<%  } else if (errors.size() > 0) { %>
 
-<form action="muc-sysadmins.jsp" method="post">
-
-<fieldset>
-    <legend>Add Admin User</legend>
-    <div>
-    User (enter JID):
-    <input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>">
-    <input type="submit" name="add" value="Add">
-    </div>
-</fieldset>
+    <div class="jive-error">
+    <table cellpadding="0" cellspacing="0" border="0">
+    <tbody>
+        <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
+        <td class="jive-icon-label">
+        Error adding the admin. Please verify the JID is correct.
+        </td></tr>
+    </tbody>
+    </table>
+    </div><br>
 
-</form>
+<%  } %>
 
-<br>
+<form action="muc-sysadmins.jsp?add" method="post">
 
 <fieldset>
     <legend>Admin Users</legend>
     <div>
+    <label for="userJIDtf">Add Admin (JID):</label>
+    <input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>"
+     id="userJIDtf">
+    <input type="submit"s value="Add">
+    <br><br>
+
     <div class="jive-table" style="width:400px;">
     <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <thead>
@@ -158,4 +162,6 @@ enter any groupchat room and their permissions are the same as the room owner.
     </div>
 </fieldset>
 
+</form>
+
 <jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file