social_stream-events 1.1.1 → 2.0.0.beta1

data/app/assets/stylesheets/social_stream/events/responsive/_responsive-1200px-min.css.sass

@@ -0,0 +1,34 @@
+//
+// Responsive: Large desktop and up
+// --------------------------------------------------
+
+
+@media (min-width: 1200px)
+  #home,
+  #user,
+  #grups
+    .activities
+      .timeline
+        .event
+          .details
+            width: 52%
+
+
+    #sidebar
+      #month_top, 
+      #month_bottom
+        font-size: 17px
+      #days
+        font-size: 15px
+        line-height: 22px
+
+      #suggestions,
+      #pendings
+        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+
+  #explore-content
+    .timeline
+      .root
+        .media-body
+          .details
+            width: 79%

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

@@ -0,0 +1,77 @@
+//
+// Responsive: Landscape phone to desktop/tablet
+// --------------------------------------------------
+
+
+@media (max-width: 767px) 
+
+  #home,
+  #user,
+  #groups
+    .timeline
+      .event,
+      .link
+        .date
+          width: 48px
+        .details,
+        .text 
+          margin-left: 10px
+          width: 50%
+          display: inline-block !important
+
+
+
+  #events
+    #toolbar
+      @extend .hidden-phone
+    td
+      .fc-button
+        padding: 3.5% !important
+        font-size: 12px !important
+      .fc-header-space
+        padding-left: 0px
+    .fc-header-center
+      h2
+        font-size: 17.5px
+    #calendar 
+      .fc-day-number
+        min-height: 32px
+
+
+
+        
+// UP TO LANDSCAPE PHONE
+// ---------------------
+
+@media (max-width: 480px)
+  
+  #home,
+  #user,
+  #group
+    .activities
+      .timeline
+        .avatar
+          float: left
+        .event,
+        .link
+          .date
+            .day,
+            .month
+              font-weight: bold
+              font-size: 15px
+          .poster
+            @include hidden-phone
+          .details,
+          .text 
+            width: 40%
+            margin-left: 7px
+        
+  
+  
+  #sidebarContent
+    #days
+      tr
+        td
+          font-size: 18px
+          padding: 3px 7px
+

data/app/assets/stylesheets/social_stream/events/responsive/_responsive-768px-979px.css.sass

@@ -0,0 +1,32 @@
+//
+// Responsive: Tablet to desktop
+// --------------------------------------------------
+
+
+@media (min-width: 768px) and (max-width: 979px) 
+  #user
+    .activities
+      .timeline
+        .event
+          .details 
+            margin-left: 10px
+            @include grid-core-span(4, $fluidGridColumnWidth, $fluidGridGutterWidth)
+    #sidebar
+      .calendar
+        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+        #days tr td
+          padding-left: 2.5%
+          padding-right: 2.5%
+      #suggestions,
+      #pendings
+        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+
+  #events
+    #toolbar
+      @extend .hidden-tablet
+
+  #explore-content
+    .timeline
+      .root
+        .media-body
+          width: 84%

data/app/assets/stylesheets/social_stream/events/timeline/_timeline_events.css.sass

@@ -0,0 +1,66 @@
+.timeline
+  .media
+    .media-body
+      .event
+        .date
+          background-color: white
+          text-align: center
+          .day,
+          .month
+            font-weight: bold
+            font-size: 22px
+          .day
+            display: inline
+          .month
+            display: inline-block
+          .hour
+            font-size: 15px
+
+        .details
+          .frequency
+            color: #c3c3c3
+            font-size: 13px
+          .description
+            font-size: 12px
+
+          .follow
+            font-size: 12px
+
+          input
+            &[type="submit"]
+              @include border-radius (7px)
+              border: 1px solid #888
+              color: #888
+              @include btn-primary
+.modal
+  .modal-body
+    .event
+      border-bottom: 1px solid #ccc
+      .date
+        background-color: white
+        text-align: center
+        .day,
+        .month
+          font-weight: bold
+          font-size: 22px
+        .day
+          display: inline
+        .month
+          display: inline-block
+        .hour
+          font-size: 15px
+
+      .details
+        .frequency
+          color: #c3c3c3
+          font-size: 13px
+        .description
+          font-size: 12px
+
+        .follow
+          font-size: 12px
+  .modal-footer
+    button
+      @include btn-primary
+      @include border-radius (5px)
+

data/app/assets/stylesheets/social_stream/events/timeline/layout/_timeline_events.css.sass

