social_stream 0.1.1 → 0.1.2

data/app/helpers/ties_helper.rb

@@ -1,6 +1,6 @@
 module TiesHelper
   def tie_brief(tie)
-    "18 contacts in common"
+    "N contacts in common"
   end
 
   def tie_link(tie)

data/app/models/actor.rb

@@ -134,7 +134,7 @@ class Actor < ActiveRecord::Base
 
     return nil unless candidate.present?
 
-    sent_ties.build :receiver_id => candidate,
+    sent_ties.build :receiver_id => candidate.id,
                     :relation => Relation.mode(subject_type, candidate.class).find_by_name(SuggestedRelations[candidate.class.to_s])
   end
 

data/app/views/home/_location.html.erb

@@ -1,3 +1,3 @@
 <div id="map_location" class="content_size">
-  <%= t('location.message', :location => "#{ image_tag('btn/btn_home.png' , :class => 'btn_config') } #{ t('home.one') }: <span class=\"name_group\">#{ sanitize current_user.name }</span>").html_safe %>
+  <%= t('location.message', :location => "#{ image_tag('btn/btn_home.png' , :class => 'btn_config') } #{ t('home') }: <span class=\"name_group\">#{ sanitize current_user.name }</span>").html_safe %>
 </div>

data/app/views/home/_options.html.erb

@@ -8,7 +8,4 @@
   <li>
     <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('inbox.one'), current_user) %>
   </li>
-  <li>
-    <%= link_to(image_tag("btn/btn_photo.png", :class => "menu_icon")+t('photo.other'),current_user) %>
-  </li>
 </ul>

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

@@ -1,7 +1,7 @@
 <div id="footerFront">
 	<div id="footer">
 	  <ul>
-		<li>© 2010 </li>
+		<li>2010 © </li>
 		<li id="trade_mark"><%= t('socialstream') %></li>
 	  </ul>
 	</div>

data/app/views/layouts/_header.erb

@@ -6,28 +6,27 @@
                 <%= link_to(t('socialstream') , root_path)%>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             </div>
             <% if user_signed_in? %>
-              <%=image_tag("btn/btn_home.png",:class=>"btn_config",:alt=>"Home") %>
+              <%=image_tag("btn/btn_home.png",:class=>"btn_config") %>
               <div class="txt_config">
-                                  <%= link_to t('home.my'),home_path  %>
+                <%= link_to t('home'), home_path %>
               </div>			
-              <%=image_tag("btn/btn_profile.png",:class=>"btn_config",:alt=>"Profile") %>
+              <%=image_tag("btn/btn_profile.png",:class=>"btn_config") %>
               <div class="txt_config">
-                                  <%=link_to(t('profile.my'),current_user)%>
+                <%= link_to(t('profile.one'), current_user)%>
               </div>
-                          <%=image_tag("btn/btn_browse.png",:class=>"btn_config",:alt=>"Browse") %>
+                <%=image_tag("btn/btn_browse.png",:class=>"btn_config") %>
               <div class="txt_config2">
-                                  <%=link_to(t('browse'),users_path) %>  &nbsp;
+                <%=link_to(t('browse'),users_path) %>  &nbsp;
               </div>
           </div>
           <div id="header_right">
-              <%=image_tag("btn/btn_config.png",:class=>"btn_config",:alt=>"Configuration") %>
+              <%=image_tag("btn/btn_config.png",:class=>"btn_config") %>
               <div class="txt_config">
-                  <%= t('account') %>
-                  
+                <%= t('account.one') %>
               </div>
-              <%=image_tag("btn/btn_exit.png",:class=>"btn_config",:alt=>"Exit") %>
+              <%=image_tag("btn/btn_exit.png",:class=>"btn_config") %>
               <div class="txt_config2">
-                <%= link_to t('logout')+" ("+current_user.name+")", destroy_user_session_path %>
+                <%= link_to t('sign_out_user', :user => current_user.name), destroy_user_session_path %>
               </div>
             <% end %>
         </div>

data/config/locales/en.yml

@@ -1,4 +1,6 @@
 en:
+  account:
+    one: "Account"
   activity:
     one: "Activity"
     other: "Activities"
@@ -60,8 +62,9 @@ en:
     by: By Groups
     my: My Groups
     one: Group
-  home:
-    one: "Home"
+  home: "Home"
+  inbox:
+    one: "Inbox"
   location:
     message: "You are here > %{location}"
   message: "Message"
@@ -69,8 +72,11 @@ en:
     options: "Menu Options"
   post:
     confirm_delete: "Delete post?"
+  profile:
+    one: "Profile"
   sign_in: "Sign in"
   sign_up: "Sign up"
+  sign_out_user: "Sign out (%{user})"
   socialstream: "SocialStream"
   tie:
     pending:

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 end

data/lib/tasks/db/populate.rake

@@ -11,21 +11,19 @@ namespace :db do
     task :create => :environment do
 
       # Create demo user if not present
-      if User.find_by_name('demo').blank?
-        u = User.create! :full_name => 'demo',
-                         :email => 'demo@dit.upm.es',
-                         :password => 'demo',
-                         :password_confirmation => 'demo'
-        u.confirm!
+      if User.find_by_name('demostration').blank?
+        u = User.create! :name => 'demostration',
+                         :email => 'demostration@test.com',
+                         :password => 'demostration',
+                         :password_confirmation => 'demostration'
       end
 
       puts "* Create Users"
       20.times do
-        u = User.create :full_name => Forgery::Name.full_name,
+        u = User.create :name => Forgery::Name.full_name,
                         :email => Forgery::Internet.email_address,
-                        :password => 'test',
-                        :password_confirmation => 'test'
-        u.confirm!
+                        :password => 'demostration',
+                        :password_confirmation => 'demostration'
       end
 
       available_users = User.all

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Antonio Tapiador