social_stream-events 0.0.17 → 0.0.18

data/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/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/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/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/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/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/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)

data/app/views/agendas/_schedule.html.erb

@@ -1,8 +1,8 @@
 <div class="block row schedule">
 	<div class="session_wrapper1">
       <div class="event_date_image">
-        <div class="event_day"> <%= sanitize(@event.start_at.strftime("%d")) %> </div>
-        <div class="event_month"> <%= localize(@event.start_at, :format => "%b")%> </div>
+        <div class="event_day"> <%= sanitize(@event.initDate.strftime("%d")) %> </div>
+        <div class="event_month"> <%= localize(@event.initDate, :format => "%b")%> </div>
       </div>
 	</div>
 	<div class="session_wrapper2">

data/app/views/agendas/_show.html.erb

@@ -62,7 +62,7 @@
   <div id="tabs" class="widget content_size">
     <ul>
       <%for i in (1..@event.days)%>
-        <li><a href="#date<%=i%>"><%=(@event.start_at+(i-1).day).strftime("%A %d %b")%></a></li>
+        <li><a href="#date<%=i%>"><%=(@event.initDate+(i-1).day).strftime("%A %d %b")%></a></li>
       <%end%>
     </ul>
 

data/app/views/events/_event.html.erb

@@ -1,10 +1,10 @@
 <%= div_for event, :class => 'content_size' do %>
   Invites to <%=link_to(event.name, event)%> </br>
-  <% if !event.start_at.blank? %>
-    Since  <%= event.start_at.gmtime.to_s %>
+  <% if !event.initDate.blank? %>
+    Since  <%= event.initDate.gmtime.to_s %>
   <% end %>
-  <% if !event.end_at.blank? %>
-    until <%= event.end_at.gmtime.to_s %> 
+  <% if !event.endDate.blank? %>
+    until <%= event.endDate.gmtime.to_s %>
   <% end %>
 
 <% end %>

data/app/views/events/_sessions_edit.html.erb

@@ -11,11 +11,11 @@
     axisFormat: 'HH:mm',
     timeFormat: 'H:mm{ - H:mm}',
     slotMinutes: 15,  
-    year:<%= @event.start_at.strftime("%Y")%>,
-    month:<%= @event.start_at.month-1 %>,
-    date:<%= @event.start_at.strftime("%d")%>,
-    minTime: '<%= @event.start_at.hour.to_s + ':00' %>',
-    maxTime: '<%= (@event.end_at.hour + 1).to_s + ':00' %>',
+    year:<%= @event.initDate.strftime("%Y")%>,
+    month:<%= @event.initDate.month-1 %>,
+    date:<%= @event.initDate.strftime("%d")%>,
+    minTime: '<%= @event.initDate.hour.to_s + ':00' %>',
+    maxTime: '<%= (@event.endDate.hour + 1).to_s + ':00' %>',
     editable: true,
     defaultView: 'agendaDay',  
     selectHelper:true,