@@ -0,0 +1,70 @@
+.timeline
+  .media
+    .media-body
+      .event
+        .date
+          width: 90px
+          display: inline
+          float: left
+          padding-top: 6px
+          padding-bottom: 6px
+
+        .poster
+          float: left
+          width: 80px
+          display: inline-block
+
+        .details
+          width: 52%
+          display: inline-block
+          margin-left: 10px
+          .frequency
+            margin: 4px 0 6px
+          .description
+            p
+              a
+                display: block
+          .follow
+            margin-top: -3px
+
+          input
+            &[type="submit"]
+              @include size (22px, 110px)
+              @include border-radius(5px)
+              padding: 0px
+              margin-top: 5px
+
+.modal
+  .modal-body
+    .event
+      clear: both
+      min-height: 152px
+      height: auto
+      .date
+        width: 90px
+        display: inline
+        float: left
+        padding-top: 6px
+        padding-bottom: 6px
+      .poster
+        float: left
+        width: 80px
+        display: inline-block
+      .details
+        width: 52%
+        display: inline-block
+        margin-left: 10px
+        .frequency
+          margin: 4px 0 6px
+        .description
+          p
+            a
+              display: block
+        .follow
+          margin-top: -3px
+
+        input
+          &[type="submit"]
+            @include size (22px, 110px)
+            padding: 0px
+            margin-top: 5px

data/app/assets/stylesheets/social_stream-events.css.sass

@@ -0,0 +1,42 @@
+@import "social_stream/events/calendar/calendar"
+
+@import "social_stream/events/calendar/calendar_sidebar"
+
+@import "social_stream/events/calendar/calendar_modal"
+
+@import "social_stream/events/calendar/layout/calendar"
+
+@import "social_stream/events/calendar/layout/calendar_sidebar"
+
+@import "social_stream/events/calendar/layout/calendar_modal"
+
+
+
+
+@import "social_stream/events/timeline/timeline_events"
+
+@import "social_stream/events/timeline/layout/timeline_events"
+
+
+
+
+@import "social_stream/events/explore/layout/explore_timeline_events"
+
+
+
+
+@import "social_stream/events/header_nav/layout/header_nav_events"
+
+
+
+
+@import "social_stream/events/repository/repository"
+
+@import "social_stream/events/repository/layout/repository"
+
+
+
+
+@import "social_stream/events/responsive/responsive-1200px-min"
+@import "social_stream/events/responsive/responsive-767px-max"
+@import "social_stream/events/responsive/responsive-768px-979px"

data/app/helpers/events_helper.rb

@@ -1,9 +1,20 @@
 module EventsHelper
+  def sidebar_month_class(date)
+    case date.month <=> Date.today.month
+    when -1
+      "past"
+    when 0
+      "current"
+    when 1
+      "next"
+    end
+  end
+
   def event_timeline_thumb(event)
     if event.poster.new_record?
       image_tag("poster.png")
     else
-      thumb_for(event.poster, 80)
+      thumb_for(event.poster, '80x113#')
     end
   end
 end

data/app/models/event.rb

@@ -9,6 +9,10 @@ class Event < ActiveRecord::Base
 
   validate :room_belongs_to_receiver
 
+  define_index do
+    activity_object_index
+  end
+
   def to_json(options = {})
     if recurrence
       st = options[:start].try(:to_date)
@@ -27,15 +31,9 @@ class Event < ActiveRecord::Base
     end
   end
 
-  def poster_object
-    object_properties.
-      where('activity_object_properties.type' => 'ActivityObjectProperty::Poster').
-      first
-  end
-
   def poster
     @poster ||=
-      poster_object.try(:document) ||
+      main_document ||
       build_poster
   end
 
@@ -54,8 +52,8 @@ class Event < ActiveRecord::Base
   end
 
   def build_poster
-    Document.new(:event_property_object_id => activity_object_id,
-                 :owner_id => owner_id)
+    Document.new(add_holder_event_id: id,
+                 owner_id: owner_id)
   end
 
 

data/app/overrides/layouts/_header_signed_in/icon_nav.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- insert_before "code[erb-silent]:contains('SocialStream.repository_models')" -->
+
+
+<li class="event">
+  <%= link_to polymorphic_path([current_subject, Event.new ]) do %>
+    <i class="icon_navbar-calendar <%= current_header_icon_class(:events) %>"></i> 
+  <% end %>
+</li>

data/app/overrides/settings/_index/add_rooms.html.erb.deface

@@ -0,0 +1,6 @@
+<!-- insert_before "code[erb-loud]:contains('notifications')" -->
+
+<% if current_subject.is_a?(Group) %>
+  <%= render partial: 'settings/rooms' %>
+<% end %>
+

