OF-1473: Update inVerse to version 3.3.2 (#1006)

src/plugins/inverse/changelog.html

@@ -43,6 +43,11 @@
     inVerse Plugin Changelog
 </h1>
 
+<p><b>3.3.2 Release 1</b> -- February 5th, 2018</p>
+<ul>
+    <li><a href="https://issues.igniterealtime.org/browse/OF-1473">OF-1473: upgrade to converse.js 3.3.2.</a></li>
+</ul>
+
 <p><b>3.2.1 Release 1</b> -- September 4th, 2017</p>
 <ul>
     <li><a href="https://issues.igniterealtime.org/browse/OF-1370">OF-1370: hide registration tab when appropriate.</a></li>

src/plugins/inverse/plugin.xml

@@ -4,8 +4,8 @@
     <name>inVerse</name>
     <description>Adds the (third-party) inVerse web client to Openfire.</description>
     <author>Guus der Kinderen</author>
-    <version>3.2.1 Release 1</version>
-    <date>09/04/2017</date>
+    <version>3.3.2 Release 1</version>
+    <date>02/05/2018</date>
     <minServerVersion>4.1.5</minServerVersion>
     <adminconsole>
         <tab id="tab-webclients" name="${admin.sidebar.webclients.name}" description="${admin.sidebar.webclients.description}" url="inverse-config.jsp">

src/plugins/inverse/pom.xml

@@ -9,7 +9,7 @@
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>inverse</artifactId>
     <name>Inverse Webchat Plugin</name>
-    <version>3.2.1-release-1</version>
+    <version>3.3.2-release-1</version>
 
     <build>
         <sourceDirectory>src/java</sourceDirectory>

src/plugins/inverse/src/i18n/inverse_i18n.properties

@@ -37,3 +37,9 @@ config.page.locked_domain.description=When enabled, users from domains other tha
 
 config.page.language.header=inVerse Language
 config.page.language.description=The selection made here affects the language of the inVerse user interface.
+
+config.page.view_mode.label=View Mode
+config.page.view_mode.description=Defines the layout of the user interface.
+config.page.view_mode.overlayed.label=Overlayed
+config.page.view_mode.fullscreen.label=Full Screen
+config.page.view_mode.mobile.label=Mobile

src/plugins/inverse/src/java/org/igniterealtime/openfire/plugin/inverse/ConfigServlet.java

@@ -51,6 +51,7 @@ public class ConfigServlet extends HttpServlet
         final boolean lockedDomain = JiveGlobals.getBooleanProperty( "inverse.config.locked_domain", false );
         final String endpoint = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + "/http-bind/";
         final boolean debug = JiveGlobals.getBooleanProperty( "inverse.config.debug", false );
+        final String viewMode = JiveGlobals.getProperty( "inverse.config.view_mode" );
 
         // The language of the inVerse UI.
         final Language language = InversePlugin.getLanguage();
@@ -76,6 +77,10 @@ public class ConfigServlet extends HttpServlet
         config.put( "domain_placeholder", defaultDomain );
         config.put( "bosh_service_url", endpoint );
         config.put( "debug", debug );
+        if ( viewMode != null && !viewMode.isEmpty() )
+        {
+            config.put( "view_mode", viewMode );
+        }
 
         final JSONArray whitelistedPlugins = new JSONArray(); // TODO make configurable.
         whitelistedPlugins.put( "converse-singleton" );
@@ -91,6 +96,7 @@ public class ConfigServlet extends HttpServlet
         config.put( "message_carbons", true ); // TODO make configurable.
         config.put( "message_archiving", "always" ); // TODO make configurable.
         config.put( "roster_groups", true ); // TODO make configurable.
+        config.put( "show_message_load_animation", false ); // TODO make configurable
 
         // inVerse.js requires some hard-coded converse.js configuration options (look in the upstream source of
         // src/converse-inverse.js at the settings in passed into `updateSettings`). We should not allow overrides of

src/plugins/inverse/src/java/org/igniterealtime/openfire/plugin/inverse/Language.java

@@ -28,7 +28,8 @@ public enum Language
     Bahasa_Indonesia ("id"),
     BrazilianPortuguese ("pt_br"),
     Catalan ("ca"),
-    Chinese ("zh"),
+    Chinese ("zh_TW"),
+    SimplifiedChinese ("zh_CN"),
     Dutch ("nl"),
     English ("en"),
     French ("fr"),

src/plugins/inverse/src/web/inverse-config.jsp

@@ -67,6 +67,14 @@
 
             JiveGlobals.setProperty( "inverse.config.locked_domain", Boolean.toString( ParamUtils.getBooleanParameter( request, "locked_domain" ) ) );
 
+            if ( ParamUtils.getParameter( request, "view_mode" ) != null )
+            {
+                JiveGlobals.setProperty( "inverse.config.view_mode", URLEncoder.encode( ParamUtils.getParameter( request, "view_mode" ) ) );
+            }
+            else
+            {
+                JiveGlobals.deleteProperty( "inverse.config.view_mode" );
+            }
             response.sendRedirect("inverse-config.jsp?success=update");
             return;
         }
