social_stream-base 0.9.14 → 0.9.15

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 0
   - 9
-  - 14
-  version: 0.9.14
+  - 15
+  version: 0.9.15
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,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 
@@ -324,9 +324,25 @@ dependencies:
   type: :runtime
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: sass-rails
   prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
+        version: 3.1.0
+  type: :runtime
+  version_requirements: *id020
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -338,11 +354,11 @@ dependencies:
         - 9
         version: 0.3.9
   type: :development
-  version_requirements: *id020
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -352,11 +368,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id021
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -366,11 +382,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id022
+  version_requirements: *id023
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -382,11 +398,11 @@ dependencies:
         - 1
         version: 2.6.1
   type: :development
-  version_requirements: *id023
+  version_requirements: *id024
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -398,11 +414,11 @@ dependencies:
         - 2
         version: 1.3.2
   type: :development
-  version_requirements: *id024
+  version_requirements: *id025
 - !ruby/object:Gem::Dependency 
   name: forgery
   prerelease: false
-  requirement: &id025 !ruby/object:Gem::Requirement 
+  requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -414,11 +430,11 @@ dependencies:
         - 2
         version: 0.4.2
   type: :development
-  version_requirements: *id025
+  version_requirements: *id026
 - !ruby/object:Gem::Dependency 
   name: ci_reporter
   prerelease: false
-  requirement: &id026 !ruby/object:Gem::Requirement 
+  requirement: &id027 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -430,11 +446,11 @@ dependencies:
         - 4
         version: 1.6.4
   type: :development
-  version_requirements: *id026
+  version_requirements: *id027
 - !ruby/object:Gem::Dependency 
   name: nifty-generators
   prerelease: false
-  requirement: &id027 !ruby/object:Gem::Requirement 
+  requirement: &id028 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -446,7 +462,7 @@ dependencies:
         - 5
         version: 0.4.5
   type: :development
-  version_requirements: *id027
+  version_requirements: *id028
 description: |-
   Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
   
@@ -630,14 +646,15 @@ files:
 - app/assets/javascripts/toolbar.js
 - app/assets/javascripts/users.js
 - app/assets/stylesheets/0_devise_sign.css
-- app/assets/stylesheets/activities.css
-- app/assets/stylesheets/base.css
-- app/assets/stylesheets/contacts.css
+- app/assets/stylesheets/_colors.scss
+- app/assets/stylesheets/activities.css.scss
+- app/assets/stylesheets/base.css.scss
+- app/assets/stylesheets/contacts.css.scss
 - app/assets/stylesheets/conversations.css
-- app/assets/stylesheets/footer.css
-- app/assets/stylesheets/frontpage.css
+- app/assets/stylesheets/footer.css.scss
+- app/assets/stylesheets/frontpage.css.scss
 - app/assets/stylesheets/groups.css
-- app/assets/stylesheets/header.css
+- app/assets/stylesheets/header.css.scss
 - app/assets/stylesheets/home.css
 - app/assets/stylesheets/images/add-policy.png
 - app/assets/stylesheets/images/fcbkcomplete/close.gif
@@ -749,6 +766,7 @@ files:
 - app/views/contacts/_contact.html.erb
 - app/views/contacts/_form.html.erb
 - app/views/contacts/_index.html.erb
+- app/views/contacts/_link.html.erb
 - app/views/contacts/_pendings.html.erb
 - app/views/contacts/_suggestions.html.erb
 - app/views/contacts/_suggestions_and_pendings.html.erb
@@ -775,6 +793,7 @@ files:
 - app/views/devise/registrations/new.html.erb
 - app/views/devise/sessions/new.html.erb
 - app/views/devise/shared/_links.erb
+- app/views/frontpage/_caracteristics.html.erb
 - app/views/frontpage/_header.html.erb
 - app/views/frontpage/_sponsor.html.erb
 - app/views/frontpage/host_meta.xml.builder
@@ -866,9 +885,8 @@ files:
 - app/views/relation/customs/create.js.erb
 - app/views/relation/customs/index.html.erb
 - app/views/relation/customs/update.js.erb
-- app/views/search/_focus_search.html.erb
+- app/views/search/_extended_search.html.erb
 - app/views/search/_form.html.erb
-- app/views/search/_global_search.html.erb
 - app/views/search/_header_search.html.erb
 - app/views/search/_index.html.erb
 - app/views/search/_index_frontpage.html.erb
@@ -889,6 +907,7 @@ files:
 - app/views/toolbar/_logo.html.erb
 - app/views/toolbar/_messages.html.erb
 - app/views/toolbar/_profile.html.erb
+- app/views/toolbar/_subject.html.erb
 - app/views/users/_groups.html.erb
 - app/views/users/_index.html.erb
 - app/views/users/_sidebar_index.html.erb
@@ -901,6 +920,7 @@ files:
 - app/views/users/show.js.erb
 - app/views/users/show.xml.builder
 - config/locales/en.yml
+- config/locales/es.yml
 - config/routes.rb
 - db/migrate/20110610112023_create_social_stream.rb
 - db/migrate/20110705103202_empty_ties_count.rb
@@ -940,6 +960,7 @@ files:
 - spec/controllers/frontpage_controller_spec.rb
 - spec/controllers/groups_controller_spec.rb
 - spec/controllers/home_controller_spec.rb
+- spec/controllers/invitations_controller_spec.rb
 - spec/controllers/likes_controller_spec.rb
 - spec/controllers/notifications_controller_spec.rb
 - spec/controllers/permissions_controller_spec.rb
@@ -1011,6 +1032,7 @@ files:
 - spec/support/db.rb
 - spec/support/devise.rb
 - spec/support/mock.rb
+- spec/support/thinking-sphinx.rb
 - vendor/assets/javascripts/ajax.paginate.js
 - vendor/assets/javascripts/chosen.jquery.js
 - vendor/assets/javascripts/d3.geom.js

data/app/assets/stylesheets/footer.css

@@ -1,26 +0,0 @@
-#sponsor-wrapper{ text-align:right; vertical-align:middle;}
-#sponsor{width:960px;margin:0 auto;color:#666; }
-
-#footer{width: 960px;margin-left: auto;margin-right: auto;padding: 0;position: relative; text-align:center;
-	clear:left;font-size:0.9166em;line-height:1.6363;color:#666;padding:0.75em 0;}
-#footer ul, #sponsor ul{list-style-type:none;margin:0 0.5em; }
-#footer ul li,#sponsor ul li{display:inline-block;margin-right:0.25em;position:relative;}
-#footer ul li#trade_mark,#sponsor ul li#trademark{font-weight:bold;color:#111;}
-#footer ul li#trade_mark_logo{font-weight:normal;}
-#footer a, #sponsor a{color:#666;}
-#footer a:hover, #sponsor a:hover{color:#444; text-decoration: underline;}
-#footer .icon,#global .icon{margin-bottom:-4px;}
-#footer-wrapper{background-color:#e1eef5;}
-#footer_right{font-weight:normal;}
-#footer_right{ font-size: 10px; line-height: 1.1em;}
-
-
-#footerFront {	width: 100%;	padding: 0;	background: #E1EEF5;}
-.banner_footer { width: 960px;	margin-left: auto;	margin-right: auto;	padding: 0;	position: relative;}
-.banner_footer #footer_content {	text-align: center;	color: #ccc;}
-.banner_footer {	width: 960px;	color: #0656a4;	margin-left: auto;	margin-right: auto;	padding-top: 2px;
-	position: relative;}
-.banner_footer .a_border {	border-right: thin solid;	color: #0656a4;	padding: 0px 7px;	text-decoration: underline;}
-.banner_footer a {	color: #0656a4;	padding: 0px 7px;	text-decoration: underline;}
-
-.rowfooter{float:right;}

data/app/views/search/_focus_search.html.erb

@@ -1,17 +0,0 @@
-<div class="title">
-	<%= @search_class_sym.to_s.capitalize.pluralize %>
-</div>
-<br class="clearfloat" />
-<% if @search_result.empty? %>
-<div class="subject_with_details">
-	<%= I18n.t('search.no_subject_found', :subject => @search_class_sym.to_s) %>
-</div>
-<% else %>
-<% total = 0 %>
-<% @search_result.each do |subject|%>
-<div class="subject_search_results block left">
-	<%= subject_with_details subject %>
-</div>
-<% end %>
-<%= paginate @search_result %>
-<% end %> 

data/app/views/search/_global_search.html.erb

@@ -1,19 +0,0 @@
-<% SocialStream.subjects.each do |subject_type| %>
-<div class="subject_search_results block  <%= cycle "left", "right" %>">
-  <div class="title">
-    <%= subject_type.to_s.capitalize.pluralize %>
-  </div>
-  <% if @search_result[subject_type].empty? %>
-  <div class="subject_with_details">
-    <%= I18n.t('search.no_subject_found', :subject => subject_type.to_s) %>
-  </div>
-  <% else %>
-  <% @search_result[subject_type].each do |subject|%>
-  <%= subject_with_details subject %>
-  <% end %>
-  <div class="subject_with_details">
-    <%= focus_search_link(I18n.t('search.all_subject_results', :subject => subject_type.to_s.pluralize, :count => @search_result[(subject_type.to_s+"_total").to_sym].to_s),subject_type.to_s,params[:search_query]) %>
-  </div>
-  <% end %>
-</div>
-<% end %>