social_stream 0.12.14 → 0.13.0

data/linkser/vendor/assets/stylesheets/jquery.lightbox.css

@@ -0,0 +1,101 @@
+/**
+ * jQuery lightBox plugin
+ * This jQuery plugin was inspired and based on Lightbox 2 by Lokesh Dhakar (http://www.huddletogether.com/projects/lightbox2/)
+ * and adapted to me for use like a plugin from jQuery.
+ * @name jquery-lightbox-0.5.css
+ * @author Leandro Vieira Pinho - http://leandrovieira.com
+ * @version 0.5
+ * @date April 11, 2008
+ * @category jQuery plugin
+ * @copyright (c) 2008 Leandro Vieira Pinho (leandrovieira.com)
+ * @license CCAttribution-ShareAlike 2.5 Brazil - http://creativecommons.org/licenses/by-sa/2.5/br/deed.en_US
+ * @example Visit http://leandrovieira.com/projects/jquery/lightbox/ for more informations about this jQuery plugin
+ */
+#jquery-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 90;
+	width: 100%;
+	height: 500px;
+}
+#jquery-lightbox {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	z-index: 100;
+	text-align: center;
+	line-height: 0;
+}
+#jquery-lightbox a img { border: none; }
+#lightbox-container-image-box {
+	position: relative;
+	background-color: #fff;
+	width: 250px;
+	height: 250px;
+	margin: 0 auto;
+}
+#lightbox-container-image { padding: 10px; }
+#lightbox-loading {
+	position: absolute;
+	top: 40%;
+	left: 0%;
+	height: 25%;
+	width: 100%;
+	text-align: center;
+	line-height: 0;
+}
+#lightbox-nav {
+	position: absolute;
+	top: 0;
+	left: 0;
+	height: 100%;
+	width: 100%;
+	z-index: 10;
+}
+#lightbox-container-image-box > #lightbox-nav { left: 0; }
+#lightbox-nav a { outline: none;}
+#lightbox-nav-btnPrev, #lightbox-nav-btnNext {
+	width: 49%;
+	height: 100%;
+	zoom: 1;
+	display: block;
+}
+#lightbox-nav-btnPrev { 
+	left: 0; 
+	float: left;
+}
+#lightbox-nav-btnNext { 
+	right: 0; 
+	float: right;
+}
+#lightbox-container-image-data-box {
+	font: 10px Verdana, Helvetica, sans-serif;
+	background-color: #fff;
+	margin: 0 auto;
+	line-height: 1.4em;
+	overflow: auto;
+	width: 100%;
+	padding: 0 10px 0;
+}
+#lightbox-container-image-data {
+	padding: 0 10px; 
+	color: #666; 
+}
+#lightbox-container-image-data #lightbox-image-details { 
+	width: 70%; 
+	float: left; 
+	text-align: left; 
+}	
+#lightbox-image-details-caption { font-weight: bold; }
+#lightbox-image-details-currentNumber {
+	display: block; 
+	clear: left; 
+	padding-bottom: 1.0em;	
+}			
+#lightbox-secNav-btnClose {
+	width: 66px; 
+	float: right;
+	padding-bottom: 0.7em;	
+}

data/presence/app/assets/javascripts/chat_interface_manager.js.erb

@@ -1,6 +1,9 @@
 ////////////////////
 //Hash table
 ////////////////////
+
+//Keys: Xmpp status
+//Value: Social Stream Status
 var statusIcons = new Array();
 statusIcons[''] = "available";
 statusIcons['chat'] = "available";
@@ -63,29 +66,63 @@ function setUserFunctions(){
 	$(".dropdown dt a").click(function(event) {
 	 	event.preventDefault();
     $(".dropdown dd ul").toggle();
+		
+		if($(".dropdown dd ul").is(":visible")){
+			setStatusWidgetTitle("default");
+		} else {
+			setStatusWidgetTitle(userStatus);
+		}
+		
+		restartAwayTimer(false);
+		
   });
           
   $(".dropdown dd ul li a.option").click(function(event) { 
 	  event.preventDefault();
-		var text = $(this).html();
-    $(".dropdown dt a span").html(text);
-    userStatus = getSelectedValue("status");
-    sendStatus(userStatus);
+		userStatus = $(this).find("span.value").html();
+		if(userStatus == "offline"){
+			disconnectStrophe();
+		} else {
+			sendStatus(userStatus);
+		}
 		$(".dropdown dd ul").hide();
   });
   
-       
-  function getSelectedValue(id) {
-    return $("#" + id).find("dt a span.value").html();
-  }
   
   $(document).bind('click', function(e) {
     var $clicked = $(e.target);
     if (! $clicked.parents().hasClass("dropdown")){
       //Click outside the select...
         $(".dropdown dd ul").hide();
+				setStatusWidgetTitle(userStatus);
     }
   });
+	
+}
+
+function setStatusWidgetTitle(status){
+	
+	if ($(".dropdown dt a span").length == 0){
+		return;
+	}
+	
+	if(status=="default"){
+    var defaultTitle = '<%=I18n.t('chat.status.choose')%>'
+    $(".dropdown dt a span").html(defaultTitle);
+		return;
+  }
+	
+	if(status=="offline"){
+		var text = $("#" + status).html();
+    $(".dropdown dt a span").html(text);
+		return;
+	}
+	
+  if ((status in statusIcons)&&($("#" + statusIcons[status]).length > 0)) {		
+	  var text = $("#" + statusIcons[status]).html();
+    $(".dropdown dt a span").html(text);
+  }
+	 
 }
 
 
