social_stream 0.4.4 → 0.4.5

data/app/views/{subjects/_toolbar_home_menu.html.erb → toolbar/_home_menu.html.erb}

@@ -4,6 +4,6 @@
 <% end %>
 
 <div id="menu_lateral">
-  <%= render :partial => "subjects/toolbar_home_menu_options" %>
+  <%= render :partial => "toolbar/home_menu_options" %>
 </div>
 

data/app/views/{subjects/_toolbar_home_menu_options.html.erb → toolbar/_home_menu_options.html.erb}

@@ -1,14 +1,18 @@
 <ul class="menu">
 
+<%= menu_options[:notifications] || capture do %>
+  <%= render :partial =>'toolbar/notifications_menu'%>
+<% end %>
+
 <%= menu_options[:messages] || capture do %>
-  <%= render :partial =>'subjects/toolbar_message_menu'%>
+  <%= render :partial =>'toolbar/message_menu'%>
 <% end %>
 
 <%= menu_options[:contacts] || capture do %>
   <li>
     <%= link_to( image_tag("btn/btn_friend.png", :class => "menu_icon")+t('contact.other'), '#', :id => "contacts_menu") %>
     <ul>
-    <% current_subject.relations.sort.each do |r| %>
+    <% current_subject.relation_customs.sort.each do |r| %>
       <li>
       <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon") + r.name , contacts_path(:relation => r.id) %>
       </li>
@@ -18,7 +22,7 @@
 <% end %>
 
 <%= menu_options[:subjects] || capture do %>
-  <%= render :partial => 'subjects/toolbar_home_menu_options_subjects' %>
+  <%= render :partial => 'toolbar/home_menu_options_subjects' %>
 <% end %>
 
 </ul>

data/app/views/{subjects/_toolbar_logo.html.erb → toolbar/_logo.html.erb}

@@ -3,7 +3,7 @@
     <div class="center">
       <span class="title_bold" ><%= subject.name %></span>
       <div class="logo_grid logo_full">          
-        <%= link_to image_tag(subject.logo.url, :alt => subject.name , :size => "119x119"), subject %>    
+        <%= link_to image_tag(subject.logo.url, :alt => subject.name , :size => "119x119", :id => "current_avatar_img"), subject %>    
         <div class="logo_menu logo_caption">    
           <%= link_to t('avatar.profile_change'), avatars_path  %>
         </div>

data/app/views/toolbar/_notifications_menu.html.erb

@@ -0,0 +1,3 @@
+<li>
+  <%= link_to( image_tag("btn/btn_notification.png", :class => "menu_icon")+t('notification.other'), notifications_path) %>
+</li>

data/app/views/{subjects/_toolbar_profile.html.erb → toolbar/_profile.html.erb}

@@ -1,8 +1,8 @@
-<%= render :partial => 'subjects/toolbar_logo', :locals => { :subject => subject } %>
+<%= render :partial => 'toolbar/logo', :locals => { :subject => subject } %>
 
 <div class="block space_center"></div>
 
-<%= render :partial => 'subjects/toolbar_profile_menu', :locals => { :subject => subject } %>
+<%= render :partial => 'toolbar/profile_menu', :locals => { :subject => subject } %>
 
 <div class="block space_center"></div>
 

data/app/views/toolbar/_profile_menu.html.erb

@@ -0,0 +1,15 @@
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "menu", :media => "screen, projection" %>
+  <%= javascript_include_tag 'menu' %>
+<% end %>
+
+<div id="menu_lateral">
+  <ul class="menu">
+    <% unless subject == current_subject %>
+      <%= render :partial => "toolbar/profile_menu_tie_options", :locals => { :subject => subject } %>
+    <% end %>
+
+    <%= render :partial => "toolbar/profile_menu_basic_options", :locals => { :subject => subject } %>
+  </ul>
+</div>
+<div class="space_center"></div>

data/app/views/toolbar/_profile_menu_basic_options.html.erb

@@ -0,0 +1,5 @@
+<%= menu_options[:profile] || capture do %>
+  <li>
+    <%= link_to( image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), [subject, :profile]) %>
+  </li>
+<% end %>