data/app/overrides/sidebar/_show/add_calendar.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_top "#sidebar" -->
+
+<% if profile_or_current_subject %>
+  <%= render partial: 'sidebar/calendar' %>
+<% end %>

data/app/views/events/_calendar_month.erb

@@ -1 +1,3 @@
-<div id="sidebar_calendar_month_<%= position %>" class="sidebar_calendar_month<%= " not_current" if date.month != Date.today.month  %>"><%= link_to l(date, :format => "%B %Y"), polymorphic_path([profile_or_current_subject, Event.new], :date => date.to_time.to_i) %></div>
+<div id="month_<%= position %>" class="month <%= sidebar_month_class(date) %>">
+  <%= link_to l(date, :format => "%B %Y"), polymorphic_path([profile_or_current_subject, Event.new], :date => date.to_time.to_i) %>
+</div>

data/app/views/events/{_event_date.html.erb → _date.html.erb}

@@ -1,20 +1,17 @@
-<div class="event_date">
-  <%= link_to event, :class => "event_date" do %>
+<div class="date">
+  <%= link_to event, :class => "date" do %>
     <time datetime="<%= event.start_at.xmlschema %>">
-      <div class="event_day">
+      <div class="day">
         <%= event.start_at.day %>
       </div>
-      <div class="event_month">
+      <div class="month">
         <%= l event.start_at, :format => "%b" %>
       </div>
       <% unless event.all_day? %>
-        <div class="event_hour">
+        <div class="hour">
           <%= l event.start_at, :format => "%H:%M" %>
         </div>
       <% end %>
-      <div class="event_frequency">
-        <%= event.frequency_description %>
-      </div>
     </time>
   <% end %>
 </div>

data/app/views/events/{_event_date_sidebar.html.erb → _date_sidebar.html.erb}

@@ -1,12 +1,12 @@
-<div class="event_date">
-  <%= link_to event, :class => "event_date" do %>
+<div class="date">
+  <%= link_to event, :class => "date" do %>
     <time datetime="<%= event.start_at.xmlschema %>">
       <% unless event.all_day? %>
-        <div class="event_hour">
+        <div class="hour">
           <%= l event.start_at, :format => "%H:%M" %>
         </div>
       <% end %>
-        <div class="event_frequency">
+        <div class="frequency">
           <%= event.frequency_description %>
         </div>
     </time>

data/app/views/events/{_event_details.html.erb → _details.html.erb}

@@ -1,21 +1,24 @@
-<div class="event_details">
+<div class="details">
   <div class="title">
     <%= link_to event.title, event %>
   </div>
 
-  <div class="description">
-    <%= simple_format auto_link(event.description) %>
+  <div class="frequency">
+    <%= event.frequency_description %>
   </div>
 
+  <%= 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>
-
-    <div class="follow_sentence">
-      <%= render :partial => 'activity_actions/follow_sentence',
-                 :locals  => { :activity_object => event.activity_object } %>
-    </div>
   </div>
 </div>

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

@@ -1,13 +1,21 @@
-<%= div_for event do %>
+<div class="event">
+  <div class="avatar">
+    <%= link_to event, :title => event.title do %>
+      <i class="icon_50-event"></i>
+    <% end %>
+  </div>
 
-  <div class="timeline-130">
-    <%= render :partial => "events/event_date", :locals => { :event => event } %>
+  <div class="data">
+    <div class="name">
+      <%= link_to truncate(event.title, :length => 15), event %>
+    </div>
 
-    <%= render :partial => "events/event_poster", :locals => { :event => event } %>
+    <div class="date">
+      <%= event.start_at.to_formatted_s(:rfc822) %>
+    </div>
 
+    <div class="frequency">
+      <%= event.frequency_description %>
+    </div>
   </div>
-
-  <%= render :partial => "events/event_details", :locals => { :event => event } %>
-<% end %>
-
-<div class="clearfloat"></div>
+</div>

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

@@ -1,10 +1,10 @@
 <%= div_for event_sidebar, :class => "event_sidebar" do %>
 
-  <%= render :partial => "events/event_date_sidebar", :locals => { :event => event_sidebar } %>
+  <%= render :partial => "events/date_sidebar", :locals => { :event => event_sidebar } %>
 
-  <%= render :partial => "events/event_poster", :locals => { :event => event_sidebar } %>
+  <%= render :partial => "events/poster", :locals => { :event => event_sidebar } %>
 
-  <%= render :partial => "events/event_details", :locals => { :event => event_sidebar } %>
+  <%= render :partial => "events/details", :locals => { :event => event_sidebar } %>
 <% end %>
 
 <div class="clearfloat"></div>

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

