social_stream 0.12.4 → 0.12.5

data/base/spec/factories/activity.rb

@@ -1,7 +1,32 @@
+# Helpers for building the post activity
+#
+class ActivityObjectSpecHelper < ActiveRecord::Base
+  set_table_name "activity_objects"
+end
+
+class PostSpecHelper < ActiveRecord::Base
+  set_table_name "posts"
+
+  belongs_to :activity_object_spec_helper, :foreign_key => "activity_object_id"
+end
+
+Factory.define :activity_object_spec_helper do |a|
+  a.object_type "Post"
+end
+
+Factory.define :post_spec_helper do |p|
+  p.association :activity_object_spec_helper
+  p.text "Post spec helper"
+end
+
+#
+## End of helpers
+
 Factory.define :activity do |a|
   a.contact { Factory(:friend).contact }
   a.activity_verb { ActivityVerb["post"] }
   a.relation_ids  { |b| Array(b.sender.relation_custom('friend').id) }
+  a.activity_object_ids { Array(Factory(:post_spec_helper).activity_object_spec_helper.id) }
 end
 
 Factory.define :self_activity, :parent => :activity do |a|

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

@@ -49,14 +49,18 @@ showAllDocumentComments = function(id){
   $("#"+id).children(".hide_show_comments").hide();
 };
 
-toggleDocumentEdit = function(){
-  if($("#document_edit").css("display")=="none"){
-    $("#document_edit").show("slow");
-    $("#document_edit_action").addClass("selected");
-    
-  }else{
-    $("#document_edit").hide("slow");
-    $("#document_edit_action").removeClass("selected");
+
+toggleDocumentMenu = function(name){
+  $(".document_menu").each(function(){
+    console.log($(this));
+    if($(this).css("display")!="none"){
+      $(this).slideToggle("slow");
+      $("#" + $(this).attr('id') + "_action").removeClass("selected");
+    }
+  });
+  if($("#document_" + name).css("display")=="none"){
+    $("#document_" + name).slideToggle("slow");
+    $("#document_" + name + "_action").addClass("selected");    
   }
 }
 

data/documents/app/assets/stylesheets/show.css.scss

@@ -35,6 +35,7 @@
 #document_info .right{
   float: right;
   margin-right: 30px; 
+  text-align: right;
 }
 #document_info .left{
   float: left;
@@ -56,8 +57,10 @@
   width: 16px;
   height: 16px;
 }
-
-#document_edit {
+#document_details {
+  padding: 10px 0px;
+}
+#document_edit, #document_details {
   margin: 5px 5px 0px 5px;
   border: thin solid $separation-color;
   background: $secondary-color;

data/documents/app/views/common/_document_info.html.erb

@@ -1,37 +1,43 @@
 <div id="document_info">
-  <div class="left">
-    <div id="date_labels">
-      <div class="details">
-        <%= t('document.info.date.created_at') %>
-      </div>
-      <div class="details">
-        <%= t('document.info.date.updated_at') %>
-      </div>
-    </div>
-    <div id="dates">
-      <div class="date">
-        <%= I18n.localize document.created_at, :format => :long %>
-      </div>
-      <div class="date">
-        <%= I18n.localize document.updated_at, :format => :long %>
-      </div>
-    </div>
-  </div>
-  <div class="right">
-    <div id="like_count">
-      <%= document.like_count %> <span class="details">likes</span>
-    </div>
-  </div>
-  <br class="clearfloat" />
   <div id="actions">
+    <%= link_to content_tag(:span,image_tag("btn/btn_write.png") + t('document.actions.details'), :class => :action, :id => :document_details_action), "javascript:toggleDocumentMenu('details');" %>
     <%= link_to content_tag(:span,image_tag("btn/download.png") + t('document.actions.download'), :class => :action), download_document_path(document) %>
     <% if document.post_activity.edit_object_by?(current_subject) %>
