social_stream 0.9.2 → 0.9.3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 +02:00
+date: 2011-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 53
         segments: 
         - 0
         - 9
-        - 3
-        version: 0.9.3
+        - 7
+        version: 0.9.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -189,6 +189,9 @@ files:
 - base/app/assets/images/HTML5_Semantics.png
 - base/app/assets/images/HTML5_Styling.png
 - base/app/assets/images/Jcrop.gif
+- base/app/assets/images/arrow-end.png
+- base/app/assets/images/arrow-start.png
+- base/app/assets/images/arrow.png
 - base/app/assets/images/big-logo.png
 - base/app/assets/images/boxy/boxy-ne.png
 - base/app/assets/images/boxy/boxy-nw.png
@@ -370,6 +373,7 @@ files:
 - base/app/assets/stylesheets/images/ui-icons_888888_256x240.png
 - base/app/assets/stylesheets/images/ui-icons_cd0a0a_256x240.png
 - base/app/assets/stylesheets/invitations.css
+- base/app/assets/stylesheets/location.css
 - base/app/assets/stylesheets/menu.css
 - base/app/assets/stylesheets/messages.css
 - base/app/assets/stylesheets/profiles.css
@@ -525,6 +529,7 @@ files:
 - base/app/views/likes/create.js.erb
 - base/app/views/likes/destroy.js.erb
 - base/app/views/location/_location.html.erb
+- base/app/views/location/_location_body.html.erb
 - base/app/views/message_mailer/new_message_email.html.erb
 - base/app/views/message_mailer/new_message_email.text.erb
 - base/app/views/message_mailer/reply_message_email.html.erb
@@ -637,9 +642,10 @@ files:
 - base/lib/social_stream/populate.rb
 - base/lib/social_stream/test_helpers.rb
 - base/lib/social_stream/test_helpers/controllers.rb
-- base/lib/social_stream/toolbar_config.rb
+- base/lib/social_stream/toolbar_config/base.rb
 - base/lib/tasks/db/populate.rake
 - base/lib/tasks/resque.rake
+- base/lib/tasks/workers.rake
 - base/social_stream-base.gemspec
 - base/spec/controllers/comments_controller_spec.rb
 - base/spec/controllers/contacts_controller_spec.rb
@@ -814,6 +820,8 @@ files:
 - documents/app/models/picture.rb
 - documents/app/models/video.rb
 - documents/app/views/audios/_audio.html.erb
+- documents/app/views/audios/_audio_processed.html.erb
+- documents/app/views/audios/_audio_processing.html.erb
 - documents/app/views/audios/_mediapreviews.html.erb
 - documents/app/views/audios/_new.html.erb
 - documents/app/views/audios/destroy.js.erb
@@ -839,6 +847,8 @@ files:
 - documents/app/views/toolbar/_uploads_menu.html.erb
 - documents/app/views/videos/_new.html.erb
 - documents/app/views/videos/_video.html.erb
+- documents/app/views/videos/_video_processed.html.erb
+- documents/app/views/videos/_video_processing.html.erb
 - documents/app/views/videos/destroy.js.erb
 - documents/app/views/videos/index.html.erb
 - documents/app/views/videos/show.html.erb
@@ -847,10 +857,12 @@ files:
 - documents/config/locales/en.yml
 - documents/config/routes.rb
 - documents/db/migrate/20110615143707_create_social_stream_documents.rb
+- documents/db/migrate/20110922173707_add_file_processing_to_document.rb
 - documents/lib/generators/social_stream/documents/install_generator.rb
 - documents/lib/social_stream-documents.rb
 - documents/lib/social_stream/documents/engine.rb
 - documents/lib/social_stream/migrations/documents.rb
+- documents/lib/social_stream/toolbar_config/documents.rb
 - documents/social_stream-documents.gemspec
 - documents/spec/controllers/documents_controller_spec.rb
 - documents/spec/controllers/pictures_controller_spec.rb
@@ -1040,7 +1052,6 @@ files:
 - events/app/views/toolbar/_profile.html.erb
 - events/app/views/toolbar/_sponsor.html.erb
 - events/app/views/toolbar/_suscribed.html.erb
