Fixes #1025
Rename icon to avoid confusion. Add back the OTR status text.
This commit is contained in:
parent
e630339a69
commit
860befcab9
@ -149,8 +149,8 @@
|
|||||||
#converse-embedded-chat .icon-legal:before,
|
#converse-embedded-chat .icon-legal:before,
|
||||||
#conversejs .icon-legal:before {
|
#conversejs .icon-legal:before {
|
||||||
content: "\f0e3"; }
|
content: "\f0e3"; }
|
||||||
#converse-embedded-chat .icon-lock-2:before,
|
#converse-embedded-chat .icon-lock:before,
|
||||||
#conversejs .icon-lock-2:before {
|
#conversejs .icon-lock:before {
|
||||||
content: "\e027"; }
|
content: "\e027"; }
|
||||||
#converse-embedded-chat .icon-minus:before,
|
#converse-embedded-chat .icon-minus:before,
|
||||||
#conversejs .icon-minus:before {
|
#conversejs .icon-minus:before {
|
||||||
|
@ -142,8 +142,8 @@
|
|||||||
#converse-embedded-chat .icon-legal:before,
|
#converse-embedded-chat .icon-legal:before,
|
||||||
#conversejs .icon-legal:before {
|
#conversejs .icon-legal:before {
|
||||||
content: "\f0e3"; }
|
content: "\f0e3"; }
|
||||||
#converse-embedded-chat .icon-lock-2:before,
|
#converse-embedded-chat .icon-lock:before,
|
||||||
#conversejs .icon-lock-2:before {
|
#conversejs .icon-lock:before {
|
||||||
content: "\e027"; }
|
content: "\e027"; }
|
||||||
#converse-embedded-chat .icon-minus:before,
|
#converse-embedded-chat .icon-minus:before,
|
||||||
#conversejs .icon-minus:before {
|
#conversejs .icon-minus:before {
|
||||||
|
@ -149,8 +149,8 @@
|
|||||||
#converse-embedded-chat .icon-legal:before,
|
#converse-embedded-chat .icon-legal:before,
|
||||||
#conversejs .icon-legal:before {
|
#conversejs .icon-legal:before {
|
||||||
content: "\f0e3"; }
|
content: "\f0e3"; }
|
||||||
#converse-embedded-chat .icon-lock-2:before,
|
#converse-embedded-chat .icon-lock:before,
|
||||||
#conversejs .icon-lock-2:before {
|
#conversejs .icon-lock:before {
|
||||||
content: "\e027"; }
|
content: "\e027"; }
|
||||||
#converse-embedded-chat .icon-minus:before,
|
#converse-embedded-chat .icon-minus:before,
|
||||||
#conversejs .icon-minus:before {
|
#conversejs .icon-minus:before {
|
||||||
|
@ -68,7 +68,7 @@
|
|||||||
.icon-italic:before { content: "\e04f"; }
|
.icon-italic:before { content: "\e04f"; }
|
||||||
.icon-key:before { content: "\e028"; }
|
.icon-key:before { content: "\e028"; }
|
||||||
.icon-legal:before { content: "\f0e3"; }
|
.icon-legal:before { content: "\f0e3"; }
|
||||||
.icon-lock-2:before { content: "\e027"; }
|
.icon-lock:before { content: "\e027"; }
|
||||||
.icon-minus:before { content: "\e05a"; }
|
.icon-minus:before { content: "\e05a"; }
|
||||||
.icon-music:before { content: "\266b"; }
|
.icon-music:before { content: "\266b"; }
|
||||||
.icon-newtab:before { content: "\e053"; }
|
.icon-newtab:before { content: "\e053"; }
|
||||||
|
@ -452,9 +452,7 @@
|
|||||||
});
|
});
|
||||||
this.el.querySelector('.chat-toolbar').insertAdjacentHTML(
|
this.el.querySelector('.chat-toolbar').insertAdjacentHTML(
|
||||||
'beforeend',
|
'beforeend',
|
||||||
tpl_toolbar_otr(
|
tpl_toolbar_otr(_.extend(data, options || {})));
|
||||||
_.extend(this.model.toJSON(), options || {})
|
|
||||||
));
|
|
||||||
},
|
},
|
||||||
|
|
||||||
getToolbarOptions (options) {
|
getToolbarOptions (options) {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
{[ } ]}
|
{[ } ]}
|
||||||
<ul class="features-list">
|
<ul class="features-list">
|
||||||
{[ if (o.passwordprotected) { ]}
|
{[ 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) { ]}
|
{[ if (o.unsecured) { ]}
|
||||||
<li class="feature" title="{{{ o.tt_unsecured }}}"><span class="icon-unlocked"></span>{{{ o.label_unsecured }}}</li>
|
<li class="feature" title="{{{ o.tt_unsecured }}}"><span class="icon-unlocked"></span>{{{ o.label_unsecured }}}</li>
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
{[ if (o.allow_otr) { ]}
|
{[ if (o.allow_otr) { ]}
|
||||||
<li class="toggle-toolbar-menu toggle-otr {{{o.otr_status_class}}}" title="{{{o.otr_tooltip}}}">
|
<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) { ]}
|
{[ if (o.otr_status == o.UNENCRYPTED) { ]}
|
||||||
<span class="icon-unlocked"></span>
|
<span class="icon-unlocked"></span>
|
||||||
{[ } ]}
|
{[ } ]}
|
||||||
|
Loading…
Reference in New Issue
Block a user