-      <%= link_to content_tag(:span,image_tag("btn/edit.png") + t('document.actions.edit'), :class => :action, :id => :document_edit_action), "javascript:toggleDocumentEdit();" %>
+    <%= link_to content_tag(:span,image_tag("btn/edit.png") + t('document.actions.edit'), :class => :action, :id => :document_edit_action), "javascript:toggleDocumentMenu('edit');" %>
     <% end %>
     <% if document.post_activity.delete_object_by?(current_subject) %>
-      <%= link_to content_tag(:span,image_tag("btn/error.png") + t('document.actions.delete'), :class => :action), document.post_activity.direct_object , :confirm => t('confirm_delete',
-        :scope => document.post_activity.direct_object.class.to_s.underscore), :method => :delete %>
+    <%= link_to content_tag(:span,image_tag("btn/error.png") + t('document.actions.delete'), :class => :action), document.post_activity.direct_object , :confirm => t('confirm_delete',
+      :scope => document.post_activity.direct_object.class.to_s.underscore), :method => :delete %>
     <% end %>
   </div>
+  <div id="document_details" class="document_menu" style="display:none;">
+    <div class="left">
+      <div id="date_labels">
+        <div class="details">
+          <%= t('document.info.date.created_at') %>
+        </div>
+        <div class="details">
+          <%= t('document.info.date.updated_at') %>
+        </div>
+      </div>      
+      <div id="dates">
+        <div class="date">
+          <%= I18n.localize document.created_at, :format => :long %>
+        </div>
+        <div class="date">
+          <%= I18n.localize document.updated_at, :format => :long %>
+        </div>
+      </div>
+    </div>
+    <div class="right">
+      <div id="like_count">
+        <%= document.like_count %> <span class="details">likes</span>
+      </div>      
+      <div id="file_size">
+        <span class="details">Size </span> <%= number_to_human_size document.file_file_size %>
+      </div>
+    </div>
+    <br class="clearfloat" />
+  </div>
 </div>
-<%= render :partial => "common/edit_form", :locals => {:document => document} %>
+<%= render :partial => "common/edit_form", :locals => {:document => document} %> 

data/documents/app/views/common/_edit_form.html.erb

@@ -1,4 +1,4 @@
-<div class="block" id="document_edit" style="display:none;">
+<div class="block document_menu" id="document_edit"  style="display:none;">
   <%= form_for(document, :html => { :method => :put }) do |f| %>
   <% if document and document.errors.any? %>
   <%= javascript_tag do %>
@@ -51,7 +51,7 @@
 <% if params[:editing].present? and params[:editing].eql?"true" and document.post_activity.edit_object_by?(current_subject) %>
   <%= javascript_tag do %>
     $(document).ready(function(){
-      toggleDocumentEdit();
+      toggleDocumentMenu('edit');
     });
   <% end %>
 <% end %>

data/documents/config/locales/en.yml

@@ -4,11 +4,14 @@ en:
     title: "Audios"
     mine: "My audios"
     msg: "Uploaded an audio:"
+    name: "audio"
     not_mine: "Audios"
+    one: "an audio"
     processing: "Processing audio clip"
   document:
     actions:
       delete: "Delete"
+      details: "Details"
       download: "Download"
       edit: "Edit"
     all: "All documents"
@@ -27,7 +30,9 @@ en:
         title: "Title"
     mine: "My documents"
     msg: "Uploaded a document:"
+    name: "file"
     not_mine: "Documents"
+    one: "a file"
     simple_all: "All"  
     title: "Documents"
   picture:
@@ -35,9 +40,11 @@ en:
     title: "Pictures"
     mine: "My pictures"  
     msg: "Uploaded a picture:"
+    name: "picture"
     not_mine: "Pictures"
+    one: "a picture"
   repository:
-    title: "Repository"
+    title: "Files"
     order:
       by: "Order by"
       last_modified: "Last modified"
@@ -45,7 +52,7 @@ en:
   resource:
     all: "All Resources"
     confirm_delete: "Delete resource?"
-    title: "Repository"
+    title: "Files"
     mine: "My resources"
     msg: "Uploaded a resource:"
     not_mine: "Resources"
@@ -53,6 +60,8 @@ en:
     confirm_delete: "Delete video?"
     title: "Videos"
     mine: "My videos"  