data/app/views/toolbar/_profile_menu_tie_options.html.erb

@@ -0,0 +1,35 @@
+<%= menu_options[:like] || capture do %>
+  <li>
+    <div class="verb_like" id="like_<%= dom_id(subject) %>">
+      <%= link_like(subject)%>
+    </div>
+  </li>
+<% end %>
+
+<%= menu_options[:contacts] || capture do %>
+  <!-- TODO: create helper -->
+  <% if user_signed_in? %>
+    <% if current_subject.ties_to(subject).present? %>
+      <li >
+      <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon") +
+                  t('tie.edit.contact', :type => current_subject.ties_to(subject).map(&:relation_name).join(", ")),
+                  edit_contact_path(subject.actor_id) %>
+     </li>
+    <% else %>
+      <li >
+      <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon") +
+                  t('tie.add.contact'),
+                  edit_contact_path(subject.actor_id),
+                  :id => 'contacts_menu' %>
+      </li>
+    <% end %>
+  <% end %>
+<% end %>
+
+<%= menu_options[:messages] || capture do %>
+  <% if user_signed_in? %>
+    <li >
+    <%= link_to(image_tag("btn/btn_send.png", :class => "menu_icon")+t('message.send'), new_message_path(:receiver => subject.slug)) %>
+    </li>
+  <% end %>
+<% end %>

data/app/views/users/_index.html.erb

@@ -16,7 +16,7 @@
         <%=link_to(user.name, user)%>
       </div>
       <div class="link">
-        <%= ties_to(user) %>
+        <%= contact_to(user) %>
       </div>
     </div>
   </div>

data/app/views/users/_sidebar_index.html.erb

@@ -1,6 +1 @@
-<% if user_signed_in? %>
-<div class="block space_center"></div>
-<%= render :partial => "ties/suggestions" %>
-<div class="block space_center"></div>
-<%= render :partial => 'ties/pendings' %>
-<% end %>
+<%= render :partial => 'contacts/suggestions_and_pendings' %>

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

@@ -12,9 +12,9 @@
 	<%= render :partial => "users/sidebar_index" %>
 <% end %>
 
-<div id="map_location" class="content_size">
-  Your are here ><img src="images/btn/btn_browse.png" class="btn_config" /> <%= t('browse') %>: <span id="name_group"><b><%= t('user.other')%></b></span>, <%=link_to(t('group.by'),groups_path)%>
-</div>
+<%= 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))%>
 
 <div class="space_center"></div>
 

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

@@ -2,15 +2,25 @@
   <%= @user.name%>
 <% end %>
 
+<% if @user.profile.description? %>
+  <% content_for :description do %>
+    <%= @user.profile.description%>
+  <% end %>
+<% end %>
+
+<% content_for :keywords do %>
+  <%= @user.profile.subject.tag_list%>
+<% end %>
 
 <% content_for :sidebar do %>
   <%= render :partial => 'sidebar_index' %>
 <% end %>
 
+<%= location(link_to(image_tag("btn/btn_profile.png", :class => "btn_config")+t('profile.one')+": "+
+                      content_tag(:span, ( sanitize @user.name), :class=>"name_group")))%>
+              
 <% toolbar :profile => @user %>
 
-<%= render :partial => 'location' %>
-
 <br class="clearfloat" />
 <div class="space_center">
 </div>

data/config/locales/en.yml

@@ -21,59 +21,23 @@ en:
           User:
             title: "%{subject} added %{contact} as contact."
             message: "%{name} added you as contact."
-            notification:
-              subject: "%{name} added you as contact."
-              body: "%{name} added you as contact."
           Group:
             title: "%{subject} added %{contact} as contact."
             message: "%{name} added you as contact."
-            notification:
-              subject: "%{name} added you as contact."
-              body: "%{name} added you as contact."
         like:
           User:
             title: "%{subject} is a fan of %{contact}."
             message: "%{name} is now your fan."
