Improve html templates for chat components

Victor Costa · Rodrigo Souto
1 parent 7007c8d4
Showing 3 changed files with 72 additions and 36 deletions Show diff stats
app/views/shared/logged_in/xmpp_chat.html.erb
public/javascripts/chat.js
public/stylesheets/chat.css
@@ -24,16 +24,22 @@
       </div>
  
       <div id="friends">
-        <div id='title-bar'><h1 class='title'><%= _("Online") %>&nbsp;(<span id='friends-online'>0</span>)</h1></div>
-        <ul class='buddy-list online'></ul>
+        <div class="status-group">
+          <div class='title-bar'><a href="#"><h1 class='title'><%= _("Online") %>&nbsp;(<span id='friends-online'>0</span>)</h1></a></div>
+          <ul class='buddy-list online'></ul>
+        </div>
  
-        <div id='title-bar'><h1 class='title'><%= _("Offline") %></h1></div>
-        <ul class='buddy-list offline'></ul>
+        <div class="status-group">
+          <div class='title-bar'><a href="#"><h1 class='title'><%= _("Offline") %>&nbsp;(<span id='friends-offline'>0</span>)</h1></a></div>
+          <ul class='buddy-list offline'></ul>
+        </div>
       </div>
  
       <div id="rooms">
-        <div id='title-bar'><h1 class='title'><%= _("Groups") %></h1></div>
-        <ul class="buddy-list room-list"></ul>
+        <div class="status-group">
+          <div class='title-bar'><a href="#"><h1 class='title'><%= _("Groups") %>&nbsp;(<span id='groups-online'>0</span>)</h1></a></div>
+          <ul class="buddy-list room-list"></ul>
+        </div>
       </div>
     </div>
  
@@ -42,18 +48,21 @@
     </div>
  
     <div id="chat-templates">
-      <div class='conversation' style="display: none;">
-        <div class="header">
-          <span class="chat-target">
-            <img class="avatar">
-            <span class="other-name"></span>
-          </span>
-          <a href="#" class="back"><%= _('Back') %></a>
-        </div>
-        <div class='history'></div>
-        <div class='input-div'>
-            <div class='icon-chat'></div>
-            <textarea class='input'></textarea>
+
+      <div class="conversation-template">
+        <div class='conversation' style="display: none;">
+          <div class="header">
+            <span class="chat-target">
+              <img class="avatar">
+              <span class="other-name"></span>
+            </span>
+            <a href="#" class="back"><%= _('Back') %></a>
+          </div>
+          <div class='history'></div>
+          <div class='input-div'>
+              <div class='icon-chat'></div>
+              <textarea class='input'></textarea>
+          </div>
         </div>
       </div>
  
@@ -67,6 +76,20 @@
         </li>
       </div>
  
+      <div class="occupant-list-template">
+        <div class="occupant-list">
+          <ul class='occupant-list'></ul>
+        </div>
+      </div>
+
+      <div class="occupant-item">
+        <li class='%{presence_status}'>
+          <a data-id='%{jid_id}' class='icon-menu-%{presence_status}-11' href='#'>
+            %{name}
+          </a>
+        </li>
+      </div>
+
       <div class="message">
         <div data-who="%{who}" class="message %{who}">
           <div class="author">
@@ -79,5 +102,10 @@
           </div>
         </div>
       </div>
+
+      <div class="error-message">
+        <span class='error'>%{text}</span>
+      </div>
+
     </div>
   </div>
