social_stream 0.9.7 → 0.10.0

data/events/app/controllers/settings_controller.rb

@@ -1,70 +0,0 @@
-	class SettingsController < InheritedResources::Base
-
-  respond_to :html, :js
-  #before_filter :authenticate_user!
-  def show
-
-  end 
-
-  def manage
-
-#	@cs_ = Actor.joins('INNER JOIN contacts ON contacts.receiver_id = actors.id INNER JOIN ties ON ties.contact_id = contacts.id INNER JOIN relations ON relations.id = ties.relation_id').where(:subject_type => ['User', 'Group', 'Event'], :contacts=>{:sender_id => current_subject}, :relations=>{:type => 'Relation::Custom'}).page(params[:page]).per(10)
-
-	@cs = current_subject.contact_subjects(:direction => :sent)
-	@cs = Kaminari.paginate_array(@cs).page(params[:page]).per(10)
-#	@cs_page = Paginator.new(self, cs.length, 10, 1)
-#	@offset = 0
-#	@cs= cs[offset..(offset + 10 -1)]
-
-  end
-
-  def delete_relation
-   @receiver = Actor.find params[:id]
-   logger.info "antes del each"       
-   contact=Contact.where(["sender_id="+current_subject.id.to_s+" and receiver_id="+@receiver.id.to_s])
-   logger.info "cs:"+current_subject.name+"receiver:"+@receiver.name
-   tie_to_delete=contact.first.ties
-   logger.info "antes del if"
-   tie_x=tie_to_delete.first
-	 if tie_x != nil      
-    tie_x.destroy
-   end
-   	@cs = current_subject.contact_subjects(:direction => :sent)
-	  @cs = Kaminari.paginate_array(@cs).page(params[:page]).per(10)
-    respond_to do |format|
-      format.js {render :layout => false}
-    end
-#   redirect_to "/settings/manage"   
-  end
-
-  def update_relation
-     @receiver = Actor.find params[:id]
-     relations = params['manage']
-     logger.info "antes del each"
-	    relations.each do |x,y|
-                 relation_id = y 
-	         contacto=Contact.where(["sender_id="+current_subject.id.to_s+" and receiver_id="+@receiver.id.to_s])
-		    logger.info "cs:"+current_subject.name+"receiver:"+@receiver.name
-	         tie_a_editar=contacto.first.ties
-		    logger.info "antes del if"
-	         tie_x=tie_a_editar.first
-	       if tie_x != nil
-		      logger.info "dentro del if"
-		       tie_x.relation_id=relation_id
-		       tie_x.save
-		      logger.info "luego del save"
-	       else 
-		      logger.info "dentro del else"
-		       nuevo_tie=Tie.new
-		       nuevo_tie.contact_id=contacto.first.id
-		       nuevo_tie.relation_id=relation_id 
-		       nuevo_tie.save
-	       end	     
-	    end 
-      respond_to do |format|
-        format.js {render :layout => false}
-      end      
-
-#     redirect_to "/settings/manage"
-  end
-end

data/events/app/views/activities/_activity.html.erb

@@ -1,5 +0,0 @@
-<% if activity.is_root? %>
-  <%= render :partial => "activities/root", :locals => { :activity => activity } %>
-<% else %>
-  <%= render :partial => "activities/child", :locals => { :activity => activity } %>
-<% end %>

data/events/app/views/activities/_child.html.erb

@@ -1,18 +0,0 @@
-<%= div_for activity, :class => "subactivity" do %>
-  <div class="actor_logo_subactivity">
-    <%= link_to image_tag(activity.sender_subject.logo.url(:actor),
-                          :alt => activity.sender_subject.name),
-                 activity.sender_subject %>
-  </div>
-  <div class="activity_content">
-    <div class="actor_name-activity_objects">
-      <%= link_to(activity.sender_subject.name, activity.sender_subject) %>
-      <span class="subactivity_objects">
-        <%= render activity.activity_objects %>
-      </span>
-    </div>
-    <%= render :partial => 'activities/options',
-               :locals => { :activity => activity } %>
-  </div>
-<% end %>
-<div class="space_comments"></div>

