more UI changes.

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

more UI changes.
git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5300 b35dd754-fafc-0310-a699-88a17e54d16e
7823e9d2 · Ryan Graham · ryan · f1679aff · 7823e9d2 · 7823e9d2
Commit 7823e9d2 authored Sep 08, 2006 by Ryan Graham Committed by ryan Sep 08, 2006
6 changed files
--- a/src/web/manage-updates.jsp
+++ b/src/web/manage-updates.jsp
@@ -237,11 +237,8 @@ else if (updateSucess) { %>
 			</tr>
 		</tbody>
 		</table>
-
-		<br/>
-		<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
-
 	</div>
+<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
 </form>
 <!-- END manage updates settings -->


--- a/src/web/muc-history-settings.jsp
+++ b/src/web/muc-history-settings.jsp
@@ -156,6 +156,7 @@
 			</tr>
 		</tbody>
 		</table>
+		<br>
 		<input type="submit" name="update" value="<fmt:message key="groupchat.history.settings.save" />"/>
 	</div>
 </form>

--- a/src/web/muc-room-edit-form.jsp
+++ b/src/web/muc-room-edit-form.jsp
@@ -307,17 +307,17 @@
 %>

 <html>
-    <head>
-        <title><fmt:message key="muc.room.edit.form.title"/></title>
-        <% if (create) { %>
-        <meta name="pageID" content="muc-room-create"/>
-        <% } else { %>
-        <meta name="subPageID" content="muc-room-edit-form"/>
-        <% } %>
-        <meta name="extraParams" content="<%= "roomName="+URLEncoder.encode(roomName, "UTF-8")+"&create="+create %>"/>
-        <meta name="helpPage" content="view_group_chat_room_summary.html"/>
-    </head>
-    <body>
+<head>
+<title><fmt:message key="muc.room.edit.form.title"/></title>
+<% if (create) { %>
+<meta name="pageID" content="muc-room-create"/>
+<% } else { %>
+<meta name="subPageID" content="muc-room-edit-form"/>
+<% } %>
+<meta name="extraParams" content="<%= "roomName="+URLEncoder.encode(roomName, "UTF-8")+"&create="+create %>"/>
+<meta name="helpPage" content="view_group_chat_room_summary.html"/>
+</head>
+<body>

 <%  if (!errors.isEmpty()) { %>

@@ -351,8 +351,7 @@
        </tr>
    </tbody>
    </table>
-    </div>
-    <br>
+    </div><br>

 <%  } else if (success || addsuccess) { %>


--- a/src/web/muc-room-summary.jsp
+++ b/src/web/muc-room-summary.jsp
@@ -140,10 +140,14 @@
        </td>
        <td width="45%" valign="middle">
            <% if (room.getName().equals(room.getNaturalLanguageName())) { %>
+                 <a href="muc-room-edit-form.jsp?roomName=<%= URLEncoder.encode(room.getName(), "UTF-8") %>"title="<fmt:message key="global.click_edit" />">
 	                 <%=  room.getName() %>
+	             </a>
            <% }
               else { %>
+	            <a href="muc-room-edit-form.jsp?roomName=<%= URLEncoder.encode(room.getName(), "UTF-8") %>"title="<fmt:message key="global.click_edit" />">
                <%= room.getNaturalLanguageName() %> (<%=  room.getName() %>)
+	            </a>
            <% } %>
        </td>
        <td width="45%" valign="middle">

--- a/src/web/session-conflict.jsp
+++ b/src/web/session-conflict.jsp
@@ -155,9 +155,10 @@
 			</tr>
 		</tbody>
 		</table>
-		<br>
-		<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
+
+
 	</div>
+<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
 </form>
 <!-- END 'Set Conflict Policy' -->


--- a/src/web/style/global.css
+++ b/src/web/style/global.css
@@ -12,6 +12,11 @@ BODY {
    background-image : url("../images/page-background_new.gif");
    background-repeat : repeat-y;
 }
+
+a {
+	color: #34679a;
+}
+
 P {
    margin-top : 0px;
 }