Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

inverse: move brand heading into template

Browse Source
This commit is contained in:
JC Brand 2017-06-15 15:09:34 +02:00
parent 3181956b61
commit 7e62546d6f
5 changed files with 70 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
css/inverse.css
View File

@ -1482,23 +1482,22 @@ body {
font-family: "Lora", "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #ffffff;
background-color: #578EA9; }
div.content {
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; }
div.content .inner-content {
body 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 {
body div.content .inner-content p.no-chats {
padding-right: 10%;
font-size: 120%; }
@ -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 {

1
sass/inverse/_controlbox.scss
View File

@ -7,6 +7,7 @@
#login-dialog, #register {
.brand-heading {
font-size: 600%;
margin: 10% 0 0 0;
color: $blue;
}

19
sass/inverse/_core.scss
View File

@ -4,9 +4,16 @@ body {
font-family: "Lora", "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #ffffff;
background-color: $global-background-color;
}
div.content {
.brand-heading {
font-size: 600%;
margin-left: -10%;
.icon-conversejs {
font-size: 88%;
}
}
div.content {
height: 100vh;
width: 100vw;
position: fixed;
@ -17,18 +24,12 @@ div.content {
padding: 7%;
@include calc(padding-left, '5% + #{$controlbox-width}');
.brand-heading {
font-size: 600%;
margin-left: -10%;
.icon-conversejs {
font-size: 88%;
}
}
p.no-chats {
padding-right: 10%;
font-size: 120%;
}
}
}
}
#conversejs {

47
src/converse-inverse.js
View File

@ -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;
}
}
});
}));

1
src/templates/brand_heading.html Normal file
View File

@ -0,0 +1 @@
<h1 class="brand-heading"><i class="icon-conversejs"></i> inVerse</h1>