data/events/app/views/activities/_comments.html.erb

@@ -1,3 +0,0 @@
-<div class="activity_comments" id="comments_<%= dom_id(activity) %>">
-  <%= render activity.comments %>
-</div>

data/events/app/views/activities/_options.html.erb

@@ -1,15 +0,0 @@
-<div class="activity_options">
-  <ul class="activity_options" >
-    <% if user_signed_in? %>
-    <li><div class="security"><%= image_tag('btn/btn_security.png', :title => activity.audience_in_words(current_subject)) %></div></li>
-    <% end %>
-    <li><div class="post_time_ago"><%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %></div></li>
-    <% if activity.is_root? && user_signed_in? %>
-    <li><div class="verb_comment"> · <%= link_to t('activity.to_comment'), "#", :class => "to_comment" %> </div></li>
-    <% end %>
-    <li><div class="verb_like" id="like_<%= dom_id(activity) %>"> · <%= link_like(activity)%></div></li>
-    <% if activity.delete_object_by?(current_subject) %>
-      <li><div class="verb_delete"> · <%= link_to t('activity.delete'), activity.direct_object , :confirm => t('confirm_delete', :scope => activity.direct_object.class.to_s.underscore), :method => :delete,  :remote => true %> </div></li>
-    <% end %>
-  </ul>
-</div>

data/events/app/views/activities/_root.html.erb

@@ -1,37 +0,0 @@
-<%= div_for activity, :class => 'super_activity' do %>
-
-  <div class="actor_logo">
-    <%= link_to image_tag(activity.sender_subject.logo.url(:actor),
-                          :alt => activity.sender_subject.name),
-                 activity.sender_subject %>
-  </div>
-
-  <div class="activity_content">
-  	
-    <div class="actor_name">      
-      <%= activity.title(self)%>
-    </div>
-
-    <div class="activity_objects">
-      <%= render activity.activity_objects %>
-    </div>
-
-    <%= render :partial => 'activities/options',
-               :locals => { :activity => activity } %>
-
-    <%= render :partial => 'activities/comments',
-               :locals => { :activity => activity } %>
-
-    <%= render :partial => 'comments/new',
-               :locals => { :activity => activity } %>
-
-  </div>
-
-  <div class="space_activities">
-    <% if activity.activity_objects.count > 1 %>
-      <div class="space_sub"></div>
-    <%else %>
-      <div class="#"></div>
-    <%end%>
-  </div>
-<% end %>

data/events/app/views/activities/_wall.html.erb

@@ -1,5 +0,0 @@
-<div id="wall">
-  <%= render activities  %>
-  <%= paginate activities %>
-</div>
-

data/events/app/views/activities/_walls.html.erb

@@ -1,34 +0,0 @@
-<% content_for :javascript do %>
-  $("#tabs").tabs({ 
-    ajaxOptions: { 
-      dataType: "script",
-      success: function(data) { eval(data); }
-    }
-  });
-<% end %>
-
-<div id="tabs" class="block">
-  <ul class="activity_tabs">
-    <li><%= link_to "<span>#{ h truncate_name owner.name }</span>".html_safe, "#wall-profile" %></li>
-
-    <% owner.relation_customs.sort.each do |r| %>
-      <li><%= link_to "<span>#{ h r.name }</span>".html_safe,
-                      polymorphic_path([ owner, Activity.new ], :section => r.id, :wall => true),
-                      :title => "wall-#{ r.id }" %></li>
-    <% end %>
-  </ul>
-
-  <div id="wall-profile">
-    <%= render :partial => 'activities/index',
-               :locals => { :owner      => owner,
-                            :activities => owner.wall(:profile,
-                                                      :for => current_subject).
-                                                 page(params[:page]) } %>
-  </div>
-
-  <% owner.relation_customs.sort.each do |r| %>
-    <div id="wall-<%= r.id %>"></div>
-  <% end %>
-</div>
-
-

data/events/app/views/activities/documents.js.erb

