social_stream-events 0.9.1 → 0.9.2

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

@@ -1,3 +1,5 @@
+//= require jquery.watermark
+//
 //= require social_stream-base
 //
 //= require_self

data/app/assets/javascripts/social_stream.calendar.js.erb

@@ -0,0 +1,98 @@
+//= require jquery.tipsy
+
+SocialStream.Calendar = (function(SS, $, undefined){
+  var elementRegExp = new RegExp('sidebar_day_(..?)_(..?)_(..?.?.?)');
+  var eventsPath;
+
+  var elementMatch = function(el){
+    return elementRegExp.exec(el.id);
+  }
+
+  var elementDate = function(el) {
+    var m = elementMatch(el);
+
+    if(m == null) return;
+
+    return new Date(m[3], (m[2]-1), m[1], 23, 59, 59);
+  }
+
+  var eventElement = function(date) {
+    return $('#sidebar_day_' + date.getDate() + '_' + (date.getMonth()+1) + '_' + date.getFullYear())
+  }
+
+  var init = function(options){
+    eventsPath = options["eventsPath"]
+
+    var now = new Date();
+
+    eventElement(now).addClass('today');
+
+
+    $('#sidebar_calendar td').each(function(index, domEl){
+      var d = elementDate(domEl)
+
+      if(d < now) $(domEl).addClass('past');
+      if(d.getMonth() != now.getMonth() && d > now) $(domEl).addClass('next_month');
+    });
+
+    $.ajax({
+      dataType: 'json',
+      cache: false,
+      url: eventsPath,
+      data: {
+        start: options["start"],
+        end: options["end"]
+      },
+
+      success: initBusyEvents
+    });
+  }
+
+  var initBusyEvents = function(events) {
+    $.map(events, function(event) {
+      var start = new Date(event.start); // This applies TZ
+      var end = new Date(event.end);
+
+      for(loopTime=start.getTime(); loopTime <= end.getTime(); loopTime+=86400000) {
+        var d = new Date(loopTime);
+        var domEl = eventElement(d);
+
+        domEl.addClass("busy");
+        domEl.tipsy({
+          title: busyTipsy,
+          html: true,
+          fade: true,
+          hoverable: true,
+          gravity: 'ne',
+          opacity: 0.95
+        });
+      }
+    })
+  }
+
+  var busyTipsy = function(){
+    var startDate = elementDate(this)
+    startDate.setHours(0);
+    startDate.setMinutes(0);
+    startDate.setSeconds(0);
+    var endDate   = elementDate(this)
+
+    $.ajax({
+      dataType: "script",
+      url: eventsPath,
+      data: {
+        // use UNIX timestamps
+        start: Math.round(startDate.getTime() / 1000),
+        end:   Math.round(endDate.getTime() / 1000),
+        tipsy: this.id
+      }
+    });
+
+    return '<div id="tipsy-' + this.id + '" class="tipsy-sidebar_calendar"><img src="<%= asset_path('loading.gif') %>"></div>';
+  }
+
+  return {
+    init: init
+  }
+
+})(SocialStream, jQuery);

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

@@ -0,0 +1,17 @@
+SocialStream.Event = (function(SS, $, undefined) {
+	var indexCallbacks = [];
+
+	var addIndexCallback = function(callback){
+		indexCallbacks.push(callback);
+	}
+
+	var index = function(){
+		$.each(indexCallbacks, function(i, callback){ callback(); });
+	}
+
+	return {
+		addIndexCallback: addIndexCallback,
+		index: index
+	}
+
+})(SocialStream, jQuery);

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

@@ -13,6 +13,7 @@ SocialStream.Events.Poster = (function(SS, $, undefined){
 	}
 
 	SS.Timeline.addInitCallback(init);
+	SS.Event.addIndexCallback(init);
 
 	return {
 		init: init

data/app/assets/javascripts/{events.js.coffee → social_stream.events.tools.js.coffee}

@@ -7,22 +7,6 @@
 #= require sprintf
 #= require scheduler
 
-SocialStream.Events.create = (start, end, allDay) ->
-  title = prompt('Event Title:');
-  if title
-    $.post(SocialStream.Events.current.eventsPath,
-           {
-           event: {
-             title: title,
-             start_at: start.toString(),
-             end_at: end.toString(),
-             all_day: allDay,
-             _contact_id: SocialStream.Events.current.contactId
-             }
-           },
-           undefined,
-          "script");
-
 SocialStream.Events.tools = {}
 
 SocialStream.Events.tools.currentRGB = () ->

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

@@ -4,6 +4,7 @@
 //
 //= require fullcalendar
 //= require boxy
+//= require tipsy
 
 @import "colors";
 
@@ -95,6 +96,7 @@ div.event_date {
 
 #sidebar_calendar td {
   height: 25px;
+  padding: 1px;
 }
 
 #sidebar_calendar td.past {
@@ -113,6 +115,23 @@ div.event_date {
 #sidebar_calendar td.busy {
   font-weight: bold;
 }
+
+#sidebar_calendar td.busy:hover {
+  font-weight: bold;
+  color: $main-color;
+  background: $secondary-color;
+  border: $main-color 1px solid;
+  padding: 0px;
+}
+
+#sidebar_calendar td.busy.today {
+	padding: 0px;
+}
+
+#sidebar_calendar td.busy:hover a {
+  color: $main-color;
+}
+
 .sidebar_calendar_month {
   text-align: center;
   padding: 5px;
@@ -145,3 +164,17 @@ div.event_date {
 #scheduler-options {
   padding: 2px 10px;
 }
+
+.tipsy-sidebar_calendar {
+	min-width: 300px;
+	width: 300px;
+	border: solid $separation-color 1px;
+	padding: 10px;
+	background-color: #FFF;
+	opacity: 1;
+	border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px;
+}
+
+.tipsy-inner {
+	max-width: 500px;
+}

data/app/controllers/events_controller.rb

@@ -7,18 +7,16 @@ class EventsController < ApplicationController
 
   def index
     index! do |format|
+      format.js {
+        events_with_start_and_end
+      }
+
       format.json {
-        start_time = Time.at(params[:start].to_i)
-        end_time   = Time.at(params[:end].to_i)
-        @activities =
-          collection.
-           joins(:activity_objects => :event).
-            merge(Event.between(start_time, end_time))
+        events_with_start_and_end
 
         render :json =>
-          @activities.
-            map(&:direct_object).
-            map{ |e| e.to_json(:start => start_time, :end => end_time) }.flatten.to_json
+          @events.
+            map{ |e| e.to_json(:start => @start_time, :end => @end_time) }.flatten.to_json
       }
     end
   end
@@ -37,4 +35,16 @@ class EventsController < ApplicationController
                            :for => current_subject,
                            :object_type => :Event)
   end
+
+  def events_with_start_and_end
+    @start_time = Time.at(params[:start].to_i)
+    @end_time   = Time.at(params[:end].to_i)
+
+    @activities =
+      collection.
+      joins(:activity_objects => :event).
+      merge(Event.between(@start_time, @end_time))
+
+    @events = @activities.map(&:direct_object)
+  end
 end

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

@@ -40,6 +40,11 @@
     <div class="title">
     <%= link_to event.title, event %>
     </div>
+
+    <div class="description">
+    <%= simple_format auto_link(event.description) %>
+    </div>
+
   </div>
 <% end %>
 

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

@@ -26,34 +26,12 @@
   </table>
 
   <%= javascript_tag do %>