-            notification:
-              subject: "%{name} is now your fan."
-              body: "%{name} is now your fan."
           Group:
             title: "%{subject} is a fan of %{contact}."
             message: "%{name} is now your fan."
-            notification:
-              subject: "%{name} is now your fan."
-              body: "%{name} is now your fan."
         make-friend:
           User:
             title: "%{subject} and %{contact} are now connected."
             message: "%{name} also added you as contact."
-            notification:
-              subject: "%{name} also added you as contact."
-              body: "%{name} also added you as contact."
           Group:
             title: "%{subject} added %{contact} as contact."
             message: "%{name} added you as contact."
-            notification:
-              subject: "%{name} added you as contact."
-              body: "%{name} added you as contact."
-        post:
-          User:
-            notification:
-              subject: "%{name} has posted something(%{direct_object}) in your wall"
-              body: "%{name} has posted something(%{direct_object}) in your wall"
-          Group:
-            notification:
-              subject: "%{name} has posted %{direct_object} in your wall"
-              body: "%{name} has posted something(%{direct_object}) in your wall"
-        update:
-          User:
-            notification:
-              subject: "%{name} has updated %{direct_object} in your wall"
-              body: "%{name} has updated something(%{direct_object}) in your wall"
-          Group:
-            notification:
-              subject: "%{name} has updated %{direct_object} in your wall"
-              body: "%{name} has updated something(%{direct_object}) in your wall"
              
   avatar:
     crop_image: "Crop the uploaded image"
@@ -86,7 +50,7 @@ en:
     list: "You have these avatars"
     new: "Create a new avatar"
     new_short: "New avatar"
-    no_avatars: "You haven't any avatar, plesase create a new one."
+    no_avatars: "You haven't got any avatar, plesase create a new one."
     one: "Avatar"
     other: "Avatars"
     original: "Original image"
@@ -101,6 +65,7 @@ en:
   browse: "Browse"
   button:
     cancel: "Cancel"
+    save: "Save"
     update: "Update"
   comment:
     input: "Write a comment..."
@@ -108,13 +73,24 @@ en:
   contact:
     all_n: "All contacts (%{count})"
     edit:
+      title: "Edit contact"
       submit: "Edit Contact"
     new:
       link: "+ Add contact"
-      title: "Add %{name} as contact"
+      title: "Add new contact"
       submit: "Add Contact"
     one: "Contact"
     other: "Contacts"
+    pending:
+      other: "Pending requests"
+      all: "All"
+    relation:
+      one: "Contact type"
+      new: "New type"
+    suggestion:
+      one: "Suggestion"
+      other: "Suggestions"
+      all: "All"
   copyright: "2010 Copyright - All rights reserved"
   days: Days
   delete:
@@ -152,6 +128,10 @@ en:
     unlocks:
       send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
       unlocked: 'Your account was successfully unlocked. You are now signed in.'
+  follower:
+    n:
+      one: "1 follower"
+      other: "%{count} followers"
   forgot_password: "Forgot you password?"
   frontpage:
     collaborate:
@@ -179,6 +159,7 @@ en:
     one: "Group"
     other: "Groups"
     all: "All groups"
+    all_n: "All groups (%{count})"
     by: "By groups"    
     last: "Last groups"
     my: "My groups"
@@ -188,14 +169,23 @@ en:
       description: "Description"
       participants: "Participants"
     cloud: "Group tag cloud"
-    popular:
-      most: "Most popular"
-    voted:
-      most: "Most voted"
+    most:
+      followed: "Most followed"
+      liked: "Most liked"
   help: "Help"
+  helpers:
+    submit:
+      sphere:
+        create: "Save"
+      relation_custom:
+        create: "Save"
   home: "Home"
   inbox:
     one: "Inbox"
+  like:
+    n:
+      one: "1 fan"
+      other: "%{count} fans"
   location:
     message: "You are here > %{location}"
     base: "You are here"
@@ -214,6 +204,12 @@ en:
     sentbox: "Sentbox"
     trash: "Trash"
     send: "Send a message"
