social_stream 2.0.0.beta2 → 2.0.0.beta3

data/documents/lib/generators/social_stream/documents/templates/initializer.rb

@@ -19,7 +19,7 @@ SocialStream::Documents.setup do |config|
   #      format: :png,
   #      convert_options: {
   #        color: :transparent,
-  #        background_color: 'ffffff',
+  #        background_color: '#333333',
   #        width: 460,
   #        height: 75
   #      },

data/documents/lib/social_stream-documents.rb

@@ -27,7 +27,7 @@ module SocialStream
         format: :png,
         convert_options: {
           color: :transparent,
-          background_color: 'ffffff',
+          background_color: '#333333',
           width: 460,
           height: 75
         },

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "2.0.0.beta2".freeze
+    VERSION = "2.0.0.beta3".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', '~> 2.0.0.beta2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta3')
   s.add_runtime_dependency('paperclip','~> 3.3.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')
   s.add_runtime_dependency('delayed_paperclip','>= 2.4.5.2')

data/events/app/assets/javascripts/social_stream/fullcalendar.js

@@ -30,7 +30,8 @@ SocialStream.FullCalendar = (function(SS, $, Scheduler, undefined){
       ignoreTimezone: false,
       firstDay: 1,
       eventColor: eventColor,
-      events: getEvents
+      events: getEvents,
+      eventClick: eventClick
     };
 
     if (calendar.attr('data-can-create')) {
@@ -79,7 +80,7 @@ SocialStream.FullCalendar = (function(SS, $, Scheduler, undefined){
 
   var getEvents = function(start, end, callback) {
     $.ajax({
-      url: getCalendarEl().attr('data-events-path'),
+      url: getCalendarEl().attr('data-events_path'),
       dataType: 'json',
       data: {
         // our hypothetical feed requires UNIX timestamps
@@ -118,6 +119,17 @@ SocialStream.FullCalendar = (function(SS, $, Scheduler, undefined){
     Scheduler.form.reset(form.find('.scheduler_form'));
   };
 
+  // After clicking an event a modal is shown
+  var eventClick = function(e) {
+    $.ajax({
+      url: getCalendarEl().attr('data-events_path') + '/' + e.id,
+      dataType: 'html',
+      success: function(data) {
+        $(data).modal();
+      }
+    });
+  };
+
   callback.register('show',
                     initFullCalendar,
                     initFormModal,

data/events/app/assets/stylesheets/social_stream/events/responsive/_responsive-767px-max.css.sass

@@ -12,12 +12,15 @@
       .event,
       .link
         .date
-          width: 48px
-        .details,
-        .text 
-          margin-left: 10px
-          width: 50%
+          width: 70px
+          margin-left: 0
+        .details
           display: inline-block !important
+          width: 100%
+          .text 
+            width: 100%
+            margin-left: 0px
+          
 
   #calendar 
     @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
@@ -55,16 +58,16 @@
         .event,
         .link
           .date
+            width: 70px
+            margin-left: 0
             .day,
             .month
               font-weight: bold
               font-size: 15px
           .poster
             @include hidden-phone
-          .details,
-          .text 
-            width: 40%
-            margin-left: 7px
+        
+
         
   
   

data/events/app/controllers/events_controller.rb

@@ -21,7 +21,13 @@ class EventsController < ApplicationController
 
   def show
     show! do |format|
-      format.html { redirect_to polymorphic_path([ @event.post_activity.receiver_subject, Event.new ], :at => @event.start_at.to_i) }
+      format.html { 
+        if request.xhr?
+          render partial: 'show_modal'
+        else
+          redirect_to polymorphic_path([ @event.post_activity.receiver_subject, Event.new ], :at => @event.start_at.to_i)
+        end
+      }
     end
   end
 

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

@@ -1,24 +1,26 @@
 <div class="details">
-  <div class="title">
+  <div class="text">
+    <h6>
     <%= link_to event.title, event %>
-  </div>
+    </h6>
 
-  <div class="frequency">
-    <%= event.frequency_description %>
-  </div>
+    <div class="frequency">
+      <%= event.frequency_description %>
+    </div>
 
-  <%= render partial: 'objects/timeline_description',
-             object: event,
-             as: :obj %>
+    <%= render partial: 'objects/timeline_description',
+               object: event,
+               as: :obj %>
 
-  <div class="follow">
-    <div class="follow_sentence">
-    <%= render :partial => 'activity_actions/follow_sentence',
-                 :locals  => { :activity_object => event.activity_object } %>
-    </div>
-    <div class="follow_form">
-      <%= render :partial => 'activity_actions/follow_form',
-                 :locals => { :activity_object => event.activity_object } %>
+    <div class="follow">
+      <div class="follow_sentence">
+      <%= render :partial => 'activity_actions/follow_sentence',
+                   :locals  => { :activity_object => event.activity_object } %>
+      </div>
+      <div class="follow_form">
+        <%= render :partial => 'activity_actions/follow_form',
+                   :locals => { :activity_object => event.activity_object } %>
+      </div>
     </div>
   </div>
 </div>

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

@@ -0,0 +1,10 @@
+<div class="modal fade">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h3><%= @event.title %></h3>
+  </div>
+  <div class="modal-body">
+    <%= render partial: 'event_sidebar',
+               object: @event %>
+  </div>
+</div>

data/events/app/views/sidebar/_calendar.html.erb

@@ -1,6 +1,6 @@
 <% bow = (Time.now - 6.days).beginning_of_week %>
 
-<div class="calendar" id="sidebar_calendar" data-path="<%= polymorphic_path([@current_subject, Event.new])%>" data-start="<%= bow.to_i %>" data-end="<%= (bow + 28.days).to_i %>">
+<div class="calendar" id="sidebar_calendar" data-path="<%= polymorphic_path([profile_or_current_subject, Event.new])%>" data-start="<%= bow.to_i %>" data-end="<%= (bow + 28.days).to_i %>">
 
   <%= render partial: 'events/calendar_month',
              locals: {

data/events/config/locales/en.yml

@@ -1,56 +1,57 @@
+---
 en:
   activerecord:
     attributes:
       event:
-        title: "Title"
-        room: "Room"
-        frequency: "Frequency"
+        title: Title
+        room: Room
+        frequency: Frequency
       room:
-        name: "Name"
+        name: Name
     errors:
       models:
         room:
           attributes:
             name:
-              taken: "is taken"
+              taken: is taken
     models:
-      event: "event"
-      room: "room"
+      event: event
+      room: room
   boxy:
-    close_text: "[close]"
+    close_text: '[close]'
   event:
     activity_action:
-      follow: "Follow"
+      follow: Follow
       sentence:
-        one: "%{followers} follows this"
-        other: "%{followers} follow this"
-      unfollow: "Unfollow"
-    calendar: "Calendar"
-    confirm_delete: "Delete event?"
+        one: '%{followers} follows this'
+        other: '%{followers} follow this'
+      unfollow: Unfollow
+    calendar: Calendar
+    confirm_delete: Delete event?
     modal:
-      view_in_calendar: "View in calendar"
-    name: "event"
+      view_in_calendar: View in calendar
+    name: event
     new:
-      title: "New event"
-    one: "an event"
-    other: "events"
+      title: New event
+    one: an event
+    other: events
     popover:
-      title: "Events on %{date}"
+      title: Events on %{date}
     poster:
-      button: "Upload"
-      update: "Upload poster"
+      button: Upload
+      update: Upload poster
     title:
-      one: "Event"
-      other: "Events"
-    wall_post: "Published an event: %{title}"
+      one: Event
+      other: Events
+    wall_post: 'Published an event: %{title}'
   header:
     icon:
-      calendar: "Calendar"
+      calendar: Calendar
   room:
-    confirm_delete: "Delete room?"
-    delete: "Delete"
+    confirm_delete: Delete room?
+    delete: Delete
     settings:
-      title: "Rooms"
-      description: "Rooms available for event celebration"
+      title: Rooms
+      description: Rooms available for event celebration
     watermark:
-      name: "New room"
+      name: New room

data/events/config/locales/es.yml

@@ -1,57 +1,57 @@
+---
 es:
   activerecord:
     attributes:
       event:
-        title: "Título"
-        room: "Espacio"
-        frequency: "Repetición"
+        title: Título
+        room: Espacio
+        frequency: Repetición
       room:
-        name: "Nombre"
+        name: Nombre
     errors:
       models:
         room:
           attributes:
             name:
-              taken: "está repetido"
+              taken: está repetido
     models:
-      event: "evento"
-      room: "espacio"
+      event: evento
+      room: espacio
   boxy:
-    close_text: "[cerrar]"
+    close_text: '[cerrar]'
   event:
     activity_action:
-      follow: "Me lo apunto"
+      follow: Me lo apunto
       sentence:
-        follow:
-          one: "%{followers} se ha apuntado esto"
-          other: "%{followers} se han apuntado esto"
-      unfollow: "Desapuntar"
-    calendar: "Calendario"
-    confirm_delete: "¿Borrar evento?"
+        one: '%{followers} follows this'
+        other: '%{followers} follow this'
+      unfollow: Desapuntar
+    calendar: Calendario
+    confirm_delete: ¿Borrar evento?
     modal:
-      view_in_calendar: "Ver en el calendario"
-    name: "evento"
+      view_in_calendar: Ver en el calendario
+    name: evento
     new:
-      title: "Nuevo evento"
-    one: "un evento"
-    other: "eventos"
+      title: Nuevo evento
+    one: un evento
+    other: eventos
     popover:
-      title: "Eventos el %{date}"
+      title: Eventos el %{date}
     poster:
-      button: "Subir"
-      update: "Subir cartel"
+      button: Subir
+      update: Subir cartel
     title:
-      one: "Evento"
-      other: "Eventos"
-    wall_post: "Publicó un evento: %{title}"
+      one: Evento
+      other: Eventos
+    wall_post: 'Publicó un evento: %{title}'
   header:
     icon:
-      calendar: "Calendar"
+      calendar: Calendar
   room:
-    confirm_delete: "¿Borrar espacio?"
-    delete: "Borrar"
+    confirm_delete: ¿Borrar espacio?
+    delete: Borrar
     settings:
-      title: "Espacios"
-      description: "Salas disponibles para la realización de eventos"
+      title: Espacios
+      description: Salas disponibles para la realización de eventos
     watermark:
-      name: "Nuevo espacio"
+      name: Nuevo espacio

data/events/config/locales/zh.yml

@@ -0,0 +1,57 @@
+---
+zh:
+  activerecord:
+    attributes:
+      event:
+        title: Title
+        room: Room
+        frequency: Frequency
+      room:
+        name: Name
+    errors:
+      models:
+        room:
+          attributes:
+            name:
+              taken: is taken
+    models:
+      event: event
+      room: room
+  boxy:
+    close_text: '[close]'
+  event:
+    activity_action:
+      follow: Follow
+      sentence:
+        one: '%{followers} follows this'
+        other: '%{followers} follow this'
+      unfollow: Unfollow
+    calendar: Calendar
+    confirm_delete: Delete event?
+    modal:
+      view_in_calendar: View in calendar
+    name: event
+    new:
+      title: New event
+    one: an event
+    other: events
+    popover:
+      title: Events on %{date}
+    poster:
+      button: Upload
+      update: Upload poster
+    title:
+      one: Event
+      other: Events
+    wall_post: 'Published an event: %{title}'
+  header:
+    icon:
+      calendar: Calendar
+  room:
+    confirm_delete: Delete room?
+    delete: Delete
+    settings:
+      title: Rooms
+      description: Rooms available for event celebration
+    watermark:
+      name: New room

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "2.0.0.beta2".freeze
+    VERSION = "2.0.0.beta3".freeze
   end
 end

data/events/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', '~> 2.0.0.beta2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta3')
   s.add_runtime_dependency('rails-scheduler', '~> 0.1.1')
 
   # Development Gem dependencies