@@ -102,6 +110,7 @@
     final boolean debugEnabled = JiveGlobals.getBooleanProperty( "inverse.config.debug", false );
     final String defaultDomain = JiveGlobals.getProperty( "inverse.config.default_domain", XMPPServer.getInstance().getServerInfo().getXMPPDomain() );
     final boolean lockedDomain = JiveGlobals.getBooleanProperty( "inverse.config.locked_domain", false );
+    final String viewMode = JiveGlobals.getProperty( "inverse.config.view_mode", "overlayed" );
 %>
 <html>
 <head>
@@ -202,21 +211,50 @@
                 </td>
             </tr>
             <tr valign="top">
-                <td width="1%" nowrap>
+                <td width="1%" nowrap style="padding-top: 1em;">
                     <b><label for="default_domain"><fmt:message key="config.page.default_domain.label" /></label></b>
                 </td>
-                <td width="99%">
+                <td width="99%" style="padding-top: 1em;">
                     <input type="text" name="default_domain" id="default_domain" size="30" value="<%=defaultDomain%>">
                 </td>
             </tr>
             <tr valign="top">
-                <td colspan="2">
+                <td colspan="2" style="padding-top: 1em;">
                     <input type="checkbox" name="locked_domain" id="locked_domain" <%= lockedDomain ? "checked" : "" %>/>&nbsp;
                     <label for="locked_domain">
                         <b><fmt:message key="config.page.locked_domain.label"/></b> - <fmt:message key="config.page.locked_domain.description"/>
                     </label>
                 </td>
             </tr>
+            <tr valign="top">
+                <td colspan="2" style="padding-top: 1em;">
+                    <b><fmt:message key="config.page.view_mode.label"/></b> - <fmt:message key="config.page.view_mode.description"/>
+                </td>
+            </tr>
+            <tr valign="top">
+                <td colspan="2">
+                    <input type="radio" name="view_mode" id="overlayed" value="overlayed" <%= "overlayed".equalsIgnoreCase( viewMode ) ? "checked" : "" %>/>&nbsp;
+                    <label for="overlayed">
+                        <fmt:message key="config.page.view_mode.overlayed.label"/>
+                    </label>
+                </td>
+            </tr>
+            <tr valign="top">
+                <td colspan="2">
+                    <input type="radio" name="view_mode" id="fullscreen" value="fullscreen" <%= "fullscreen".equalsIgnoreCase( viewMode ) ? "checked" : "" %>/>&nbsp;
+                    <label for="fullscreen">
+                        <fmt:message key="config.page.view_mode.fullscreen.label"/>
+                    </label>
+                </td>
+            </tr>
+            <tr valign="top">
+                <td colspan="2">
+                    <input type="radio" name="view_mode" id="mobile" value="mobile" <%= "mobile".equalsIgnoreCase( viewMode ) ? "checked" : "" %>/>&nbsp;
+                    <label for="mobile">
+                        <fmt:message key="config.page.view_mode.mobile.label"/>
+                    </label>
+                </td>
+            </tr>
             </tbody>
         </table>