Fixes #1025

Rename icon to avoid confusion. Add back the OTR status text.

css/converse.css

@@ -149,8 +149,8 @@
 #converse-embedded-chat .icon-legal:before,
 #conversejs .icon-legal:before {
   content: "\f0e3"; }
-#converse-embedded-chat .icon-lock-2:before,
-#conversejs .icon-lock-2:before {
+#converse-embedded-chat .icon-lock:before,
+#conversejs .icon-lock:before {
   content: "\e027"; }
 #converse-embedded-chat .icon-minus:before,
 #conversejs .icon-minus:before {

css/fonts.css

@@ -142,8 +142,8 @@
 #converse-embedded-chat .icon-legal:before,
 #conversejs .icon-legal:before {
   content: "\f0e3"; }
-#converse-embedded-chat .icon-lock-2:before,
-#conversejs .icon-lock-2:before {
+#converse-embedded-chat .icon-lock:before,
+#conversejs .icon-lock:before {
   content: "\e027"; }
 #converse-embedded-chat .icon-minus:before,
 #conversejs .icon-minus:before {

css/inverse.css

@@ -149,8 +149,8 @@
 #converse-embedded-chat .icon-legal:before,
 #conversejs .icon-legal:before {
   content: "\f0e3"; }
-#converse-embedded-chat .icon-lock-2:before,
-#conversejs .icon-lock-2:before {
+#converse-embedded-chat .icon-lock:before,
+#conversejs .icon-lock:before {
   content: "\e027"; }
 #converse-embedded-chat .icon-minus:before,
 #conversejs .icon-minus:before {

sass/_fonts.scss

@@ -68,7 +68,7 @@
     .icon-italic:before         { content: "\e04f"; }
     .icon-key:before            { content: "\e028"; }
     .icon-legal:before          { content: "\f0e3"; }
-    .icon-lock-2:before         { content: "\e027"; }
+    .icon-lock:before           { content: "\e027"; }
     .icon-minus:before          { content: "\e05a"; }
     .icon-music:before          { content: "\266b"; }
     .icon-newtab:before         { content: "\e053"; }

src/converse-otr.js

@@ -452,9 +452,7 @@
                     });
                     this.el.querySelector('.chat-toolbar').insertAdjacentHTML(
                         'beforeend',
-                        tpl_toolbar_otr(
-                            _.extend(this.model.toJSON(), options || {})
-                        ));
+                        tpl_toolbar_otr(_.extend(data, options || {})));
                 },
 
                 getToolbarOptions (options) {

src/templates/chatroom_features.html

@@ -3,7 +3,7 @@
 {[ } ]}
 <ul class="features-list">
 {[ if (o.passwordprotected) { ]}
-<li class="feature" title="{{{ o.tt_passwordprotected }}}"><span class="icon-lock-2"></span>{{{ o.label_passwordprotected }}}</li>
+<li class="feature" title="{{{ o.tt_passwordprotected }}}"><span class="icon-lock"></span>{{{ o.label_passwordprotected }}}</li>
 {[ } ]}
 {[ if (o.unsecured) { ]}
 <li class="feature" title="{{{ o.tt_unsecured }}}"><span class="icon-unlocked"></span>{{{ o.label_unsecured }}}</li>

src/templates/toolbar_otr.html

 {[ if (o.allow_otr)  { ]}
     <li class="toggle-toolbar-menu toggle-otr {{{o.otr_status_class}}}" title="{{{o.otr_tooltip}}}">
+        <span class="chat-toolbar-text">{{{o.otr_translated_status}}}</span>
         {[ if (o.otr_status == o.UNENCRYPTED) { ]}
             <span class="icon-unlocked"></span>
         {[ } ]}