-    msg: "Uploaded a video:" 
+    msg: "Uploaded a video:"
+    name: "video" 
     not_mine: "Videos"
+    one: "a video"
     processing: "Processing video"

data/documents/config/locales/es.yml

@@ -4,11 +4,14 @@ es:
     title: "Audios"
     mine: "Mis audios"
     msg: "Subió un audio:"
+    name: "archivo de audio"
     not_mine: "Audios"
+    one: "un archivo de audio"
     processing: "Procesando fichero de audio..."
   document:
     actions:
       delete: "Borrar"
+      details: "Detalles"
       download: "Descargar"
       edit: "Editar"
     all: "Todos los documentos"
@@ -27,7 +30,9 @@ es:
         title: "Título"
     mine: "Mis documentos"
     msg: "Subió un documento:"
+    name: "documento"
     not_mine: "Documentos"
+    one: "un documento"
     simple_all: "Todos"
     title: "Documentos"
   picture:
@@ -35,9 +40,11 @@ es:
     title: "Imágenes"
     mine: "Mis imágenes"
     msg: "Subió una imagen:"
+    name: "imagen"
     not_mine: "Imágenes"
+    one: "una imagen"
   repository:
-    title: "Repositorio"
+    title: "Archivos"
     order:
       by: "Ordenar por"
       last_modified: "Última modificación"
@@ -45,7 +52,7 @@ es:
   resource:
     all: "Todos los recursos"
     confirm_delete: "¿Borrar recursos?"
-    title: "Repositorio"
+    title: "Archivos"
     mine: "Mis recursos"
     msg: "Subió un recurso:"
     not_mine: "Recursos"
@@ -54,5 +61,7 @@ es:
     title: "Vídeos"
     mine: "Mis vídeos"  
     msg: "Subió un vídeo:"
+    name: "vídeo"
     not_mine: "Vídeos"
+    one: "un vídeo"
     processing: "Procesando vídeo..."

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.4.3".freeze
+    VERSION = "0.4.4".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.27')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.28')
   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/events/app/assets/javascripts/schedule.js