@@ -28,11 +28,8 @@ jQuery(function($) {
      jids: {},
      rooms: {},
  
-     templates: {
-        occupant_item: "<li class='%{presence_status}'><a data-id='%{jid_id}' class='icon-menu-%{presence_status}-11' href='#'>%{name}</a></li>",
-        room_item: "<li class='room'><a id='%{jid_id}' class='icon-chat' href='#'>%{name}</a></li>",
-        error: "<span class='error'>%{text}</span>",
-        occupant_list: "<div class='occupant-list'><ul class='occupant-list'></ul></div>"
+     template: function(selector) {
+       return $('#chat #chat-templates '+selector).clone().html();
      },
  
      jid_to_id: function (jid) {
@@ -72,7 +69,7 @@ jQuery(function($) {
         var item = $('#' + jid_id);
         presence = presence || ($(item).length > 0 ? $(item).parent('li').attr('class') : 'offline');
         log('adding or updating contact ' + jid + ' as ' + presence);
-        Jabber.insert_or_update_user(list, item, jid, Jabber.name_of(jid_id), presence, $('#chat #chat-templates .buddy-item').clone().html(), 'groupchat');
+        Jabber.insert_or_update_user(list, item, jid, Jabber.name_of(jid_id), presence, Jabber.template('.buddy-item'), 'groupchat');
         $("#chat-window .tab a[href='#"+ Jabber.conversation_prefix + jid_id +"']")
            .removeClass()
            .addClass('icon-menu-' + presence + '-11');
@@ -84,7 +81,7 @@ jQuery(function($) {
         var list = $('#buddy-list #friends .buddy-list' + (presence=='offline' ? '.offline' : '.online'));
  
         log('adding or updating contact ' + jid + ' as ' + presence);
-        Jabber.insert_or_update_user(list, item, jid, name, presence, $('#chat #chat-templates .buddy-item').clone().html(), 'chat');
+        Jabber.insert_or_update_user(list, item, jid, name, presence, Jabber.template('.buddy-item'), 'chat');
         $("#chat-window .tab a[href='#"+ Jabber.conversation_prefix + jid_id +"']")
            .removeClass()
            .addClass('icon-menu-' + presence + '-11');
@@ -94,7 +91,7 @@ jQuery(function($) {
         var jid_id = Jabber.jid_to_id(jid);
         var list = $('#' + Jabber.conversation_prefix + Jabber.jid_to_id(room_jid) + ' .occupant-list ul');
         var item = $(list).find('a[data-id='+ jid_id +']');
-        Jabber.insert_or_update_user(list, item, jid, name, presence, Jabber.templates.occupant_item, 'chat');
+        Jabber.insert_or_update_user(list, item, jid, name, presence, Jabber.template('.occupant-item'), 'chat');
         if (Jabber.rooms[Jabber.jid_to_id(room_jid)] === undefined) {
            Jabber.rooms[Jabber.jid_to_id(room_jid)] = {};
         }
@@ -130,7 +127,7 @@ jQuery(function($) {
                if (time==undefined) {
                   time = new Date().toISOString();
                }
-               var message_html = $('#chat #chat-templates .message').clone().html()
+               var message_html = Jabber.template('.message')
                  .replace('%{message}', body)
                  .replace(/%{who}/g, who)
                  .replace('%{time}', time)
@@ -170,8 +167,8 @@ jQuery(function($) {
         Jabber.connection.send(
            $pres({to: room_jid + '/' + $own_name}).c('x', {xmlns: Strophe.NS.MUC}).c('history', {maxchars: 0})
         );
-        //FIXME list group
         Jabber.insert_or_update_group(room_jid, 'group');
+        Jabber.update_chat_title();
      },
  
      leave_room: function(room_jid) {
@@ -180,8 +177,12 @@ jQuery(function($) {
      },
  
      update_chat_title: function () {
-        var friends_online = $('#buddy-list .buddy-list.online li').length;
+        var friends_online = $('#buddy-list #friends .buddy-list.online li').length;
         $('#friends-online').text(friends_online);
+        var friends_offline = $('#buddy-list #friends .buddy-list.offline li').length;
+        $('#friends-offline').text(friends_offline);
+        var groups_online = $('#buddy-list #rooms .buddy-list li').length;
+        $('#groups-online').text(groups_online);
      },
  
      on_connect: function (status) {
@@ -360,7 +361,7 @@ jQuery(function($) {
         message = Jabber.parse(message)
         var jid = Strophe.getBareJidFromJid(message.from);
         log('Receiving error message from ' + jid);
-        var body = Jabber.templates.error.replace('%{text}', message.error);
+        var body = Jabber.template('.error-message').replace('%{text}', message.error);
         Jabber.show_message(jid, Jabber.name_of(Jabber.jid_to_id(jid)), body, 'other', Strophe.getNodeFromJid(jid));
         return true;
      },
@@ -559,7 +560,7 @@ jQuery(function($) {
  
       // opening chat with selected online friend
       var panel = $('<div id="'+conversation_id +'"></div>').appendTo($conversations);
-      panel.append($('#chat #chat-templates .conversation').clone());
+      panel.append(Jabber.template('.conversation-template'));
       panel.find('.chat-target .avatar').replaceWith(getAvatar(identifier));
       panel.find('.chat-target .other-name').html(title);
       $('#chat .history').perfectScrollbar();
@@ -568,7 +569,7 @@ jQuery(function($) {
       textarea.attr('name', panel.id);
  
       if (Jabber.is_a_room(jid_id)) {
-          panel.append(Jabber.templates.occupant_list);
+          panel.append(Jabber.template('.occupant-list-template'));
           panel.find('.history').addClass('room');
       }
       textarea.attr('data-to', jid);
@@ -668,6 +669,10 @@ jQuery(function($) {
       Jabber.show_status('offline');
    }
  
+   $('.title-bar a').click(function() {
+     $(this).parents('.status-group').find('.buddy-list').toggle('fast');
+   });
+
    //restore connection if user was connected
    if($presence=='' || $presence == 'chat') {
       $('#chat-connect').trigger('click');
@@ -46,8 +46,8 @@
   width: 32px;
   max-height: 40px;
 }
-#buddy-list .buddy-list li.offline, .occupant-list li.offline {
-/*  display: none;*/
+#buddy-list .buddy-list.offline, .occupant-list.offline {
+  display: none;
 }
 #chat #buddy-list .toolbar {
   border: 0;
@@ -195,14 +195,17 @@
   margin-left: 0;
 }
  
-#chat #title-bar {
+#chat .title-bar {
   height: 34px;
   background: #ccc url(/images/icons-app/chat-22x22.png) 3px 5px no-repeat;
   width: 250px;
   background-color: #303030;
   border-bottom: 1px solid #383838;
 }
-#title-bar .title {
+#chat .title-bar a {
+  text-decoration: none;
+}
+.title-bar .title {
   margin: 0;
   font-size: 12px;
   padding-left: 30px;
...	...	@@ -24,16 +24,22 @@
24	24	</div>
25	25
26	26	<div id="friends">
27		- <div id='title-bar'><h1 class='title'><%= _("Online") %> (<span id='friends-online'>0</span>)</h1></div>
28		- <ul class='buddy-list online'></ul>
	27	+ <div class="status-group">
	28	+ <div class='title-bar'><a href="#"><h1 class='title'><%= _("Online") %> (<span id='friends-online'>0</span>)</h1></a></div>
	29	+ <ul class='buddy-list online'></ul>
	30	+ </div>
29	31
30		- <div id='title-bar'><h1 class='title'><%= _("Offline") %></h1></div>
31		- <ul class='buddy-list offline'></ul>
	32	+ <div class="status-group">
	33	+ <div class='title-bar'><a href="#"><h1 class='title'><%= _("Offline") %> (<span id='friends-offline'>0</span>)</h1></a></div>
	34	+ <ul class='buddy-list offline'></ul>
	35	+ </div>
32	36	</div>
33	37
34	38	<div id="rooms">
35		- <div id='title-bar'><h1 class='title'><%= _("Groups") %></h1></div>
36		- <ul class="buddy-list room-list"></ul>
	39	+ <div class="status-group">
	40	+ <div class='title-bar'><a href="#"><h1 class='title'><%= _("Groups") %> (<span id='groups-online'>0</span>)</h1></a></div>
	41	+ <ul class="buddy-list room-list"></ul>
	42	+ </div>
37	43	</div>
38	44	</div>
39	45
...	...	@@ -42,18 +48,21 @@
42	48	</div>
43	49
44	50	<div id="chat-templates">
45		- <div class='conversation' style="display: none;">
46		- <div class="header">
47		- <span class="chat-target">
48		- <img class="avatar">
49		- <span class="other-name"></span>
50		- </span>
51		- <a href="#" class="back"><%= _('Back') %></a>
52		- </div>
53		- <div class='history'></div>
54		- <div class='input-div'>
55		- <div class='icon-chat'></div>
56		- <textarea class='input'></textarea>
	51	+
	52	+ <div class="conversation-template">
	53	+ <div class='conversation' style="display: none;">
	54	+ <div class="header">
	55	+ <span class="chat-target">
	56	+ <img class="avatar">
	57	+ <span class="other-name"></span>
	58	+ </span>
	59	+ <a href="#" class="back"><%= _('Back') %></a>
	60	+ </div>
	61	+ <div class='history'></div>
	62	+ <div class='input-div'>
	63	+ <div class='icon-chat'></div>
	64	+ <textarea class='input'></textarea>
	65	+ </div>
57	66	</div>
58	67	</div>
59	68
...	...	@@ -67,6 +76,20 @@
67	76	</li>
68	77	</div>
69	78
	79	+ <div class="occupant-list-template">
	80	+ <div class="occupant-list">
	81	+ <ul class='occupant-list'></ul>
	82	+ </div>
	83	+ </div>
	84	+
	85	+ <div class="occupant-item">
	86	+ <li class='%{presence_status}'>
	87	+ <a data-id='%{jid_id}' class='icon-menu-%{presence_status}-11' href='#'>
	88	+ %{name}
	89	+ </a>
	90	+ </li>
	91	+ </div>
	92	+
70	93	<div class="message">
71	94	<div data-who="%{who}" class="message %{who}">
72	95	<div class="author">
...	...	@@ -79,5 +102,10 @@
79	102	</div>
80	103	</div>
81	104	</div>
	105	+
	106	+ <div class="error-message">
	107	+ <span class='error'>%{text}</span>
	108	+ </div>
	109	+
82	110	</div>
83	111	</div>
...	...
...	...	@@ -28,11 +28,8 @@ jQuery(function($) {
28	28	jids: {},
29	29	rooms: {},
30	30
31		- templates: {
32		- occupant_item: "<li class='%{presence_status}'><a data-id='%{jid_id}' class='icon-menu-%{presence_status}-11' href='#'>%{name}</a></li>",
33		- room_item: "<li class='room'><a id='%{jid_id}' class='icon-chat' href='#'>%{name}</a></li>",
34		- error: "<span class='error'>%{text}</span>",
35		- occupant_list: "<div class='occupant-list'><ul class='occupant-list'></ul></div>"
	31	+ template: function(selector) {
	32	+ return $('#chat #chat-templates '+selector).clone().html();
36	33	},
37	34
38	35	jid_to_id: function (jid) {
...	...	@@ -72,7 +69,7 @@ jQuery(function($) {
72	69	var item = $('#' + jid_id);
73	70	presence = presence \|\| ($(item).length > 0 ? $(item).parent('li').attr('class') : 'offline');
74	71	log('adding or updating contact ' + jid + ' as ' + presence);
75		- Jabber.insert_or_update_user(list, item, jid, Jabber.name_of(jid_id), presence, $('#chat #chat-templates .buddy-item').clone().html(), 'groupchat');
	72	+ Jabber.insert_or_update_user(list, item, jid, Jabber.name_of(jid_id), presence, Jabber.template('.buddy-item'), 'groupchat');
76	73	$("#chat-window .tab a[href='#"+ Jabber.conversation_prefix + jid_id +"']")
77	74	.removeClass()
78	75	.addClass('icon-menu-' + presence + '-11');
...	...	@@ -84,7 +81,7 @@ jQuery(function($) {
84	81	var list = $('#buddy-list #friends .buddy-list' + (presence=='offline' ? '.offline' : '.online'));
85	82
86	83	log('adding or updating contact ' + jid + ' as ' + presence);
87		- Jabber.insert_or_update_user(list, item, jid, name, presence, $('#chat #chat-templates .buddy-item').clone().html(), 'chat');
	84	+ Jabber.insert_or_update_user(list, item, jid, name, presence, Jabber.template('.buddy-item'), 'chat');
88	85	$("#chat-window .tab a[href='#"+ Jabber.conversation_prefix + jid_id +"']")
89	86	.removeClass()
90	87	.addClass('icon-menu-' + presence + '-11');
...	...	@@ -94,7 +91,7 @@ jQuery(function($) {
94	91	var jid_id = Jabber.jid_to_id(jid);
95	92	var list = $('#' + Jabber.conversation_prefix + Jabber.jid_to_id(room_jid) + ' .occupant-list ul');
96	93	var item = $(list).find('a[data-id='+ jid_id +']');
97		- Jabber.insert_or_update_user(list, item, jid, name, presence, Jabber.templates.occupant_item, 'chat');
	94	+ Jabber.insert_or_update_user(list, item, jid, name, presence, Jabber.template('.occupant-item'), 'chat');
98	95	if (Jabber.rooms[Jabber.jid_to_id(room_jid)] === undefined) {
99	96	Jabber.rooms[Jabber.jid_to_id(room_jid)] = {};
100	97	}
...	...	@@ -130,7 +127,7 @@ jQuery(function($) {
130	127	if (time==undefined) {
131	128	time = new Date().toISOString();
132	129	}
133		- var message_html = $('#chat #chat-templates .message').clone().html()
	130	+ var message_html = Jabber.template('.message')
134	131	.replace('%{message}', body)
135	132	.replace(/%{who}/g, who)
136	133	.replace('%{time}', time)
...	...	@@ -170,8 +167,8 @@ jQuery(function($) {
170	167	Jabber.connection.send(
171	168	$pres({to: room_jid + '/' + $own_name}).c('x', {xmlns: Strophe.NS.MUC}).c('history', {maxchars: 0})
172	169	);
173		- //FIXME list group
174	170	Jabber.insert_or_update_group(room_jid, 'group');
	171	+ Jabber.update_chat_title();
175	172	},
176	173
177	174	leave_room: function(room_jid) {
...	...	@@ -180,8 +177,12 @@ jQuery(function($) {
180	177	},
181	178
182	179	update_chat_title: function () {
183		- var friends_online = $('#buddy-list .buddy-list.online li').length;
	180	+ var friends_online = $('#buddy-list #friends .buddy-list.online li').length;
184	181	$('#friends-online').text(friends_online);
	182	+ var friends_offline = $('#buddy-list #friends .buddy-list.offline li').length;
	183	+ $('#friends-offline').text(friends_offline);
	184	+ var groups_online = $('#buddy-list #rooms .buddy-list li').length;
	185	+ $('#groups-online').text(groups_online);
185	186	},
186	187
187	188	on_connect: function (status) {
...	...	@@ -360,7 +361,7 @@ jQuery(function($) {
360	361	message = Jabber.parse(message)
361	362	var jid = Strophe.getBareJidFromJid(message.from);
362	363	log('Receiving error message from ' + jid);
363		- var body = Jabber.templates.error.replace('%{text}', message.error);
	364	+ var body = Jabber.template('.error-message').replace('%{text}', message.error);
364	365	Jabber.show_message(jid, Jabber.name_of(Jabber.jid_to_id(jid)), body, 'other', Strophe.getNodeFromJid(jid));
365	366	return true;
366	367	},
...	...	@@ -559,7 +560,7 @@ jQuery(function($) {
559	560
560	561	// opening chat with selected online friend
561	562	var panel = $('<div id="'+conversation_id +'"></div>').appendTo($conversations);
562		- panel.append($('#chat #chat-templates .conversation').clone());
	563	+ panel.append(Jabber.template('.conversation-template'));
563	564	panel.find('.chat-target .avatar').replaceWith(getAvatar(identifier));
564	565	panel.find('.chat-target .other-name').html(title);
565	566	$('#chat .history').perfectScrollbar();
...	...	@@ -568,7 +569,7 @@ jQuery(function($) {
568	569	textarea.attr('name', panel.id);
569	570
570	571	if (Jabber.is_a_room(jid_id)) {
571		- panel.append(Jabber.templates.occupant_list);
	572	+ panel.append(Jabber.template('.occupant-list-template'));
572	573	panel.find('.history').addClass('room');
573	574	}
574	575	textarea.attr('data-to', jid);
...	...	@@ -668,6 +669,10 @@ jQuery(function($) {
668	669	Jabber.show_status('offline');
669	670	}
670	671
	672	+ $('.title-bar a').click(function() {
	673	+ $(this).parents('.status-group').find('.buddy-list').toggle('fast');
	674	+ });
	675	+
671	676	//restore connection if user was connected
672	677	if($presence=='' \|\| $presence == 'chat') {
673	678	$('#chat-connect').trigger('click');
...	...
...	...	@@ -46,8 +46,8 @@
46	46	width: 32px;
47	47	max-height: 40px;
48	48	}
49		-#buddy-list .buddy-list li.offline, .occupant-list li.offline {
50		-/* display: none;*/
	49	+#buddy-list .buddy-list.offline, .occupant-list.offline {
	50	+ display: none;
51	51	}
52	52	#chat #buddy-list .toolbar {
53	53	border: 0;
...	...	@@ -195,14 +195,17 @@
195	195	margin-left: 0;
196	196	}
197	197
198		-#chat #title-bar {
	198	+#chat .title-bar {
199	199	height: 34px;
200	200	background: #ccc url(/images/icons-app/chat-22x22.png) 3px 5px no-repeat;
201	201	width: 250px;
202	202	background-color: #303030;
203	203	border-bottom: 1px solid #383838;
204	204	}
205		-#title-bar .title {
	205	+#chat .title-bar a {
	206	+ text-decoration: none;
	207	+}
	208	+.title-bar .title {
206	209	margin: 0;
207	210	font-size: 12px;
208	211	padding-left: 30px;
...	...