Ported changes from branch.

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

Ported changes from branch.
git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10128 b35dd754-fafc-0310-a699-88a17e54d16e
e39d34b9 · Daniel Henninger · dhenninger · 448f067c · e39d34b9 · e39d34b9
Commit e39d34b9 authored Mar 26, 2008 by Daniel Henninger Committed by dhenninger Mar 26, 2008
15 changed files
--- a/src/i18n/openfire_i18n_cs_CZ.properties
+++ b/src/i18n/openfire_i18n_cs_CZ.properties
--- a/src/i18n/openfire_i18n_de.properties
+++ b/src/i18n/openfire_i18n_de.properties
--- a/src/i18n/openfire_i18n_en.properties
+++ b/src/i18n/openfire_i18n_en.properties
@@ -354,6 +354,8 @@
 ##      Added key: 'security.audit.viewer.write_only'
 ##      Added key: 'security.audit.viewer.view_url'
 ##      Added key: 'security.audit.viewer.view_url.url'
+##      Added key: 'muc.room.edit.form.edit.title'
+##      Added key: 'muc.room.edit.form.create.title'
 ##
 ## 3.6.0
 ##      Added key: 'setup.ldap.server.alias_dereference'
@@ -1063,6 +1065,8 @@ muc.room.delete.destroy_room=Destroy Room
 # Muc room edit form Page
 muc.room.edit.form.title=Room Administration
+muc.room.edit.form.create.title=Create New Room
+muc.room.edit.form.edit.title=Room Settings
 muc.room.edit.form.edited=Room settings edited successfully.
 muc.room.edit.form.created=Room creation was successful.
 muc.room.edit.form.info=Use the form below to edit the room settings.
@@ -1132,7 +1136,7 @@ muc.room.summary.service=Service
 muc.service.summary.title=Group Chat Service
 muc.service.summary.info=Below is an overview of the Group Chat Services in the system. From here you can \
-       edit their configurations, and create new services, and delete services you don't need anymore. 
+       edit their configurations, and create new services, and delete services you don't need anymore.
 muc.service.summary.deleted=Service destroyed successfully.
 muc.service.summary.total_room=Total Service
 muc.service.summary.sorted_id=Sorted by Subdomain

--- a/src/i18n/openfire_i18n_es.properties
+++ b/src/i18n/openfire_i18n_es.properties
--- a/src/i18n/openfire_i18n_fr.properties
+++ b/src/i18n/openfire_i18n_fr.properties
--- a/src/i18n/openfire_i18n_ja_JP.properties
+++ b/src/i18n/openfire_i18n_ja_JP.properties
@@ -2480,3 +2480,5 @@ muc.service.delete.destroy_service=Destroy Service
 muc.room.summary.info2=. From here you can view the rooms, edit their properties, and create new rooms.
 muc.room.edit.form.service=Service
 muc.room.summary.info=Below is an overview of the Group Chat Rooms in the service
+muc.room.edit.form.create.title=Create New Room
+muc.room.edit.form.edit.title=Room Settings
--- a/src/i18n/openfire_i18n_nl.properties
+++ b/src/i18n/openfire_i18n_nl.properties
--- a/src/i18n/openfire_i18n_pl_PL.properties
+++ b/src/i18n/openfire_i18n_pl_PL.properties
--- a/src/i18n/openfire_i18n_pt_BR.properties
+++ b/src/i18n/openfire_i18n_pt_BR.properties
--- a/src/i18n/openfire_i18n_zh_CN.properties
+++ b/src/i18n/openfire_i18n_zh_CN.properties
--- a/src/web/enterprise-info.jsp
+++ b/src/web/enterprise-info.jsp
@@ -225,7 +225,7 @@
 <span class="jive-enterprise-info">
-    <img src="images/enterprise.png" alt="Openfire Enterprise" hspace="10" vspace="10" width="200" height="197" border="0" align="right" />
+    <img src="images/enterprise.png" alt="Openfire Enterprise" hspace="10" vspace="10" width="252" height="291" border="0" align="right" />
    <h3>What is it?</h3>

--- a/src/web/error.jsp
+++ b/src/web/error.jsp
@@ -13,6 +13,7 @@
    isErrorPage="true"
 %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+<fmt:setBundle basename="openfire_i18n"/>
 <%  boolean debug = "true".equals(JiveGlobals.getProperty("skin.default.debug"));
    if (debug) {
        exception.printStackTrace();

--- a/src/web/images/enterprise.png
+++ b/src/web/images/enterprise.png
--- a/src/web/muc-room-edit-form.jsp
+++ b/src/web/muc-room-edit-form.jsp
@@ -329,10 +329,11 @@
 <html>
 <head>
-<title><fmt:message key="muc.room.edit.form.title"/></title>
 <% if (create) { %>
+<title><fmt:message key="muc.room.edit.form.create.title"/></title>
 <meta name="pageID" content="muc-room-create"/>
 <% } else { %>
+<title><fmt:message key="muc.room.edit.form.edit.title"/></title>
 <meta name="subPageID" content="muc-room-edit-form"/>
 <% } %>
 <meta name="extraParams" content="<%= "roomJID="+(roomJID != null ? URLEncoder.encode(roomJID.toBareJID(), "UTF-8") : "")+"&create="+create %>"/>

--- a/src/web/style/global.css
+++ b/src/web/style/global.css
@@ -389,6 +389,7 @@ iframe {
    overflow:hidden;
    padding:0;
    width:200px;
+    background-color: #f9f9f9;
 }
 #jive-sidebar {
    background:transparent url(../images/jive-tertnav-top.gif) no-repeat scroll right top;
@@ -400,7 +401,6 @@ iframe {
    -moz-border-radius-bottomright:5px;
    -moz-border-radius-topleft:0;
    -moz-border-radius-topright:0;
-    background-color:#F9F9F9;
    border-bottom:1px solid #E6E6E6;
    border-right:1px solid #E6E6E6;
    list-style-type:none;