@@ -7,8 +7,8 @@ function createSessionEvent(title, start, end, event_id,receiver){
         data:
     'session[title]='+title+
     '&session[_contact_id]='+receiver+
-		'&session[start_at]='+start.toString().substring(0, 24)+
-		'&session[end_at]='+end.toString().substring(0, 24)+
+		'&session[initDate]='+start.toString().substring(0, 24)+
+		'&session[endDate]='+end.toString().substring(0, 24)+
 		'&event_id='+event_id,
         dataType: 'script',
         type: 'POST',
@@ -81,9 +81,9 @@ function deleteSession(session_id, delete_all){
 function dateScheduleAvailable(start, end, allDay){
 	return $('#calendar').fullCalendar('clientEvents', function(session)
 	{
-		if ((session.start_at < start && start < session.end_at) ||
-		    (session.start_at < end && end < session.end_at) ||
-		    (compareDate(session.start_at, start) && (session.allDay || allDay))
+		if ((session.initDate < start && start < session.endDate) ||
+		    (session.initDate < end && end < session.endDate) ||
+		    (compareDate(session.initDate, start) && (session.allDay || allDay))
 		   )
 			{
 				return true;
@@ -95,17 +95,17 @@ function dateScheduleAvailable(start, end, allDay){
 function dateAvailable(start, end, allDay){
 	return $('#calendar').fullCalendar('clientEvents', function(session)
 	{
-		if (session.start_at < start && start < session.end_at)
+		if (session.initDate < start && start < session.endDate)
 			return true;
-		else if (session.start_at < end && end < session.end_at)
+		else if (session.initDate < end && end < session.endDate)
 			return true;
-    else if (session.start_at > start && (session.end_at && session.end_at < end))
+    else if (session.initDate > start && (session.endDate && session.endDate < end))
       return true;
-		else if (compareDateWithMinutes(session.start_at, start))
+		else if (compareDateWithMinutes(session.initDate, start))
 			return true;
-		else if (session.end_at && compareDateWithMinutes(session.end_at, end))
+		else if (session.endDate && compareDateWithMinutes(session.endDate, end))
 			return true;
-		else if (compareDate(session.start_at, start) && (session.allDay || allDay))
+		else if (compareDate(session.initDate, start) && (session.allDay || allDay))
 			return true;
 		else
 			return false;

data/events/app/controllers/agendas_controller.rb

@@ -25,8 +25,8 @@ class AgendasController < InheritedResources::Base
       sessions << {:id => session.id,
                    :title => session.title,
                    :description => session.description || "Some cool description here...",
-                   :start => "#{session.start_at.iso8601}",
-                   :end => "#{session.end_at.iso8601}",
+                   :start => "#{session.initDate.iso8601}",
+                   :end => "#{session.endDate.iso8601}",
                    :allDay => false,
                    :recurring =>  false,
                    :editable => true

data/events/app/controllers/events_controller.rb

@@ -15,14 +15,11 @@ class EventsController < InheritedResources::Base
         self.current_subject = @event
         redirect_to [current_subject, :profile]
       }
-
     end
-
   end
 
   def edit
     @event = Event.find(params[:id])
-
   end
 
   def index
@@ -77,7 +74,6 @@ class EventsController < InheritedResources::Base
 
   def set_founder
     return unless user_signed_in?
-
     params[:event]            ||= {}
     params[:event][:_founder] ||= current_subject.slug
   end

data/events/app/controllers/sessions_controller.rb

@@ -8,6 +8,7 @@ class SessionsController < InheritedResources::Base
 
   end
 
+
   def edit
     @event= Event.find_by_id(params[:id_event])
     @session= Session.find_by_id(params[:id])
@@ -21,16 +22,16 @@ class SessionsController < InheritedResources::Base
     @session.update_attributes(params[:session])
 #    @session = Session.new (params[:session])
 #    @session.save
-    if @event.start_at.nil?
-      @event.start_at = @session.start_at
-      @event.end_at =   @session.end_at
+    if @event.initDate.nil?
+      @event.initDate = @session.initDate
+      @event.endDate =   @session.endDate
       @event.save
     else
-      if @event.start_at > @session.start_at
-        @event.start_at = @session.start_at
+      if @event.initDate > @session.initDate
+        @event.initDate = @session.initDate
       end
-      if @event.end_at <  @session.end_at
-        @event.end_at =  @session.end_at
+      if @event.endDate <  @session.endDate
+        @event.endDate =  @session.endDate
       end
       @event.save
     end
@@ -41,18 +42,30 @@ class SessionsController < InheritedResources::Base
     @event = Event.find_by_id(params[:event_id])
     params[:session][:agenda_id]=@event.agenda.id
     @session = Session.new (params[:session])
-    @session.save
 
-    if @event.start_at.nil?
-      @event.start_at = @session.start_at
-      @event.end_at =   @session.end_at
+    # default configuration for VC server
+    @event.vc_mode = Event::VC_MODE.index(:in_person)
+    @session.cm_streaming = @event.streaming_by_default # this param is to set streamming url for vc-event
+    @session.cm_recording = true   #this param is only true if recording is automatic
+
+    #debugger
+
+    begin
+      @session.save
+    rescue StandardError => e
+      @session.errors[:base]<<(e.to_s)
+    end
+
+    if @event.initDate.nil?
+      @event.initDate = @session.initDate
+      @event.endDate =   @session.endDate
       @event.save
     else
-      if @event.start_at > @session.start_at
-        @event.start_at = @session.start_at
+      if @event.initDate > @session.initDate
+        @event.initDate = @session.initDate
       end
-      if @event.end_at <  @session.end_at
-        @event.end_at =  @session.end_at
+      if @event.endDate <  @session.endDate
+        @event.endDate =  @session.endDate
       end
       @event.save
     end
@@ -70,21 +83,21 @@ class SessionsController < InheritedResources::Base
   def move
     @session = Session.find_by_id(params[:id])
     if @session
-      @session.start_at = (params[:minute_delta].to_i).minutes.from_now((params[:day_delta].to_i).days.from_now(@session.start_at))
-      @session.end_at = (params[:minute_delta].to_i).minutes.from_now((params[:day_delta].to_i).days.from_now(@session.end_at))
+      @session.initDate = (params[:minute_delta].to_i).minutes.from_now((params[:day_delta].to_i).days.from_now(@session.initDate))
+      @session.endDate = (params[:minute_delta].to_i).minutes.from_now((params[:day_delta].to_i).days.from_now(@session.endDate))
       @session.save
     end
 
-    if @event.start_at.nil?
-      @event.start_at = @session.start_at
-      @event.end_at =  @session.end_at
+    if @event.initDate.nil?
+      @event.initDate = @session.initDate
+      @event.endDate =  @session.endDate
       @event.save
     else
-      if @event.start_at > @session.start_at
-        @event.start_at = @session.start_at
+      if @event.initDate > @session.initDate
+        @event.initDate = @session.initDate
       end
-      if @event.end_at < @session.end_at
-        @event.end_at = @session.end_at
+      if @event.endDate < @session.endDate
+        @event.endDate = @session.endDate
       end
       @event.save
     end
@@ -95,7 +108,7 @@ class SessionsController < InheritedResources::Base
   def resize
     @session = Session.find(params[:id])
     if @session
-      @session.end_at = (params[:minute_delta].to_i).minutes.from_now((params[:day_delta].to_i).days.from_now(@session.end_at))
+      @session.endDate = (params[:minute_delta].to_i).minutes.from_now((params[:day_delta].to_i).days.from_now(@session.endDate))
       @session.save
     end
   end
@@ -104,18 +117,18 @@ class SessionsController < InheritedResources::Base
   def destroy
     @session = Session.find(params[:id])
     @event = @session.event
-    start_at=@session.start_at
-    end_at=@session.end_at
+    initDate=@session.initDate
+    endDate=@session.endDate
     @session.destroy
 
-    if !@event.start_at.nil?
-      if start_at < @event.start_at
-        #changing the start_at of the event
-        @event.start_at = @event.sessions.order("start_at ASC").map{|x| x.start_at}.first
+    if !@event.initDate.nil?
+      if initDate < @event.initDate
+        #changing the initDate of the event
+        @event.initDate = @event.sessions.order("initDate ASC").map{|x| x.initDate}.first
       end
-      if end_at > @event.end_at
-        #changing the end_at of the event
-        @event.end_at = @event.sessions.order("end_at DESC").map{|x| x.end_at}.first
+      if endDate > @event.endDate
+        #changing the endDate of the event
+        @event.endDate = @event.sessions.order("endDate DESC").map{|x| x.endDate}.first
       end
       @event.save
     end    

data/events/app/models/agenda.rb

@@ -19,22 +19,22 @@ class Agenda < ActiveRecord::Base
 
 
   def start_date
-    event.start_at
+    event.initDate
   end
 
   def end_date
-    event.end_at
+    event.endDate
   end
 
   def getSessions(id,time_start,time_end)
-    @sessions = sessions.where( "start_at >= '#{time_start.to_formatted_s(:db)}' AND
-                             end_at  <= '#{time_end.to_formatted_s(:db)}' ")
+    @sessions = sessions.where( "initDate >= '#{time_start.to_formatted_s(:db)}' AND
+                             endDate  <= '#{time_end.to_formatted_s(:db)}' ")
   end
 
   def contents_for_day(i)
 
       @sessions = sessions.where(
-                "start_at >= :day_start AND start_at < :day_end", {:day_start => start_date.to_date + (i-1).day,
+                "initDate >= :day_start AND initDate < :day_end", {:day_start => start_date.to_date + (i-1).day,
                 :day_end => start_date.to_date + i.day})
 
 

data/events/app/models/event.rb

@@ -1,6 +1,6 @@
 class Event < ActiveRecord::Base
   include SocialStream::Models::Subject
-  acts_as_conference_manager_event
+  #acts_as_conference_manager_event
 
   has_one :agenda, :dependent => :destroy
   has_many :sessions, :through => :agenda
@@ -15,9 +15,12 @@ class Event < ActiveRecord::Base
   after_create :create_agenda
 
   scope :live_events, lambda { 
-  where("events.start_at <= ? AND events.end_at > ?", Time.zone.now, Time.zone.now)
+  where("events.initDate <= ? AND events.endDate > ?", Time.zone.now, Time.zone.now)
   }
-  
+
+  VC_MODE = [:in_person, :telemeeting, :teleconference, :teleclass]
+  RECORDING_TYPE = [:automatic, :manual, :none]
+
   #acts_as_conference_manager_event
   def profile!
     actor!.profile || actor!.build_profile
@@ -57,7 +60,7 @@ class Event < ActiveRecord::Base
 
   def days
     if has_date?
-      (end_at.to_date - start_at.to_date).to_i + 1
+      (endDate.to_date - initDate.to_date).to_i + 1
     else
       return 0
     end
@@ -66,7 +69,7 @@ class Event < ActiveRecord::Base
   #method to know if this event is happening now
   def is_happening_now?
      #first we check if start date is past and end date is future
-     if has_date? && start_at.past? && end_at.future?
+     if has_date? && initDate.past? && endDate.future?
        true
      else
        return false
@@ -84,7 +87,7 @@ class Event < ActiveRecord::Base
      if is_happening_now?
        #now we check the sessions
        agenda.agenda_entries.each do |session|
-         return entry if entry.start_at.past? && entry.end_time.future?
+         return entry if entry.initDate.past? && entry.end_time.future?
        end
      end
      return nil
@@ -92,41 +95,47 @@ class Event < ActiveRecord::Base
 
   #method to know if an event happens in the future
   def future?
-    return has_date? && start_at.future?
+    return has_date? && initDate.future?
   end
 
 
   #method to know if an event happens in the past
   def past?
-    return has_date? && end_at.past?
+    return has_date? && endDate.past?
   end
 
 
   def has_date?
-    start_at
+    initDate
+  end
+
+  def isabel_bw
+    256
   end
 
   def get_formatted_date
     has_date? ?
-    I18n::localize(start_at, :format => "%A, %d %b %Y #{I18n::translate('date.at')} %H:%M. #{get_formatted_timezone}") :
+    I18n::localize(initDate, :format => "%A, %d %b %Y #{I18n::translate('date.at')} %H:%M. #{get_formatted_timezone}") :
     I18n::t('date.undefined')
   end
 
   def get_formatted_day
     has_date? ?
-    I18n::localize(start_at, :format => "%A, %d %b %Y #{I18n::translate('date.at')} %H:%M. #{get_formatted_timezone}") :
+    I18n::localize(initDate, :format => "%A, %d %b %Y #{I18n::translate('date.at')} %H:%M. #{get_formatted_timezone}") :
     I18n::t('date.undefined')
   end
 
   def get_formatted_timezone
     has_date? ?
-      "#{Time.zone.name} (#{start_at.zone}, GMT #{start_at.formatted_offset})" :
+      "#{Time.zone.name} (#{initDate.zone}, GMT #{initDate.formatted_offset})" :
     I18n::t('date.undefined')
   end
 
   #method to get the starting hour of an event in the correct format
   def get_formatted_hour
-    has_date? ? start_at.strftime("%H:%M") : I18n::t('date.undefined')
+    has_date? ? initDate.strftime("%H:%M") : I18n::t('date.undefined')
   end
 
+
+
 end

data/events/app/models/session.rb

@@ -9,7 +9,7 @@ class Session < ActiveRecord::Base
 
   acts_as_conference_manager_session
   def to_fullcalendar_json
-    "{title: '#{name}', start: new Date(#{start_at.year},#{start_at.month-1},#{start_at.day},#{start_at.hour},#{start_at.min}),end: new Date(#{end_at.year},#{end_at.month-1},#{end_at.day},#{end_at.hour},#{end_at.min}),allDay: false}"
+    "{title: '#{name}', start: new Date(#{initDate.year},#{initDate.month-1},#{initDate.day},#{initDate.hour},#{initDate.min}),end: new Date(#{endDate.year},#{endDate.month-1},#{endDate.day},#{endDate.hour},#{endDate.min}),allDay: false}"
   end
 
   def sanitize_for_fullcalendar(string)