social_stream-presence 1.1.0 → 2.0.0.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b989789ea5b81aeb2924972e849e7c584ee67318
+  data.tar.gz: a7cfd170446b4294244e64276d804a9c95a6c071
+SHA512:
+  metadata.gz: da40366468ed6a328ce3ef50d434142c988cf837e95a1e24faec5b3bead99b6552148199571d2e4709dd8fb653ee0347ecd8aecfb3e9619a40f3d003310c6068
+  data.tar.gz: 383f09363d54f18768b6a2c8c4913535370586d142b5d12651ac240d6b0922922ae02b85d048102e4414682336f54b710d32d6f3c6ba3bdb4c5282be726774ac

data/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js

@@ -150,8 +150,7 @@
 		})
 		.appendTo(uiChatboxTitlebar),
 	    uiChatboxTitlebarCloseText = $('<span></span>')
-		.addClass('ui-icon-closethick ' + 'chat-thick ' + 'chat-closethick')
-		.text('close')
+		.addClass('icon_tool16-trash ' + 'chat-thick ' + 'chat-closethick')
 		.appendTo(uiChatboxTitlebarClose),
 	    uiChatboxTitlebarMinimize = (self.uiChatboxTitlebarMinimize = $('<a href="#"></a>'))
 		.addClass('ui-corner-all ' + 
@@ -172,8 +171,7 @@
 		})
 		.appendTo(uiChatboxTitlebar),
 	    uiChatboxTitlebarMinimizeText = $('<span></span>')
-		.addClass('ui-icon-minusthick ' +  'chat-thick ' + ' chat-minusthick')
-		.text('minimize')
+		.addClass('icon_tool16-less ' +  'chat-thick ' + ' chat-minusthick')
 		.appendTo(uiChatboxTitlebarMinimize),
 	    
 			//Video Menu button
@@ -391,4 +389,4 @@
 	}
     });
 
-}(jQuery));
+}(jQuery));

data/app/assets/javascripts/presence_XmppClient.js.erb