@@ -1 +0,0 @@
-$('#wall').html("<%= escape_javascript render(:partial => 'wall', :locals => { :owner => parent, :activities => @activities }) %>");

data/events/app/views/activities/index.js.erb

@@ -1 +0,0 @@
-$('#wall-<%= params[:section] || "profile" %>').html("<%= escape_javascript render(:partial => 'index', :locals => { :owner => parent, :activities => @activities }) %>");

data/events/app/views/calendar_events/_edit_form.html.erb

@@ -1,58 +0,0 @@
-<%remote_form_for @event, :url => {:action => :update} , :before => "$('#updating_events').show();", :complete => "$('#updating_events').hide();" do |f| %>
-<p>
-  <%=f.label :title, "Titulo" %>
-  <br/>
-  <%=f.text_field :title %>
-</p>
-<p>
-  <%=f.label :description, "Descripcion" %>
-  <br/>
-  <%=f.text_area :description, :rows => 4, :cols => 30 %>
-</p>
-<p>
-  <%=f.label :starttime, 'Inicio' %>
-  <br/>
-  <%=f.datetime_select :starttime, :minute_step => 30 %>
-</p>
-<p>
-  <%=f.label :endtime, 'Fin' %>
-  <br/>
-  <%=f.datetime_select :endtime, :minute_step => 30 %>
-</p>
-<p>
-  <%=f.label :all_day, "Todo el día" %>
-  <%=f.check_box :all_day %>
-</p>
-<% #if @event.calendar_event_series
- %>
-<%period = (@event.calendar_event_series)?@event.calendar_event_series.period : nil -%>
-<p>
-  <%=f.label :period, "Repetir" %>
-  <%=f.select :period, CalendarEvent::REPEATS,{:selected => period}, :onchange => "showPeriodAndFrequency(this.value);" %>
-</p>
-<%frequency = (@event.calendar_event_series)?@event.calendar_event_series.frequency : nil -%>
-<p id = "frequency" style = "display:<%(period)? '' : 'none'%>;">
-  <%=f.label :frequency, "Repetir cada" %>
-  <%=f.select :frequency, (1..30).to_a, {:selected => frequency} %> <span id = "period"></span>
-</p>
-<p>
-  <%=f.label :starttime, 'Repetir hasta' %>
-  <br/>
-  <%= select_date Date.current, :prefix => :repeat_until, :order => [:year, :month, :day] %>
-</p>
-<% #end
-%>
-<%=f.hidden_field :id, :value => @event.id%>
-<%=f.hidden_field :commit_button, :value => ""%>
-<p>
-  <%if @event.calendar_event_series -%>
-  <%=f.submit 'Actualizar solo esta instancia', :onclick => "document.getElementById('calendar_event_commit_button').value = this.value"%>
-  <%=f.submit 'Actualizar todas las instancias', :onclick => "document.getElementById('calendar_event_commit_button').value = this.value"%>
-  <%=f.submit 'Actualizar todas las instancias siguientes', :onclick => "document.getElementById('calendar_event_commit_button').value = this.value"%>
-  <%else-%>
-  <%=f.submit 'Guardar', :onclick => "document.getElementById('calendar_event_commit_button').value = this.value"%>
-  <%end-%>
-  
-  <span id = "updating_events" style = "display:none;">Updating, Please wait...</span>
-</p>
-<%end %>

data/events/app/views/calendar_events/_form.html.erb

