social_stream-events 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4987018b8e4381997ef90ed050e02372997d8053
-  data.tar.gz: 94fb6cb287d1ec59d53f8a08e8e4c4acaded1542
+  metadata.gz: 7e596aa40ebd3027ede9e2444bfbc273597fadef
+  data.tar.gz: acedc480c8feea85f71afcb1336ce60b3bdb1750
 SHA512:
-  metadata.gz: 26a6ca8444a54b5417e77c47fbfe96561de78196425295ac2584b6e852e6f1f83dbd31007e9450672f013f96209eba4f35ff8dade130c84f5307710d4ca373af
-  data.tar.gz: ae173bef7a68e5c34a66848ad84412027ee325e66bad1a9be6746ec40f88f887022fd20044686a08f7a9c32f44545a5a254e6fb58853fd1b9be31818c87baaf6
+  metadata.gz: 79bef9997ef7ddb5e09992398fe975a982253f92e06f4a53d7017967e9176a2651c41a6be8d45018692bb3b809c1e0fd5abcf023f6b41c7fee97f4dfbdfc3e67
+  data.tar.gz: c2cfee3edba3b1e9450646cf6dc71b680601a2a2ca279af86da47e822c5231f94fb34daa3ec72df592305ccf313fa21ba09ac151f182a0bb98ecc89c06886d0e

data/app/assets/stylesheets/social_stream/events/calendar/layout/_calendar.css.sass

@@ -1,6 +1,9 @@
 @import "fullcalendar"
 
 #calendar
+  @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
+  float: left
+  margin-left: 2.5%
   .fc-button.fc-state-default 
     position: relative
 

data/app/assets/stylesheets/social_stream/events/calendar/layout/_calendar_sidebar.css.sass

@@ -1,8 +1,6 @@
 @import "fullcalendar"
 
 #events
-  #toolbar
-    display: none
 
   #sidebar
     .calendar

data/app/assets/stylesheets/social_stream/events/repository/_repository.css.sass

@@ -6,11 +6,10 @@
   .event
     .data
       .name
-        .date
-          @include ellipsis
-          font-size: 12px
+        .date,
         .frequency
           @include ellipsis
           font-size: 12px
+        .frequency
           color: #888
     

data/app/assets/stylesheets/social_stream/events/repository/layout/_repository.css.sass

@@ -20,5 +20,12 @@
         margin-top: 11px
         @include ellipsis
         width: 73%
-      .date
-        font-size: 11px
+      .date  
+        font-size: 11px
+      .date,
+      .frequency
+        @include ellipsis
+        width: 73%
+      .frequency
+        color: #888
+        font-size: 12px

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

@@ -19,11 +19,11 @@
           width: 50%
           display: inline-block !important
 
-
-
+  #calendar 
+    @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+    margin-left: 0
   #events
-    #toolbar
-      @extend .hidden-phone
+
     td
       .fc-button
         padding: 3.5% !important

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

@@ -21,9 +21,7 @@
       #pendings
         @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
 
-  #events
-    #toolbar
-      @extend .hidden-tablet
+ 
 
   #explore-content
     .timeline

data/app/controllers/events_controller.rb

@@ -1,7 +1,7 @@
 class EventsController < ApplicationController
   include SocialStream::Controllers::Objects
 
-  before_filter :profile_subject!, :only => :index
+  before_filter :profile_or_current_subject!, :only => :index
 
   def index
     index! do |format|

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

@@ -2,7 +2,7 @@
 
 
 <li class="event">
-  <%= link_to polymorphic_path([current_subject, Event.new ]) do %>
-    <i class="icon_navbar-calendar <%= current_header_icon_class(:events) %>"></i> 
+  <%= link_to events_path do %>
+    <i class="icon_navbar-calendar <%= current_header_icon_class(:events) %>" title="<%= t 'header.icon.calendar' %>"></i> 
   <% end %>
 </li>

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

@@ -1,4 +1,4 @@
-<%= form_for @event || Event.new(:owner_id => profile_subject.actor_id, :interval => 1), :remote => true do |f| %>
+<%= form_for @event || Event.new(:owner_id => profile_or_current_subject.actor_id, :interval => 1), :remote => true do |f| %>
   <%= f.hidden_field :owner_id  %>
   <%= f.hidden_field :start_at %>
   <%= f.hidden_field :end_at %>

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

@@ -1,13 +1,13 @@
 <% content_for :title do %>
-  <%= profile_subject.name + ": " + t('event.calendar') %>
+  <%= profile_or_current_subject.name + ": " + t('event.calendar') %>
 <% end %>
 
 <section id="events">
-  <%= render partial: 'toolbar/profile', locals: { subject: profile_subject } %>
+  <%= render partial: 'toolbar/profile', locals: { subject: profile_or_current_subject } %>
 
-  <div id="calendar" class="table-striped" data-events_path="<%= polymorphic_path [profile_subject, Event.new] %>" data-date="<%= params[:date] %>" data-view="<%= params[:view] %>" <%= 'data-can-create="true"' if can?(:create, new_post(profile_subject)) %>></div>
+  <div id="calendar" class="table-striped" data-events_path="<%= polymorphic_path [profile_or_current_subject, Event.new] %>" data-date="<%= params[:date] %>" data-view="<%= params[:view] %>" <%= 'data-can-create="true"' if can?(:create, new_post(profile_or_current_subject)) %>></div>
 
-  <% if can? :create, new_post(profile_subject) %>
+  <% if can? :create, new_post(profile_or_current_subject) %>
     <div id="calendar_form" class="modal hide fade">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">

data/config/locales/en.yml

@@ -43,6 +43,9 @@ en:
       one: "Event"
       other: "Events"
     wall_post: "Published an event: %{title}"
+  header:
+    icon:
+      calendar: "Calendar"
   room:
     confirm_delete: "Delete room?"
     delete: "Delete"

data/config/locales/es.yml

@@ -44,6 +44,9 @@ es:
       one: "Evento"
       other: "Eventos"
     wall_post: "Publicó un evento: %{title}"
+  header:
+    icon:
+      calendar: "Calendar"
   room:
     confirm_delete: "¿Borrar espacio?"
     delete: "Borrar"

data/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "2.0.0.beta1".freeze
+    VERSION = "2.0.0.beta2".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', '~> 2.0.0.beta1')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta2')
   s.add_runtime_dependency('rails-scheduler', '~> 0.1.1')
 
   # Development Gem dependencies

data/spec/controllers/events_controller_spec.rb

@@ -3,6 +3,16 @@ require 'spec_helper'
 describe EventsController do
   render_views
 
+  context "public calendar" do
+    context "when Anonymous" do
+      it "should render index" do
+        get :index
+
+        response.should redirect_to(new_user_session_path)
+      end
+    end
+  end
+
   context "user's calendar" do
     before do
       @user = Factory(:user)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-events
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Antonio Tapiador
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta1
+        version: 2.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta1
+        version: 2.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: rails-scheduler
   requirement: !ruby/object:Gem::Requirement