Skip to content

C
converse.js
Commit c788041a authored by JC Brand's avatar JC Brand
Browse files
Options

Merge branch 'sane-mockup' into otr 

Conflicts:
	docs/html/searchindex.js
	index.html
parents 2699c3ca 9ba32930
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2257 additions and 138 deletions
converse.css
View file @ c788041a
This diff is collapsed.
converse.js
View file @ c788041a
...@@ -564,7 +564,7 @@ ...@@ -564,7 +564,7 @@
template: _.template( template: _.template(
'<div class="chat-head chat-head-chatbox">' + '<div class="chat-head chat-head-chatbox">' +
'<a class="close-chatbox-button">X</a>' + '<a class="close-chatbox-button icon-close"></a>' +
'<a href="{{url}}" target="_blank" class="user">' + '<a href="{{url}}" target="_blank" class="user">' +
'<div class="chat-title"> {{ fullname }} </div>' + '<div class="chat-title"> {{ fullname }} </div>' +
'</a>' + '</a>' +
...@@ -664,7 +664,8 @@ ...@@ -664,7 +664,8 @@
'<dl class="add-converse-contact dropdown">' + '<dl class="add-converse-contact dropdown">' +
'<dt id="xmpp-contact-search" class="fancy-dropdown">' + '<dt id="xmpp-contact-search" class="fancy-dropdown">' +
'<a class="toggle-xmpp-contact-form" href="#"'+ '<a class="toggle-xmpp-contact-form" href="#"'+
'title="'+__('Click to add new chat contacts')+'">'+__('Add a contact')+'</a>' + 'title="'+__('Click to add new chat contacts')+'">'+
'<span class="icon-plus"></span>'+__('Add a contact')+'</a>' +
'</dt>' + '</dt>' +
'<dd class="search-xmpp" style="display:none"><ul></ul></dd>' + '<dd class="search-xmpp" style="display:none"><ul></ul></dd>' +
'</dl>' '</dl>'
...@@ -790,11 +791,12 @@ ...@@ -790,11 +791,12 @@
room_template: _.template( room_template: _.template(
'<dd class="available-chatroom">'+ '<dd class="available-chatroom">'+
'<a class="open-room" data-room-jid="{{jid}}"'+ '<a class="open-room" data-room-jid="{{jid}}"'+
'title="'+__('Click to open this room')+'" href="#">{{name}}</a>'+ 'title="'+__('Click to open this room')+'" href="#">{{name}}</a>'+
'<a class="room-info" data-room-jid="{{jid}}"'+ '<a class="room-info icon-room-info" data-room-jid="{{jid}}"'+
'title="'+__('Show more information on this room')+'" href="#">&nbsp;</a>'+ 'title="'+__('Show more information on this room')+'" href="#">&nbsp;</a>'+
'</dd>'), '</dd>'),
// FIXME: check markup in mockup
room_description_template: _.template( room_description_template: _.template(
'<div class="room-info">'+ '<div class="room-info">'+
'<p class="room-info"><strong>'+__('Description:')+'</strong> {{desc}}</p>' + '<p class="room-info"><strong>'+__('Description:')+'</strong> {{desc}}</p>' +
...@@ -1067,7 +1069,7 @@ ...@@ -1067,7 +1069,7 @@
template: _.template( template: _.template(
'<div class="chat-head oc-chat-head">'+ '<div class="chat-head oc-chat-head">'+
'<ul id="controlbox-tabs"></ul>'+ '<ul id="controlbox-tabs"></ul>'+
'<a class="close-chatbox-button">X</a>'+ '<a class="close-chatbox-button icon-close"></a>'+
'</div>'+ '</div>'+
'<div id="controlbox-panes"></div>' '<div id="controlbox-panes"></div>'
), ),
...@@ -1167,8 +1169,8 @@ ...@@ -1167,8 +1169,8 @@
template: _.template( template: _.template(
'<div class="chat-head chat-head-chatroom">' + '<div class="chat-head chat-head-chatroom">' +
'<a class="close-chatbox-button">X</a>' + '<a class="close-chatbox-button icon-close"></a>' +
'<a class="configure-chatroom-button" style="display:none">&nbsp;</a>' + '<a class="configure-chatroom-button icon-wrench" style="display:none"></a>' +
'<div class="chat-title"> {{ name }} </div>' + '<div class="chat-title"> {{ name }} </div>' +
'<p class="chatroom-topic"><p/>' + '<p class="chatroom-topic"><p/>' +
'</div>' + '</div>' +
...@@ -1817,19 +1819,20 @@ ...@@ -1817,19 +1819,20 @@
}, },
template: _.template( template: _.template(
'<a class="open-chat" title="'+__('Click to chat with this contact')+'" href="#">{{ fullname }}</a>' + '<a class="open-chat" title="'+__('Click to chat with this contact')+'" href="#">{{ fullname }}</a>' +
'<a class="remove-xmpp-contact" title="'+__('Click to remove this contact')+'" href="#"></a>'), '<span class="icon-{{ chat_status }}" title="{{ status_desc }}"></span>'+
'<a class="remove-xmpp-contact" title="'+__('Click to remove this contact')+'" href="#"></a>'),
pending_template: _.template( pending_template: _.template(
'<span>{{ fullname }}</span>' + '<span>{{ fullname }}</span>' +
'<a class="remove-xmpp-contact" title="'+__('Click to remove this contact')+'" href="#"></a>'), '<a class="remove-xmpp-contact" title="'+__('Click to remove this contact')+'" href="#"></a>'),
request_template: _.template('<div>{{ fullname }}</div>' + request_template: _.template('<div>{{ fullname }}</div>' +
'<button type="button" class="accept-xmpp-request">' + '<button type="button" class="accept-xmpp-request">' +
'Accept</button>' + 'Accept</button>' +
'<button type="button" class="decline-xmpp-request">' + '<button type="button" class="decline-xmpp-request">' +
'Decline</button>' + 'Decline</button>' +
''), ''),
render: function () { render: function () {
var item = this.model, var item = this.model,
...@@ -1846,7 +1849,15 @@ ...@@ -1846,7 +1849,15 @@
converse.showControlBox(); converse.showControlBox();
} else if (subscription === 'both' || subscription === 'to') { } else if (subscription === 'both' || subscription === 'to') {
this.$el.addClass('current-xmpp-contact'); this.$el.addClass('current-xmpp-contact');
this.$el.html(this.template(item.toJSON())); var status_desc = {
'dnd': 'This contact is busy',
'online': 'This contact is online',
'offline': 'This contact is offline',
'away': 'This contact is away'
}[item.get('chat_status')||'offline'];
this.$el.html(this.template(
_.extend(item.toJSON(), {'status_desc': status_desc})
));
} }
return this; return this;
}, },
...@@ -2358,6 +2369,7 @@ ...@@ -2358,6 +2369,7 @@
status_template: _.template( status_template: _.template(
'<div class="xmpp-status">' + '<div class="xmpp-status">' +
'<a class="choose-xmpp-status {{ chat_status }}" data-value="{{status_message}}" href="#" title="'+__('Click to change your chat status')+'">' + '<a class="choose-xmpp-status {{ chat_status }}" data-value="{{status_message}}" href="#" title="'+__('Click to change your chat status')+'">' +
'<span class="icon-{{ chat_status }}"></span>'+
'{{ status_message }}' + '{{ status_message }}' +
'</a>' + '</a>' +
'<a class="change-xmpp-status-message" href="#" title="'+__('Click here to write a custom status message')+'"></a>' + '<a class="change-xmpp-status-message" href="#" title="'+__('Click here to write a custom status message')+'"></a>' +
...@@ -2420,12 +2432,15 @@ ...@@ -2420,12 +2432,15 @@
choose_template: _.template( choose_template: _.template(
'<dl id="target" class="dropdown">' + '<dl id="target" class="dropdown">' +
'<dt id="fancy-xmpp-status-select" class="fancy-dropdown"></dt>' + '<dt id="fancy-xmpp-status-select" class="fancy-dropdown"></dt>' +
'<dd><ul></ul></dd>' + '<dd><ul class="xmpp-status-menu"></ul></dd>' +
'</dl>'), '</dl>'),
option_template: _.template( option_template: _.template(
'<li>' + '<li>' +
'<a href="#" class="{{ value }}" data-value="{{ value }}">{{ text }}</a>' + '<a href="#" class="{{ value }}" data-value="{{ value }}">'+
'<span class="icon-{{ value }}"></span>'+
'{{ text }}'+
'</a>' +
'</li>'), '</li>'),
initialize: function () { initialize: function () {
......
fonticons/Read Me.txt 0 → 100644
View file @ c788041a
To modify your generated font, use the *dev.svg* file, located in the *fonts* folder in this package. You can import this dev.svg file to the IcoMoon app. All the tags (class names) and the Unicode points of your glyphs are saved in this file.
See the documentation for more info on how to use this package: http://icomoon.io/#docs/font-face
\ No newline at end of file
fonticons/fonts/Converse-js.dev.svg 0 → 100644
View file @ c788041a
This diff is collapsed.
fonticons/fonts/Converse-js.svg 0 → 100644
View file @ c788041a
This diff is collapsed.
fonticons/index.html 0 → 100644
View file @ c788041a
This diff is collapsed.
fonticons/license.txt 0 → 100644
View file @ c788041a
Icon Set: IcoMoon - Free -- http://keyamoon.com/icomoon/
License: CC BY 3.0 -- http://creativecommons.org/licenses/by/3.0/
\ No newline at end of file
fonticons/lte-ie7.js 0 → 100644
View file @ c788041a
/* Load this script using conditional IE comments if you need to support IE 7 and IE 6. */
window.onload = function() {
function addIcon(el, entity) {
var html = el.innerHTML;
el.innerHTML = '<span style="font-family: \'Converse-js\'">' + entity + '</span>' + html;
}
var icons = {
'icon-home' : '&#xe000;',
'icon-pencil' : '&#x270e;',
'icon-camera' : '&#xe003;',
'icon-camera-2' : '&#x2616;',
'icon-play' : '&#x25d9;',
'icon-music' : '&#x266b;',
'icon-headphones' : '&#x266c;',
'icon-phone' : '&#x260f;',
'icon-phone-hang-up' : '&#x260e;',
'icon-address-book' : '&#x270f;',
'icon-notebook' : '&#x2710;',
'icon-envelop' : '&#x2709;',
'icon-pushpin' : '&#xe012;',
'icon-bubble' : '&#x25fc;',
'icon-bubble-2' : '&#x25fb;',
'icon-bubbles' : '&#xe015;',
'icon-bubbles-2' : '&#xe016;',
'icon-bubbles-3' : '&#xe017;',
'icon-user' : '&#xe01a;',
'icon-users' : '&#xe01b;',
'icon-quotes-left' : '&#xe01d;',
'icon-spinner' : '&#x231b;',
'icon-search' : '&#xe021;',
'icon-cogs' : '&#xe022;',
'icon-wrench' : '&#xe024;',
'icon-unlocked' : '&#xe025;',
'icon-lock' : '&#xe026;',
'icon-lock-2' : '&#xe027;',
'icon-key' : '&#xe028;',
'icon-key-2' : '&#xe029;',
'icon-zoom-out' : '&#xe02a;',
'icon-zoom-in' : '&#xe02b;',
'icon-cog' : '&#xe02f;',
'icon-remove' : '&#xe02d;',
'icon-remove-2' : '&#xe02e;',
'icon-eye' : '&#xe030;',
'icon-eye-blocked' : '&#xe031;',
'icon-attachment' : '&#xe032;',
'icon-globe' : '&#xe033;',
'icon-heart' : '&#x2764;',
'icon-happy' : '&#x263b;',
'icon-thumbs-up' : '&#x261d;',
'icon-smiley' : '&#x263a;',
'icon-tongue' : '&#xe038;',
'icon-sad' : '&#x2639;',
'icon-wink' : '&#xe03a;',
'icon-wondering' : '&#x2369;',
'icon-confused' : '&#x2368;',
'icon-shocked' : '&#x2364;',
'icon-evil' : '&#x261f;',
'icon-angry' : '&#xe03f;',
'icon-cool' : '&#xe040;',
'icon-grin' : '&#xe041;',
'icon-info' : '&#x2360;',
'icon-notification' : '&#xe01f;',
'icon-warning' : '&#x26a0;',
'icon-spell-check' : '&#xe045;',
'icon-volume-high' : '&#xe046;',
'icon-volume-medium' : '&#xe047;',
'icon-volume-low' : '&#xe048;',
'icon-volume-mute' : '&#xe049;',
'icon-volume-mute-2' : '&#xe04a;',
'icon-volume-decrease' : '&#xe04b;',
'icon-volume-increase' : '&#xe04c;',
'icon-bold' : '&#xe04d;',
'icon-underline' : '&#xe04e;',
'icon-italic' : '&#xe04f;',
'icon-strikethrough' : '&#xe050;',
'icon-new-tab' : '&#xe053;',
'icon-youtube' : '&#xe055;',
'icon-close' : '&#x2715;',
'icon-blocked' : '&#x2718;',
'icon-cancel-circle' : '&#xe058;',
'icon-minus' : '&#xe05a;',
'icon-plus' : '&#x271a;',
'icon-checkbox-checked' : '&#x2611;',
'icon-checkbox-unchecked' : '&#x2b27;',
'icon-checkbox-partial' : '&#x2b28;',
'icon-radio-checked' : '&#x2b26;',
'icon-radio-unchecked' : '&#x2b25;',
'icon-info-2' : '&#xe059;',
'icon-newspaper' : '&#xe001;',
'icon-image' : '&#x2b14;',
'icon-offline' : '&#xe002;',
'icon-busy' : '&#xe004;'
},
els = document.getElementsByTagName('*'),
i, attr, html, c, el;
for (i = 0; ; i += 1) {
el = els[i];
if(!el) {
break;
}
attr = el.getAttribute('data-icon');
if (attr) {
addIcon(el, attr);
}
c = el.className;
c = c.match(/icon-[^\s'"]+/);
if (c && icons[c[0]]) {
addIcon(el, icons[c[0]]);
}
}
};
\ No newline at end of file
fonticons/style.css 0 → 100644
View file @ c788041a
This diff is collapsed.
index.html
View file @ c788041a
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="chrome=1" /> <meta http-equiv="X-UA-Compatible" content="chrome=1" />
<meta name="description" content="Converse.js: Open Source Browser-Based Instant Messaging" /> <meta name="description" content="Converse.js: Open Source Browser-Based Instant Messaging" />
<link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css"> <link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css">
<link rel="stylesheet" type="text/css" media="screen" href="converse.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="converse.css">
<!-- <script src="converse.min.js"></script> -->
<script data-main="main" src="components/requirejs/require.js"></script> <script data-main="main" src="components/requirejs/require.js"></script>
<title>Converse.js</title> <title>Converse.js</title>
</head> </head>
......
mockup.html 0 → 100644
View file @ c788041a
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7