From 7212de73bb870b95913a6c727b5cd51ef3f8d343 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Thu, 14 Aug 2014 14:55:36 -0300 Subject: [PATCH] Small fixes for chat --- app/helpers/chat_helper.rb | 2 +- app/views/shared/logged_in/xmpp_chat.html.erb | 33 ++++++++++++++++++++------------- public/javascripts/chat.js | 79 +++++++++++++++++++++++++++++++++++++++++++++++-------------------------------- public/stylesheets/chat.css | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------- 4 files changed, 178 insertions(+), 120 deletions(-) diff --git a/app/helpers/chat_helper.rb b/app/helpers/chat_helper.rb index 6a0c0c2..6e4315b 100644 --- a/app/helpers/chat_helper.rb +++ b/app/helpers/chat_helper.rb @@ -7,7 +7,7 @@ module ChatHelper ['icon-menu-offline', _('Sign out of chat'), 'chat-disconnect'], ] content_tag('span', - link_to(content_tag('span', status) + ui_icon('ui-icon-triangle-1-s'), + link_to(content_tag('span', user.name) + ui_icon('ui-icon-triangle-1-s'), '#', :onclick => 'toggleMenu(this); return false', :class => icon_class + ' simplemenu-trigger' diff --git a/app/views/shared/logged_in/xmpp_chat.html.erb b/app/views/shared/logged_in/xmpp_chat.html.erb index aa70b00..74c5b4e 100644 --- a/app/views/shared/logged_in/xmpp_chat.html.erb +++ b/app/views/shared/logged_in/xmpp_chat.html.erb @@ -29,27 +29,33 @@
-
-

<%= _("Online") % h(page_title) %> (0)

-
-
<%= user_status_menu('icon-menu-offline', _('Offline')) %>
+
+ + <%= user_status_menu('icon-menu-offline', _('Offline')) %> +
+
+

<%= _("Online") % h(page_title) %> (0)

+
-
-
-
    -
-
+
+
-
- <%= _('Back') %> +