+  notification:
+    one: "Notification"
+    other: "Notifications"
+    read: "Mark as read"
+    read_all: "Mark all as read"
+    unread: "Mark as unread"
   password:
     forgot: "Do you forgot your password?"
   post:
@@ -238,12 +234,19 @@ en:
     contact: "Contact information"
     country: "Country"
     email: "E-mail"
+    empty: "These fields are empty. Please, update them."
     fax: "Fax"
     mobile: "Mobile"
     organization: "Organization"
     phone: "Phone"
     profile: "Edit profile"
-    website: "Website"      
+    tags:
+      default: "social, stream,"
+      other: "Tags"
+    website: "Website" 
+    update:
+      error: "Please, check the format of your profile:"
+      success: "Your profile has been updated"     
   public:
     other: "Everybody"
   representation:
@@ -252,51 +255,75 @@ en:
   service:
     one: "Service"
     other: "Services"
-  permissions:
-    read:
-      activity:
-        star_ties: "Allow %{user} to read my wall"
-      tie:
-        weak_star_ties: "Not defined"
-    follow: "Follow %{user}"
-    create: 
-         activity:
-             tie: "Allow %{user} to write in my wall"
-             weak_ties: "Not defined"
+  permission:
+    description:
+      brief:
+        create: 
+          activity:
+            nil: "Post to wall"
+        destroy:
+          activity:
+            nil: "Delete activities in wall"
+        follow:
+          nil:
+            nil: "Follow their activity"
+        read:
+          activity:
+            weak_star_ties: "Read wall"
+        represent:
+          nil:
+            nil: "Represent"
+      detailed:
+        create:
+          activity:
+            nil: "Post to \"%{sphere}\" wall at %{relation} level"
+            weak_ties: "Post to \"%{sphere}\" wall as %{relations} and %{public}"
+        destroy:
+          activity:
+            nil: "Delete the activities posted to \"%{sphere}\" wall by this %{relation}"
+            weak_star_ties: "Delete the activities posted to \"%{sphere}\" wall at levels %{relations} and %{public}"
+        follow:
+          nil:
+            nil: "Activities of the contacts at %{relation} level will appear in our home wall"
+        read:
+          activity:
+            weak_star_ties: "Read posts in \"%{sphere}\" wall at levels %{relations} and %{public}"
+          tie:
+            weak_star_ties:
+              "See contacts in levels: %{relations} and %{public}"
+        represent:
+          nil:
+            nil: "Represent me/us in the website"
+        update:
+          activity:
+            nil: "Update the wall activities posted by %{relation}"
+            weak_star_ties: "Update the wall activities posted in levels %{relations} and %{public}"
+    of_relation:
+      choose: "3. Permissions in <strong>%{name}</strong> level"
+  privacy:
+    intro: "Contacts at <strong>%{relation}</strong> level are only allowed to:"
+    rule:
+      title: "Privacy rules"
+      saved: "Privacy rules saved"
   products:
     one: "Product"
     other: "Products"
-  relation:
-    public:
+  relation_custom:
+    in_sphere:
+      choose: "2. Levels in <strong>%{name}</strong> sphere"
+    new: "+ New level"
+  relation_public:
       name: "Public"
   share: "Share"
   sign_in: "Sign in"
   sign_out: "Sign out"
   sign_up: "Sign up"
   socialstream: "SocialStream"
-  tie:
-    add:
-      bookmark: "Bookmark"
-      contact: "Add contact as..."
-      follow: "Follow"
-      like: "Like"
-      partner: "Add Partner"
-    relation:
-      one: "Contact type"
-      new: "New type"
-    edit:
-      contact: "Contact: %{type}"
-      title: "Edit Contact"
-    new:
-      title: "Add New Contact"
-    pending:
-      other: "Pending requests"
-      all: "All"
-    suggestion:
-      one: "Suggestion"
-      other: "Suggestions"
-      all: "All"
-    options: "Tie options"
+  sphere:
+    title: "Privacy & context"
+    choose: "1. Choose sphere"
+    new: '+ New sphere'
+  sure: "Are you sure?"
   time:
     ago: "%{time} ago"
   user: