social_stream-events 0.0.7 → 0.0.8

data/app/models/event.rb

@@ -1,5 +1,6 @@
 class Event < ActiveRecord::Base
   include SocialStream::Models::Subject
+  acts_as_conference_manager_event
 
   has_one :agenda, :dependent => :destroy
   has_many :sessions, :through => :agenda

data/app/models/session.rb

@@ -1,5 +1,6 @@
 class Session < ActiveRecord::Base
   include SocialStream::Models::Object
+  acts_as_conference_manager_session
 
   belongs_to :agenda
   has_one :event, :through => :agenda

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

@@ -3,3 +3,8 @@
 <%= f.hidden_field :founder_id, :value => current_subject.id %>
 <%= f.text_field :name, :size => 85, :value => t('event.input')  %>
 
+<%= javascript_tag do %>
+  $(function() {
+    $("#event_name").Watermark("<%= I18n.t('event.input') %>","#666");
+  });
+<% end %>

data/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.0.7".freeze
+    VERSION = "0.0.8".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.9.13')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.15')
   s.add_runtime_dependency('conference_manager-ruby', '~> 0.0.3')
 
   # Development Gem dependencies

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-events
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Diego Carrera
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 +02:00
+date: 2011-10-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,12 +28,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 37
         segments: 
         - 0
         - 9
-        - 13
-        version: 0.9.13
+        - 15
+        version: 0.9.15
   name: social_stream-base
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -210,7 +210,6 @@ files:
 - app/views/events/_event.html.erb
 - app/views/events/_event_with_details.html.erb
 - app/views/events/_form.html.erb
-- app/views/events/_jquery.html.erb
 - app/views/events/_manage.html.erb
 - app/views/events/_new_activity.html.erb
 - app/views/events/_new_activity_fields.html.erb

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

@@ -1,125 +0,0 @@
-//javascript for main activities input
-title = "<%= t('activity.input') %>";
-$("#input_activities").click(function(){
-  if(this.value == title){
-    this.value="";
-    $("#masterSubmitButton").show();
-  }
-});
-
-//initial state
-$('#wrapper_activities_header form').hide();
-$('#new_post').show();
-
-//clicks on headers
-$('.activities_title_header').live('click',function(){
-	$('.activities_title_header').removeClass('selected');
-	$(this).addClass('selected');
-	$('#wrapper_activities_header form').hide();
-	$('#new_'+this.id.split("_")[1]).show();
-});
-
-//submit
-$('#masterSubmitButton').live('click',function(){
-	$('.liveAdded').remove();
-	$('#wrapper_activities_header form:visible').append(
-	$('<input/>')
-	  .addClass('liveAdded')
-	  .attr('type', 'hidden')
-	  .attr('name', $('#wrapper_activities_header form:visible')
-	  .attr('id').split('_')[1]+'[_relation_ids][]')
-	  .val($('#security option:selected').attr('value')));
-	$('#wrapper_activities_header form:visible').submit();
-});
-
-
-//javascript for comments
-$(".input_new_comments").val("<%= t('comment.input') %>");
-$(".activities_comment_btn").hide();
-
-//usa livequery para usar el javascript luego de una accion con  AJAX
-$(".input_new_comments").livequery("click",function(){
-	if(this.value == "<%= t('comment.input') %>"){
-		$(this).val("");
-	}
-	$(".activities_comment_btn").hide();
-	$(this).parent(".new_comment").children(".activities_comment_btn").show();
-});
-$(".input_new_comments").livequery("blur",function(){
-	if(this.value == ""){
-		$(".activities_comment_btn").hide();
-    $(this).val("<%= t('comment.input') %>");
-	}
-});
-
-$(".input_new_comments").click(function(){
-	if(this.value == "<%= t('comment.input') %>"){
-		$(this).val("");
-	}
-	$(".activities_comment_btn").hide();
-	$(this).parent(".new_comment").children(".activities_comment_btn").show();
-});
-
-//javascript for tocomment option
-$(".to_comment").livequery("click", function(){
-  $(this).parents(".activity_content").find(".input_new_comments").click();
-  $(this).parents(".activity_content").find(".input_new_comments").focus();
-	return false;
-});
-$(".to_comment").livequery("blur", function(){
-  $(this).parents(".activity_content").find(".input_new_comments").blur();
-	return false;
-});
-
-
-
-
-
-
-
-
-
-//move he last list item before the first item. The purpose of this is if the user clicks to slide left he will be able to see the last item.
-$('#carousel_ul li:first').before($('#carousel_ul li:last'));
-
-
-//when user clicks the image for sliding right
-$('#right_scroll img').livequery("click",function(){
-
-  //get the width of the items ( i like making the jquery part dynamic, so if you change the width in the css you won't have o change it here too ) '
-  var item_width = $('#carousel_ul li').outerWidth() + 10;
-
-  //calculae the new left indent of the unordered list
-  var left_indent = parseInt($('#carousel_ul').css('left')) - item_width;
-
-  //make the sliding effect using jquery's anumate function '
-  $('#carousel_ul:not(:animated)').animate({'left' : left_indent},500,function(){
-
-      //get the first list item and put it after the last list item (that's how the infinite effects is made) '
-      $('#carousel_ul li:last').after($('#carousel_ul li:first'));
-
-      //and get the left indent to the default -210px
-      $('#carousel_ul').css({'left' : '-210px'});
-  });
-});
-
-//when user clicks the image for sliding left
-$('#left_scroll img').livequery("click",function(){
-
-  var item_width = $('#carousel_ul li').outerWidth() + 10;
-
-  /* same as for sliding right except that it's current left indent + the item width (for the sliding right it's - item_width) */
-  var left_indent = parseInt($('#carousel_ul').css('left')) + item_width;
-
-  $('#carousel_ul:not(:animated)').animate({'left' : left_indent},500,function(){
-
-  /* when sliding to left we are moving the last item before the first list item */
-  $('#carousel_ul li:first').before($('#carousel_ul li:last'));
-
-  /* and again, when we make that change we are setting the left indent of our unordered list to the default -210px */
-  $('#carousel_ul').css({'left' : '-210px'});
-  });
-
-
-});
-