@@ -1,65 +0,0 @@
-<% #remote_form_for @event, :url => {:action => :create}, :before => "$('#creating_events').show();", :complete => "$('#creating_events').hide();" do |f| 
-%>
-<% remote_form_for @event, :url => {:action => :create}, :complete => "$('#create_event_dialog').dialog('destroy');" do |f| %>
-
-<!--
-<p>
-  <%=f.label :title %>
-  <br/>
-  <%=f.text_field :title %>
-</p>
--->
-<%=f.hidden_field :title, :value => "No disponible" %>
-<!--
-<p>
-  <%=f.label :description %>
-  <br/>
-  <%=f.text_area :description, :rows => 4, :cols => 30 %>
-</p>
--->
-<%=f.hidden_field :description, :value => "No disponible" %>
-<p>
-  <%=f.label :starttime, 'Inicio' %>
-  <br/>
-  <%=f.datetime_select :starttime, :minute_step => 30 %>
-</p>
-<p>
-  <%=f.label :endtime, 'Fin' %>
-  <br/>
-  <%=f.datetime_select :endtime, :minute_step => 30 %>
-</p>
-<p>
-  <%=f.label :all_day, "Todo el día" %>
-  <%=f.check_box :all_day %>
-</p>
-<p>
-  <%=f.label :period, "Repetir" %>
-  <%=f.select :period, CalendarEvent::REPEATS,{}, :onchange => "showPeriodAndFrequency(this.value);" %>
-</p>
-<div id = "frequency" style = "display:none;">
-<p>
-  <%=f.label :frequency, "Repetir cada" %>
-  <%=f.select :frequency, (1..30).to_a %> <span id = "period"></span>
-</p>
-<p>
-  <%=f.label :starttime, 'Repetir hasta' %>
-  <%=check_box_tag :repeat, 1, false, :onchange => "showRepeatUntil(this.checked);" %>
-  <span id="repeat_until" style = "display:none;">
-  <%= select_date nil, {:prefix => :repeat_until, :include_blank => true}, :order => [:year, :month, :day] %>
-  </span>  
-</p>
-</div>
-<!--
-<p>
-  <%=f.label :starttime, 'Repetir hasta' %>
-  <br/>
-  <%= select_date Date.current, :prefix => :repeat_until, :order => [:year, :month, :day] %>
-</p>
--->
-
-<%=f.hidden_field :object_id, :value => @room.id %>
-<%=f.hidden_field :object_type, :value => 'Room' %>
-<p>
-  <%=f.submit 'Agregar' %> <span id = "creating_events" style = "display:none;">Agregando, espere por favor...</span>
-</p>
-<%end %>

data/events/app/views/calendar_events/available.html.erb

@@ -1,81 +0,0 @@
-<% content_for :headers do  -%>
-  <%= javascript_include_tag :defaults, 'jquery', 'jquery-ui', 'fullcalendar' %>
-  <%= stylesheet_link_tag 'jquery-ui', 'fullcalendar' %>
-<% end -%>
-
-<% content_for :javascript do %>
-      $(document).ready(function(){
-		$('#calendar').fullCalendar({
-		    monthNames: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 
-			             'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
-            monthNamesShort: ['Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 
-			                  'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic'],
-			dayNames: ['Domingo', 'Lunes', 'Martes', 'Miercoles', 'Jueves', 'Viernes', 'Sabado'],
-			dayNamesShort: ['Dom', 'Lun', 'Mar', 'Mie', 'Jue', 'Vie', 'Sab'],
-			buttonText: {
-			    prev:     '&nbsp;&#9668;&nbsp;',  // left triangle
-			    next:     '&nbsp;&#9658;&nbsp;',  // right triangle
-			    prevYear: '&nbsp;&lt;&lt;&nbsp;', // <<
-			    nextYear: '&nbsp;&gt;&gt;&nbsp;', // >>
-			    today:    'Hoy',
-			    month:    'Mes',
-			    week:     'Semana',
-			    day:      'Dia'
-			},
-			firstDay: 1,
-			allDayText: 'Todo el dia',
-			axisFormat: 'HH:mm G\'M\'\'T\' <%= escape_javascript(Time.zone.formatted_offset) %>',
-			ignoreTimezone: true,
-			allowCalEventOverlap: false,
-			header: {
-				left: 'prev,next today',
-				center: 'title',
-				right: 'month,agendaWeek,agendaDay'
-			},
-			defaultView: 'agendaWeek',
-			height: 500,
-			columnFormat: {
-                            month: 'ddd',
-                            week: 'ddd d/M',
-                            day: 'dddd d/M'
-                     },
-			slotMinutes: 30,
-			loading: function(bool){
-				if (bool) 
-					//$('#loading').show();
-					$('#loading').hide();
-				else 
-					$('#loading').hide();
-			},
-
-			//events: "/calendar_events/get_events",
-			events: "/calendar_events/get_room_events?room_id=<%=@room.id%>&calendar_events=<%=params[:calendar_events]%>",
-			timeFormat: 'HH:mm t{ - HH:mm t} ',
-			dragOpacity: "0.5",
-			eventClick: function(event, jsEvent, view){
-			    if (event.editable) {
-					showEventDetails(event);
-				} else {
-				    showEventDescription(event);
-				}
-			}
-		});
-	});
-	
-<% end %>
-
-<div><div id='calendar'></div></div>
-
-<div id = "desc_dialog" style ="display:none;">
-  <div id = "event_desc"></div>
-  <br/>
-  <br/>
-  <div id = "event_actions">
-    <span id = "edit_event"></span>
-    <span id = "delete_event"></span>
-  </div>
-</div>
-<div id = "create_event_dialog" style ="display:none;">
-  <div id = "create_event">
-  </div>
-</div>

data/events/app/views/calendar_events/create.js.erb

@@ -1,18 +0,0 @@
-if @event
-  if @event.save
-    page<<"if (parent.$('#reservation_calendar_events')) { parent.$('#reservation_calendar_events').val(parent.$('#reservation_calendar_events').val() + ' ' + #{@event.id}) };"
-    page<<"$('#calendar').fullCalendar( 'refetchEvents' )"
-    #page<<"$('#create_event_dialog').dialog('destroy')"
-  else
-    page.alert @event.errors.full_messages(',').join("\n")
-  end
-end
-
-if @event_series
-  if @event_series.save
-    page<<"$('#calendar').fullCalendar( 'refetchEvents' )"
-    #page<<"$('#create_event_dialog').dialog('destroy')"
-  else
-    page.alert @event_series.errors.full_messages(',').join("\n")
-  end
-end

data/events/app/views/calendar_events/edit.js.erb

@@ -1 +0,0 @@
-page.replace_html 'event_desc', :partial => 'edit_form'

data/events/app/views/calendar_events/index.html.erb

@@ -1,162 +0,0 @@
-<% content_for :headers do  -%>
-  <%= javascript_include_tag :defaults, 'jquery', 'jquery-ui', 'fullcalendar' %>
-  <%= stylesheet_link_tag 'jquery-ui', 'fullcalendar' %>
-<% end -%>
-
-<% content_for :javascript do %>
-      $(document).ready(function(){
-		$('#calendar').fullCalendar({
-		    monthNames: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 
-			             'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
-            monthNamesShort: ['Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 
-			                  'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic'],
-			dayNames: ['Domingo', 'Lunes', 'Martes', 'Miercoles', 'Jueves', 'Viernes', 'Sabado'],
-			dayNamesShort: ['Dom', 'Lun', 'Mar', 'Mie', 'Jue', 'Vie', 'Sab'],
-			buttonText: {
-			    prev:     '&nbsp;&#9668;&nbsp;',  // left triangle
-			    next:     '&nbsp;&#9658;&nbsp;',  // right triangle
-			    prevYear: '&nbsp;&lt;&lt;&nbsp;', // <<
-			    nextYear: '&nbsp;&gt;&gt;&nbsp;', // >>
-			    today:    'Hoy',
-			    month:    'Mes',
-			    week:     'Semana',
-			    day:      'Dia'
-			},
-			firstDay: 1,
-			allDayText: 'Todo el dia',
-			axisFormat: 'HH:mm G\'M\'\'T\' <%= escape_javascript(Time.zone.formatted_offset) %>',
-                        ignoreTimezone: true,
-			allowCalEventOverlap: false,
-			selectable: true,
-			selectHelper: true,
-			select: function(start, end, allDay) {
-				var title = "<%= escape_javascript(params[:reservation][:title])%>";
-
-				if (dateAvailable(start, end, allDay)) {			
-					$('#calendar').fullCalendar('renderEvent', {
-						title: title,
-						start: start,
-						end: end,
-                                          editable: true,
-						allDay: allDay
-					  }, false
-                    );
-				    createReservationEvent(title, start, end, allDay);					
-				}
-				$('#calendar').fullCalendar('unselect');
-			},
-			editable: true,
-			header: {
-				left: 'prev,next today',
-				center: 'title',
-				right: 'month,agendaWeek,agendaDay'
-			},
-			defaultView: 'agendaWeek',
-			height: 500,
-			columnFormat: {
-                            month: 'ddd',
-                            week: 'ddd d/M',
-                            day: 'dddd d/M'
-                     },
-			slotMinutes: 30,
-			loading: function(bool){
-				if (bool) 
-					//$('#loading').show();
-					$('#loading').hide();
-				else 
-					$('#loading').hide();
-			},
-
-			//events: "/calendar_events/get_events",
-			eventSources: [
-				"/calendar_events/get_room_events?room_id=<%=@room.id%>",
-				<% if @rooms %>
-				"/calendar_events/get_others_events?room_ids="+$('#room_ids').val(),
-				<% end %>
-				function(start, end, callback) {
-					$.ajax({
-						url: '/calendar_events/get_calendar_events',
-						dataType: 'json',
-						data: {
-							start: Math.round(start.getTime() / 1000),
-							end: Math.round(end.getTime() / 1000),
-							calendar_events: parent.$('#reservation_calendar_events').val()
-						},
-						success: function(events) {
-							callback(events);
-						}
-					});
-				}				
-			],
-			timeFormat: 'HH:mm t{ - HH:mm t} ',
-			dragOpacity: "0.5",
-			eventDrop: function(event, dayDelta, minuteDelta, allDay, revertFunc){
-				if (dateAvailable(event.start, event.end, allDay)) 
-				{
-				  moveEvent(event, dayDelta, minuteDelta, allDay);
-                }
-			    else 
-				{
-			      revertFunc();
-			    }
-			},
-			
-			eventResize: function(event, dayDelta, minuteDelta, revertFunc){
-				if (dateAvailable(event.start, event.end, false)) 
-				{				
-				  resizeEvent(event, dayDelta, minuteDelta);
-				}
-				else 
-				{
-				  revertFunc();
-				}
-			},
-			
-			eventClick: function(event, jsEvent, view){
-			    if (event.editable) {
-					showEventDetails(event);
-				} else {
-				    showEventDescription(event);
-				}
-			}
-		});
-	});
-	
-<% end %>
-
-<p>
-  <% link_to_remote 'Create Event', 
-      :url => {:action => :new}, 
-      :before => "$('#loading').show()", 
-      :complete => "$('#loading').hide()"
-  %>
-
-<%=  select_tag :room_ids, 
-    "<option>Seleccione otras salas</option>" + 
-    options_for_select(Room.find(:all, :order => "country, space_id, name").select {|y| y.id !=  @room.id && !y.space.nil? }.collect {|x| ["#{x.country}, #{x.space.name}, #{x.name}", x.id]}, @rooms ? @rooms.collect {|z| z.id } : ""), 
-    :multiple =>true, :size => 3, :style => "font-size: 10px;", :onchange => "parent.$('#fancy_frame').attr('src', '/calendar_events?reservation[room_id]=#{@room.id}&reservation[title]=#{params[:reservation][:title]}&calendar_events=#{params[:calendar_events]}&room_ids='+$('#room_ids').val());" 
-%>
-<br />
-<% if @rooms %>
-Aula seleccionada(s):
-<% @rooms.each do |room| %>
-<span style="font-size: 10px;"><%= "#{room.country}, #{room.space.name}, #{room.name}" %></span>
-<% end %>
-<% end %>
-</p>
-
-<div><div id='calendar'></div></div>
-
-<div id = "desc_dialog" style ="display:none;">
-  <div id = "event_desc"></div>
-  <br/>
-  <br/>
-  <div id = "event_actions">
-    <span id = "edit_event"></span>
-    <span id = "delete_event"></span>
-  </div>
-</div>
-<div id = "create_event_dialog" style ="display:none;">
-  <div id = "create_event">
-  </div>
-</div>