social_stream 0.12.8 → 0.12.9

data/base/app/assets/stylesheets/header.css.scss

@@ -4,8 +4,8 @@
 #headerFront {	width: 100%;	padding: 0;	background: $header-color;  padding: 0px 0px 0px 0px;}
 #header_left {	left: 0px;	float: left;	padding-left: 15px; padding-right: 5px; width:155px;}
 #header_right {	right: 0px;	float: right; padding-right: 10px;  }
-.banner_top{	width: 960px;	margin-left: auto;	margin-right: auto;	margin-top: 0px;  padding-bottom: 0px;
-	position: relative; background: $header-color; }
+.banner_top{	width: 960px;	margin-left: auto;	margin-right: auto;	margin-top: 0px;
+	position: relative; background: $header-color; padding: 3px; }
 .banner_top_height{	height:23px;}
 
 /********** CONTENT ************/

data/base/app/controllers/conversations_controller.rb

@@ -50,7 +50,7 @@ class ConversationsController < ApplicationController
     else
       @receipts = @mailbox.receipts_for(@conversation).not_trash
     end
-    render :action => :show
+    redirect_to :action => :show
     @receipts.mark_as_read
 
   end

data/base/app/views/settings/_index.html.erb

@@ -16,3 +16,6 @@
 <% else %>
   <%= render :partial => 'destroy' %>
 <% end %>
+<% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
+  <%= render :partial => 'chat/settings' %>
+<% end %>

data/base/app/views/toolbar/_home.html.erb

@@ -8,7 +8,7 @@
 </div>
 
 <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
-  <%= render :partial => 'xmpp/chat' %>
+  <%= render :partial => 'chat/index' %>
 <% end %>
 
 <div class="block space_center">

data/base/config/locales/en.yml

@@ -91,7 +91,8 @@ en:
   comment:
     input: "Write a comment..."
     confirm_delete: "Delete comment?"
-    name: "a comment"
+    name: "comment"
+    one: "a comment"
     view_all: "View all comments"
   contact:
     all_n: "All contacts (%{count})"

data/base/config/locales/es.yml

@@ -91,7 +91,8 @@ es:
   comment:
     input: "Comentar..."
     confirm_delete: "¿Borrar commentario?"
-    name: "un comentario"
+    name: "comentario"
+    one: "un comentario"
     view_all: "Ver todos los comentarios"
   contact:
     all_n: "Todos los contactos (%{count})"
@@ -452,7 +453,7 @@ es:
     name: "Social Stream"
   subject:
     this_is_you: "¡Eres tú!"
-  sure: "¿Seguro?"
+  sure: "¿Confirmar?"
   time:
     ago: "hace %{time}"
   unknown: "Desconocido"

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.30".freeze
+    VERSION = "0.9.31".freeze
   end
 end

data/documents/config/locales/es.yml

@@ -44,7 +44,7 @@ es:
     not_mine: "Imágenes"
     one: "una imagen"
   repository:
-    title: "Archivos"
+    title: "Ficheros"
     order:
       by: "Ordenar por"
       last_modified: "Última modificación"

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.4.4".freeze
+    VERSION = "0.4.5".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.28')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.31')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.12.8".freeze
+  VERSION = "0.12.9".freeze
 end

data/presence/app/assets/javascripts/chat_audio.js

@@ -0,0 +1,73 @@
+////////////////////
+//Audio functions
+////////////////////
+
+//Global audio variables
+var onMessageAudio;
+
+var html5_audiotypes=[
+  ["mp3","audio/mpeg"],
+  //["mp4","audio/mp4"],
+  //["ogg","audio/ogg"],
+  ["wav","audio/wav"]
+]
+
+function initAudio(){
+  //Init all audio files
+  initSound("onMessageAudio");
+}
+
+function initSound(sound){
+  
+  //Check support for HTML5 audio
+  var html5audio=document.createElement('audio')
+  
+  if (html5audio.canPlayType){ 
+    path = 'assets/chat/' + sound;
+    window[sound] = new Audio();
+
+    for(i=0; i<html5_audiotypes.length; i++){
+      if (window[sound].canPlayType(html5_audiotypes[i][1])) {
+        var source= document.createElement('source');
+        source.type= html5_audiotypes[i][1];
+        source.src= path + '.' + html5_audiotypes[i][0];
+        window[sound].addEventListener('ended', endSoundListener);
+        window[sound].appendChild(source);
+      } 
+    }
+  } else {
+    //Browser doesn't support HTML5 audio
+  }
+}
+
+function endSoundListener(){ }
+
+function playSound(sound){
+  if (window[sound]!=null){
+    window[sound].play();
+  } else {
+    //Fallback option: When browser doesn't support HTML5 audio
+    $('body').append('<embed src="/' + sound + '.mp3" autostart="true" hidden="true" loop="false">');
+  }
+}
+
+function initAndPlaySound(sound){
+    initSound(sound);
+    playSound(sound);
+}
+
+
+function mustPlaySoundForChatWindow(chatBox){
+  //Deny conditions
+  if(userStatus == "dnd"){
+    return false;
+  }
+  
+  //Accept conditions
+  if (!chatFocus){
+    return true;
+  }
+  
+  //Default action
+  return false
+}

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