-    var now = new Date();
-    $('#sidebar_day_' + now.getDate() + '_' + (now.getMonth()+1) + '_' + now.getFullYear()).addClass('today');
-    var re = new RegExp('sidebar_day_(..?)_(..?)_(..?.?.?)');
-    $('#sidebar_calendar td').each(function(index, domEl){
-      var m = re.exec(domEl.id);
-      if(m == null) return;
-      var d = new Date(m[3], (m[2]-1), m[1], 23, 59, 59);
-      if(d < now) $(domEl).addClass('past');
-      if(m[2] != (now.getMonth()+1) && d > now) $(domEl).addClass('next_month');
-    });
-    $.ajax({
-      dataType: 'json',
-      cache: false,
-      url: "<%= escape_javascript polymorphic_path([@current_subject, Event.new]) %>",
-      data: {
-        start: <%= bow.to_i %>,
-	end: <%= (bow + 28.days).to_i %>
-      },
-      success: function(events) {
-        $.map(events, function(event) {
-	  var start = new Date(event.start); // This applies TZ
-	  var end = new Date(event.end);
-	  for(loopTime=start.getTime(); loopTime <= end.getTime(); loopTime+=86400000) {
-	    var d = new Date(loopTime);
-	    $('#sidebar_day_'+ d.getDate() + '_' + (d.getMonth()+1) + '_' + d.getFullYear()).addClass("busy");
-	  }
-	})
-      }
+    $(function(){
+      SocialStream.Calendar.init({
+        eventsPath: "<%= escape_javascript polymorphic_path([@current_subject, Event.new]) %>",
+        start: "<%= bow.to_i %>",
+	end: "<%= (bow + 28.days).to_i %>"
+      });
     });
   <% end %>
 

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

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

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

@@ -26,6 +26,6 @@
 
 <%= javascript_tag do %>
   $(function(){
-    $('#room_name').Watermark("<%= escape_javascript t('room.watermark.name') %>");
+    $('#room_name').watermark("<%= escape_javascript t('room.watermark.name') %>");
   });
 <% end %>

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

@@ -1,7 +1,7 @@
 <% if @room.valid? %>
   $('#rooms').replaceWith("<%= escape_javascript render(:partial => 'index') %>");
   $('#room_name').val("");
-  $('#room_name').Watermark("<%= escape_javascript t('room.watermark.name') %>");
+  $('#room_name').watermark("<%= escape_javascript t('room.watermark.name') %>");
 <% else %>
   $('#new_room').replaceWith("<%= escape_javascript render(:partial => 'form') %>");
 <% end %>

data/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.9.1".freeze
+    VERSION = "0.9.2".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.17.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.17.2')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.6')
   s.add_runtime_dependency('coffee-rails', '>= 3.1.0')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-events
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000Z
+date: 2012-03-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &70584250 !ruby/object:Gem::Requirement
+  requirement: &86141060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.17.2
   type: :runtime
   prerelease: false
-  version_requirements: *70584250
+  version_requirements: *86141060
 - !ruby/object:Gem::Dependency
   name: rails-scheduler
-  requirement: &70583230 !ruby/object:Gem::Requirement
+  requirement: &86140600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70583230
+  version_requirements: *86140600
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &70582000 !ruby/object:Gem::Requirement
+  requirement: &86140300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70582000
+  version_requirements: *86140300
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70581250 !ruby/object:Gem::Requirement
+  requirement: &86140030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70581250
+  version_requirements: *86140030
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -72,9 +72,11 @@ files:
 - README.rdoc
 - Rakefile
 - app/assets/images/poster.png
-- app/assets/javascripts/events.js.coffee
 - app/assets/javascripts/social_stream-events.js
+- app/assets/javascripts/social_stream.calendar.js.erb
+- app/assets/javascripts/social_stream.event.js
 - app/assets/javascripts/social_stream.events.poster.js
+- app/assets/javascripts/social_stream.events.tools.js.coffee
 - app/assets/stylesheets/events.css.scss
 - app/assets/stylesheets/social_stream-events.css
 - app/controllers/events_controller.rb
@@ -92,6 +94,7 @@ files:
 - app/views/events/destroy.js.erb
 - app/views/events/edit.js.erb
 - app/views/events/index.html.erb
+- app/views/events/index.js.erb
 - app/views/rooms/_form.html.erb
 - app/views/rooms/_index.html.erb
 - app/views/rooms/_settings.html.erb