social_stream 0.9.2 → 0.9.3

data/.gitignore

@@ -10,3 +10,4 @@ nbproject
 .yardoc/*
 lib/generators/social_stream/templates/public/images/tmp/
 **.*swp
+spec/dummy/documents/pictures/*

data/base/app/assets/javascripts/layouts.js

@@ -4,7 +4,6 @@
 //
 $(function() {
     jQuery('ul.sf-menu').superfish({
-        delay: 2000, // one second delay on mouseout
         animation: {
             height: 'show'
         }, // fade-in and slide-down animation

data/base/app/assets/stylesheets/frontpage.css

@@ -19,8 +19,8 @@ span.find{  padding-right:5px;}
 #login{  padding-top: 5px;}
 .instructions{text-align: left; padding-bottom: 5px;}
 #remember{padding-left:22%; text-align: left;}
-#user_password_confirmation{vertical-align: 30%;}
-#user_password_confirmation_label {padding-top: 0;}
+#welcome #user_password_confirmation{vertical-align: 30%;}
+#welcome #user_password_confirmation_label {padding-top: 0;}
 #welcome{  margin: 50px auto 50px auto;  width:330px;  padding:20px;  border: 4px solid #BDC7D8;
   background-color: white;-moz-border-radius: 20px; 
   -webkit-border-radius: 20px; border-radius: 20px;}

data/base/app/assets/stylesheets/location.css

@@ -0,0 +1,36 @@
+#map_location .first{
+  background: transparent url("/assets/arrow-start.png") no-repeat top left;
+  display: inline-block;
+  height: 23px;
+  margin-left: 5px;
+}
+#map_location .first span{
+  margin-left:5px;
+}
+#map_location .last{
+  margin-left: 5px;
+}
+#map_location .last a{
+  font-size: inherit;
+}
+#map_location .mid{
+  background: transparent url("/assets/arrow.png") no-repeat top right;
+}
+#map_location .penultimate{
+  background: transparent url("/assets/arrow-end.png") no-repeat top right;
+}
+#map_location .mid, #map_location .penultimate{
+  color: white;  
+  padding-left:5px;
+  padding-right: 12px;
+}
+#map_location .last, #map_location .mid, #map_location .penultimate{
+  display: inline-block;
+  font-size: 13px;
+  height: 23px;
+  line-height: 23px;
+}
+#map_location .mid a, #map_location .penultimate a{
+  color: inherit;
+  font-size: inherit;
+}

data/base/app/helpers/location_helper.rb

@@ -16,15 +16,13 @@ module LocationHelper
   # partial => location/_location.html.erb 
   #
   # Example:  
-  # 	Render a location with a two leves depth:
+  # 	Render a location with two leves depth:
   #
   #   	<%= location(link_to(leve1.name, level1.url),link_to(leve2.name, level2.url)) %>
   #
   def location(*stack)
-    location_body = t('location.base')
-    stack.collect {|level|
-      location_body << t('location.separator') + level
-    }
+    
+    location_body = render :partial => "location/location_body", :locals=>{:stack => stack}
     
     location_div = capture do
       render :partial => "location/location", :locals=>{:location_body => location_body}

data/base/app/helpers/toolbar_helper.rb

@@ -1,4 +1,7 @@
 module ToolbarHelper
+  # Configuration of toolbar items
+  include SocialStream::ToolbarConfig
+
   # Define the toolbar content for your view. There are two typical cases, depending on the value of
   # options[:profile]
   # * If present, render the profile menu for the {SocialStream::Models::Subject subject}
@@ -82,21 +85,17 @@ module ToolbarHelper
 
   #Prints the home toolbar menu.
   def home_toolbar_menu
-    default_home_toolbar_menu
+    render_items home_toolbar_items
   end
 
   #Prints the home profile menu.
   def profile_toolbar_menu(subject=current_subject)
-    default_profile_toolbar_menu(subject)
+    render_items profile_toolbar_items(subject)
   end
  
-
   #Renders array of navigation items with simple_navigation
   def render_items(items)
     menu = render_navigation :items => items
     return raw menu
   end
-  
-  
-  include SocialStream::ToolbarConfig
 end

data/base/app/views/avatars/index.html.erb

@@ -21,8 +21,8 @@
 <% end %>
 
 <%= location(
- 	link_to(image_tag("btn/btn_edit.png", :class => "menu_icon")+t('profile.one'), [current_subject,:profile]),	
- 	link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('avatar.other'), avatars_path)
+ 	link_to(t('menu.information'), [current_subject,:profile]),	
+ 	link_to(t('avatar.other'), avatars_path)
 ) %>
 
 <%= render :partial => 'list' %>

data/base/app/views/contacts/edit.html.erb

@@ -1,6 +1,6 @@
 <% toolbar :profile => @contact.receiver_subject, :option => 'contacts' %>
 
-<% location link_to(image_tag("btn/btn_friend.png", :class => "menu_icon") + 
-                    t("contact.#{ @contact.action }.title", :name => @contact.receiver.name), edit_contact_path(@contact.to_param)) %>
+<% location link_to(t("contact.#{ @contact.action }.title", :name => @contact.receiver.name),
+                     edit_contact_path(@contact.to_param)) %>
 
 <%= render :partial => 'form' %>

data/base/app/views/conversations/_show.html.erb

@@ -1,6 +1,6 @@
 <%= location(
-	link_to(image_tag("btn/message_" + @box + ".png", :class => "menu_icon")+t('message.' + @box), conversations_path(:box => @box),:remote => true),
-	link_to(image_tag("btn/message_conversation.png", :class => "menu_icon")+ truncate(@conversation.subject, :length => 45), conversation_path(@conversation.id,:box => @box,:page => params[:page]))
+	link_to(t('message.' + @box), conversations_path(:box => @box),:remote => true),
+	link_to(truncate(@conversation.subject, :length => 45), conversation_path(@conversation.id,:box => @box,:page => params[:page]))
 ) %>
 
 <br class="clearfloat" />

data/base/app/views/conversations/index.html.erb

@@ -10,9 +10,7 @@
   $('.pagination a').attr('data-remote', 'true');
 <% end %>
 
-<%= location(
-    link_to(image_tag("btn/message_" + @box + ".png", :class => "menu_icon")+t('message.' + @box), conversations_path(:box => @box),:remote => true)
-) %>
+<%= location(link_to(t('message.' + @box), conversations_path(:box => @box),:remote => true)) %>
 
 <% toolbar :option => :messages %>
 

data/base/app/views/devise/registrations/edit.html.erb

@@ -1,6 +1,6 @@
 <% toolbar :profile => current_subject %>
 
-<%= location(image_tag("btn/btn_account.png", :class => "menu_icon")+t('account.one'), 
+<%= location(t('account.one'), 
   link_to(t('account.edit'), edit_user_registration_path)
 ) %>
 

data/base/app/views/frontpage/_header.html.erb

@@ -1,6 +1,6 @@
 <div id="headerFront">
   <div class="banner_top">
-    <div id="logo"><%= link_to(image_tag('logo.png', :alt => t('socialstream')), '/'); %></div>
+    <div id="logo"><%= link_to(image_tag('logo.png', :alt => t('site.name')), '/'); %></div>
     <div class="div_login">
       <%= form_for User.new, :as => :user, :url => user_session_path do |f| -%>
         <span><%= f.label :email %></span>

data/base/app/views/home/index.html.erb

@@ -2,8 +2,7 @@
   <% render :partial => 'sidebar' %>
 <% end %>
 
-<%= location(link_to(image_tag("btn/btn_home.png", :class => "btn_config")+t('home')+": "+
-                      content_tag(:span, ( sanitize current_subject.name), :class=>"name_group")))%>
+<%= location(link_to(t('home')+": "+ truncate_name(sanitize current_subject.name)))%>
                       
 <% toolbar %>
 

data/base/app/views/invitation_mailer/send_invitation.html.erb

@@ -7,7 +7,7 @@
     <div>
       <div>
         <div style="padding: 10px 5px 5px 5px;">
-          <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('socialstream'), new_user_registration_url)%>
+          <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('site.name'), new_user_registration_url)%>
         </div>
         <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
           <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">

data/base/app/views/invitation_mailer/send_invitation.text.erb

@@ -1,4 +1,4 @@
-<%= @sender.name %> has invited you to <%= t('socialstream')%>: <%= new_user_registration_url%>
+<%= @sender.name %> has invited you to <%= t('site.name')%>: <%= new_user_registration_url%>
 
 <% if @message.blank? %>
   <%= t('invitation.join_me')%>         
@@ -17,4 +17,4 @@
 
 <%= t('frontpage.collaborate.default')%>:
 <%= t('frontpage.collaborate.sentence1') %>
-<%= t('frontpage.collaborate.sentence2') %>
+<%= t('frontpage.collaborate.sentence2') %>

data/base/app/views/invitations/new.html.erb

@@ -5,7 +5,7 @@
 <% end %>
 
 <%= location(
-  link_to(image_tag("btn/btn_invitation.png", :class => "menu_icon")+t('invitation.other'), new_invitation_path)
+  link_to(t('invitation.other'), new_invitation_path)
 ) %>
 
 <%= render :partial => 'new' %>

data/base/app/views/layouts/_footer.html.erb

@@ -7,7 +7,7 @@
     </div>
 	  <ul>
 		<li>2011 © </li>
-		<li id="trade_mark"><%= link_to t('socialstream'), 'http://social-stream.dit.upm.es/' %></li>
+		<li id="trade_mark"><%= link_to t('site.name'), 'http://social-stream.dit.upm.es/' %></li>
 	  </ul>
 	</div>
 </div>

data/base/app/views/layouts/_header.erb

@@ -2,7 +2,7 @@
   <div class="banner_top banner_top_height">
     <div id="header_left">
       <div id="logo_txt">
-        <%= link_to(image_tag('header-logo.png', :alt => t('socialstream')), root_path) %>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <%= link_to(image_tag('header-logo.png', :alt => t('site.name')), root_path) %>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
       </div>
       <% if user_signed_in? %>
         <div class="menu_list menu_white" id="menu_home">

data/base/app/views/layouts/application.html.erb

@@ -3,7 +3,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title><%= yield(:title).empty? ? t('socialstream') : yield(:title)%></title>
+    <title><%= yield(:title).empty? ? t('site.name') : yield(:title)%></title>
     <meta name="keywords" content="<%= t('profile.tags.default') %><%= yield(:keywords) %>" >
     <meta name="description" content= "<%= yield(:description).empty? ? t('frontpage.main_title') : yield(:description) %>" >
 

data/base/app/views/layouts/frontpage.html.erb

@@ -3,7 +3,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title><%= yield(:title).empty? ? t('socialstream') : yield(:title)%></title>
+    <title><%= yield(:title).empty? ? t('site.name') : yield(:title)%></title>
     <meta name="keywords" content="<%= yield(:keywords).empty? ? t('profile.tags.default') : yield(:keywords) %>" >
     <meta name="description" content= "<%= yield(:description).empty? ? "Home" : yield(:description) %>" >
     <%= stylesheet_link_tag "application" %>

data/base/app/views/location/_location_body.html.erb

@@ -0,0 +1,18 @@
+
+<% aux='<div class="last">' + stack.last + '</div>' %>
+    <% if stack.count >1 %>
+      <% aux.insert(0, '<div class="penultimate">'+ stack.last(2).first + '</div>') %>
+    <% end %>
+    
+    <% if stack.count >2 %> 
+      <% stack.first(stack.count - 2).reverse.collect {|level|
+        aux.insert(0, '<div class="mid">'+ level + '</div>')
+      } %>
+    <% end %>
+    
+    <% if stack.count ==1 %>
+      <% aux.insert(0, '<div class="first"><span class="penultimate">'+ t('location.base') + '</span></div>') %>
+    <% else %>
+      <% aux.insert(0, '<div class="first"><span class="mid">'+ t('location.base') + '</span></div>') %>
+    <% end%>    
+<%= raw aux %>

data/base/app/views/message_mailer/new_message_email.html.erb

@@ -27,9 +27,9 @@
       </div>
       <div style="padding: 10px 5px 5px 5px;">    
         <p>
-          <%= link_to((t('message.look')+" at "+t('socialstream')), conversation_url(@message.conversation))%> 
+          <%= link_to((t('message.look')+" at "+t('site.name')), conversation_url(@message.conversation))%> 
         </p>
       </div>
     </div>
   </body>
-</html>
+</html>

data/base/app/views/message_mailer/new_message_email.text.erb

@@ -5,4 +5,4 @@
 <%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>
 -----------------------------------------------
 
-<%=t('message.look')%> at <%= t('socialstream')%>: <%=conversation_url(@message.conversation)%>.
+<%=t('message.look')%> at <%= t('site.name')%>: <%=conversation_url(@message.conversation)%>.

data/base/app/views/message_mailer/reply_message_email.html.erb

@@ -27,9 +27,9 @@
       </div>
       <div style="padding: 10px 5px 5px 5px;">    
         <p>
-          <%= link_to t('message.look'), conversation_url(@message.conversation)%> at <%= t('socialstream')%>
+          <%= link_to t('message.look'), conversation_url(@message.conversation)%> at <%= t('site.name')%>
         </p>
       </div>
     </div>
   </body>
-</html>
+</html>

data/base/app/views/message_mailer/reply_message_email.text.erb

@@ -5,4 +5,4 @@
 "<%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>"
 -----------------------------------------------
 
-<%=t('message.look')%> at <%= t('socialstream')%>: <%=conversation_url(@message.conversation)%>.
+<%=t('message.look')%> at <%= t('site.name')%>: <%=conversation_url(@message.conversation)%>.

data/base/app/views/messages/new.html.erb

@@ -8,8 +8,8 @@
 <% toolbar :option => :messages %>
 
 <%= location(
-  link_to(image_tag("btn/new.png", :class => "menu_icon")+t('message.other'), conversations_path,:remote => true),
-  link_to(image_tag("btn/message_new.png", :class => "menu_icon")+ t('message.new'), new_message_path, :remote => true)
+  link_to(t('message.other'), conversations_path,:remote => true),
+  link_to(t('message.new'), new_message_path, :remote => true)
 ) %>
 
 <% content_for :javascript do %>

data/base/app/views/profiles/edit.html.erb

@@ -7,25 +7,25 @@
 <%if params[:section].present? 
   case params[:section]
   when "about_me"
-    level2 = link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('profile.' + current_subject.class.to_s.downcase + '.info'),
+    level2 = link_to( t('profile.' + current_subject.class.to_s.downcase + '.info'),
       :controller => :profiles , :action => :edit, :section => "about_me")
   when "contact_info" 
-    level2 = link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('profile.contact'),
+    level2 = link_to(t('profile.contact'),
       :controller => :profiles , :action => :edit, :section => "contact_info")
   when "my_experience" 
-    level2 = link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('profile.' + current_subject.class.to_s.downcase + '.experience'),
+    level2 = link_to(t('profile.' + current_subject.class.to_s.downcase + '.experience'),
       :controller => :profiles , :action => :edit, :section => "my_experience")
   when "tags"
-  level2 = link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('profile.' + current_subject.class.to_s.downcase + '.tags'),
+  level2 = link_to(t('profile.' + current_subject.class.to_s.downcase + '.tags'),
     :controller => :profiles , :action => :edit, :section => "tags")
 	end
 else
-  level2 = link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('profile.one'),
+  level2 = link_to(t('profile.one'),
       :controller => :profiles , :action => :edit)
 end %>
 
 <%= location(
-  link_to(image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), [current_subject, :profile]),
+  link_to(t('menu.information'), [current_subject, :profile]),
   level2
 ) %>
 <div class="space_center"></div>

data/base/app/views/profiles/show.html.erb

@@ -18,8 +18,7 @@
 <% toolbar :profile => @profile.subject %>
 
 
-<%= location(link_to(image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), 
-              [@profile.subject, :profile])) %>
+<%= location(link_to(t('menu.information'), [@profile.subject, :profile])) %>
 
 
 <%= render :partial => "profile" %>

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

@@ -8,7 +8,7 @@
 	<%= render :partial => "users/sidebar_index" %>
 <% end %>
 
-<%= location(image_tag("btn/btn_browse.png", :class=>"btn_config") + t('browse') +": "+
+<%= location(t('browse') +": "+
              content_tag(:b ,content_tag(:span, t('user.other'), :id=>'name_group')) + ", "+ 
              link_to(t('group.by'),groups_path))%>
 

data/base/app/views/users/show.html.erb

@@ -16,8 +16,7 @@
   <%= render :partial => 'sidebar_index' %>
 <% end %>
 
-<%= location(link_to(image_tag("btn/btn_profile.png", :class => "btn_config")+t('profile.one')+": "+
-                      content_tag(:span, ( truncate_name sanitize @user.name), :class=>"name_group")))%>
+<%= location(link_to(t('profile.one')+": "+truncate_name(sanitize @user.name)))%>
               
 <% toolbar :profile => @user %>
 

data/base/config/locales/en.yml

@@ -152,7 +152,7 @@ en:
       participants: "Participants"
       groups: "Groups"
       tags: "Tags"
-    main_title: "SocialStream is a core for building social network websites."
+    main_title: "Social Stream is a core for building social network websites."
     meet:
       default: "Meet"
       sentence1: "Meet interesting people and groups"
@@ -195,9 +195,9 @@ en:
   invitation:
     e-mails: "E-mail addresses"
     error: "Your request was unprocessable"
-    invited: " has invited you to SocialStream!"
-    join: "Invite other people to join SocialStream!"
-    join_me: "Join me at SocialStream!"
+    invited: " has invited you to Social Stream!"
+    join: "Invite other people to join Social Stream!"
+    join_me: "Join me at Social Stream!"
     one: "Invitation"
     other: "Invitations"
     toolbar: "Invite"
@@ -371,7 +371,8 @@ en:
   sign_in: "Sign in"
   sign_out: "Sign out"
   sign_up: "Sign up"
-  socialstream: "SocialStream"
+  site:
+    name: "Social Stream"
   subject:
     this_is_you: "This is you!"
   sure: "Are you sure?"
@@ -383,5 +384,5 @@ en:
     other: "Users"
     all: "All users"
     all_n: "All users (%{count})"
-  welcome: "Welcome to SocialStream!"
+  welcome: "Welcome to Social Stream!"