@@ -236,7 +236,7 @@ PRESENCE.XMPPClient = (function(P,$,undefined){
 	  } else if (status == Strophe.Status.AUTHFAIL) {
 	    PRESENCE.UTILITIES.log('Strophe authentication fail.');
 	      if ((window.sessionStorage)&&(sessionStorage.getItem("ss_user_pass") != null)){
-	        sessionStorage.setItem("ss_user_pass",null);
+	        sessionStorage.removeItem("ss_user_pass");
 	      }
 	      disconnectionFlag = true;
 	  } else if (status == Strophe.Status.ERROR) {
@@ -290,7 +290,11 @@ PRESENCE.XMPPClient = (function(P,$,undefined){
 	      
 	      PRESENCE.UIMANAGER.changeChatHeaderTitle(I18n.t('chat.reconnecting'))
 	      
-	      connectToChat(user_jid,cookie,null);
+	      if (authByCookie()){
+                connectToChat(user_jid,cookie);
+              } else {
+                connectToChat(user_jid);
+              }
 	      
 	      reconnectTimer = setTimeout ("PRESENCE.XMPPClient.onReconnect()", 9000);
 	      

data/app/assets/javascripts/presence_uiManager.js.erb

@@ -565,4 +565,4 @@ PRESENCE.UIMANAGER = (function(P,$,undefined){
 		updateConnectedUsersOfMainChatBox : updateConnectedUsersOfMainChatBox
   };
 
-}) (PRESENCE, jQuery);
+}) (PRESENCE, jQuery);

data/app/assets/javascripts/presence_windowManager.js

@@ -259,7 +259,7 @@ PRESENCE.WINDOW = (function(P,$,undefined){
 	
 	var modifyChatPartialIfMainBox = function(chatPartial){
 	  if (mainChatBox != null) {
-	    p = $(chatPartial)
+	    p = $('<div/>').append(chatPartial);
 	    $(p).find(".header").remove();
 	    $(p).find(".dropdown dd ul").css("min-width",147);
 	    return $(p); 

data/app/assets/stylesheets/social_stream/presence/_toolbar-chat.css.sass

@@ -0,0 +1,65 @@
+#chat_partial
+  margin-top: 30px
+  .chat_off
+    input
+      &[type="submit"]
+        @extend .pull-rigth
+        @extend .btn-blue
+  .users_connected
+    display: block
+    padding-left: 17px
+    .user_presence
+      display: inline-block
+      img
+        width: 40px
+      .presence_status
+        width: 20px
+.chat_wrapper
+  @include makeColumn(2, 0)
+
+#status,
+#statusList
+  dt,
+  li
+    font-size: 15px
+    border-bottom: 1px solid #ccc
+    padding-bottom: 7px
+    a
+      padding: 4px 6px
+      text-decoration: none
+      &:hover
+        background-color: $white
+      .badge
+        @include size(12px, 12px)
+        padding: 0px
+      .available
+        background-color: $green
+      .away
+        background-color: $orange
+      .dnd
+        background-color: $red
+      .offline
+        background-color: $blue
+#statusList
+  @include box-shadow (0px 4px 6px #c4c4c4)
+  margin-left: -11px !important
+  background-color: $white
+  li
+    margin: 4px 0px 4px 6px
+    a
+      &:hover
+        text-decoration: none
+
+#chat_header_title
+  display: inline-block
+#search_chat_contact,
+#search_chat_contact,
+  width: 100%
+
+.connectChatButton
+  @extend .btn
+
+.searchChatContacts
+  input
+    &[type="text"]
+      width: 91%

data/app/assets/stylesheets/social_stream/presence/_wrapper-chatBox.css.sass

@@ -0,0 +1,25 @@
+@import "jquery.ui.chatbox"
+
+.ui-chatbox
+  @include border-top-left-radius (5px)
+  @mixin box-shadow($gray)
+  background: #f2f2f2
+  border: 1px solid $grayLighter
+  right: 1px
+  position: fixed
+  z-index: 10000
+
+.ui-chatbox-titlebar,
+.ui-widget-content
+  width: 98%
+
+.ui-chatbox-titlebar
+  a
+    .icon_tool16-less
+      margin-right: 6px
+
+.ui-chatbox-input
+  border: none
+  textarea
+    border: 1px solid $grayLight
+    height: 22px

data/app/assets/stylesheets/social_stream/responsive/_responsive-1200px-min.css.sass

@@ -0,0 +1,9 @@
+//
+// Responsive: Large desktop and up
+// --------------------------------------------------
+
+
+@media (min-width: 1200px)
+
+  .ui-chatbox
+    @include grid-core-span(3, $fluidGridColumnWidth, $fluidGridGutterWidth)

data/app/assets/stylesheets/social_stream/responsive/_responsive-767px-max.css.sass

@@ -0,0 +1,16 @@
+//
+// Responsive: Landscape phone to desktop/tablet
+// --------------------------------------------------
+
+
+@media (max-width: 767px)
+
+  .ui-chatbox
+    @include grid-core-span(3, $fluidGridColumnWidth, $fluidGridGutterWidth)
+
+// UP TO LANDSCAPE PHONE
+// ---------------------
+
+@media (max-width: 480px)
+
+  

data/app/assets/stylesheets/social_stream/responsive/_responsive-768px-979px.css.sass

@@ -0,0 +1,9 @@
+//
+// Responsive: Tablet to desktop
+// --------------------------------------------------
+
+
+@media (min-width: 768px) and (max-width: 1119px)
+  
+  .ui-chatbox
+    @include grid-core-span(3, $fluidGridColumnWidth, $fluidGridGutterWidth)

data/app/assets/stylesheets/social_stream-presence.css.sass

@@ -0,0 +1,9 @@
+/* require_tree
+
+@import "social_stream/responsive/responsive-768px-979px"
+@import "social_stream/responsive/responsive-1200px-min"
+@import "social_stream/responsive/responsive-767px-max"
+
+@import "social_stream/presence/toolbar-chat"
+
+@import "social_stream/presence/wrapper-chatBox"

data/app/overrides/settings/_index/add_chat.html.erb.deface

@@ -0,0 +1,6 @@
+<!-- insert_before "code[erb-loud]:contains('notifications')" -->
+
+<% if SocialStream::Presence.enable && current_subject == current_user %>
+  <%= render partial: "settings/chat" %>
+<% end %>
+

data/app/overrides/toolbar/_home/add_chat.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after "code[erb-loud]:contains('toolbar/menu')" -->
+
+<%= render partial: 'chat/index' %>

data/app/overrides/toolbar/_profile/add_chat.html.erb.deface

@@ -0,0 +1,4 @@
+<!-- insert_after "code[erb-loud]:contains('toolbar/contacts')" -->
+
+<%= render partial: 'chat/index',
+           locals: { group: @group } %>

data/app/views/chat/_contacts.html.erb

@@ -15,4 +15,4 @@
         </a>
       </div>
   <%end%>
-</div>
+</div>

data/app/views/chat/_index.html.erb

@@ -1,77 +1,104 @@
-<% if current_user and current_user.chat_enabled and current_subject.subject_type=="User" %>
-	
+<% if current_user && current_user.chat_enabled %>
+
 <div id="chat_wrapper"> 
 
   <div id="chat_partial">    
   </div>
-	
-	<div id="chat_divs">  
-	  <div id="chat_div"></div>
-	</div>
-	
-	<div id="chat_connecting">
-	  <div class="block">
-      <div class="header">
-        <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
-        <div class="header_text">
-          <%=t('chat.connecting')%>
-        </div>
-      </div>
-    </div>
-	</div>
-	
-  <div id="chat_connection_off">
-    <div class="block">
-      <div class="header">
-        <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
-        <div class="header_text">
-          <p id="chat_header_title"><%=t('chat.disconnected')%></p>
-        </div>
-      </div>
+  
+  <div id="chat_divs">  
+    <div id="chat_div">
     </div>
+  </div>
+  
+  <section id="chat_connecting">
+    <header> 
+      <%=image_tag("chat-off.png", :class => "header_icon")%>
+      
+      <%=t('chat.connecting')%>
+    </header>
+  </section>
+  
+  <article id="chat_connection_off">
+    <header>
+      <%=image_tag("chat-off.png", :class => "header_icon")%>
+      <p id="chat_header_title">
+        <%=t('chat.disconnected')%>
+      </p>
+    </header>
+
     <div class="chat_off">
       <div id="passwordFormChat">
-        <label for="user_password" class="chatPasswordTitle"><%=t('chat.password')%></label>
-        <input id="user_password" class="chat_password" type="password"></input>
-      </div>
-      <input class="connectChatButton storePass" value="Connect">
-    </div>	
-	</div>
-	
-	<div id="chat_widgets">
-		<div class="block">
-      <div class="header">
-        <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
-        <div class="header_text">
-          <%=t('chat.title')%>
-        </div>
+        <label for="user_password" class="chatPasswordTitle">
+          <%=t('chat.password')%>
+        </label>
+        <input id="user_password" class="chat_password" type="password">
+        </input>
       </div>
+      <input type="submit" class="btn storePass connectChatButton" value="Connect">
+    </div>  
+  </article>
+  
+  <div id="chat_widgets">
+    <header>
+      <%=image_tag("chat-off.png", :class => "header_icon")%>
     
-	    <div id="status" class="dropdown">
-	      <dt><a href=""><span><%=t('chat.status.choose')%></span></a></dt>
-	      <dd>
-	        <ul id="statusList">
-	          <li><a id="available" href="#" class="option"><img class="flag" src="<%=image_path("status/available.png")%>" alt=""/> <%=t('chat.status.available')%> <span class="value">available</span></a></li>
-	          <li><a id="away" href="#" class="option"><img class="flag" src="<%=image_path("status/away.png")%>" alt=""/> <%=t('chat.status.away')%> <span class="value">away</span></a></li>
-	          <li><a id="dnd" href="#" class="option"><img class="flag" src="<%=image_path("status/dnd.png")%>" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
-	          <li><a id="offline" href="#" class="option"><img class="flag" src="<%=image_path("status/offline.png")%>" alt=""/> <%=t('chat.status.offline')%> <span class="value">offline</span></a></li>
-	        </ul>
-	      </dd>
-	    </div>
-						
-			<div class="searchChatContacts">
-			    <select id="search_chat_contact" class="flexselect">
-			      <option value="">""</option>
-			    </select>
-			</div>
-			
+      <%=t('chat.title')%>
+    </header>
+      
+    <div id="status" class="dropdown">
+      <dt>
+        <a href="">
+          <span>
+            <%=t('chat.status.choose')%>
+          </span>
+        </a>
+      </dt>
+      <dd>
+        <ul id="statusList">
+          <li>
+            <a id="available" href="#" class="option">
+              <span class="badge available">
+              </span>
+              <%=t('chat.status.available')%>
+            </a>
+          </li>
+          <li>
+            <a id="away" href="#" class="option">
+              <span class="badge away">
+              </span>
+              <%=t('chat.status.away')%> 
+            </a>
+          </li>
+          <li>
+            <a id="dnd" href="#" class="option">
+              <span class="badge dnd">
+              </span>
+              <%=t('chat.status.dnd')%> 
+            </a>
+          </li>
+          <li>
+            <a id="offline" href="#" class="option">
+              <span class="badge offline">
+              </span> 
+              <%=t('chat.status.offline')%> 
+            </a>
+          </li>
+        </ul>
+      </dd>
     </div>
-	</div>
-	
-	<div>
-		<div id="publisherID"></div>
-	</div>
-	
+      
+    <div class="searchChatContacts">
+      <select id="search_chat_contact" class="flexselect">
+        <option value="">
+          ""
+        </option>
+      </select>
+    </div>
+  </div>
+  <div>
+    <div id="publisherID">
+    </div>
+  </div>
 </div>
 
 
@@ -79,45 +106,50 @@
 
   //Global variables
   var cookie = "AuthenticationByCookie>>" + "<%=cookies[Rails.application.config.session_options[:key]]%>";
-	var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
-	var user_name = '<%=current_user.name%>';
+  var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
+  var user_name = '<%=current_user.name%>';
   var user_slug = '<%=current_user.slug%>';
   var user_jid = PRESENCE.XMPPClient.getJidFromSlug('<%=current_user.slug%>');
-	
+  
 
   $(document).ready(function () {
-			
-		//Inicial field
-		$("#chat_partial").html($("#chat_connecting").html())
-	
-    if((PRESENCE.PERSISTENCE.getRestoreUserChatStatus()!="offline")&&(cookie)){
-			PRESENCE.XMPPClient.connectToChat(user_jid,cookie);
-      initialTimer = setTimeout("PRESENCE.UIMANAGER.updateChatWindow()", 10000);
-    } else {
-      PRESENCE.UIMANAGER.updateChatWindow();
-    }
-      
-	  PRESENCE.CORE.init();
-  });
+    
+        //Inicial field
+        $("#chat_connecting").hide();
+        $("#chat_connection_off").hide();
+        $("#chat_widgets").hide();
+        $("#statusList").hide();
+        $("#chat_partial").html($("#chat_connecting").html())
+        
+        if((PRESENCE.PERSISTENCE.getRestoreUserChatStatus()!="offline")&&(cookie)){
+          if (PRESENCE.XMPPClient.authByCookie()) {
+            PRESENCE.XMPPClient.connectToChat(user_jid,cookie);
+          } else {
+            PRESENCE.XMPPClient.connectToChat(user_jid);
+          }
+          initialTimer = setTimeout("PRESENCE.UIMANAGER.updateChatWindow()", 10000);
+        } else {
+          PRESENCE.UIMANAGER.updateChatWindow();
+        }
+        
+        PRESENCE.CORE.init();
+      });
   
-</script>
+  </script>
 
-<% if defined?(flow)!=nil and flow %>
   <script type="text/javascript">
-	  $(document).ready(function () {
-		  PRESENCE.WINDOW.createMainChatBox();
-			PRESENCE.WINDOW.addContentToMainChatBox(PRESENCE.WINDOW.modifyChatPartialIfMainBox($("#chat_partial")));
-			$("#chat_wrapper").find("#chat_partial").remove();
-		});
-	</script>
-<% end %>
-
+  $(document).ready(function () {
+    PRESENCE.WINDOW.createMainChatBox();
+    PRESENCE.WINDOW.addContentToMainChatBox(PRESENCE.WINDOW.modifyChatPartialIfMainBox($("#chat_partial")));
+    $("#chat_wrapper").find("#chat_partial").remove();
+  });
+  </script>
 
-<% if defined?(group)!=nil and group %>
+  <% if defined?(group)!=nil and group %>
   <script type="text/javascript">
-  	var current_group_slug = '<%=group.slug%>';
+  var current_group_slug = '<%=group.slug%>';
   </script>
-<% end %>
+  <% end %>
 
 
-<% end %>
+  <% end %>

data/app/views/settings/_chat.html.erb

@@ -0,0 +1,23 @@
+<div id="chat_settings" class="accordion-group">
+  <header class="accordion-heading">
+    <h5>      
+      <%= link_to t('chat.title'),  "javascript:void(0);", class: 'accordion-toggle', "data-toggle" => 'collapse', "data-parent" => "#settings-accordion", "data-target" => "#chat_settings_content" %>
+    </h5>
+  </header>
+
+  <div class="content settings_content collapse" id="chat_settings_content">
+	  <%= form_tag(:controller => "Xmpp", :action => "updateSettings", :method => "get") do %>
+    <ul  class="settings_block">
+      <li>  
+        <% checked = current_user.chat_enabled %>
+        <%= check_box_tag 'enable_chat', true, checked %>
+        <%= label_tag(:enable_chat, t('chat.settings.checkbox')) %> 
+        <div class="actions center">
+          <%= hidden_field_tag :settings_section, :chat %>
+          <%= submit_tag t('chat.settings.update'), :class => "btn" %>
+        </div>
+      </li>
+    </ul>
+    <% end %>
+  </div>
+</div>

data/config/locales/en.yml

@@ -1,9 +1,9 @@
 en:
   chat:
-    connecting: "Chat Connecting"
-    reconnecting: "Chat Reconnecting"
-    disconnected: "Chat Disconnected"
-    unableconnect: "Chat Out of Service"
+    connecting: "Connecting"
+    reconnecting: "Reconnecting"
+    disconnected: "Disconnected"
+    unableconnect: "Out of Service"
     title: "Chat"
     password: "Password"
     zerousers: "No users connected"
@@ -64,4 +64,4 @@ en:
       finish: "{{name}} close the game"
       waiting: Waiting for response...
       unknown: Unknown response
-      clientIssue: "{{name}}'s client not support games"
+      clientIssue: "{{name}}'s client not support games"

data/config/locales/es.yml

@@ -1,9 +1,9 @@
 es:
   chat:
-    connecting: "Chat Conectando"
-    reconnecting: "Chat Reconectando"
-    disconnected: "Chat Desconectado"
-    unableconnect: "Chat Fuera de servicio"
+    connecting: "Conectando"
+    reconnecting: "Reconectando"
+    disconnected: "Desconectado"
+    unableconnect: "Fuera de servicio"
     title: "Chat"
     password: "Contraseña"
     zerousers: "No hay contactos conectados"
@@ -64,4 +64,4 @@ es:
       finish: "{{name}} ha cerrado el juego"
       waiting: Esperando respuesta...
       unknown: Respuesta desconocida
-      clientIssue: "El cliente de {{name}} no tiene juegos"
+      clientIssue: "El cliente de {{name}} no tiene juegos"

data/lib/generators/social_stream/presence/install_generator.rb

@@ -21,8 +21,7 @@ class SocialStream::Presence::InstallGenerator < Rails::Generators::Base
   end
 
   def require_stylesheets
-    inject_into_file 'app/assets/stylesheets/application.css',
-                     " *= require social_stream-presence\n",
-                     :before => ' *= require_tree .'
+    append_file 'app/assets/stylesheets/social_stream.css.sass',
+                "@import social_stream-presence\n"
   end
 end

data/lib/social_stream/presence/engine.rb

@@ -1,17 +1,6 @@
 module SocialStream
   module Presence
     class Engine < Rails::Engine
-      initializer "social_stream-presence.views.settings" do
-        SocialStream::Views::Settings.module_eval do
-          include SocialStream::Views::Settings::Presence
-        end
-      end
-
-      initializer "social_stream-presence.views.toolbar" do
-        SocialStream::Views::Toolbar.module_eval do
-          include SocialStream::Views::Toolbar::Presence
-        end
-      end
     end
   end
 end

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "1.1.0"
+    VERSION = "2.0.0.beta1"
   end
 end

data/lib/social_stream-presence.rb

@@ -1,16 +1,6 @@
 require 'social_stream-base'
 
 module SocialStream
-  module Views
-    module Settings
-      autoload :Presence, 'social_stream/views/settings/presence'
-    end
-
-    module Toolbar
-      autoload :Presence, 'social_stream/views/toolbar/presence'
-    end
-  end
-
   module Presence   
     autoload :VERSION, 'social_stream/presence/version'
 

data/social_stream-presence.gemspec

@@ -5,7 +5,7 @@ require "social_stream/presence/version"
 Gem::Specification.new do |s|
   s.name        = "social_stream-presence"
   s.version     = SocialStream::Presence::VERSION
-  s.authors     = ["Aldo Gordillo"]
+  s.authors     = ["Aldo Gordillo", "GING"]
   s.email       = ["agordillos@gmail.com"]
   s.homepage    = "https://github.com/ging/social_stream/wiki/Getting-Started-With-Social-Stream-Presence"
   s.summary = "Presence capabilities for Social Stream, the core for building social network websites."
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 1.1.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta1')
   
   s.add_runtime_dependency "xmpp4r"