@@ -25,7 +25,7 @@
     select: function(startDate, endDate, allDay) {
         var title = prompt('Event Title:');
         if (title) {
-          $.post('<%= event_agenda_sessions_path(@event)%>', { session : {name: title, start_at: startDate + "", end_at: endDate + ""}});
+          $.post('<%= event_agenda_sessions_path(@event)%>', { session : {name: title, initDate: startDate + "", endDate: endDate + ""}});
           calendar.fullCalendar('renderEvent',
             {
               title: title,

data/app/views/events/new.html.erb

@@ -0,0 +1 @@
+evento new

data/app/views/sessions/_form.html.erb

@@ -19,19 +19,19 @@
   </div>
 
  <div class="form_row">
-    <%= label_tag :start_at%>
+    <%= label_tag :initDate%>
   </div>
   
   <div class="form_row">
-    <%= f.datetime_select :start_at %>
+    <%= f.datetime_select :initDate %>
   </div>
 
   <div class="form_row">
-    <%= label_tag :end_at%>
+    <%= label_tag :endDate%>
   </div>
   
   <div class="form_row">
-    <%= f.datetime_select :end_at %>
+    <%= f.datetime_select :endDate %>
   </div>
     <%= hidden_field_tag :id_event, @event.id %>
   <div class="form_row">

data/app/views/sessions/_new.html.erb

@@ -27,7 +27,7 @@
       <%=t('time.from')%>
     </div>
     <div class="form_field">
-      <%= f.datetime_select :start_at, {:start_year => Time.zone.now.year, :minute_step => Agenda::SLOT_VALUES[1], :default => Agenda.next_time_slot_for_drop_down + 2.hours} %>
+      <%= f.datetime_select :initDate, {:start_year => Time.zone.now.year, :minute_step => Agenda::SLOT_VALUES[1], :default => Agenda.next_time_slot_for_drop_down + 2.hours} %>
       <span class="needed"> (*)</span>
     </div>
   </div>
@@ -36,7 +36,7 @@
       <%=t('time.to')%>
     </div>
     <div class="form_field">
-      <%= f.datetime_select :end_at, {:start_year => Time.zone.now.year, :minute_step => Agenda::SLOT_VALUES[1], :default => Agenda.next_time_slot_for_drop_down + 2.hours + 30.minutes} %>
+      <%= f.datetime_select :endDate, {:start_year => Time.zone.now.year, :minute_step => Agenda::SLOT_VALUES[1], :default => Agenda.next_time_slot_for_drop_down + 2.hours + 30.minutes} %>
       <span class="needed"> (*)</span>
     </div>
   </div>

data/app/views/sessions/_show.html.erb

@@ -4,13 +4,13 @@
       <%=t('time.from').capitalize%>
 		</div>
 	  <div class="event_month">
-      <%=session.start_at.strftime("%H:%M") %>
+      <%=session.initDate.strftime("%H:%M") %>
     </div>
 		<div class="event_hour">
 			<%=t('time.to')%>
 		</div>
 		<div class="event_month">
-			<%=session.end_at.strftime("%H:%M") %>
+			<%=session.endDate.strftime("%H:%M") %>
 		</div>
 	</div>
 	<div class="session_wrapper2">

data/config/locales/en.yml

@@ -55,6 +55,8 @@ en:
     most:
       followed: "Most followed"
       liked: "Most liked"
+    name: "event"
+    one: "an event"
     other: "Events"
     suscribed: "Last Suscribed"
   frontpage:
@@ -74,6 +76,21 @@ en:
       sentence3: "Your contacts and relations"
   menu:
     outline: "Outline"
+  notification:
+    follow:
+      event: "%{sender} wants to take part in the event %{who}."
+    like:
+      event: "%{sender} likes %{whose} %{thing}."
+    makefriend:
+      event: "%{sender} accepted the invitation to join the event %{who}."
+    post:
+      event: "%{sender} added %{thing} in %{whose} wall."
+    update:
+      event: "%{sender} updated %{thing} in %{whose} wall."
+    who:
+      event: "%{name}"
+    whose:
+      event: "%{receiver}'s"
   profile:
     event:
       about: "About us"

data/config/locales/es.yml

@@ -55,6 +55,8 @@ es:
     most:
       followed: "Más seguidos"
       liked: "Me Gusta"
+    name: "evento"
+    one: "un evento"
     other: "Eventos"
     suscribed: "últimos suscritos"
   frontpage:
@@ -74,6 +76,21 @@ es:
       sentence3: "Sus contactos y relaciones"
   menu:
     outline: "Agenda"
+  notification:
+    follow:
+      event: "%{sender} quiere participar en el evento %{who}."
+    like:
+      event: "A %{sender} le gusta el %{thing} %{whose}."
+    makefriend:
+      event: "%{sender} aceptó la invitación para unirse al evento %{who}."
+    post:
+      event: "%{sender} añadió %{thing} en el muro %{whose}."
+    update:
+      event: "%{sender} actualizó %{thing} en el muro %{whose}."
+    who:
+      event: "%{name}"
+    whose:
+      event: "de %{receiver}'s"
   profile:
     event:
       about: "Acerca de"

data/db/migrate/20110910161707_create_social_stream_events.rb

@@ -4,8 +4,8 @@ class CreateSocialStreamEvents < ActiveRecord::Migration
 
   create_table :events do |t|
     t.references :actor
-    t.datetime :start_at
-    t.datetime :end_at
+    t.datetime :initDate
+    t.datetime :endDate
     t.integer :founder_id
     t.timestamps
   end
@@ -19,8 +19,8 @@ class CreateSocialStreamEvents < ActiveRecord::Migration
   create_table :sessions do |t|
     t.references :activity_object
     t.references :agenda
-    t.datetime :start_at
-    t.datetime :end_at
+    t.datetime :initDate
+    t.datetime :endDate
     t.string   :title
     t.string  :description
     t.timestamps

data/db/migrate/20111102145626_add_more_fields_to_events.rb

@@ -21,4 +21,4 @@ class AddMoreFieldsToEvents < ActiveRecord::Migration
     add_column :events, :other_participation_url, :text
     add_column :events, :web_interface, :int
   end
-end
+end

data/db/migrate/20111104165944_add_more_fields_to_sessions.rb

@@ -0,0 +1,13 @@
+class AddMoreFieldsToSessions < ActiveRecord::Migration
+
+  def change
+    add_column :sessions, :speakers, :string
+    add_column :sessions, :embedded_video, :text
+    add_column :sessions, :video_thumbnail, :text
+    add_column :sessions, :uid, :text
+    add_column :sessions, :cm_session_id, :int
+    add_column :sessions, :cm_streaming, :int, :default => false
+    add_column :sessions, :cm_recording, :int, :default => false
+  end
+
+end

data/db/migrate/20111104182420_add_details_to_events.rb

@@ -0,0 +1,44 @@
+class AddDetailsToEvents < ActiveRecord::Migration
+
+  def change
+    remove_column :events, :marte_event
+    remove_column :events, :spam
+    remove_column :events, :vc_mode
+    remove_column :events, :web_interface
+    add_column :events, :marte_event, :int, :default => false
+    add_column :events, :spam, :int, :default => false
+    add_column :events, :vc_mode, :int , :default => 0
+    add_column :events, :web_interface, :string, :default => false
+    add_column :events, :isabel_interface, :string, :default => false
+    add_column :events, :sip_interface, :string, :default => false
+    add_column :events, :streaming_by_default, :string, :default => true
+    add_column :events, :manual_configuration, :string, :default => false
+    add_column :events, :recording_type, :string, :default => 0
+
+    add_column :events, :isabel_bw, :text
+    add_column :events, :web_bw, :integer
+    add_column :events, :recording_bw, :integer
+
+
+
+=begin
+
+    add_column :events, :enable_httplivestreaming
+    add_column :events, :enable_httplivestreaming
+    add_column :events, :enable_httplivestreaming
+    add_column :events, :enable_httplivestreaming
+
+
+            :enable_httplivestreaming => "0",
+            :isabel_bw => isabel_bw,
+            :web_bw => WEB_BANDWIDTH[web_bw],
+            :recording_bw => RECORDING_BANDWIDTH[recording_bw],
+            :httplivestreaming_bw => WEB_BANDWIDTH[web_bw],
+            :web_codec => WEB_CODEC[web_bw],
+            :recording_codec => RECORDING_CODEC[recording_bw],
+            :path => "attachments/conferences/#{permalink}"
+
+=end
+  end
+
+end

data/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.0.17".freeze
+    VERSION = "0.0.18".freeze
   end
 end

data/social_stream-events.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.25')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.28')
   s.add_runtime_dependency('conference_manager-ruby', '~> 0.0.3')
 
   # Development Gem dependencies

data/vendor/assets/javascripts/jquery.ad-gallery.js

@@ -10,7 +10,7 @@
 (function($) {
   $.fn.adGallery = function(options) {
     var defaults = { loader_image: 'loader.gif',
-                     start_at_index: 0,
+                     initDate_index: 0,
                      description_wrapper: false,
                      thumb_opacity: 0.7,
                      animate_first_image: false,
@@ -202,22 +202,22 @@
       if(this.settings.enable_keyboard_move) {
         this.initKeyEvents();
       };
-      var start_at = parseInt(this.settings.start_at_index, 10);
+      var initDate = parseInt(this.settings.initDate_index, 10);
       if(window.location.hash && window.location.hash.indexOf('#ad-image') === 0) {
-        start_at = window.location.hash.replace(/[^0-9]+/g, '');
+        initDate = window.location.hash.replace(/[^0-9]+/g, '');
         // Check if it's a number
-        if((start_at * 1) != start_at) {
-          start_at = this.settings.start_at_index;
+        if((initDate * 1) != initDate) {
+          initDate = this.settings.initDate_index;
         };
       };
 
       this.loading(true);
-      this.showImage(start_at,
+      this.showImage(initDate,
         function() {
           // We don't want to start the slideshow before the image has been
           // displayed
           if(context.settings.slideshow.autostart) {
-            context.preloadImage(start_at + 1);
+            context.preloadImage(initDate + 1);
             context.slideshow.start();
           };
         }

data/vendor/assets/javascripts/jquery.ad-gallery.pack.js

@@ -7,4 +7,4 @@
  *
  * Demo and documentation: http://coffeescripter.com/code/ad-gallery/
  */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(8($){$.3n.3o=8(b){5 c={2s:\'Z.3p\',1W:0,1X:q,11:0.7,2t:q,1b:3q,v:q,x:q,2u:B,2v:B,1Y:0,t:{1c:B,1Z:q,1d:3r,2w:\'3s\',2x:\'3t\',20:B,2y:\'(\',2z:\')\',2A:q,2B:q},2C:\'21-2D\',2E:B,1z:B,1A:{1e:q,2F:q,2G:q}};5 d=$.2H(q,c,b);4(b&&b.t){d.t=$.2H(q,c.t,b.t)};4(!d.t.1c){d.t.1Z=q};5 e=[];$(3).2I(8(){5 a=1B 22(3,d);e[e.J]=a});w e};8 2J(a,b,c){5 d=12(a.u(\'Q\'),10);4(b==\'C\'){5 e=\'-\'+3.D+\'z\';a.u(\'Q\',3.D+\'z\')}y{5 e=3.D+\'z\';a.u(\'Q\',\'-\'+3.D+\'z\')};4(c){c.u(\'1f\',\'-\'+c[0].1C+\'z\');c.13({1f:0},3.r.1b*2)};4(3.R){3.R.13({1f:\'-\'+3.R[0].1C+\'z\'},3.r.1b*2)};w{1g:{Q:e},1h:{Q:d}}};8 2K(a,b,c){5 d=12(a.u(\'C\'),10);4(b==\'C\'){5 e=\'-\'+3.K+\'z\';a.u(\'C\',3.K+\'z\')}y{5 e=3.K+\'z\';a.u(\'C\',\'-\'+3.K+\'z\')};4(c){c.u(\'1f\',\'-\'+c[0].1C+\'z\');c.13({1f:0},3.r.1b*2)};4(3.R){3.R.13({1f:\'-\'+3.R[0].1C+\'z\'},3.r.1b*2)};w{1g:{C:e},1h:{C:d}}};8 2L(a,b,c){5 d=a.v();5 e=a.x();5 f=12(a.u(\'C\'),10);5 g=12(a.u(\'Q\'),10);a.u({v:0,x:0,Q:3.D/2,C:3.K/2});w{1g:{v:0,x:0,Q:3.D/2,C:3.K/2},1h:{v:d,x:e,Q:g,C:f}}};8 2M(a,b,c){a.u(\'S\',0);w{1g:{S:0},1h:{S:1}}};8 2N(a,b,c){a.u(\'S\',0);w{1g:{S:0},1h:{S:1},1d:0}};8 22(a,b){3.1e(a,b)};22.2O={17:q,T:q,1D:q,V:q,Z:q,1r:q,N:q,1E:q,1F:q,1i:q,1j:q,t:q,K:0,D:0,O:0,18:q,R:q,1G:0,r:q,G:q,1k:q,1H:q,1e:8(b,c){5 d=3;3.17=$(b);3.r=c;3.2P();3.2Q();4(3.r.v){3.K=3.r.v;3.T.v(3.r.v);3.17.v(3.r.v)}y{3.K=3.T.v()};4(3.r.x){3.D=3.r.x;3.T.x(3.r.x)}y{3.D=3.T.x()};3.1G=3.V.v();3.O=0;3.18=q;3.R=q;3.1k=q;3.2R();4(3.r.2u){3.2S()};5 e=8(a){w d.1I(a)};3.t=1B 23(e,3.r.t);3.L.F(3.t.2T());4(3.r.t.1c){3.t.1c()}y{3.t.24()};4(3.r.2v){3.2U()};4(3.r.2E){3.2V()};5 f=12(3.r.1W,10);4(25.26.27&&25.26.27.3u(\'#s-W\')===0){f=25.26.27.2W(/[^0-9]+/g,\'\');4((f*1)!=f){f=3.r.1W}};3.1J(B);3.1s(f,8(){4(d.r.t.1Z){d.14(f+1);d.t.1t()}});3.P(3.r.1A.1e)},2Q:8(){3.1H={\'21-3v\':2J,\'21-2D\':2K,\'3w\':2L,\'3x\':2M,\'3y\':2N}},2P:8(){3.L=3.17.E(\'.s-L\');3.1D=$(\'<p H="s-3z"></p>\');3.L.F(3.1D);3.T=3.17.E(\'.s-W-17\');3.T.3A();3.V=3.17.E(\'.s-V\');3.N=3.V.E(\'.s-3B\');3.1r=$(\'<A H="s-1r"></A>\');3.Z=$(\'<19 H="s-Z" 1K="\'+3.r.2s+\'">\');3.T.F(3.Z);3.Z.15();$(1L.3C).F(3.1r)},1J:8(a){4(a){3.Z.1l()}y{3.Z.15()}},3D:8(a,b){4($.28(b)){3.1H[a]=b}},2R:8(){5 f=3;3.G=[];5 g=0;5 h=0;5 j=3.N.E(\'a\');5 k=j.J;4(3.r.11<1){j.E(\'19\').u(\'S\',3.r.11)};j.2I(8(i){5 a=$(3);5 b=a.I(\'2X\');5 c=a.E(\'19\');4(!f.29(c[0])){c.2Y(8(){g+=3.1u.1u.2a;h++})}y{g+=c[0].1u.1u.2a;h++};a.1M(\'s-1N\'+i);a.1v(8(){f.1s(i);f.t.M();w q}).2Z(8(){4(!$(3).1w(\'.s-1m\')&&f.r.11<1){$(3).E(\'19\').1O(1P,1)};f.14(i)},8(){4(!$(3).1w(\'.s-1m\')&&f.r.11<1){$(3).E(\'19\').1O(1P,f.r.11)}});5 a=q;4(c.1n(\'s-1x\')){a=c.1n(\'s-1x\')}y 4(c.I(\'2b\')&&c.I(\'2b\').J){a=c.I(\'2b\')};5 d=q;4(c.1n(\'s-1o\')){d=c.1n(\'s-1o\')}y 4(c.I(\'2c\')&&c.I(\'2c\').J){d=c.I(\'2c\')};5 e=q;4(c.1n(\'s-U\')){e=c.1n(\'s-U\')}y 4(c.I(\'U\')&&c.I(\'U\').J){e=c.I(\'U\')};f.G[i]={1N:c.I(\'1K\'),W:b,2d:q,1p:q,1o:d,U:e,1q:q,1x:a}});5 l=2e(8(){4(k==h){f.V.E(\'.s-1N-3E\').u(\'v\',g+\'z\');1Q(l)}},3F)},2V:8(){5 a=3;$(1L).31(8(e){4(e.2f==39){a.1I();a.t.M()}y 4(e.2f==37){a.2g();a.t.M()}})},2S:8(){3.1i=$(\'<A H="s-2h"><A H="s-2h-W"></A></A>\');3.1j=$(\'<A H="s-32"><A H="s-32-W"></A></A>\');3.T.F(3.1i);3.T.F(3.1j);5 a=3;3.1j.33(3.1i).3G(8(e){$(3).u(\'x\',a.D);$(3).E(\'A\').1l()}).3H(8(e){$(3).E(\'A\').15()}).1v(8(){4($(3).1w(\'.s-2h\')){a.1I();a.t.M()}y{a.2g();a.t.M()}}).E(\'A\').u(\'S\',0.7)},2U:8(){5 c=3;3.1F=$(\'<A H="s-2i"></A>\');3.1E=$(\'<A H="s-3I"></A>\');3.V.F(3.1F);3.V.34(3.1E);5 d=0;5 e=q;$(3.1E).33(3.1F).1v(8(){5 a=c.1G-3J;4(c.r.1Y>0){5 a=c.r.1Y};4($(3).1w(\'.s-2i\')){5 b=c.N.1a()+a}y{5 b=c.N.1a()-a};4(c.r.t.20){c.t.M()};c.N.13({1a:b+\'z\'});w q}).u(\'S\',0.6).2Z(8(){5 b=\'C\';4($(3).1w(\'.s-2i\')){b=\'2j\'};e=2e(8(){d++;4(d>30&&c.r.t.20){c.t.M()};5 a=c.N.1a()+1;4(b==\'C\'){a=c.N.1a()-1};c.N.1a(a)},10);$(3).u(\'S\',1)},8(){d=0;1Q(e);$(3).u(\'S\',0.6)})},2k:8(){3.1D.2l((3.O+1)+\' / \'+3.G.J);4(!3.r.1z){3.1j.1l().u(\'x\',3.D);3.1i.1l().u(\'x\',3.D);4(3.O==(3.G.J-1)){3.1i.15()};4(3.O==0){3.1j.15()}};3.P(3.r.1A.2F)},35:8(a,b){4(b>3.D){5 c=a/b;b=3.D;a=3.D*c};4(a>3.K){5 c=b/a;a=3.K;b=3.K*c};w{v:a,x:b}},36:8(a,b,c){a.u(\'Q\',\'38\');4(c<3.D){5 d=3.D-c;a.u(\'Q\',(d/2)+\'z\')};a.u(\'C\',\'38\');4(b<3.K){5 d=3.K-b;a.u(\'C\',(d/2)+\'z\')}},3a:8(a){5 b=q;4(a.1o.J||a.U.J){5 c=\'\';4(a.U.J){c=\'<3b H="s-3c-U">\'+a.U+\'</3b>\'};5 b=\'\';4(a.1o.J){b=\'<16>\'+a.1o+\'</16>\'};b=$(\'<p H="s-W-3c">\'+c+b+\'</p>\')};w b},1s:8(a,b){4(3.G[a]&&!3.1k){5 c=3;5 d=3.G[a];3.1k=B;4(!d.1p){3.1J(B);3.14(a,8(){c.1J(q);c.2m(a,b)})}y{3.2m(a,b)}}},2m:8(a,b){4(3.G[a]){5 c=3;5 d=3.G[a];5 e=$(1L.3K(\'A\')).1M(\'s-W\');5 f=$(1B 3d()).I(\'1K\',d.W);4(d.1x){5 g=$(\'<a 2X="\'+d.1x+\'" 3L="3M"></a>\');g.F(f);e.F(g)}y{e.F(f)}3.T.34(e);5 h=3.35(d.1q.v,d.1q.x);f.I(\'v\',h.v);f.I(\'x\',h.x);e.u({v:h.v+\'z\',x:h.x+\'z\'});3.36(e,h.v,h.x);5 i=3.3a(d,e);4(i){4(!3.r.1X){e.F(i);5 j=h.v-12(i.u(\'3e-C\'),10)-12(i.u(\'3e-2j\'),10);i.u(\'v\',j+\'z\')}y{3.r.1X.F(i)}};3.3f(3.V.E(\'.s-1N\'+a));5 k=\'2j\';4(3.O<a){k=\'C\'};3.P(3.r.1A.2G);4(3.18||3.r.2t){5 l=3.r.1b;5 m=\'3N\';5 n=3.1H[3.r.2C].2n(3,e,k,i);4(1R n.1d!=\'1S\'){l=n.1d};4(1R n.3g!=\'1S\'){m=n.3g};4(3.18){5 o=3.18;5 p=3.R;o.13(n.1g,l,m,8(){o.3h();4(p)p.3h()})};e.13(n.1h,l,m,8(){c.O=a;c.18=e;c.R=i;c.1k=q;c.2k();c.P(b)})}y{3.O=a;3.18=e;c.R=i;3.1k=q;c.2k();3.P(b)}}},3i:8(){4(3.O==(3.G.J-1)){4(!3.r.1z){w q};5 a=0}y{5 a=3.O+1};w a},1I:8(a){5 b=3.3i();4(b===q)w q;3.14(b+1);3.1s(b,a);w B},3j:8(){4(3.O==0){4(!3.r.1z){w q};5 a=3.G.J-1}y{5 a=3.O-1};w a},2g:8(a){5 b=3.3j();4(b===q)w q;3.14(b-1);3.1s(b,a);w B},3O:8(){5 a=3;5 i=0;8 2o(){4(i<a.G.J){i++;a.14(i,2o)}};a.14(i,2o)},14:8(a,b){4(3.G[a]){5 c=3.G[a];4(!3.G[a].1p){5 d=$(1B 3d());d.I(\'1K\',c.W);4(!3.29(d[0])){3.1r.F(d);5 e=3;d.2Y(8(){c.1p=B;c.1q={v:3.v,x:3.x};e.P(b)}).2d(8(){c.2d=B;c.1p=q;c.1q=q})}y{c.1p=B;c.1q={v:d[0].v,x:d[0].x};3.P(b)}}y{3.P(b)}}},29:8(a){4(1R a.3k!=\'1S\'&&!a.3k){w q};4(1R a.3l!=\'1S\'&&a.3l==0){w q};w B},3f:8(a){3.N.E(\'.s-1m\').3m(\'s-1m\');a.1M(\'s-1m\');4(3.r.11<1){3.N.E(\'a:3P(.s-1m) 19\').1O(1P,3.r.11);a.E(\'19\').1O(1P,1)};5 b=a[0].1u.3Q;b-=(3.1G/2)-(a[0].2a/2);3.N.13({1a:b+\'z\'})},P:8(a){4($.28(a)){a.2n(3)}}};8 23(a,b){3.1e(a,b)};23.2O={1T:q,1U:q,X:q,L:q,r:q,2p:q,1y:q,Y:q,1V:q,1e:8(a,b){5 c=3;3.2p=a;3.r=b},2T:8(){3.1T=$(\'<16 H="s-t-1t">\'+3.r.2w+\'</16>\');3.1U=$(\'<16 H="s-t-M">\'+3.r.2x+\'</16>\');3.X=$(\'<16 H="s-t-X"></16>\');3.L=$(\'<A H="s-t-L"></A>\');3.L.F(3.1T).F(3.1U).F(3.X);3.X.15();5 a=3;3.1T.1v(8(){a.1t()});3.1U.1v(8(){a.M()});$(1L).31(8(e){4(e.2f==3R){4(a.Y){a.M()}y{a.1t()}}});w 3.L},24:8(){3.1y=q;3.M();3.L.15()},1c:8(){3.1y=B;3.L.1l()},3S:8(){4(3.1y){3.24()}y{3.1c()}},1t:8(){4(3.Y||!3.1y)w q;5 a=3;3.Y=B;3.L.1M(\'s-t-Y\');3.2q();3.P(3.r.2A);w B},M:8(){4(!3.Y)w q;3.Y=q;3.X.15();3.L.3m(\'s-t-Y\');1Q(3.1V);3.P(3.r.2B);w B},2q:8(){5 c=3;5 d=3.r.2y;5 e=3.r.2z;1Q(c.1V);3.X.1l().2l(d+(3.r.1d/2r)+e);5 f=0;3.1V=2e(8(){f+=2r;4(f>=c.r.1d){5 a=8(){4(c.Y){c.2q()};f=0};4(!c.2p(a)){c.M()};f=0};5 b=12(c.X.3T().2W(/[^0-9]/g,\'\'),10);b--;4(b>0){c.X.2l(d+b+e)}},2r)},P:8(a){4($.28(a)){a.2n(3)}}}})(3U);',62,243,'|||this|if|var|||function||||||||||||||||||false|settings|ad|slideshow|css|width|return|height|else|px|div|true|left|image_wrapper_height|find|append|images|class|attr|length|image_wrapper_width|controls|stop|thumbs_wrapper|current_index|fireCallback|top|current_description|opacity|image_wrapper|title|nav|image|countdown|running|loader||thumb_opacity|parseInt|animate|preloadImage|hide|span|wrapper|current_image|img|scrollLeft|animation_speed|enable|speed|init|bottom|old_image|new_image|next_link|prev_link|in_transition|show|active|data|desc|preloaded|size|preloads|showImage|start|parentNode|click|is|link|enabled|cycle|callbacks|new|offsetHeight|gallery_info|scroll_back|scroll_forward|nav_display_width|animations|nextImage|loading|src|document|addClass|thumb|fadeTo|300|clearInterval|typeof|undefined|start_link|stop_link|countdown_interval|start_at_index|description_wrapper|scroll_jump|autostart|stop_on_scroll|slide|AdGallery|AdGallerySlideshow|disable|window|location|hash|isFunction|isImageLoaded|offsetWidth|longdesc|alt|error|setInterval|keyCode|prevImage|next|forward|right|_afterShow|html|_showWhenLoaded|call|preloadNext|nextimage_callback|_next|1000|loader_image|animate_first_image|display_next_and_prev|display_back_and_forward|start_label|stop_label|countdown_prefix|countdown_sufix|onStart|onStop|effect|hori|enable_keyboard_move|afterImageVisible|beforeImageVisible|extend|each|VerticalSlideAnimation|HorizontalSlideAnimation|ResizeAnimation|FadeAnimation|NoneAnimation|prototype|setupElements|setupAnimations|findImages|initNextAndPrev|create|initBackAndForward|initKeyEvents|replace|href|load|hover||keydown|prev|add|prepend|_getContainedImageSize|_centerImage||0px||_getDescription|strong|description|Image|padding|highLightThumb|easing|remove|nextIndex|prevIndex|complete|naturalWidth|removeClass|fn|adGallery|gif|400|5000|Start|Stop|indexOf|vert|resize|fade|none|info|empty|thumbs|body|addAnimation|list|100|mouseover|mouseout|back|50|createElement|target|_blank|swing|preloadAll|not|offsetLeft|83|toggle|text|jQuery'.split('|'),0,{}))
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(8($){$.3n.3o=8(b){5 c={2s:\'Z.3p\',1W:0,1X:q,11:0.7,2t:q,1b:3q,v:q,x:q,2u:B,2v:B,1Y:0,t:{1c:B,1Z:q,1d:3r,2w:\'3s\',2x:\'3t\',20:B,2y:\'(\',2z:\')\',2A:q,2B:q},2C:\'21-2D\',2E:B,1z:B,1A:{1e:q,2F:q,2G:q}};5 d=$.2H(q,c,b);4(b&&b.t){d.t=$.2H(q,c.t,b.t)};4(!d.t.1c){d.t.1Z=q};5 e=[];$(3).2I(8(){5 a=1B 22(3,d);e[e.J]=a});w e};8 2J(a,b,c){5 d=12(a.u(\'Q\'),10);4(b==\'C\'){5 e=\'-\'+3.D+\'z\';a.u(\'Q\',3.D+\'z\')}y{5 e=3.D+\'z\';a.u(\'Q\',\'-\'+3.D+\'z\')};4(c){c.u(\'1f\',\'-\'+c[0].1C+\'z\');c.13({1f:0},3.r.1b*2)};4(3.R){3.R.13({1f:\'-\'+3.R[0].1C+\'z\'},3.r.1b*2)};w{1g:{Q:e},1h:{Q:d}}};8 2K(a,b,c){5 d=12(a.u(\'C\'),10);4(b==\'C\'){5 e=\'-\'+3.K+\'z\';a.u(\'C\',3.K+\'z\')}y{5 e=3.K+\'z\';a.u(\'C\',\'-\'+3.K+\'z\')};4(c){c.u(\'1f\',\'-\'+c[0].1C+\'z\');c.13({1f:0},3.r.1b*2)};4(3.R){3.R.13({1f:\'-\'+3.R[0].1C+\'z\'},3.r.1b*2)};w{1g:{C:e},1h:{C:d}}};8 2L(a,b,c){5 d=a.v();5 e=a.x();5 f=12(a.u(\'C\'),10);5 g=12(a.u(\'Q\'),10);a.u({v:0,x:0,Q:3.D/2,C:3.K/2});w{1g:{v:0,x:0,Q:3.D/2,C:3.K/2},1h:{v:d,x:e,Q:g,C:f}}};8 2M(a,b,c){a.u(\'S\',0);w{1g:{S:0},1h:{S:1}}};8 2N(a,b,c){a.u(\'S\',0);w{1g:{S:0},1h:{S:1},1d:0}};8 22(a,b){3.1e(a,b)};22.2O={17:q,T:q,1D:q,V:q,Z:q,1r:q,N:q,1E:q,1F:q,1i:q,1j:q,t:q,K:0,D:0,O:0,18:q,R:q,1G:0,r:q,G:q,1k:q,1H:q,1e:8(b,c){5 d=3;3.17=$(b);3.r=c;3.2P();3.2Q();4(3.r.v){3.K=3.r.v;3.T.v(3.r.v);3.17.v(3.r.v)}y{3.K=3.T.v()};4(3.r.x){3.D=3.r.x;3.T.x(3.r.x)}y{3.D=3.T.x()};3.1G=3.V.v();3.O=0;3.18=q;3.R=q;3.1k=q;3.2R();4(3.r.2u){3.2S()};5 e=8(a){w d.1I(a)};3.t=1B 23(e,3.r.t);3.L.F(3.t.2T());4(3.r.t.1c){3.t.1c()}y{3.t.24()};4(3.r.2v){3.2U()};4(3.r.2E){3.2V()};5 f=12(3.r.1W,10);4(25.26.27&&25.26.27.3u(\'#s-W\')===0){f=25.26.27.2W(/[^0-9]+/g,\'\');4((f*1)!=f){f=3.r.1W}};3.1J(B);3.1s(f,8(){4(d.r.t.1Z){d.14(f+1);d.t.1t()}});3.P(3.r.1A.1e)},2Q:8(){3.1H={\'21-3v\':2J,\'21-2D\':2K,\'3w\':2L,\'3x\':2M,\'3y\':2N}},2P:8(){3.L=3.17.E(\'.s-L\');3.1D=$(\'<p H="s-3z"></p>\');3.L.F(3.1D);3.T=3.17.E(\'.s-W-17\');3.T.3A();3.V=3.17.E(\'.s-V\');3.N=3.V.E(\'.s-3B\');3.1r=$(\'<A H="s-1r"></A>\');3.Z=$(\'<19 H="s-Z" 1K="\'+3.r.2s+\'">\');3.T.F(3.Z);3.Z.15();$(1L.3C).F(3.1r)},1J:8(a){4(a){3.Z.1l()}y{3.Z.15()}},3D:8(a,b){4($.28(b)){3.1H[a]=b}},2R:8(){5 f=3;3.G=[];5 g=0;5 h=0;5 j=3.N.E(\'a\');5 k=j.J;4(3.r.11<1){j.E(\'19\').u(\'S\',3.r.11)};j.2I(8(i){5 a=$(3);5 b=a.I(\'2X\');5 c=a.E(\'19\');4(!f.29(c[0])){c.2Y(8(){g+=3.1u.1u.2a;h++})}y{g+=c[0].1u.1u.2a;h++};a.1M(\'s-1N\'+i);a.1v(8(){f.1s(i);f.t.M();w q}).2Z(8(){4(!$(3).1w(\'.s-1m\')&&f.r.11<1){$(3).E(\'19\').1O(1P,1)};f.14(i)},8(){4(!$(3).1w(\'.s-1m\')&&f.r.11<1){$(3).E(\'19\').1O(1P,f.r.11)}});5 a=q;4(c.1n(\'s-1x\')){a=c.1n(\'s-1x\')}y 4(c.I(\'2b\')&&c.I(\'2b\').J){a=c.I(\'2b\')};5 d=q;4(c.1n(\'s-1o\')){d=c.1n(\'s-1o\')}y 4(c.I(\'2c\')&&c.I(\'2c\').J){d=c.I(\'2c\')};5 e=q;4(c.1n(\'s-U\')){e=c.1n(\'s-U\')}y 4(c.I(\'U\')&&c.I(\'U\').J){e=c.I(\'U\')};f.G[i]={1N:c.I(\'1K\'),W:b,2d:q,1p:q,1o:d,U:e,1q:q,1x:a}});5 l=2e(8(){4(k==h){f.V.E(\'.s-1N-3E\').u(\'v\',g+\'z\');1Q(l)}},3F)},2V:8(){5 a=3;$(1L).31(8(e){4(e.2f==39){a.1I();a.t.M()}y 4(e.2f==37){a.2g();a.t.M()}})},2S:8(){3.1i=$(\'<A H="s-2h"><A H="s-2h-W"></A></A>\');3.1j=$(\'<A H="s-32"><A H="s-32-W"></A></A>\');3.T.F(3.1i);3.T.F(3.1j);5 a=3;3.1j.33(3.1i).3G(8(e){$(3).u(\'x\',a.D);$(3).E(\'A\').1l()}).3H(8(e){$(3).E(\'A\').15()}).1v(8(){4($(3).1w(\'.s-2h\')){a.1I();a.t.M()}y{a.2g();a.t.M()}}).E(\'A\').u(\'S\',0.7)},2U:8(){5 c=3;3.1F=$(\'<A H="s-2i"></A>\');3.1E=$(\'<A H="s-3I"></A>\');3.V.F(3.1F);3.V.34(3.1E);5 d=0;5 e=q;$(3.1E).33(3.1F).1v(8(){5 a=c.1G-3J;4(c.r.1Y>0){5 a=c.r.1Y};4($(3).1w(\'.s-2i\')){5 b=c.N.1a()+a}y{5 b=c.N.1a()-a};4(c.r.t.20){c.t.M()};c.N.13({1a:b+\'z\'});w q}).u(\'S\',0.6).2Z(8(){5 b=\'C\';4($(3).1w(\'.s-2i\')){b=\'2j\'};e=2e(8(){d++;4(d>30&&c.r.t.20){c.t.M()};5 a=c.N.1a()+1;4(b==\'C\'){a=c.N.1a()-1};c.N.1a(a)},10);$(3).u(\'S\',1)},8(){d=0;1Q(e);$(3).u(\'S\',0.6)})},2k:8(){3.1D.2l((3.O+1)+\' / \'+3.G.J);4(!3.r.1z){3.1j.1l().u(\'x\',3.D);3.1i.1l().u(\'x\',3.D);4(3.O==(3.G.J-1)){3.1i.15()};4(3.O==0){3.1j.15()}};3.P(3.r.1A.2F)},35:8(a,b){4(b>3.D){5 c=a/b;b=3.D;a=3.D*c};4(a>3.K){5 c=b/a;a=3.K;b=3.K*c};w{v:a,x:b}},36:8(a,b,c){a.u(\'Q\',\'38\');4(c<3.D){5 d=3.D-c;a.u(\'Q\',(d/2)+\'z\')};a.u(\'C\',\'38\');4(b<3.K){5 d=3.K-b;a.u(\'C\',(d/2)+\'z\')}},3a:8(a){5 b=q;4(a.1o.J||a.U.J){5 c=\'\';4(a.U.J){c=\'<3b H="s-3c-U">\'+a.U+\'</3b>\'};5 b=\'\';4(a.1o.J){b=\'<16>\'+a.1o+\'</16>\'};b=$(\'<p H="s-W-3c">\'+c+b+\'</p>\')};w b},1s:8(a,b){4(3.G[a]&&!3.1k){5 c=3;5 d=3.G[a];3.1k=B;4(!d.1p){3.1J(B);3.14(a,8(){c.1J(q);c.2m(a,b)})}y{3.2m(a,b)}}},2m:8(a,b){4(3.G[a]){5 c=3;5 d=3.G[a];5 e=$(1L.3K(\'A\')).1M(\'s-W\');5 f=$(1B 3d()).I(\'1K\',d.W);4(d.1x){5 g=$(\'<a 2X="\'+d.1x+\'" 3L="3M"></a>\');g.F(f);e.F(g)}y{e.F(f)}3.T.34(e);5 h=3.35(d.1q.v,d.1q.x);f.I(\'v\',h.v);f.I(\'x\',h.x);e.u({v:h.v+\'z\',x:h.x+\'z\'});3.36(e,h.v,h.x);5 i=3.3a(d,e);4(i){4(!3.r.1X){e.F(i);5 j=h.v-12(i.u(\'3e-C\'),10)-12(i.u(\'3e-2j\'),10);i.u(\'v\',j+\'z\')}y{3.r.1X.F(i)}};3.3f(3.V.E(\'.s-1N\'+a));5 k=\'2j\';4(3.O<a){k=\'C\'};3.P(3.r.1A.2G);4(3.18||3.r.2t){5 l=3.r.1b;5 m=\'3N\';5 n=3.1H[3.r.2C].2n(3,e,k,i);4(1R n.1d!=\'1S\'){l=n.1d};4(1R n.3g!=\'1S\'){m=n.3g};4(3.18){5 o=3.18;5 p=3.R;o.13(n.1g,l,m,8(){o.3h();4(p)p.3h()})};e.13(n.1h,l,m,8(){c.O=a;c.18=e;c.R=i;c.1k=q;c.2k();c.P(b)})}y{3.O=a;3.18=e;c.R=i;3.1k=q;c.2k();3.P(b)}}},3i:8(){4(3.O==(3.G.J-1)){4(!3.r.1z){w q};5 a=0}y{5 a=3.O+1};w a},1I:8(a){5 b=3.3i();4(b===q)w q;3.14(b+1);3.1s(b,a);w B},3j:8(){4(3.O==0){4(!3.r.1z){w q};5 a=3.G.J-1}y{5 a=3.O-1};w a},2g:8(a){5 b=3.3j();4(b===q)w q;3.14(b-1);3.1s(b,a);w B},3O:8(){5 a=3;5 i=0;8 2o(){4(i<a.G.J){i++;a.14(i,2o)}};a.14(i,2o)},14:8(a,b){4(3.G[a]){5 c=3.G[a];4(!3.G[a].1p){5 d=$(1B 3d());d.I(\'1K\',c.W);4(!3.29(d[0])){3.1r.F(d);5 e=3;d.2Y(8(){c.1p=B;c.1q={v:3.v,x:3.x};e.P(b)}).2d(8(){c.2d=B;c.1p=q;c.1q=q})}y{c.1p=B;c.1q={v:d[0].v,x:d[0].x};3.P(b)}}y{3.P(b)}}},29:8(a){4(1R a.3k!=\'1S\'&&!a.3k){w q};4(1R a.3l!=\'1S\'&&a.3l==0){w q};w B},3f:8(a){3.N.E(\'.s-1m\').3m(\'s-1m\');a.1M(\'s-1m\');4(3.r.11<1){3.N.E(\'a:3P(.s-1m) 19\').1O(1P,3.r.11);a.E(\'19\').1O(1P,1)};5 b=a[0].1u.3Q;b-=(3.1G/2)-(a[0].2a/2);3.N.13({1a:b+\'z\'})},P:8(a){4($.28(a)){a.2n(3)}}};8 23(a,b){3.1e(a,b)};23.2O={1T:q,1U:q,X:q,L:q,r:q,2p:q,1y:q,Y:q,1V:q,1e:8(a,b){5 c=3;3.2p=a;3.r=b},2T:8(){3.1T=$(\'<16 H="s-t-1t">\'+3.r.2w+\'</16>\');3.1U=$(\'<16 H="s-t-M">\'+3.r.2x+\'</16>\');3.X=$(\'<16 H="s-t-X"></16>\');3.L=$(\'<A H="s-t-L"></A>\');3.L.F(3.1T).F(3.1U).F(3.X);3.X.15();5 a=3;3.1T.1v(8(){a.1t()});3.1U.1v(8(){a.M()});$(1L).31(8(e){4(e.2f==3R){4(a.Y){a.M()}y{a.1t()}}});w 3.L},24:8(){3.1y=q;3.M();3.L.15()},1c:8(){3.1y=B;3.L.1l()},3S:8(){4(3.1y){3.24()}y{3.1c()}},1t:8(){4(3.Y||!3.1y)w q;5 a=3;3.Y=B;3.L.1M(\'s-t-Y\');3.2q();3.P(3.r.2A);w B},M:8(){4(!3.Y)w q;3.Y=q;3.X.15();3.L.3m(\'s-t-Y\');1Q(3.1V);3.P(3.r.2B);w B},2q:8(){5 c=3;5 d=3.r.2y;5 e=3.r.2z;1Q(c.1V);3.X.1l().2l(d+(3.r.1d/2r)+e);5 f=0;3.1V=2e(8(){f+=2r;4(f>=c.r.1d){5 a=8(){4(c.Y){c.2q()};f=0};4(!c.2p(a)){c.M()};f=0};5 b=12(c.X.3T().2W(/[^0-9]/g,\'\'),10);b--;4(b>0){c.X.2l(d+b+e)}},2r)},P:8(a){4($.28(a)){a.2n(3)}}}})(3U);',62,243,'|||this|if|var|||function||||||||||||||||||false|settings|ad|slideshow|css|width|return|height|else|px|div|true|left|image_wrapper_height|find|append|images|class|attr|length|image_wrapper_width|controls|stop|thumbs_wrapper|current_index|fireCallback|top|current_description|opacity|image_wrapper|title|nav|image|countdown|running|loader||thumb_opacity|parseInt|animate|preloadImage|hide|span|wrapper|current_image|img|scrollLeft|animation_speed|enable|speed|init|bottom|old_image|new_image|next_link|prev_link|in_transition|show|active|data|desc|preloaded|size|preloads|showImage|start|parentNode|click|is|link|enabled|cycle|callbacks|new|offsetHeight|gallery_info|scroll_back|scroll_forward|nav_display_width|animations|nextImage|loading|src|document|addClass|thumb|fadeTo|300|clearInterval|typeof|undefined|start_link|stop_link|countdown_interval|initDate_index|description_wrapper|scroll_jump|autostart|stop_on_scroll|slide|AdGallery|AdGallerySlideshow|disable|window|location|hash|isFunction|isImageLoaded|offsetWidth|longdesc|alt|error|setInterval|keyCode|prevImage|next|forward|right|_afterShow|html|_showWhenLoaded|call|preloadNext|nextimage_callback|_next|1000|loader_image|animate_first_image|display_next_and_prev|display_back_and_forward|start_label|stop_label|countdown_prefix|countdown_sufix|onStart|onStop|effect|hori|enable_keyboard_move|afterImageVisible|beforeImageVisible|extend|each|VerticalSlideAnimation|HorizontalSlideAnimation|ResizeAnimation|FadeAnimation|NoneAnimation|prototype|setupElements|setupAnimations|findImages|initNextAndPrev|create|initBackAndForward|initKeyEvents|replace|href|load|hover||keydown|prev|add|prepend|_getContainedImageSize|_centerImage||0px||_getDescription|strong|description|Image|padding|highLightThumb|easing|remove|nextIndex|prevIndex|complete|naturalWidth|removeClass|fn|adGallery|gif|400|5000|Start|Stop|indexOf|vert|resize|fade|none|info|empty|thumbs|body|addAnimation|list|100|mouseover|mouseout|back|50|createElement|target|_blank|swing|preloadAll|not|offsetLeft|83|toggle|text|jQuery'.split('|'),0,{}))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-events
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - Diego Carrera
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 +01:00
+date: 2011-11-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,12 +28,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
         - 0
         - 9
-        - 25
-        version: 0.9.25
+        - 28
+        version: 0.9.28
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -230,6 +230,7 @@ files:
 - app/views/events/index.html.erb
 - app/views/events/manage.html.erb
 - app/views/events/manage.js.erb
+- app/views/events/new.html.erb
 - app/views/events/show.html.erb
 - app/views/frontpage/_caracteristics.html.erb
 - app/views/frontpage/index.html.erb
@@ -253,6 +254,8 @@ files:
 - config/routes.rb
 - db/migrate/20110910161707_create_social_stream_events.rb
 - db/migrate/20111102145626_add_more_fields_to_events.rb
+- db/migrate/20111104165944_add_more_fields_to_sessions.rb
+- db/migrate/20111104182420_add_details_to_events.rb
 - lib/generators/social_stream/events/install_generator.rb
 - lib/social_stream-events.rb
 - lib/social_stream/events/engine.rb