-- events/app/views/users/index.html.erb
 - events/config/locales/en.yml
 - events/config/routes.rb
 - events/db/migrate/20110910161707_create_social_stream_events.rb
@@ -1048,6 +1059,7 @@ files:
 - events/lib/social_stream-events.rb
 - events/lib/social_stream/events/engine.rb
 - events/lib/social_stream/migrations/events.rb
+- events/lib/social_stream/toolbar_config/events.rb
 - events/social_stream-events.gemspec
 - events/vendor/assets/javascripts/fullcalendar.js
 - events/vendor/assets/javascripts/gcal.js
@@ -1056,6 +1068,7 @@ files:
 - lib/social_stream.rb
 - lib/social_stream/version.rb
 - social_stream.gemspec
+- social_stream.thor
 - spec/controllers/frontpage_controller_spec.rb
 - spec/dummy/.gitignore
 - spec/dummy/Rakefile
@@ -1098,30 +1111,6 @@ files:
 - spec/dummy/documents/documents/000/000/006/original.pdf
 - spec/dummy/documents/documents/000/000/007/original.pdf
 - spec/dummy/documents/documents/000/000/008/original.pdf
-- spec/dummy/documents/pictures/000/000/009/original.png
-- spec/dummy/documents/pictures/000/000/009/thumb.png
-- spec/dummy/documents/pictures/000/000/009/thumb0.png
-- spec/dummy/documents/pictures/000/000/010/original.png
-- spec/dummy/documents/pictures/000/000/010/thumb.png
-- spec/dummy/documents/pictures/000/000/010/thumb0.png
-- spec/dummy/documents/pictures/000/000/011/original.png
-- spec/dummy/documents/pictures/000/000/011/thumb.png
-- spec/dummy/documents/pictures/000/000/011/thumb0.png
-- spec/dummy/documents/pictures/000/000/012/original.png
-- spec/dummy/documents/pictures/000/000/012/thumb.png
-- spec/dummy/documents/pictures/000/000/012/thumb0.png
-- spec/dummy/documents/pictures/000/000/013/original.png
-- spec/dummy/documents/pictures/000/000/013/thumb.png
-- spec/dummy/documents/pictures/000/000/013/thumb0.png
-- spec/dummy/documents/pictures/000/000/014/original.png
-- spec/dummy/documents/pictures/000/000/014/thumb.png
-- spec/dummy/documents/pictures/000/000/014/thumb0.png
-- spec/dummy/documents/pictures/000/000/015/original.png
-- spec/dummy/documents/pictures/000/000/015/thumb.png
-- spec/dummy/documents/pictures/000/000/015/thumb0.png
-- spec/dummy/documents/pictures/000/000/016/original.png
-- spec/dummy/documents/pictures/000/000/016/thumb.png
-- spec/dummy/documents/pictures/000/000/016/thumb0.png
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html

data/base/lib/social_stream/toolbar_config.rb

