Skip to content

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

Merge branch 'sane-mockup' 

Conflicts:
	docs/html/searchindex.js
	index.html
parents 0a1a8373 9ba32930
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2264 additions and 141 deletions
converse.css
View file @ 810f5dec
This diff is collapsed.
converse.js
View file @ 810f5dec
......@@ -568,7 +568,7 @@
template: _.template(
'<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">' +
'<div class="chat-title"> {{ fullname }} </div>' +
'</a>' +
......@@ -668,7 +668,8 @@
'<dl class="add-converse-contact dropdown">' +
'<dt id="xmpp-contact-search" class="fancy-dropdown">' +
'<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>' +
'<dd class="search-xmpp" style="display:none"><ul></ul></dd>' +
'</dl>'
......@@ -795,10 +796,11 @@
'<dd class="available-chatroom">'+
'<a class="open-room" data-room-jid="{{jid}}"'+
'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>'+
'</dd>'),
// FIXME: check markup in mockup
room_description_template: _.template(
'<div class="room-info">'+
'<p class="room-info"><strong>'+__('Description:')+'</strong> {{desc}}</p>' +
......@@ -1071,7 +1073,7 @@
template: _.template(
'<div class="chat-head oc-chat-head">'+
'<ul id="controlbox-tabs"></ul>'+
'<a class="close-chatbox-button">X</a>'+
'<a class="close-chatbox-button icon-close"></a>'+
'</div>'+
'<div id="controlbox-panes"></div>'
),
......@@ -1171,8 +1173,8 @@
template: _.template(
'<div class="chat-head chat-head-chatroom">' +
'<a class="close-chatbox-button">X</a>' +
'<a class="configure-chatroom-button" style="display:none">&nbsp;</a>' +
'<a class="close-chatbox-button icon-close"></a>' +
'<a class="configure-chatroom-button icon-wrench" style="display:none"></a>' +
'<div class="chat-title"> {{ name }} </div>' +
'<p class="chatroom-topic"><p/>' +
'</div>' +
......@@ -1826,6 +1828,7 @@
template: _.template(
'<a class="open-chat" title="'+__('Click to chat with this contact')+'" href="#">{{ fullname }}</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(
......@@ -1854,7 +1857,15 @@
converse.showControlBox();
} else if (subscription === 'both' || subscription === 'to') {
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;
},
......@@ -2366,6 +2377,7 @@
status_template: _.template(
'<div class="xmpp-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 }}' +
'</a>' +
'<a class="change-xmpp-status-message" href="#" title="'+__('Click here to write a custom status message')+'"></a>' +
......@@ -2428,12 +2440,15 @@
choose_template: _.template(
'<dl id="target" class="dropdown">' +
'<dt id="fancy-xmpp-status-select" class="fancy-dropdown"></dt>' +
'<dd><ul></ul></dd>' +
'<dd><ul class="xmpp-status-menu"></ul></dd>' +
'</dl>'),
option_template: _.template(
'<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>'),
initialize: function () {
......
docs/html/searchindex.js
View file @ 810f5dec
This diff is collapsed.
docs/html/static/stylesheet.css
View file @ 810f5dec
......@@ -7,6 +7,11 @@ by Jason Costello, @jsncostello
@import url("../../../stylesheets/stylesheet.css");
@import url(pygment_trac.css);
div.body h1 {
font-size: 36px;
margin-top: 1em;
}
div.body,
div.document {
background-color: transparent;
......@@ -34,7 +39,6 @@ ul {
margin-bottom: 0;
}
tt.literal {
color: #222;
background-color: #fff;
......
fonticons/Read Me.txt 0 → 100644
View file @ 810f5dec
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 @ 810f5dec
This diff is collapsed.
fonticons/fonts/Converse-js.svg 0 → 100644
View file @ 810f5dec
This diff is collapsed.
fonticons/index.html 0 → 100644
View file @ 810f5dec
This diff is collapsed.
fonticons/license.txt 0 → 100644
View file @ 810f5dec
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 @ 810f5dec
/* 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 @ 810f5dec
This diff is collapsed.
index.html
View file @ 810f5dec
......@@ -5,8 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="chrome=1" />
<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="converse.min.css">
<!-- <script src="converse.min.js"></script> -->
<link rel="stylesheet" type="text/css" media="screen" href="converse.css">
<script data-main="main" src="components/requirejs/require.js"></script>
<title>Converse.js</title>
</head>
......@@ -164,7 +163,7 @@
auto_subscribe: false,
bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes
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,
show_controlbox_by_default: true,
xhr_user_search: false,
......
mockup.html 0 → 100644
View file @ 810f5dec
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