From 7e62546d6f618ca56084487c06ffd03bafbff509 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Thu, 15 Jun 2017 15:09:34 +0200
Subject: [PATCH] inverse: move brand heading into template

---
 css/inverse.css                  | 38 ++++++++++++------------
 sass/inverse/_controlbox.scss    |  1 +
 sass/inverse/_core.scss          | 51 ++++++++++++++++----------------
 src/converse-inverse.js          | 47 ++++++++++++++---------------
 src/templates/brand_heading.html |  1 +
 5 files changed, 70 insertions(+), 68 deletions(-)
 create mode 100644 src/templates/brand_heading.html

diff --git a/css/inverse.css b/css/inverse.css
index 2b6b04920..f9fac4072 100644
--- a/css/inverse.css
+++ b/css/inverse.css
@@ -1482,25 +1482,24 @@ body {
   font-family: "Lora", "Helvetica Neue", Helvetica, Arial, sans-serif;
   color: #ffffff;
   background-color: #578EA9; }
-
-div.content {
-  height: 100vh;
-  width: 100vw;
-  position: fixed;
-  background-color: #578EA9; }
-  div.content .inner-content {
-    text-align: center;
-    padding: 7%;
-    padding-left: -webkit-calc(5% + 250px);
-    padding-left: calc(5% + 250px); }
-    div.content .inner-content .brand-heading {
-      font-size: 600%;
-      margin-left: -10%; }
-      div.content .inner-content .brand-heading .icon-conversejs {
-        font-size: 88%; }
-    div.content .inner-content p.no-chats {
-      padding-right: 10%;
-      font-size: 120%; }
+  body .brand-heading {
+    font-size: 600%;
+    margin-left: -10%; }
+    body .brand-heading .icon-conversejs {
+      font-size: 88%; }
+  body div.content {
+    height: 100vh;
+    width: 100vw;
+    position: fixed;
+    background-color: #578EA9; }
+    body div.content .inner-content {
+      text-align: center;
+      padding: 7%;
+      padding-left: -webkit-calc(5% + 250px);
+      padding-left: calc(5% + 250px); }
+      body div.content .inner-content p.no-chats {
+        padding-right: 10%;
+        font-size: 120%; }
 
 #conversejs {
   width: 100vw;
@@ -2327,6 +2326,7 @@ div.content {
   float: left;
   margin: 0; }
   #conversejs #controlbox #login-dialog .brand-heading, #conversejs #controlbox #register .brand-heading {
+    font-size: 600%;
     margin: 10% 0 0 0;
     color: #387592; }
   #conversejs #controlbox #login-dialog .converse-form, #conversejs #controlbox #register .converse-form {
diff --git a/sass/inverse/_controlbox.scss b/sass/inverse/_controlbox.scss
index b94fc9203..d5aab80f0 100644
--- a/sass/inverse/_controlbox.scss
+++ b/sass/inverse/_controlbox.scss
@@ -7,6 +7,7 @@
 
         #login-dialog, #register {
             .brand-heading {
+                font-size: 600%;
                 margin: 10% 0 0 0;
                 color: $blue;
             }
diff --git a/sass/inverse/_core.scss b/sass/inverse/_core.scss
index d03e2cf00..e5752498e 100644
--- a/sass/inverse/_core.scss
+++ b/sass/inverse/_core.scss
@@ -1,32 +1,33 @@
 body {
-  width: 100%;
-  height: 100%;
-  font-family: "Lora", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  color: #ffffff;
-  background-color: $global-background-color;
-}
-
-div.content {
-    height: 100vh;
-    width: 100vw;
-    position: fixed;
+    width: 100%;
+    height: 100%;
+    font-family: "Lora", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    color: #ffffff;
     background-color: $global-background-color;
 
-    .inner-content {
-        text-align: center;
-        padding: 7%;
-        @include calc(padding-left, '5% + #{$controlbox-width}');
-
-        .brand-heading {
-            font-size: 600%;
-            margin-left: -10%;
-            .icon-conversejs {
-                font-size: 88%;
-            }
+    .brand-heading {
+        font-size: 600%;
+        margin-left: -10%;
+        .icon-conversejs {
+            font-size: 88%;
         }
-        p.no-chats {
-            padding-right: 10%;
-            font-size: 120%;
+    }
+
+    div.content {
+        height: 100vh;
+        width: 100vw;
+        position: fixed;
+        background-color: $global-background-color;
+
+        .inner-content {
+            text-align: center;
+            padding: 7%;
+            @include calc(padding-left, '5% + #{$controlbox-width}');
+
+            p.no-chats {
+                padding-right: 10%;
+                font-size: 120%;
+            }
         }
     }
 }
diff --git a/src/converse-inverse.js b/src/converse-inverse.js
index f2fa10b36..c9e9323f7 100644
--- a/src/converse-inverse.js
+++ b/src/converse-inverse.js
@@ -4,21 +4,39 @@
 // Copyright (c) 2012-2016, Jan-Carel Brand <jc@opkode.com>
 // Licensed under the Mozilla Public License (MPLv2)
 //
-/*global Backbone, define, window */
+/*global define */
 
 (function (root, factory) {
     define(["converse-core",
+            "tpl!brand_heading",
             "converse-chatview",
             "converse-controlbox",
             "converse-muc",
             "converse-singleton"
     ], factory);
-}(this, function (converse) {
+}(this, function (converse, tpl_brand_heading) {
     "use strict";
     var $ = converse.env.jQuery,
         Strophe = converse.env.Strophe,
         _ = converse.env._;
 
+    function createBrandHeadingElement () {
+        var div = document.createElement('div');
+        div.innerHTML = tpl_brand_heading();
+        return div.firstChild;
+    }
+
+     function isMessageToHiddenChat (_converse, message) {
+        var jid = Strophe.getBareJidFromJid(message.getAttribute('from'));
+        var model = _converse.chatboxes.get(jid);
+        if (!_.isNil(model)) {
+            return model.get('hidden');
+        }
+        // Not having a chat box is assume to be practically the same
+        // as it being hidden.
+        return true;
+    }
+
     converse.plugins.add('converse-inverse', {
 
         overrides: {
@@ -37,7 +55,7 @@
             shouldNotifyOfMessage: function (message) {
                 var _converse = this.__super__._converse;
                 var result = this.__super__.shouldNotifyOfMessage.apply(this, arguments);
-                return result && _converse.isMessageToHiddenChat(message);
+                return result && isMessageToHiddenChat(_converse, message);
             },
 
             ControlBoxView: {
@@ -50,11 +68,8 @@
                 renderRegistrationPanel: function () {
                     this.__super__.renderRegistrationPanel.apply(this, arguments);
 
-                    // TODO: put into template
-                    var div = document.createElement('div');
-                    div.innerHTML = '<h1 class="brand-heading"><i class="icon-conversejs"></i> inVerse</h1>';
                     var el = document.getElementById('converse-register');
-                    el.parentNode.insertBefore(div.firstChild, el);
+                    el.parentNode.insertBefore(createBrandHeadingElement(), el);
                     return this;
                 },
 
@@ -62,11 +77,8 @@
                     this.__super__.renderLoginPanel.apply(this, arguments);
                     this.el.classList.add("fullscreen");
 
-                    // TODO: put into template
-                    var div = document.createElement('div');
-                    div.innerHTML = '<h1 class="brand-heading"><i class="icon-conversejs"></i> inVerse</h1>';
                     var el = document.getElementById('converse-login');
-                    el.parentNode.insertBefore(div.firstChild, el);
+                    el.parentNode.insertBefore(createBrandHeadingElement(), el);
                     return this;
                 }
             },
@@ -85,8 +97,6 @@
         },
 
         initialize: function () {
-            var _converse = this._converse;
-
             this.updateSettings({
                 chatview_avatar_height: 44,
                 chatview_avatar_width: 44,
@@ -96,17 +106,6 @@
                 sounds_path: '/node_modules/converse.js/sounds/', // New default
                 sticky_controlbox: true,
             });
-
-            _converse.isMessageToHiddenChat = function (message) {
-                var jid = Strophe.getBareJidFromJid(message.getAttribute('from'));
-                var model = _converse.chatboxes.get(jid);
-                if (!_.isNil(model)) {
-                    return model.get('hidden');
-                }
-                // Not having a chat box is assume to be practically the same
-                // as it being hidden.
-                return true;
-            }
         }
     });
 }));
diff --git a/src/templates/brand_heading.html b/src/templates/brand_heading.html
new file mode 100644
index 000000000..7265b793f
--- /dev/null
+++ b/src/templates/brand_heading.html
@@ -0,0 +1 @@
+<h1 class="brand-heading"><i class="icon-conversejs"></i> inVerse</h1>