social_stream-events 0.0.2 → 0.0.4

data/.gitignore

@@ -1,3 +1,10 @@
-Gemfile.lock
 pkg/*
-
+.bundle
+**.tmp_*
+Gemfile.lock
+.idea
+nbproject
+.loadpath
+.project
+.DS_Store
+.yardoc/*

data/Gemfile

@@ -1,9 +1,5 @@
 source "http://rubygems.org"
 
-if File.exists?(File.join(File.dirname(__FILE__), '..', 'social_stream-base'))
-  gem 'social_stream-base', :path => '../social_stream-base'
-else
-  gem 'social_stream-base', :git => 'https://github.com/ging/social_stream-base.git'
-end
+gem 'social_stream-base', :path => '../base'
 
 gemspec

data/Rakefile

@@ -27,3 +27,10 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 Bundler::GemHelper.install_tasks
+
+# Modify this gem's tags
+class Bundler::GemHelper
+  def version_tag
+    "events#{version}"
+  end
+end

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

@@ -26,11 +26,7 @@
 #founder #created{display: inline-block;}
 #founder #thumb{display: inline-block;}
 
-#event_name{
-  border: 1px solid #BDC7D8;
-  padding: 5px;
-  width: 95%;
-}.sb_wrapper input[type="text"],
+.sb_wrapper input[type="text"],
 ul.sb_dropdown{
 	border:1px solid #fff;
 	background: #fafafa; 

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

@@ -0,0 +1,2 @@
+<%= render :partial => 'subjects/subject_with_details',
+           :locals => {:subject => event} %>

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

@@ -0,0 +1,2 @@
+<%= render :partial => 'objects/new_activity', :locals => {:receiver => receiver, :object => Event.new, :remote => false	 } %>
+

data/config/locales/en.yml

@@ -34,8 +34,6 @@ en:
     confirm_delete: "Confirm delete?"
   agenda:
     confirm_delete: "delete"
-  button:
-    create: "Create"
   conference:
     title: "Conferences"
     list: "Contact's conferences"
@@ -69,8 +67,6 @@ en:
       info: "Event information"
       tags: "Event tags"
     outline: "Outline"
-  preposition:
-    and: "and"
   session:
     confirm_delete: "delete"
     new: "New Session"
@@ -79,11 +75,6 @@ en:
     title: "title"
     description: "description"
     schedule: "schedule"
-  settings:
-    manage:
-      name: "Admin Contacs"
-      briefing: "Settings contacts preferences"
-      explanation: "Change contacts permissions"
   time:
     am: am
     end: End time

data/config/routes.rb

@@ -1,19 +1,6 @@
-
 Rails.application.routes.draw do
 
-  resource :settings
-  resource :tie
-  match "/settings/update_relation/:id" => "settings#update_relation"
-
-  resource :settings
-  resource :tie
-
-  resource :actor
-  match "/settings/update_relation/:id" => "settings#update_relation"
-  match "/settings/manage" => "settings#manage"
   match "/events/manage" => "events#manage"
-  match "/settings/delete_relation/:id" => "settings#delete_relation"
-  match "/activities/documents" => "activities#documents"
   match "/sessions/delete/:id" => "sessions#delete"
   # Social Stream subjects configured in config/initializers/social_stream.rb
 
@@ -27,7 +14,6 @@ Rails.application.routes.draw do
     end
   end
 
-
   match "events/:id/agenda" => "agendas#show"
   match "events/:id/sessions" => "sessions#show"
   match "events/:id/sessions/create" => "sessions#create"
@@ -41,6 +27,4 @@ Rails.application.routes.draw do
   match "sessions/:id/new" => "sessions#new"
   match "sessions/:id/create" => "sessions#create"
   match "sessions/:id/update" => "sessions#update"
-
-
 end

data/lib/social_stream-events.rb

@@ -1,8 +1,13 @@
 require 'social_stream-base'
 
 module SocialStream
+  module ToolbarConfig
+    autoload :Events, 'social_stream/toolbar_config/events'
+  end
+
   module Events
-    # Add :document to SocialStream.objects and SocialStream.activity_forms by default
+    # Add :event, :agenda, :session to SocialStream.objects and SocialStream.activity_forms
+    # by default
     # It can be configured by users at application's config/initializers/social_stream.rb
     [:event, :agenda, :session].each do |o|
       SocialStream.objects.push(o) unless SocialStream.objects.include?(o)

data/lib/social_stream/events/engine.rb

@@ -1,8 +1,11 @@
 module SocialStream
   module Events
     class Engine < Rails::Engine
-    
-      
+      initializer "social_stream-events.toolbar_config" do
+        SocialStream::ToolbarConfig.module_eval do
+          include SocialStream::ToolbarConfig::Events
+        end
+      end
     end
   end
 end

data/lib/social_stream/events/version.rb

@@ -0,0 +1,5 @@
+module SocialStream
+  module Events
+    VERSION = "0.0.4".freeze
+  end
+end

data/lib/social_stream/migrations/events.rb

@@ -1,25 +1,8 @@
-require 'social_stream/migrations/base'
+require 'social_stream/migrations/components'
 
 module SocialStream
   module Migrations
-    class Events < Base
-      def initialize
-        super
-
-        @events = find_migration('social_stream-events')
-      end
-
-      def up
-        super
-
-        ActiveRecord::Migrator.migrate @events
-      end
-
-      def down
-        ActiveRecord::Migrator.migrate @events, 0
-
-        super
-      end
+    class Events < Components
     end
   end
 end

data/lib/social_stream/toolbar_config/events.rb

@@ -0,0 +1,40 @@
+module SocialStream
+  module ToolbarConfig
+    module Events
+      def home_toolbar_items
+        items = super
+
+        items.find{ |i| i[:key] == :resources }[:items].unshift({
+          :key => :resources_events,
+          :name => image_tag("btn/btn_event.png")+t('conference.title'),
+          :url => events_path
+        })
+
+        items
+      end
+
+      def profile_toolbar_items(subject = current_subject)
+        items = super
+
+        items.find{ |i| i[:key] == :resources }[:items].unshift({
+          :key => :resources_events,
+          :name => image_tag("btn/btn_event.png")+t('conference.title'),
+          :url => polymorphic_path([subject, Event.new])
+        })
+
+        if SocialStream.activity_forms.include?(:event) &&
+           subject.is_a?(Event) &&
+           subject.agenda.present?
+
+           items.insert(1, {
+             :key => :outline_info,
+             :name => image_tag("btn/btn_outline.png")+t('menu.outline'),
+             :url =>  agenda_path(subject)
+           })
+        end
+
+        items
+      end
+    end
+  end
+end

data/social_stream-events.gemspec

@@ -1,6 +1,9 @@
+# encoding: UTF-8
+require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'events', 'version')
+
 Gem::Specification.new do |s|
   s.name = "social_stream-events"
-  s.version = "0.0.2"
+  s.version = SocialStream::Events::VERSION.dup
   s.authors = ["Diego Carrera", "Antonio Tapiador", "GING - DIT - UPM"]
   s.summary = "Events and Video conferences capabilities for Social Stream, the core for building social network websites"
   s.description = "Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.\n\nThis gem allow you  to add events and videoconferences as new social stream activity."
@@ -9,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.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.11')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'