@@ -0,0 +1,197 @@
+////////////////////
+//Hash table
+////////////////////
+var statusIcons = new Array();
+statusIcons[''] = "available";
+statusIcons['chat'] = "available";
+statusIcons['away'] = "away";
+statusIcons['xa'] = "away";
+statusIcons['dnd'] = "dnd";
+
+
+////////////////////
+//Reconnect button interface functions
+////////////////////
+
+var connectButtonTimer;
+var periodBetweenAttempts=15; //(seg)
+var connectButtonTimerCounter=periodBetweenAttempts;
+
+function connectButtonTimerFunction(){
+	  if(connectButtonTimerCounter < periodBetweenAttempts){
+			connectButtonTimerCounter++;
+		} else if (connectButtonTimerCounter == periodBetweenAttempts) {
+			$("#chat_header_title").html('<%=I18n.t('chat.disconnected')%>')
+		}
+}
+
+function requestConnectToChat(){
+  if (connectButtonTimerCounter > (periodBetweenAttempts-1)) {
+    connectButtonTimerCounter=0; 
+		$("#chat_header_title").html('<%=I18n.t('chat.connecting')%>')
+    return true
+  } else {
+    return false
+  } 
+}
+
+
+////////////////////
+//Chat interface: Connection boxes
+////////////////////
+
+function setUserFunctions(){
+	
+	$("div.user_presence").click(function(event, ui){
+	  var guest_name = $(this).attr("name");
+	  var guest_slug = $(this).attr("slug");
+	  var guest_jid = guest_slug + "@" + domain;
+	  
+	  if (createChatBox(guest_slug, guest_name, guest_jid, user_name, user_jid)) {
+	  } else {
+	    window[getChatVariableFromSlug(guest_slug)].chatbox("option", "boxManager").toggleBox(true);
+	  };
+	});
+	
+	
+////////////////////
+//Chat interface: Status selector
+////////////////////
+
+	//JQuery DropdwanStatus
+	
+	$(".dropdown dt a").click(function(event) {
+	 	event.preventDefault();
+    $(".dropdown dd ul").toggle();
+  });
+          
+  $(".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);
+		$(".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();
+    }
+  });
+}
+
+
+////////////////////
+//Away Timer Management
+////////////////////
+
+function awayTimerFunction(){
+	  awayCounter++;
+	  if (awayCounter > (awayTime/awayTimerPeriod)){
+	    userStatus = "away";
+			sendStatus(userStatus);
+			clearTimeout(awayTimer);
+	  } else {
+	    userStatus = "chat";
+	  }
+}
+
+function resumeAwayTimerIfAway(){
+	  if (userStatus == "away"){
+			awayCounter = 0;
+			userStatus = "chat";
+			sendStatus(userStatus);
+			awayTimer = setInterval("awayTimerFunction()", awayTimerPeriod);
+		}
+}
+
+
+////////////////////
+//Update chatWindow Management
+////////////////////
+
+function timerFunction(){
+    timerCounter++;	
+		
+    if((timerCounter > cyclesToRefresh)&&(requestContacts)) {
+        requestContacts = false;
+        updateChatWindow();
+	  }
+}
+
+
+function refreshChatWindow(){  
+		if(timerCounter > cyclesToRefresh){
+			updateChatWindow();
+		} else {
+			requestContacts = true;
+		}
+}
+
+
+function updateChatWindow(){
+	timerCounter=0;
+	log("updateChatWindow()");
+  $.post("/chatWindow", { userConnected: userConnected }, function(data){
+			$(".tooltip").hide() //Prevent tooltips
+      $("#chat_partial").html(data);
+      if (userConnected) {
+        $(".user_presence a[title]").tooltip();
+        setUserFunctions();
+      }
+  });
+}
+
+function getConnectionBoxFromSlug(slug){
+	if ($('div.user_presence[slug=' + slug + ']').length > 0){
+		return ($('div.user_presence[slug=' + slug + ']'))[0];
+	}  else {
+		return null;
+	}
+}
+
+var cacheConnectedUsers = [];
+function hideConnectionBoxFromSlug(slug){
+  if ($('div.user_presence[slug=' + slug + ']').length > 0){
+    $('div.user_presence[slug=' + slug + ']').hide();
+		if(cacheConnectedUsers.indexOf(slug)==-1){
+		  cacheConnectedUsers.push(slug);
+		}
+  }
+}
+
+function showConnectionBoxFromSlug(slug){
+  if ($('div.user_presence[slug=' + slug + ']').length > 0){
+		if (!($('div.user_presence[slug=' + slug + ']').is(":visible"))){
+			 $('div.user_presence[slug=' + slug + ']').show();
+		}
+  }
+}
+
+function setUserIconStatus(slug, status){
+	 if (status in statusIcons) {
+   	 iconName = statusIcons[status];
+		 var $img_status = $('img.presence_status');
+		 connectionBox = getConnectionBoxFromSlug(slug);
+     $(connectionBox).find($img_status).attr("src", "/assets/status/" + iconName + ".png")
+   }
+}
+
+function getAllConnectedSlugs(){
+	connectedSlugs=[];
+  connectionBoxes = $('div.user_presence[slug]');
+	$.each(connectionBoxes, function(index, value) {
+	    if($(value).is(":visible")){
+	        connectedSlugs.push($(value).attr("slug"))
+	    }
+	});
+  return connectedSlugs
+}

