Commit 6517b9bb authored by JC Brand's avatar JC Brand

Merge branch 'otr'

Conflicts:
	CHANGES.rst
	locale/af/LC_MESSAGES/af.js
	locale/af/LC_MESSAGES/converse.json
	locale/af/LC_MESSAGES/converse.po
	locale/converse.pot
	locale/de/LC_MESSAGES/converse.po
	locale/en/LC_MESSAGES/converse.po
	locale/es/LC_MESSAGES/converse.po
	locale/fr/LC_MESSAGES/converse.po
	locale/it/LC_MESSAGES/converse.po
	locale/pt_BR/LC_MESSAGES/converse.po
parents 04c71d5b 960861ad
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
"strophe.vcard": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/vcard/strophe.vcard.js", "strophe.vcard": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/vcard/strophe.vcard.js",
"strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js", "strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js",
"strophe.muc": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/muc/strophe.muc.js", "strophe.muc": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/muc/strophe.muc.js",
"otr": "~0.2.5",
"crypto-js": "~3.1.2",
"almond": "~0.2.6" "almond": "~0.2.6"
}, },
"exportsOverride": {} "exportsOverride": {}
......
...@@ -8,6 +8,15 @@ ...@@ -8,6 +8,15 @@
@import url("fonticons/style.css"); @import url("fonticons/style.css");
.no-text-select {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: -moz-none;
-ms-user-select: none;
user-select: none;
}
#collective-xmpp-chat-data, #collective-xmpp-chat-data,
#collective-xmpp-chat-data input { #collective-xmpp-chat-data input {
color: rgb(79, 79, 79); color: rgb(79, 79, 79);
...@@ -107,13 +116,11 @@ span.spinner.hor_centered { ...@@ -107,13 +116,11 @@ span.spinner.hor_centered {
.chatroom .participants { .chatroom .participants {
float: left; float: left;
overflow: auto;
border-left: 1px solid #AAA;
max-width: 98px;
height: 274px; height: 274px;
background-color: white; background-color: white;
overflow: auto; overflow: auto;
border-left: 1px solid #AAA; border-left: 1px solid #AAA;
max-width: 98px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
} }
...@@ -123,12 +130,13 @@ span.spinner.hor_centered { ...@@ -123,12 +130,13 @@ span.spinner.hor_centered {
white-space: nowrap; white-space: nowrap;
display: block; display: block;
font-size: 12px; font-size: 12px;
font-weight: bold;
padding: 0.5em 0 0 0.5em; padding: 0.5em 0 0 0.5em;
cursor: default; cursor: default;
} }
ul.participant-list li.moderator { ul.participant-list li.moderator {
color: #FE0007; color: #8f2831;
} }
.chatroom .participant-list { .chatroom .participant-list {
...@@ -142,30 +150,20 @@ ul.participant-list li.moderator { ...@@ -142,30 +150,20 @@ ul.participant-list li.moderator {
} }
.chat-content { .chat-content {
position: relative;
padding: 0.3em; padding: 0.3em;
font-size: 13px; font-size: 13px;
color: rgb(79, 79, 79); color: rgb(79, 79, 79);
height:200px; height:180px;
width: 192px; width: 190px;
overflow-y:auto; overflow-y:auto;
border: 0; border: 0;
background-color: #ffffff; background-color: #ffffff;
line-height: 1.3em; line-height: 1.3em;
} }
.chat-textarea { .chatroom .chat-content {
border: 0; height:200px;
height: 50px;
}
.chat-textarea-chatbox-selected {
border: 1px solid #578308;
margin:0;
}
.chat-textarea-chatroom-selected {
border: 2px solid #2D617A;
margin:0;
} }
.chatroom .chat-content { .chatroom .chat-content {
...@@ -173,7 +171,10 @@ ul.participant-list li.moderator { ...@@ -173,7 +171,10 @@ ul.participant-list li.moderator {
} }
.chat-info { .chat-info {
color:#666666; color: #666666;
}
.chat-error {
color: #8f2831;
} }
.chat-message-room, .chat-message-room,
...@@ -194,7 +195,7 @@ ul.participant-list li.moderator { ...@@ -194,7 +195,7 @@ ul.participant-list li.moderator {
} }
.chat-message-them { .chat-message-them {
color: #F62817; color: #8f2831;
} }
.chat-message-me { .chat-message-me {
...@@ -218,7 +219,6 @@ li.chat-info { ...@@ -218,7 +219,6 @@ li.chat-info {
padding-top: 10px; padding-top: 10px;
} }
div#settings,
div#chatrooms, div#chatrooms,
div#login-dialog { div#login-dialog {
height: 274px; height: 274px;
...@@ -611,7 +611,7 @@ dd.available-chatroom:hover a.room-info { ...@@ -611,7 +611,7 @@ dd.available-chatroom:hover a.room-info {
background-color: #DCEAC5; background-color: #DCEAC5;
} }
div#controlbox-panes { .controlbox-panes {
background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(240,240,240,1) 100%); /* FF3.6+ */ background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(240,240,240,1) 100%); /* FF3.6+ */
background: -ms-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* IE10+ */ background: -ms-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* IE10+ */
background: -o-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* Opera 11.10+ */ background: -o-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* Opera 11.10+ */
...@@ -747,7 +747,7 @@ form.sendXMPPMessage { ...@@ -747,7 +747,7 @@ form.sendXMPPMessage {
background-clip: padding-box; background-clip: padding-box;
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
height: 65px; height: 85px;
width: 200px; width: 200px;
} }
...@@ -772,20 +772,80 @@ ul.chat-toolbar { ...@@ -772,20 +772,80 @@ ul.chat-toolbar {
font-size: 14px; font-size: 14px;
margin: 0; margin: 0;
padding: 0 5px 0 0; padding: 0 5px 0 0;
height: 20px;
display: block;
width: 195px;
/* XXX: CHECKME */
float: right; float: right;
display: inline-block; display: inline-block;
height: 20px; height: 20px;
} }
.chat-toolbar .toggle-otr {
float: right;
}
.chat-toolbar .toggle-otr ul {
display: none;
font-size:12px;
position: absolute;
bottom: 100%;
margin-bottom: 0;
right: 0;
background: #fff;
box-shadow: -1px -2px 2px 1px rgba(0,0,0,0.4);
}
.chat-toolbar .toggle-otr ul li {
position: relative;
list-style: none;
cursor: pointer;
display: block;
z-index: 99;
}
.chat-toolbar .toggle-otr ul li:hover {
background-color: #eee;
}
.chat-toolbar .toggle-otr ul li a {
transition:background-color 0.2s ease-in-out;
-webkit-transition:background-color 0.2s ease-in-out;
-moz-transition:background-color 0.2s ease-in-out;
display: block;
padding: 1px;
text-decoration: none;
}
.chat-toolbar-text {
font-size: 12px;
padding-right: 3px;
}
.unencrypted a,
.unencrypted {
color: #8f2831;
}
.unverified a,
.unverified {
color: #cf5300;
}
.private a,
.private {
color: #4B7003
}
ul.chat-toolbar li { ul.chat-toolbar li {
display: inline-block; display: inline-block;
list-style: none; list-style: none;
padding: 0 3px 0 3px; padding: 0 3px 0 3px;
cursor: pointer;
} }
ul.chat-toolbar li:hover { ul.chat-toolbar li:hover {
cursor: pointer; cursor: pointer;
color: rgb(39, 39, 39);
} }
form#set-custom-xmpp-status { form#set-custom-xmpp-status {
...@@ -878,3 +938,4 @@ form.add-xmpp-contact input { ...@@ -878,3 +938,4 @@ form.add-xmpp-contact input {
padding: 0 5px 0 5px; padding: 0 5px 0 5px;
color: rgb(79, 79, 79); color: rgb(79, 79, 79);
} }
This diff is collapsed.
...@@ -192,15 +192,16 @@ ...@@ -192,15 +192,16 @@
<script> <script>
require(['converse'], function (converse) { require(['converse'], function (converse) {
converse.initialize({ converse.initialize({
allow_otr: true,
auto_list_rooms: false, auto_list_rooms: false,
auto_subscribe: false, auto_subscribe: false,
bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes
debug: true ,
hide_muc_server: false, hide_muc_server: false,
i18n: locales['en'], // Refer to ./locale/locales.js to see which locales are supported i18n: locales['en'], // Refer to ./locale/locales.js to see which locales are supported
prebind: false, prebind: false,
show_controlbox_by_default: true, show_controlbox_by_default: true,
xhr_user_search: false, xhr_user_search: false,
debug: true
}); });
}); });
</script> </script>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -10,7 +10,8 @@ require.config({ ...@@ -10,7 +10,8 @@ require.config({
"strophe.muc": "components/strophe.muc/index", "strophe.muc": "components/strophe.muc/index",
"strophe.roster": "components/strophe.roster/index", "strophe.roster": "components/strophe.roster/index",
"strophe.vcard": "components/strophe.vcard/index", "strophe.vcard": "components/strophe.vcard/index",
"strophe.disco": "components/strophe.disco/index" "strophe.disco": "components/strophe.disco/index",
"crypto.aes": "components/crypto-js/build/rollups/aes"
}, },
// define module dependencies for modules not using define // define module dependencies for modules not using define
...@@ -26,6 +27,9 @@ require.config({ ...@@ -26,6 +27,9 @@ require.config({
//module value. //module value.
exports: 'Backbone' exports: 'Backbone'
}, },
'crypto.aes': {
exports: 'CryptoJS'
},
'jquery.tinysort': { deps: ['jquery'] }, 'jquery.tinysort': { deps: ['jquery'] },
'strophe': { deps: ['jquery'] }, 'strophe': { deps: ['jquery'] },
'underscore': { exports: '_' }, 'underscore': { exports: '_' },
......
This diff is collapsed.
...@@ -676,7 +676,7 @@ ...@@ -676,7 +676,7 @@
it("contains two tabs, 'Contacts' and 'ChatRooms'", $.proxy(function () { it("contains two tabs, 'Contacts' and 'ChatRooms'", $.proxy(function () {
var cbview = this.chatboxesview.views.controlbox; var cbview = this.chatboxesview.views.controlbox;
var $panels = cbview.$el.find('#controlbox-panes'); var $panels = cbview.$el.find('.controlbox-panes');
expect($panels.children().length).toBe(2); expect($panels.children().length).toBe(2);
expect($panels.children().first().attr('id')).toBe('users'); expect($panels.children().first().attr('id')).toBe('users');
expect($panels.children().first().is(':visible')).toBe(true); expect($panels.children().first().is(':visible')).toBe(true);
...@@ -693,7 +693,7 @@ ...@@ -693,7 +693,7 @@
it("is opened by clicking the 'Chatrooms' tab", $.proxy(function () { it("is opened by clicking the 'Chatrooms' tab", $.proxy(function () {
var cbview = this.chatboxesview.views.controlbox; var cbview = this.chatboxesview.views.controlbox;
var $tabs = cbview.$el.find('#controlbox-tabs'); var $tabs = cbview.$el.find('#controlbox-tabs');
var $panels = cbview.$el.find('#controlbox-panes'); var $panels = cbview.$el.find('.controlbox-panes');
var $contacts = $panels.children().first(); var $contacts = $panels.children().first();
var $chatrooms = $panels.children().last(); var $chatrooms = $panels.children().last();
spyOn(cbview, 'switchTab').andCallThrough(); spyOn(cbview, 'switchTab').andCallThrough();
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment