social_stream-base 0.9.11 → 0.9.12

data/app/assets/stylesheets/frontpage.css

@@ -8,7 +8,7 @@
 .div_busqueda #find_button{	width:15px;	border:0px;	height:15px;}
 .div_busqueda .a_border{	border-right:thin solid;	color:#0656a4;	padding:0px 7px;	text-decoration:underline;}
 .div_busqueda a{	color:#0656a4;	padding:0px 7px;	text-decoration:underline;}
-#espacio_busqueda {	width:692px;  margin-left:20px;	height:45px;	margin-bottom:0px;	float:left;
+#espacio_busqueda {	width:652px;  margin-left:20px;	height:45px;	margin-bottom:0px;	float:left;
 	display:inline;}
 #form_busqueda{  padding-top:3px;}
 span.find{  padding-right:5px;}

data/app/assets/stylesheets/header.css

@@ -20,9 +20,8 @@
 .div_login .subtexto{	padding-top: 8px;	height:12px;	font-size: 11px; }
 .div_login .a_border{	border-right:thin solid;	padding-right:7px;	text-decoration:underline; }
 #new_representation {	display: inline-block;}
-#header_notifications{padding: 0px 5px 0px 5px !important;}
-#header_notifications a{ color: white; background-color: #879eb5;-moz-border-radius: 6px; -webkit-border-radius: 6px;
-                border-radius: 6px; padding: 4px 9px 4px 9px;}
+#header_notifications a{color: white; background: transparent url('btn/header_notifications.png') no-repeat center center;padding: 4px 8px 6px 7px;}
+#header_inbox_count a{ color: white; background-color: #879eb5; padding: 2px 5px 2px 5px;}
 #representation {  display: inline;  padding-left:3px;  padding-right:3px;}
 .txt_config {color: #fff;	vertical-align: top;	display: inline;	padding-top: 2px;	border-right: thin solid;
 	padding-right: 3px;}
@@ -30,46 +29,26 @@
 
 
 /******** MENU HEADER *******/
-#menu_home{	vertical-align: top; }
+#menu_home, .menu_home {vertical-align: top; }
 #menu_home a {color:white;}
-#menu_home span {	float:left;	padding-right: 5px;	vertical-align: top;	padding-top: 5px;}
-#menu_home ul{	list-style: none;	margin: 0px;	float:left;}
-#menu_home ul li{	line-height:20px;	padding:5px 0px 5px 20px; vertical-align:top;}
-
-li.btn_menu_home{background: transparent url("btn/btn_home.png") no-repeat left center;}
-li.btn_menu_profile{background: transparent url("btn/btn_profile.png") no-repeat left center;}
-li.btn_menu_browse{background: transparent url("btn/btn_browse.png") no-repeat left center;}
-#btn_menu_settings{background: transparent url("btn/btn_config.png") no-repeat left center;}
-#btn_menu_account{background: transparent url("btn/btn_account.png") no-repeat left center;}
-#btn_menu_account_logout{background: transparent url("btn/btn_exit.png") no-repeat left center;}
-
-#menu_account{	vertical-align: top; height:23px; }
-#menu_account span {	float:right;	padding-right: 5px;	vertical-align: top;	padding-top: 5px;}
-#menu_account ul{	list-style: none;	margin: 0px;	float:left;}
-#menu_account ul li{	line-height:20px;	padding:5px 0px 5px 20px; vertical-align:top;}
-
-#menu_pipe{	vertical-align: top; height:23px; }
-#menu_pipe span {	float:right;	padding-right: 5px;	vertical-align: top;	padding-top: 5px;}
-#menu_pipe ul{	list-style: none;	margin: 0px;	float:left;}
-#menu_pipe ul li{	line-height:20px;	padding:5px 0px 5px 0px; vertical-align:top;}
-
-
-#account, #representation_li,#current_user_info, #representations_menu, #account_menu, #settings_menu {display:inline-block;vertical-align: top; height:22px; color:#FFF;}
-#representation_li{margin-left:10px;}
-#representation_text{display:inline;margin-left:2px;color:#FFF;}
-#current_user_info a{color:white;}
-li.btn_menu_representation{}
-#menu_home ul li.pipe,#menu_account ul li.pipe{padding:0px 3px 0px 3px; margin:0px;}
-.menu_white{display:inline-block; color:#fff;}
-.white_link{padding-top:3px;  vertical-align:top;  display:inline-block;}
-.black{color:#000; font-weight:bold;}
-
-
-
-
+#menu_home a:hover {text-decoration: none;}
+#menu_home ul {list-style: none;	margin: 0px;	float:left;}
+#menu_home ul li {line-height:20px;	vertical-align:top;}
 
+#header_dropdown_menu,.header_dropdown_li {width: 180px;display:inline-block;vertical-align: top; height:22px; color:#FFF;}
 
+#header_dropdown_menu ul li {width: 180px;line-height: 15px;}
+#header_dropdown_menu ul li a{padding: .40em 1em .70em 2.5em;}
+#header_dropdown_menu ul li a:hover{color:#1F4A75;}
+#header_dropdown_menu ul li ul li a{padding: .40em 1em .70em 1em;}
+#header_dropdown_menu ul li ul li ul li a{padding: .40em 1em .70em 2.5em;}
+#header_dropdown_menu ul li ul li ul{position: absolute; left: -180px;}
+#header_dropdown_menu a.session_change{background: transparent url('btn/arrow_session_change.png') no-repeat 3px 6px;}
 
+#menu_home ul li.pipe,#menu_account ul li.pipe{padding:0; margin:0;font-size: 20px;font-weight: bold;}
+.menu_white{display:inline-block; color:#fff;}
+.white_link{padding-top:3px;  vertical-align:top;  display:inline-block;}
+.black{color:#000; font-weight:bold;}
 
 
 /*** ESSENTIAL STYLES ***/
@@ -131,7 +110,7 @@ ul.sf-menu li li li.sfHover ul {
 	/*margin-bottom:	1em;   */
 }
 .sf-menu a {
-	padding: 		.40em 1em .70em 2em;
+	padding: 		.40em 1em .70em 1em;
 	text-decoration:none;
 }
 .sf-menu a, .sf-menu a:visited  { /* visited pseudo selector so IE6 applies text colour*/

data/app/assets/stylesheets/search.css

@@ -2,7 +2,7 @@
 /********************************* Header **************/
 #header_search {
   float: left;
-  padding: 1px 10px 0 10px;
+  padding: 1px 0 0 10px;
   z-index: 2001;
 }
 #header_search_input, #global_search_input {
@@ -14,7 +14,11 @@
 #header_search_input {
   border: solid 1px #dedede;
   height: 16px;
-  width: 150px;
+  width: 200px;
+}
+.banner_busqueda #header_search_input {
+  border: solid 1px #aaa;
+  height: 20px;
 }
 #global_search_input {
   border: solid 1px #aeaeae;

data/app/views/layouts/_header.erb

@@ -2,39 +2,42 @@
   <div class="banner_top banner_top_height">
     <div id="header_left">
       <div id="logo_txt">
-        <%= link_to(image_tag('header-logo.png', :alt => t('site.name')), root_path) %>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <%= link_to(image_tag('header-logo.png', :alt => t('site.name')), root_path) %>   
       </div>
-      <% if user_signed_in? %>
-        <div class="menu_list menu_white" id="menu_home">
-          <ul>
-            <li class="btn_menu_profile"><%= link_to(t('profile.one'), current_subject)%></li>
-            <li id="header_notifications">
-              <%= link_to( current_subject.mailbox.notifications.not_trashed.unread.count.to_s, notifications_path) %>
-            </li>
-          </ul>
-        </div>
-      <% end %>
     </div>
     <% if user_signed_in? %>
       <%= render :partial => 'layouts/search' %>
     <%end%>
     <div id="header_right">
        <% if user_signed_in? %>
-        <%= render :partial => 'layouts/representation' %>
-        <div class="menu_list menu_white" id="menu_pipe" >
-          <ul>
-            <li class="pipe">|</li>
-          </ul>
-        </div>
-        <%= render :partial => 'layouts/settings' %>
-        
-        <div class="menu_list menu_white" id="menu_pipe" >
+        <div class="menu_list menu_white" id="menu_home">
           <ul>
-            <li class="pipe">|</li>
+            <li>
+              <%= link_to(t('home'), root_path)%>
+            </li>   
+            <li class="pipe">·</li>
+            <li>
+              <%= link_to(t('profile.one'), current_subject)%>
+            </li>            
+            <li class="pipe">·</li>
+            <li>
+              <%= link_to(t('message.inbox'), conversations_path) %>
+              <span id="header_inbox_count">
+              <%= link_to(current_subject.mailbox.inbox(:unread => true).count.to_s, conversations_path) %>
+              </span>
+            </li>            
+            <li class="pipe">·</li>
+            <li>
+              <span id="header_notifications">
+              <%= link_to( current_subject.mailbox.notifications.not_trashed.unread.count.to_s, notifications_path) %>
+              </span>
+            </li>
+            <li class="pipe">·</li>
+            <li>
+              <%= render :partial => 'layouts/header_dropdown_menu' %>  
+            </li>
           </ul>
         </div>
-        <%= render :partial => 'layouts/account' %>
-
       <% end %>
     </div>
   </div>

data/app/views/layouts/_header_dropdown_menu.html.erb

@@ -0,0 +1,22 @@
+<div id="header_dropdown_menu">
+  <ul class="sf-menu" >
+    <li class="header_dropdown_li">
+      <a href="#" class="sf-with-ul" id="current_subject_avatar_img" style="background: transparent url('<%= image_path current_subject.logo.url(:representation)%>') no-repeat left top;"><%= truncate_name current_subject.name %><span class="sf-sub-indicator"> »</span></a>
+      <ul>
+        <%= render :partial => 'layouts/header_dropdown_menu_sessions'%>
+        <li>
+          <%= link_to t('account.edit'), edit_user_registration_path %>
+        </li>
+        <li>
+          <%= link_to t('settings.main'), settings_path, :id => "btn_menu_settings" %>
+        </li>
+        <li>
+          <%= link_to t('account.privacy'), relation_customs_path %>
+        </li>
+        <li>
+          <%= link_to t('sign_out'), destroy_user_session_path, :method => :delete  %>
+        </li>
+      </ul>
+    </li>
+  </ul>
+</div>

data/app/views/layouts/_header_dropdown_menu_sessions.html.erb

@@ -0,0 +1,13 @@
+<% representations = current_user.represented.unshift(current_user) - [current_subject] %>
+<% unless representations.empty? %>
+<li>
+  <%= link_to "Switch session", "javascript:;", :class=>"session_change" %>
+  <ul>
+    <% representations.each do |representation| %>
+    <li>
+      <%= link_to truncate_name(representation.name), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
+    </li>
+    <% end %>
+  </ul>
+</li>
+<% end %> 

data/app/views/layouts/_representation.html.erb

@@ -11,9 +11,6 @@
 <% representations = current_user.represented.unshift(current_user) - [current_subject] %>
 
 <% if !representations.empty? %>
-
-<span id="representation_text"><%= t('representation.action') %></span>
-
 <div id="representations_menu">	
   <ul class="sf-menu" >
     <li id="representation_li">

data/app/views/layouts/_settings.html.erb

@@ -7,7 +7,7 @@
             </a>
             <ul>
                 <li>
-                    <%= link_to t('settings.main'), settings_path, :id => "btn_menu_settings" %>
+                    <%= link_to t('settings.one'), settings_path %>
                 </li>
                 <li class="current">
                     <%= link_to t('account.privacy'), relation_customs_path %>

data/config/locales/en.yml

@@ -330,7 +330,7 @@ en:
   settings:
     error: "Some errors raised when saving your changes"
     for: "Settings for"
-    main: "Main settings"
+    main: "Settings"
     manage:
       name: "Admin Contacs"
       briefing: "Settings contacts preferences"

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.11".freeze
+    VERSION = "0.9.12".freeze
   end
 end

metadata

@@ -1,464 +1,326 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: social_stream-base
-version: !ruby/object:Gem::Version 
-  hash: 45
+version: !ruby/object:Gem::Version
+  version: 0.9.12
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 11
-  version: 0.9.11
 platform: ruby
-authors: 
+authors:
 - GING - DIT - UPM
 - CISE - ESPOL
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-29 00:00:00 +02:00
+date: 2011-09-29 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &75516460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ancestry
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *75516460
+- !ruby/object:Gem::Dependency
+  name: ancestry
+  requirement: &75516210 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 2
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.2.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: foreigner
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *75516210
+- !ruby/object:Gem::Dependency
+  name: foreigner
+  requirement: &75515980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 9
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: devise
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *75515980
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: &75515750 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 4
-        - 5
+      - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: inherited_resources
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *75515750
+- !ruby/object:Gem::Dependency
+  name: inherited_resources
+  requirement: &75515520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: stringex
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *75515520
+- !ruby/object:Gem::Dependency
+  name: stringex
+  requirement: &75515290 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: avatars_for_rails
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *75515290
+- !ruby/object:Gem::Dependency
+  name: avatars_for_rails
+  requirement: &75515060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 1
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.1.3
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: jquery-rails
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *75515060
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: &75514830 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 0
-        - 9
+      - !ruby/object:Gem::Version
         version: 1.0.9
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: cancan
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *75514830
+- !ruby/object:Gem::Dependency
+  name: cancan
+  requirement: &75514600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: kaminari
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *75514600
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: &75514370 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 39
-        segments: 
-        - 0
-        - 12
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.12.4
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: omniauth
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *75514370
+- !ruby/object:Gem::Dependency
+  name: omniauth
+  requirement: &75514140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 2
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.2.6
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: oauth-plugin
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *75514140
+- !ruby/object:Gem::Dependency
+  name: oauth-plugin
+  requirement: &75513910 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: -223651605
-        segments: 
-        - 0
-        - 4
-        - 0
-        - pre
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.4.0.pre1
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: mailboxer
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *75513910
+- !ruby/object:Gem::Dependency
+  name: mailboxer
+  requirement: &75513690 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 5
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.5.3
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: acts-as-taggable-on
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *75513690
+- !ruby/object:Gem::Dependency
+  name: acts-as-taggable-on
+  requirement: &75513460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        - 6
+      - !ruby/object:Gem::Version
         version: 2.0.6
   type: :runtime
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: formtastic
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *75513460
+- !ruby/object:Gem::Dependency
+  name: formtastic
+  requirement: &75513230 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 2
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.2.3
   type: :runtime
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: simple-navigation
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: *75513230
+- !ruby/object:Gem::Dependency
+  name: simple-navigation
+  requirement: &75545180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: resque
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: *75545180
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: &75544910 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 81
-        segments: 
-        - 1
-        - 17
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.17.1
   type: :runtime
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
-  name: modernizr-rails
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: *75544910
+- !ruby/object:Gem::Dependency
+  name: modernizr-rails
+  requirement: &75544660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        - 6
+      - !ruby/object:Gem::Version
         version: 2.0.6
   type: :runtime
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
-  name: thinking-sphinx
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: *75544660
+- !ruby/object:Gem::Dependency
+  name: thinking-sphinx
+  requirement: &75544430 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 0
-        - 7
+      - !ruby/object:Gem::Version
         version: 2.0.7
   type: :runtime
-  version_requirements: *id019
-- !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  version_requirements: *75544430
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &75544200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 3
-        - 9
+      - !ruby/object:Gem::Version
         version: 0.3.9
   type: :development
-  version_requirements: *id020
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  version_requirements: *75544200
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &75544010 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id021
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  version_requirements: *75544010
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &75543770 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id022
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  version_requirements: *75543770
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &75543520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.6.1
   type: :development
-  version_requirements: *id023
-- !ruby/object:Gem::Dependency 
-  name: factory_girl
   prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  version_requirements: *75543520
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: &75543270 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :development
-  version_requirements: *id024
-- !ruby/object:Gem::Dependency 
-  name: forgery
   prerelease: false
-  requirement: &id025 !ruby/object:Gem::Requirement 
+  version_requirements: *75543270
+- !ruby/object:Gem::Dependency
+  name: forgery
+  requirement: &75543040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.4.2
   type: :development
-  version_requirements: *id025
-- !ruby/object:Gem::Dependency 
-  name: ci_reporter
   prerelease: false
-  requirement: &id026 !ruby/object:Gem::Requirement 
+  version_requirements: *75543040
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
+  requirement: &75542810 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
-  version_requirements: *id026
-- !ruby/object:Gem::Dependency 
-  name: nifty-generators
   prerelease: false
-  requirement: &id027 !ruby/object:Gem::Requirement 
+  version_requirements: *75542810
+- !ruby/object:Gem::Dependency
+  name: nifty-generators
+  requirement: &75542580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 4
-        - 5
+      - !ruby/object:Gem::Version
         version: 0.4.5
   type: :development
-  version_requirements: *id027
-description: |-
-  Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
-  
-  This gem packages the basic functionality, along with basic actors (user, group) and activity objects (post and comments)
+  prerelease: false
+  version_requirements: *75542580
+description: ! 'Social Stream is a Ruby on Rails engine providing your application
+  with social networking features and activity streams.
+
+
+  This gem packages the basic functionality, along with basic actors (user, group)
+  and activity objects (post and comments)'
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .yardopts
@@ -482,6 +344,7 @@ files:
 - app/assets/images/btn/_notes/btn_certificates.png.mno
 - app/assets/images/btn/activity.png
 - app/assets/images/btn/arrowBlue.png
+- app/assets/images/btn/arrow_session_change.png
 - app/assets/images/btn/arrows-ffffff.png
 - app/assets/images/btn/bold.png
 - app/assets/images/btn/btn_account.png
@@ -537,6 +400,7 @@ files:
 - app/assets/images/btn/flag.png
 - app/assets/images/btn/group_left.png
 - app/assets/images/btn/group_right.png
+- app/assets/images/btn/header_notifications.png
 - app/assets/images/btn/index_71.png
 - app/assets/images/btn/info.png
 - app/assets/images/btn/italic.png
@@ -802,6 +666,8 @@ files:
 - app/views/layouts/_flash.html.erb
 - app/views/layouts/_footer.html.erb
 - app/views/layouts/_header.erb
+- app/views/layouts/_header_dropdown_menu.html.erb
+- app/views/layouts/_header_dropdown_menu_sessions.html.erb
 - app/views/layouts/_representation.html.erb
 - app/views/layouts/_search.html.erb
 - app/views/layouts/_settings.html.erb
@@ -1047,36 +913,26 @@ files:
 has_rdoc: true
 homepage: http://social-stream.dit.upm.es/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Basic features for Social Stream, the core for building social network websites
 test_files: []
-