@@ -96,21 +133,32 @@ function setUserFunctions(){
 function awayTimerFunction(){
 	  awayCounter++;
 	  if (awayCounter > (awayTime/awayTimerPeriod)){
-	    userStatus = "away";
-			sendStatus(userStatus);
+			if (userStatus != "dnd") {
+	  	  userStatus = "away";
+	  	  sendStatus(userStatus);
+	    }
 			clearTimeout(awayTimer);
-	  } else {
-	    userStatus = "chat";
 	  }
 }
 
-function resumeAwayTimerIfAway(){
+function autochangeStatusOnUserAway(){
 	  if (userStatus == "away"){
-			awayCounter = 0;
-			userStatus = "chat";
-			sendStatus(userStatus);
+      userStatus = "chat";
+      sendStatus(userStatus);
+    }
+}
+
+function restartAwayTimer(autochangeStatus){
+		
+		if (awayCounter > (awayTime/awayTimerPeriod)){
 			awayTimer = setInterval("awayTimerFunction()", awayTimerPeriod);
+			
+			if(autochangeStatus){
+        autochangeStatusOnUserAway();
+      }
 		}
+		
+		awayCounter = 0;		
 }
 
 
@@ -144,6 +192,7 @@ function updateChatWindow(){
 			$(".tooltip").hide() //Prevent tooltips
       $("#chat_partial").html(data);
       if (userConnected) {
+				setStatusWidgetTitle(userStatus);
         $(".user_presence a[title]").tooltip();
         setUserFunctions();
       }

data/presence/app/assets/javascripts/xmpp_client_management.js.erb

@@ -135,7 +135,9 @@ function onConnect(status) {
    log('Strophe is disconnected.');
    userConnected = false;
 	 clearTimeout(awayTimer);
-   setTimeout ("onReconnect()", 3000);
+	 if(userStatus!="offline"){
+	 	setTimeout ("onReconnect()", 3000);
+	 }
   } else if (status == Strophe.Status.CONNECTED) {
    log('Strophe is connected.');
    log('Presenze stanza send for:' + connection.jid);
@@ -144,6 +146,7 @@ function onConnect(status) {
    //addHandler:(callback, namespace to match, stanza name, stanza type, stanza id , stanza from, options)
    sendStatus(userStatus);
    userConnected = true;
+	 userStatus = "chat";
    awayTimer = setInterval("awayTimerFunction()", awayTimerPeriod);
 	 timer = setInterval("timerFunction()", timerPeriod);
   }
@@ -170,6 +173,12 @@ function onReconnect(){
 	}
 }
 
+function disconnectStrophe(){
+	userStatus = "offline";
+	connection.send($pres({type: "unavailable"}).tree()); 
+	connection.disconnect();
+	setStatusWidgetTitle("offline");
+}
 
 ////////
 //Manage Message stanzas
@@ -198,7 +207,7 @@ function onMessage(msg) {
 //Manage Presence stanzas
 ///////
 function onPresence(presence) {
-	 
+	  
 	  //Check presence stanza type
 		ptype = $(presence).attr('type');
 				
@@ -258,7 +267,7 @@ function sendChatMessage(from,to,text){
     body.t(text);
     var message = $msg({to: to, from: from, type: 'chat'}).cnode(body.tree());
     connection.send(message.tree());	  	
-		resumeAwayTimerIfAway();
+		restartAwayTimer(false);
 		return true;
 }
 
@@ -275,5 +284,6 @@ function sendStatus(status){
       .c('show')
       .t(status);
        connection.send(pres.tree());
+			 setStatusWidgetTitle(status);
     }
 }

data/presence/app/controllers/xmpp_controller.rb

@@ -172,15 +172,12 @@ class XmppController < ApplicationController
     redirect_to :controller => :settings, :action => :index
   end
   
-  #TEST METHODS
+  
+  #Test Method
   def active_users
     @users = User.find_all_by_connected(true)
     @all_users = User.all
   end
-   
-  def test
-    #puts "TEST"
-  end
   
   
   private

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

@@ -1,4 +1,4 @@
-      <div>
+    <div>
       	
 			<div class="block">
 		    <div class="header">
@@ -12,9 +12,10 @@
 			    <dt><a href=""><span><%=t('chat.status.choose')%></span></a></dt>
 			    <dd>
 			        <ul>
-					      <li><a href="#" class="option"><img class="flag" src="assets/status/available.png" alt=""/> <%=t('chat.status.available')%> <span class="value">chat</span></a></li>
-					      <li><a href="#" class="option"><img class="flag" src="assets/status/away.png" alt=""/> <%=t('chat.status.away')%> <span class="value">away</span></a></li>
-					      <li><a href="#" class="option"><img class="flag" src="assets/status/dnd.png" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
+					      <li><a id="available" href="#" class="option"><img class="flag" src="assets/status/available.png" alt=""/> <%=t('chat.status.available')%> <span class="value">chat</span></a></li>
+					      <li><a id="away" href="#" class="option"><img class="flag" src="assets/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="assets/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="assets/status/offline.png" alt=""/> <%=t('chat.status.offline')%> <span class="value">offline</span></a></li>
 			        </ul>
 			    </dd>
         </div>
@@ -38,9 +39,9 @@
 				<% end %>
 			</div>
 			
-			</div>
+	  </div>
  	
-			<div id="chat_divs">	
-	      <div id="chat_div">
-	      </div>
-			</div>
+		<div id="chat_divs">	
+	    <div id="chat_div">
+	    </div>
+		</div>

data/presence/app/views/chat/_settings.html.erb

@@ -1,7 +1,7 @@
 <div class="block" id="chat_settings">
     <div class="header">
         <div class="header_text">
-             Chat
+             <%=t('chat.title')%>
         </div>
         <div class="header_icon_right">
           <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"chat_settings\");" %>
@@ -9,7 +9,7 @@
     </div>
     <div id="chat_settings_briefing" class="settings_briefing content">        
         <div class="form_row">
-            Enable and configure Social Stream Chat
+            <%=t('chat.settings.title')%>
         </div>
     </div>
     <div class="content settings_content" id="chat_settings_content" style="display:none;">
@@ -21,11 +21,11 @@
           <div class="form_sub_row">
             <% checked = current_user.chat_enabled %>
             <%= check_box_tag 'enable_chat', true, checked %>
-            <%= label_tag(:enable_chat, "Enable or disable Social Stream Chat") %> 
+            <%= label_tag(:enable_chat, t('chat.settings.checkbox')) %> 
           </div>
           <div class="actions center">
               <%= hidden_field_tag :settings_section, :chat %>
-              <%= submit_tag "Update Settings", :class => "button" %>
+              <%= submit_tag t('chat.settings.update'), :class => "button" %>
           </div>
         </div>
         </ul>

data/presence/app/views/xmpp/active_users.html.erb

@@ -1,33 +1,33 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Demo2</title>
+  <title>Social Stream Presence</title>
 </head>
 <body>
 
 
-<p> Usuarios conectados Social Stream </p>
+<p> Social Stream connected users </p>
 
 <p>&nbsp;</p>
 <ul>
-<%@users.each do |user| %>
-  <li><b><%=user.name%></b></li>
-<%end%>
+  <%@users.each do |user| %>
+    <li><b><%=user.name%></b></li>
+  <%end%>
  </ul>
 <p>&nbsp;</p>
 
 
-<p> Usuarios Social Stream </p>
+<p> All Social Stream users </p>
 
 <p>&nbsp;</p>
 <ul>
-<%@all_users.each do |user| %>
-  <li><b><%=user.slug%></b> with email: <%=user.email%></li>
-<%end%>
+  <%@all_users.each do |user| %>
+    <li><b><%=user.slug%></b> with email: <%=user.email%></li>
+  <%end%>
  </ul>
 <p>&nbsp;</p>
  
-<p> <a href="/test">Volver</a></p>
+<p> <a href="/test">Come back</a></p>
 
 </body>
 </html>

data/presence/config/locales/en.yml

@@ -8,4 +8,9 @@ en:
       choose: "Choose status"
       available: "Available"
       away: "Away"
-      dnd: "Busy"
+      dnd: "Busy"
+      offline: "Offline"
+    settings:
+      title: "Enable and configure Social Stream Chat"  
+      checkbox: "Enable or disable Social Stream Chat"  
+      update: "Update Settings"

data/presence/config/locales/es.yml

@@ -8,4 +8,10 @@ es:
       choose: "Establecer estado"
       available: "Disponible"
       away: "Ausente"
-      dnd: "No molestar"
+      dnd: "No molestar"
+      offline: "Desconectado"
+    settings:
+      title: "Activación y configuración del chat de Social Stream"
+      checkbox: "Activar o desactivar chat"  
+      update: "Guardar configuración"
+