social_stream 0.23.4 → 0.24.0

data/documents/lib/social_stream/documents/engine.rb

@@ -53,9 +53,9 @@ module SocialStream
         Mime::Type.register "video/webm", :webm
       end
 
-      initializer "social_stream-documents.toolbar_config" do
-        SocialStream::ToolbarConfig.module_eval do
-          include SocialStream::ToolbarConfig::Documents
+      initializer "social_stream-documents.views.toolbar" do
+        SocialStream::Views::Toolbar.module_eval do
+          include SocialStream::Views::Toolbar::Documents
         end
       end
     end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.11.5".freeze
+    VERSION = "0.12.0".freeze
   end
 end

data/documents/lib/social_stream/views/toolbar/documents.rb

@@ -0,0 +1,28 @@
+module SocialStream
+  module Views
+    module Toolbar
+      module Documents
+        def toolbar_menu_items type, options = {}
+          super.tap do |items|
+            case type
+            when :home
+              items << {
+                :key => :documents,
+                :html => link_to(image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title.other"),
+                                 [current_subject, Document.new],
+                                 :id => "toolbar_menu-documents")
+              }
+            when :profile
+              items << {
+                :key => :documents,
+                :name => link_to(image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title.other"),
+                                 [options[:subject], Document.new],
+                                 :id => "toolbar_menu-documents")
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.17.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.18.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','= 2.4.5')
   s.add_runtime_dependency('delayed_paperclip','2.4.5.1')

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

@@ -1,3 +1,5 @@
+//= require social_stream.timeline
+
 SocialStream.Event = (function(SS, $, undefined) {
 	var indexCallbacks = [];
 
@@ -9,6 +11,37 @@ SocialStream.Event = (function(SS, $, undefined) {
 		$.each(indexCallbacks, function(i, callback){ callback(); });
 	}
 
+        var fixDates = function(){
+          $(".event").each(function(){
+            dateString = $(this).find("time").attr("datetime");
+
+            date = new Date(dateString);
+
+            var dayEl = $(this).find(".event_day");
+	    if (dayEl.length) {
+		    dayEl.text($.datepicker.formatDate('d', date));
+	    }
+
+            var monthEl = $(this).find(".event_month");
+	    if (monthEl.length) {
+            	monthEl.text($.datepicker.formatDate('M', date));
+	    }
+
+            var hourEl = $(this).find(".event_hour");
+            if(hourEl.length) {
+              var minutes = date.getMinutes();
+              if (minutes<10) minutes = "0" + minutes;
+              hourEl.text(date.getHours() + ':' + minutes);
+            }
+
+          });
+
+        }
+
+	addIndexCallback(fixDates);
+
+        SocialStream.Timeline.addInitCallback(index);
+
 	return {
 		addIndexCallback: addIndexCallback,
 		index: index

data/events/app/assets/stylesheets/events.css.scss

@@ -46,8 +46,15 @@ div.event_date {
   min-width: 30px;
 }
 
+.event_sidebar .event_hour {
+  font-size: 2em;
+  line-height: 90%;
+}
+
+
 .event_details {
   padding-top: 10px;
+  float: left;
 }
 
 .event_poster {
@@ -74,6 +81,30 @@ div.event_date {
 	-MS-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
 }
 
+.event_frequency {
+	text-align: center;
+	font-size: 0.8em;
+}
+
+.event_details .description {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	height: 50px;
+}
+
+.event_details .follow_form {
+	float: left;
+}
+
+.event_details .follow_sentence {
+	float: left;
+	padding: 20px 10px;
+}
+
+.event_sidebar .event_frequency {
+	font-size: 1em;
+}
+
 #calendar {
 	margin-top: 20px;
 }
@@ -165,6 +196,12 @@ div.event_date {
   padding: 2px 10px;
 }
 
+.event_sidebar {
+	float: left;
+	border-bottom: 1px solid $secondary-color;
+	padding: 5px;
+}
+
 .tipsy-sidebar_calendar {
 	min-width: 300px;
 	width: 300px;

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

@@ -1,51 +1,10 @@
 <%= div_for event do %>
-  <%= link_to event, :class => "event_date" do %>
-    <div class="event_date_image">
-      <div class="event_day">
-        <%= event.start_at.day %>
-      </div>
-      <div class="event_month">
-        <%= l event.start_at, :format => "%b" %>
-      </div>
-      <% unless event.all_day? %>
-        <div class="event_hour">
-          <%= l event.start_at, :format => "%H:%M" %>
-        </div>
-      <% end %>
-    </div>
-  <% end %>
 
-  <%= javascript_tag do %>
-  var d = new Date(<%= 1000*event.start_at.to_i %>);
-  $("#<%= dom_id event %> .event_day").text($.datepicker.formatDate('d', d));
-  $("#<%= dom_id event %> .event_month").text($.datepicker.formatDate('M', d));
-  if($("#<%= dom_id event %> .event_hour").length) {
-   var minutes = d.getMinutes();
-   if (minutes<10) minutes = "0" + minutes;
-   $("#<%= dom_id event %> .event_hour").text(d.getHours() + ':' + minutes);
-  }
-  <% end %>
+  <%= render :partial => "events/event_date", :locals => { :event => event } %>
 
-  <div class="event_poster">
-    <%= event_timeline_thumb(event) %>
+  <%= render :partial => "events/event_poster", :locals => { :event => event } %>
 
-    <% if can? :update, event %>
-      <div class="event_poster_update">
-        <%= link_to t('event.poster.update'), edit_event_path(event, :poster => true), :remote => true %>
-      </div>
-    <% end %>
-  </div>
-
-  <div class="event_details">
-    <div class="title">
-    <%= link_to event.title, event %>
-    </div>
-
-    <div class="description">
-    <%= simple_format auto_link(event.description) %>
-    </div>
-
-  </div>
+  <%= render :partial => "events/event_details", :locals => { :event => event } %>
 <% end %>
 
 <div class="clearfloat"></div>

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

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

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

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

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

@@ -0,0 +1,21 @@
+<div class="event_details">
+  <div class="title">
+    <%= link_to event.title, event %>
+  </div>
+
+  <div class="description">
+    <%= simple_format auto_link(event.description) %>
+  </div>
+
+  <div class="follow">
+    <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/events/app/views/events/_event_poster.html.erb

@@ -0,0 +1,9 @@
+<div class="event_poster">
+  <%= event_timeline_thumb(event) %>
+
+  <% if can? :update, event %>
+    <div class="event_poster_update">
+      <%= link_to t('event.poster.update'), edit_event_path(event, :poster => true), :remote => true %>
+    </div>
+  <% end %>
+</div>

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

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

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

@@ -14,7 +14,7 @@
   link_to(t('event.calendar'), polymorphic_path([profile_subject, Event.new]))
   ) %>
 
-<% toolbar :profile => profile_subject %>
+<% toolbar :profile, :subject => profile_subject %>
 
 <div id="calendar"></div>
 

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

@@ -1,3 +1,3 @@
-$("#tipsy-<%= params[:tipsy] %>").html("<%= escape_javascript render(@events) %>");
+$("#tipsy-<%= params[:tipsy] %>").html("<%= escape_javascript render(:partial => "event_sidebar", :collection => @events) %>");
 
 SocialStream.Event.index();

data/events/config/locales/en.yml

@@ -19,6 +19,12 @@ en:
   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?"
     new:

data/events/config/locales/es.yml

@@ -19,6 +19,13 @@ es:
   boxy:
     close_text: "[cerrar]"
   event:
+    activity_action:
+      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?"
     new:

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.9.2".freeze
+    VERSION = "0.10.0".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.17.2')
-  s.add_runtime_dependency('rails-scheduler', '~> 0.0.6')
+  s.add_runtime_dependency('social_stream-base', '~> 0.18.0')
+  s.add_runtime_dependency('rails-scheduler', '~> 0.0.8')
   s.add_runtime_dependency('coffee-rails', '>= 3.1.0')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.23.4".freeze
+  VERSION = "0.24.0".freeze
 end

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.7.1".freeze
+    VERSION = "0.8.0".freeze
   end
 end

data/linkser/social_stream-linkser.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.17.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.18.0')
   s.add_runtime_dependency('linkser', '~> 0.0.10')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')