data/presence/app/assets/javascripts/chat_parser.js

@@ -0,0 +1,243 @@
+////////////////////
+//Hash table
+////////////////////
+var chatIcons = new Array();
+chatIcons[':)'] = "face-smile.png";
+chatIcons[':('] = "face-sad.png";
+chatIcons['(B)'] = "beer.png";
+chatIcons['(C)'] = "clock.png";
+chatIcons['(P)'] = "present.png";
+chatIcons[':P']= "face-raspberry.png";
+chatIcons[':Z']= "face-tired.png";
+chatIcons['(R)']= "rain.png";
+chatIcons['(S)']= "sun.png";
+chatIcons[';)']= "face-wink.png";
+
+///////////////////////////////////////////////////////
+// Parser functions
+// Allow new features in chat msg like links, images, emoticons, ...
+///////////////////////////////////////////////////////
+
+//Patterns
+var html_tag_pattern=/.*\<[^>]+>.*/g
+var simple_word_pattern=/^[aA-zZ0-9]+$/g
+var http_urls_pattern=/(http(s)?:\/\/)([aA-zZ0-9%=_&+?])+([./-][aA-zZ0-9%=_&+?]+)*[/]?/g
+var www_urls_pattern = /(www[.])([aA-zZ0-9%=_&+?])+([./-][aA-zZ0-9%=_&+?]+)*[/]?/g
+var icons_a_pattern=/\([A-Z]\)/g
+var icons_b_pattern=/((:|;)([()A-Z]))/g
+var youtube_video_pattern=/(http(s)?:\/\/)?(((youtu.be\/)([aA-zZ0-9]+))|((www.youtube.com\/watch\?v=)([aA-z0-9Z&=.])+))/g
+
+
+function getParsedContent(content,fromUser){
+  if (fromUser){
+	 var chatTextclass = "ownChatText"
+	} else {
+	 var chatTextclass = "guestChatText"
+	}
+	return ("<span class=\"" + chatTextclass + "\">" + parseContent(content) +  "</span>");
+}
+
+
+function parseContent(content){
+  
+  if (content.match(html_tag_pattern)!=null){
+    content = content.replace(/>/g, "&gt;");
+    content = content.replace(/</g, "&lt;");
+    return "<pre>" + content + "</pre>"
+  }
+  
+  words = content.split(" ");
+  for(i=0; i<words.length; i++){
+    words[i] = parseWord(words[i]);
+  }
+
+  return words.join(" "); 
+}
+
+function parseWord(word){ 
+  
+  //Look for empty or simple words
+  if ((word.trim()=="")||(word.match(simple_word_pattern)!=null)){
+    return word
+  }
+
+  //Look for http urls
+  var http_urls = word.match(http_urls_pattern)
+  if (http_urls!=null){
+    var url = http_urls[0]
+    var type = getUrlType(url);
+  
+    switch(type){
+      case "link":
+        var link = buildUrlLink(url,url)
+        var subwords = splitFirst(word,url)
+        return parseWord(subwords[0]) + link + parseWord(subwords[1])
+      case "image":
+        var imageLink = buildImageLink(url);
+        var subwords = splitFirst(word,url)
+        return parseWord(subwords[0]) + imageLink + parseWord(subwords[1])
+      case "video-youtube":
+        var youtubeLink =  buildYoutubeVideoLink(url);
+        var subwords = splitFirst(word,url)
+        return parseWord(subwords[0]) + youtubeLink + parseWord(subwords[1])
+      default:
+        return word
+    }
+  }
+  
+
+  //Look for www urls
+  var www_urls = word.match(www_urls_pattern)
+  if (www_urls!=null){
+    var url = www_urls[0]
+    var type = getUrlType(url);
+
+    switch(type){
+    case "link":
+      var link = buildUrlLink("http://" + url,url)
+      var subwords = splitFirst(word,url)
+      return parseWord(subwords[0]) + link + parseWord(subwords[1])
+    case "image": 
+      var imageLink = buildImageLink("http://" + url);
+      var subwords = splitFirst(word,url)
+      return parseWord(subwords[0]) + imageLink + parseWord(subwords[1])
+    case "video-youtube":
+        var youtubeLink =  buildYoutubeVideoLink("http://" + url);
+        var subwords = splitFirst(word,url)
+        return parseWord(subwords[0]) + youtubeLink + parseWord(subwords[1])
+    default:
+      return word
+    }  
+  }
+
+  //Look for icons: Regex
+  var icons_a = word.match(icons_a_pattern)
+  if(icons_a!=null){
+    for(g=0; g<icons_a.length; g++){
+        word = word.replace(buildRegex(icons_a[g]), buildIconImage(icons_a[g]))
+    }
+  }
+
+  var icons_b = word.match(icons_b_pattern)
+  if(icons_b!=null){
+    for(h=0; h<icons_b.length; h++){
+        word = word.replace(buildRegex(icons_b[h]), buildIconImage(icons_b[h]))
+    }
+  }
+  
+  
+  //No special content detected (maybe emoticons but not special pattern like urls)
+  return word
+}
+
+function splitFirst(word,key){
+    split=[]  
+    cut = word.split(key);   
+    split[0]=cut[0]
+    cut.shift()
+    paste = cut.join(key)
+    split[1]=paste
+    return split
+}
+
+function buildIconImage(icon){
+  if (icon in chatIcons){
+    image_file = chatIcons[icon]
+    return "<img class=\"chatEmoticon\" src=\"assets/emoticons/" + image_file + "\"/>";
+  }
+  return icon
+}
+
+function buildUrlLink(url,name){
+  return "<a target=\"_blank\" class=\"chatLink\" href=\"" + url + "\">" + name + "</a>";
+}
+
+function buildImageLink(url){
+  return "<a target=\"_blank\" class=\"chatImageLink\" href=\"" + url + "\">" + "<img class=\"chatImage\" src=\"" + url + "\"/>" + "</a>";
+}
+
+function buildYoutubeVideoLink(url){
+  //Get youtube video id
+  var youtube_video_id=url.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0];
+  var youtube_api_url = "http://gdata.youtube.com/feeds/api/videos/" + youtube_video_id
+
+  //Get info from the video
+  $.ajax({
+        type: "GET",
+        url: youtube_api_url,
+        cache: false,
+        dataType:'jsonp',
+        success: function(data){
+					var url_name = url;
+					var youtube_video_thumbnail = "";
+					
+					//Video title
+					var video_title = $(data).find("media\\:title")
+					if (video_title.length > 0) {
+		  	   //url_name = url + " (" + $(video_title).text() + ")";
+					 url_name = $(video_title).text()
+		      }
+					
+					//Thumbnails
+          var thumbnails = $(data).find("media\\:thumbnail")
+          if (thumbnails.length>0){
+            var thumbnail_url = $(thumbnails[0]).attr("url")
+						if (thumbnail_url!=null){
+							youtube_video_thumbnail = "<p><img class=\"chatVideoImage\" src=\"" + thumbnail_url + "\"/></p>";
+						} 
+          }
+					
+					 //Replace video link
+					 $("a[youtube_id=" + youtube_video_id + "]").html(buildUrlLink(url,url_name)+youtube_video_thumbnail);
+      },
+        error: function(xOptions, textStatus){
+          //Handle errors
+        }
+   });
+
+  return "<a target=\"_blank\" youtube_id=\"" + youtube_video_id + "\" class=\"chatLink\" href=\"" + url + "\">" + url + "</a>";
+}
+
+function buildRegex(word){
+  word = word.replace(")","\\)")
+  word = word.replace("(","\\(")
+  var pattern = "(" + word + ")";
+  pattern = buildPattern(pattern)
+  return (new RegExp(pattern,'g'));
+}
+
+function buildPattern(pattern){
+  //Escape pattern special characters
+  pattern = pattern.replace("+","\\+")
+  pattern = pattern.replace("?","\\?")
+  return pattern
+}
+
+
+function getUrlType(url){
+
+  if (url.match(youtube_video_pattern)!=null){
+    return  "video-youtube"
+  }
+
+  var urlArray = url.split(".");
+  if (urlArray!=null && urlArray.length>0){
+    var extension= urlArray[urlArray.length-1]
+  } else {
+    var extension = null;
+  }
+
+  switch(extension){
+    case "jpg":
+      return "image"
+      break;
+    case "png":
+      return "image"
+      break;
+    case "gif":
+      return "image"
+      break;
+    default:
+      return "link"
+  }
+}