@@ -1,99 +0,0 @@
-module SocialStream
-  module ToolbarConfig
-    #Prints the default home toolbar menu
-    def default_home_toolbar_menu
-      items = Array.new
-
-      #Messages
-      items << {:key => :messages,
-        :name => image_tag("btn/new.png")+t('message.other')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
-        :url => "#",
-        :options => {:link => {:id => "messages_menu"}},
-        :items => [
-          {:key => :message_new, :name => image_tag("btn/message_new.png")+ t('message.new'), :url => new_message_path, :options => {:link =>{:remote=> false}}},
-          {:key => :message_inbox, :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
-            :url => conversations_path, :options => {:link =>{:remote=> false}}},
-          {:key => :message_sentbox, :name => image_tag("btn/message_sentbox.png")+t('message.sentbox'), :url => conversations_path(:box => :sentbox), :options => {:link =>{:remote=> false}}},
-          {:key => :message_trash, :name => image_tag("btn/message_trash.png")+t('message.trash'), :url => conversations_path(:box => :trash)}
-        ]}
-
-      #Documents if present
-      if SocialStream.activity_forms.include? :document
-        items << {:key => :resources,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t('resource.mine'),
-          :url => "#",
-          :options => {:link => {:id => "resources_menu"}},
-          :items => [
-            {:key => :resources_documents,:name => image_tag("btn/btn_document.png")+t('document.title'),:url => documents_path},
-            {:key => :resources_pictures,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => pictures_path},
-            {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => videos_path},
-            {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => audios_path}
-          ]}
-      end
-
-      #Contacts
-      items << {:key => :contacts,
-        :name => image_tag("btn/btn_friend.png")+t('contact.other'),
-        :url => "#",
-        :options => {:link => {:id => "contacts_menu"}},
-        :items => [
-          {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.current'), :url => contacts_path},
-          {:key => :contacts_graph, :name => image_tag("btn/btn_friend.png")+t('contact.graph.one'), :url => ties_path},
-          {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.pending.other'), :url => contacts_path(:pending=>true)},
-          {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path}
-        ]}
-
-      render_items items
-    end
-
-    #Prints the default profile toolbar menu
-    def default_profile_toolbar_menu(subject = current_subject)
-      items = Array.new
-      #Information button
-      items << {:key => :subject_info,
-        :name => image_tag("btn/btn_edit.png")+t('menu.information'),
-        :url => [subject, :profile]
-      }
-
-      if subject!=current_subject
-        #Like button
-        items << {:key => :like_button,
-          :name => link_like_params(subject)[0],
-          :url => link_like_params(subject)[1],
-          :options => {:link => link_like_params(subject)[2]}}
-
-        if user_signed_in?
-          #Relation button
-          items << {:key => :subject_relation,
-            :name => image_tag("btn/btn_friend.png") + current_subject.contact_to!(subject).status,
-            :url => edit_contact_path(current_subject.contact_to!(subject))
-          }
-          #Send message button
-          items << {:key => :send_message,
-            :name => image_tag("btn/btn_send.png")+t('message.send'),
-            :url => new_message_path(:receiver => subject.slug)
-          }
-        end
-      end
-      #Documents if present
-      if SocialStream.activity_forms.include? :document
-        if subject == current_subject
-          resources_label = t('resource.mine')
-        else
-          resources_label = t('resource.title')
-        end
-        items << {:key => :resources,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+resources_label,
-          :url => "#",
-          :options => {:link => {:id => "resources_menu"}},
-          :items => [
-            {:key => :resources_documents,:name => image_tag("btn/btn_document.png")+t('document.title'),:url => polymorphic_path([subject, Document.new])},
-            {:key => :resources_pictures,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => polymorphic_path([subject, Picture.new])},
-            {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => polymorphic_path([subject, Video.new])},
-            {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => polymorphic_path([subject, Audio.new])}
-          ]}
-      end
-      render_items items
-    end
-  end
-end

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

@@ -1,46 +0,0 @@
-<% content_for :title do%>
-  <%= t('user.other') %>
-<%end%>
-
-<% toolbar if user_signed_in? %>
-
-<% content_for :sidebar do %>
-	<%= render :partial => "users/sidebar_index" %>
-<% end %>
-
-<%= location(image_tag("btn/btn_browse.png", :class=>"btn_config") + t('browse') +": "+
-             content_tag(:b ,content_tag(:span, t('user.other'), :id=>'name_group')) + ", "+ 
-             link_to(t('group.by'),groups_path) + ", "+ 
-             link_to(t('event.by'),:controller => :events , :action => :manage))
-
-%>
-
-<div class="space_center"></div>
-
-<div id="my_conferences">
-  <div id="contacts" class="block">
-    <div class="search_field_wrapper">
-      <input type="text" value="Search by name" id="search_field" class="search_input" />
-      <%= image_tag("btn/search.png",:size=>"20x20",:id=>"search_button") %>
-    </div>
-    <div class="space_center"></div>
-    <div class="row" >
-      <div class="center">
-        <%= link_to t('user.all_n', :count => User.count), users_path %> -
-        <% for u in User.distinct_initials %>
-          <%= link_to u.initial,{:letter => u.initial,:page => 1},:class => "user_letter_link" %>
-        <% end %>
-      </div>
-    </div>
-    <div class="space_center"></div>
-    <div id="list_users_ajax" class="tab_content block">
-      <%= render :partial => "users/index"%>
-    </div>
-    <div class="space_center"></div>
-  </div>
-</div>
-
-
-<div class="space_center"></div>
-
-