@@ -1,8 +1,8 @@
 <%= form_for @event.poster do |f| %>
-  <%= f.hidden_field :event_property_object_id %>
+  <%= f.hidden_field :add_holder_event_id %>
   <%= f.hidden_field :owner_id %>
 
   <%= f.file_field :file %>
 
-  <%= f.submit %>
+  <%= f.submit t('event.poster.button') %>
 <% end %>

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

@@ -16,31 +16,22 @@
     </div>
   <% end %>
 
-  <div class="form_row">
-    <%= f.label :title %>
-    <%= f.text_field :title %>
-  </div>
-
-  <div class="form_row">
-    <%= f.label :description %>
-    <%= f.text_area :description %>
-  </div>
+  <%= f.label :title %>
+  <%= f.text_field :title %>
 
+  <%= f.label :description %>
+  <%= f.text_area :description %>
 
   <% if f.object.owner.rooms.any? %>
-  <div class="form_row">
     <%= f.label :room %>
-    <%= f.select :room_id, f.object.owner.rooms.map{ |r| [r.name, r.id] }, { :include_blank => true } %>
-  </div>
+    <%= f.select :room_id, f.object.owner.rooms.map{ |r| [r.name, r.id] }, { include_blank: true } %>
   <% end %>
 
-  <div class="form_row">
-    <%= render :partial => 'scheduler/form',
-               :locals  => { :f => f }
-     %>
-  </div>
+  <%= render :partial => 'scheduler/form',
+             :locals  => { :f => f } %>
 
-  <div class="form_row space_center">
-  <%= f.submit %>
-  </div>
+  <%= render partial: 'objects/form_privacy',
+             locals: { f: f } %>
+  
+  <%= f.submit nil, { class: "btn-blue" } %>
 <% end %>

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

@@ -0,0 +1,13 @@
+<div class="poster">
+  <% if event.poster.new_record? %>
+    <%= image_tag("poster.png") %>
+  <% else %>
+    <%= image_tag thumb_file_for(event.poster, '80x113#'), "data-modal-carousel-id" => "false", "data-modal-carousel-content" => "#{ thumb_for(event.poster, 500) }" %>
+  <% end %>
+
+  <% if can? :update, event %>
+    <div class="update">
+      <%= link_to t('event.poster.update'), edit_event_path(event, :poster => true), :remote => true %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1 @@
+<%= render event %>

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

@@ -0,0 +1 @@
+<%= render event %>

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

@@ -0,0 +1,8 @@
+<%= div_for event do %>
+
+  <%= render :partial => "events/date", :locals => { :event => event } %>
+
+  <%= render :partial => "events/poster", :locals => { :event => event } %>
+
+  <%= render :partial => "events/details", :locals => { :event => event } %>
+<% end %>

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

@@ -1,21 +1,9 @@
 <% if @event.valid? %>
-  SocialStream.Events.current.newForm.unload();
-
-  var cal = SocialStream.Events.current.calendar;
-
-  jQuery.each(<%= raw Array.wrap(@event.to_json).to_json  %>,
-              function(index, ev) {
-    ev.color = SocialStream.Event.color(<%= @event.room_id %>);
-  
-    cal.fullCalendar('renderEvent', ev,
-                     true // make the event "stick"
-                    );
+  SocialStream.FullCalendar.create({
+    "events": "<%= j raw(Array.wrap(@event.to_json).to_json) %>"
   });
-
-  cal.fullCalendar('unselect');
-
 <% else %>
-  SocialStream.Events.current.newForm.setContent("<%= escape_javascript render(:partial => 'new') %>");
+  SocialStream.FullCalendar.getFormEl().setContent("<%= escape_javascript render(partial: 'new') %>");
 
-  Scheduler.form.init(SocialStream.Events.current.newForm.getContent().find('.scheduler_form'));
+  Scheduler.form.init(SocialStream.FullCalendar.getFormEl().getContent().find('.scheduler_form'));
 <% end %>

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

@@ -1,5 +1,5 @@
 <% if params[:poster] %>
-  $("#<%= dom_id @event %> .event_poster").hide("slow");
-  $("#<%= dom_id @event %> .event_details").hide("slow");
+  $("#<%= dom_id @event %> .poster").hide("slow");
+  $("#<%= dom_id @event %> .details").hide("slow");
   $("#<%= dom_id @event %>").append("<%= escape_javascript render(:partial => 'events/form_poster', :locals => { :event => @event }) %>");
 <% end %>