social_stream 0.4.1 → 0.4.2

data/app/views/{users → profiles}/update.js.erb

@@ -1,19 +1,16 @@
 
-
-
-  if ($("#notice").length == 0){
-
-    $("#content").prepend('<div id="notice"></div>');
-    
+  if ($("#profile_notice").length == 0){
+    $("#content").prepend('<div id="profile_notice" class="notice"></div>');  
   } 
 	
-<% if @user.valid? %>
+<% if @profile.valid? %>
 
-  $("#notice").html("<h2>Form Submitted!</h2><br/>");
-	$("#notice").removeClass('error_explanation');
-  $("#notice").addClass('confirmed');
-  $("#sidebarContent").replaceWith("<%= escape_javascript(render(:partial => 'sidebar_show'))%>");
+  $("#profile_notice").html("<h2>Form Submitted!</h2><br/>");
+	$("#profile_notice").removeClass('error');
+  $("#profile_notice").addClass('success');
 	
+  /*$("#sidebarContent").replaceWith("<%#= escape_javascript(render(:partial => 'sidebar_show'))%>");*/
+
   $("#contact_info").addClass('section_normal');
   $("#experience_info").addClass('section_normal');
 	$("#personal_info").addClass('section_normal');
@@ -34,10 +31,10 @@
 	<%end%>
 	
 <% else %>
-  $("#notice").html("<h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>"
-	 +"<ul><% @user.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul><br/>");
-	$("#notice").removeClass('confirmed');
-	$("#notice").addClass('error_explanation'); 
+  $("#profile_notice").html("<h2><%= pluralize(@profile.errors.count, "error") %> prohibited this profile from being saved:</h2>"
+	 +"<ul><% @profile.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul><br/>");
+	$("#profile_notice").removeClass('success');
+	$("#profile_notice").addClass('error'); 
 
 <% end %>
 

data/app/views/subjects/_contacts.html.erb

@@ -1,5 +1,4 @@
-<% if (cs = subject.subjects(:direction => :receivers)).present? %>
-
+<% if (cs = subject.contacts(:direction => :sent)).present? %>
   <div class="block">
     <div class="header">
       <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
@@ -11,7 +10,7 @@
   <div class ="content">
       <div class="contact space_center">
         <% cs.each do |contact| %>
-            <%= link_to(image_tag(contact.logo.url, :alt => contact.name , :size => "40x40"), contact) %>
+            <%= link_to(image_tag(contact.logo.url, :alt => contact.name , :size => "28x28"), contact) %>
         <% end %>
       </div>
   </div>

data/app/views/subjects/_toolbar_home.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'subjects/toolbar_logo', :locals => { :subject => current_subject } %>
+<%= render :partial => 'subjects/toolbar_logo', :locals => { :subject => current_subject, } %>
 
 <div class="block space_center">
 </div>

data/app/views/subjects/_toolbar_home_menu.html.erb

@@ -1,4 +1,7 @@
-<% content_for :headers, stylesheet_link_tag("menu", :media => "screen, projection") %>
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "menu", :media => "screen, projection" %>
+  <%= javascript_include_tag 'menu' %>
+<% end %>
 
 <div id="menu_lateral">
   <%= render :partial => "subjects/toolbar_home_menu_options" %>

data/app/views/subjects/_toolbar_home_menu_options.html.erb

@@ -1,20 +1,16 @@
-<ul class="menu noaccordion">
+<ul class="menu">
 
 <%= menu_options[:messages] || capture do %>
-  <li>
-    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.other') +" (" + current_subject.mailbox.inbox(:unread => true).count.to_s + ")", messages_path) %>
-  </li>
+  <%= render :partial =>'subjects/toolbar_message_menu'%>
 <% end %>
 
 <%= menu_options[:contacts] || capture do %>
   <li>
     <%= link_to( image_tag("btn/btn_friend.png", :class => "menu_icon")+t('contact.other'), '#') %>
-  </li>
-  <li>
     <ul>
     <% current_subject.relations.sort.each do |r| %>
       <li>
-      <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon") + r.name , '#' %>
+      <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon") + r.name , contacts_path(:relation => r.id) %>
       </li>
     <% end %>
     </ul>
@@ -26,3 +22,4 @@
 <% end %>
 
 </ul>
+

data/app/views/subjects/_toolbar_home_menu_options_subjects.html.erb

@@ -1,9 +1,6 @@
 <%= menu_options[:groups] || capture do %>
   <li>
     <%= link_to( image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.other'), '#') %>
-  </li>
-
-  <li>
     <ul>
       <li>
         <%= link_to( image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new.action'), new_group_path) %>

data/app/views/subjects/_toolbar_logo.html.erb

@@ -1,4 +1,4 @@
 <div id="logo_index">
-  <div class="center"><span class="title_bold" ><%= subject.name %></span> (<%= ties_to(subject) %>)</div>
+  <div class="center"><span class="title_bold" ><%= subject.name %></span></div>
   <%= link_to image_tag(subject.logo.url, :alt => subject.name , :size => "119x108"), subject %>
 </div>

data/app/views/subjects/_toolbar_message_menu.html.erb

@@ -0,0 +1,17 @@
+<li>
+  <%= link_to( image_tag("btn/new.png", :class => "menu_icon")+t('message.other'), '#') %>
+  <ul>
+    <li>
+      <%= link_to( image_tag("btn/message_new.png", :class => "menu_icon")+ t('message.new'), new_message_path) %>
+    </li>
+    <li>
+      <%= link_to( image_tag("btn/message_inbox.png", :class => "menu_icon")+t('message.inbox')+" (" + current_subject.mailbox.inbox(:unread => true).count.to_s + ")", conversations_path, :remote => true) %>
+    </li>
+    <li>
+      <%= link_to( image_tag("btn/message_sentbox.png", :class => "menu_icon")+t('message.sentbox'), conversations_path(:box => :sentbox), :remote => true) %>
+    </li>
+    <li>
+      <%= link_to( image_tag("btn/message_trash.png", :class => "menu_icon")+t('message.trash'), conversations_path(:box => :trash), :remote => true) %>
+    </li>
+  </ul>
+</li>

data/app/views/subjects/_toolbar_profile.html.erb

@@ -1,21 +1,13 @@
 <%= render :partial => 'subjects/toolbar_logo', :locals => { :subject => subject } %>
 
-<div class="block space_center">
-</div>
+<div class="block space_center"></div>
 
 <%= render :partial => 'subjects/toolbar_profile_menu', :locals => { :subject => subject } %>
 
-<div class="block space_center">
-</div>
+<div class="block space_center"></div>
 
-<%= render :partial => 'subjects/tabs' %>
-
-<div class="block space_center">
-</div>
 
 <%= render :partial => 'subjects/contacts', :locals => { :subject => subject } %>
 
-<div class="block space_center">
-</div>
-<div class="block space_center">
-</div>
+<div class="block space_center"></div>
+<div class="block space_center"></div>

data/app/views/subjects/_toolbar_profile_menu.html.erb

@@ -1,13 +1,12 @@
-<% content_for :headers, stylesheet_link_tag("menu", :media => "screen, projection") %>
-
-<div id="menu_lateral_tie">
-  <%= render :partial => "subjects/toolbar_profile_menu_tie_options", :locals => { :subject => subject } %>
-</div>
-<div class="space_center">
-</div>
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "menu", :media => "screen, projection" %>
+  <%= javascript_include_tag 'menu' %>
+<% end %>
 
 <div id="menu_lateral">
-  <%= render :partial => "subjects/toolbar_profile_menu_basic_options", :locals => { :subject => subject } %>
-</div>
-<div class="space_center">
+  <ul class="menu">
+    <%= render :partial => "subjects/toolbar_profile_menu_tie_options", :locals => { :subject => subject } %>
+    <%= render :partial => "subjects/toolbar_profile_menu_basic_options", :locals => { :subject => subject } %>
+  </ul>
 </div>
+<div class="space_center"></div>

data/app/views/subjects/_toolbar_profile_menu_basic_options.html.erb

@@ -1,12 +1,13 @@
-<ul class="menu noaccordion">
 <%= menu_options[:messages] || capture do %>
-  <li>
-    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('message.other'), messages_path) %>
-  </li>
+  <% 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 %>
+
 <%= menu_options[:profile] || capture do %>
   <li>
     <%= link_to( image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), [subject, :profile]) %>
   </li>
 <% end %>
-</ul>

data/app/views/subjects/_toolbar_profile_menu_tie_options.html.erb

@@ -1,28 +1,28 @@
-<ul class="menu noaccordion">
 <%= menu_options[:like] || capture do %>
   <li>
     <%= link_to( image_tag("btn/btn_bookmark.png", :class => "menu_icon")+t('tie.add.bookmark'), '#') %>
   </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'), '#') %>
-  </li>
+      <li >
+      <%= link_to(image_tag("btn/btn_friend.png", :class => "menu_icon")+t('tie.edit.contact', :type => current_subject.ties_to(subject).first.relation_name), '#') %>
+     </li>
     <% else %>
-  <li >
-    <%= link_to(image_tag("btn/btn_friend.png", :class => "menu_icon")+t('tie.add.contact'), '#') %>
-  </li>
-  <li>
-    <ul>
+      <li >
+        <%= link_to(image_tag("btn/btn_friend.png", :class => "menu_icon")+t('tie.add.contact'), '#') %>
+      </li>
+
       <li>
-        <%= link_to(image_tag("btn/twitter-follow-icon.png", :size => "19x19", :class => "menu_icon")+t('tie.add.follow'), '#') %>
+        <li>
+          <%= link_to(image_tag("btn/twitter-follow-icon.png", :size => "19x19", :class => "menu_icon")+t('tie.add.follow'), '#') %>
+        </li>
       </li>
-    </ul>
-  </li>
     <% end %>
   <% end %>
 <% end %>
-</ul>
+
+

data/app/views/ties/_new.html.erb

@@ -1,30 +1,35 @@
 <div class="dialog_add_tie" id="new_tie">
     <div class="content_add_user" >
-      <div class="tie_logo">
-        <%= link_to image_tag(@tie.receiver_subject.logo.url(:profile),
-                              :size => "100x100",
-                              :alt => @tie.receiver_subject.name),
-                     @tie.receiver_subject %>
-      </div>
       <div class="activity_add_ties">
-        <div><%= t('message.one')+":" %><br />
   
-		 <%= form_for @tie do |f| %>
-		  
-           <%= f.hidden_field :receiver_id %>
-           <%= f.hidden_field :sender_id %>
-           <%= f.text_area :message,   :class =>"input_new_tie" %>
-
-           <%= f.select :relation_name, @tie.sender.relations.sort.map{ |r| [ r.name, r.name ] } %>
-
-           <div class="ties_btn">
-             <%= submit_tag t('contact.new.submit'), :class => "tie_btn" %>
-           </div>
-         <% end %>
-		 
-		 <button id="close_add_contact" type="button">X</button>
-		 
-        </div>
-      </div>
-    </div>
+	  	<%= form_for @tie do |f| %>  
+           	<%= f.hidden_field :receiver_id %>
+           	<%= f.hidden_field :sender_id %>
+        	   
+			<div class="block">
+				  <div class="close_add_contact">
+				  	<%=link_to('X','#', :id => "close_add_contact")%>
+				  </div>
+				  <div class="form_row center">
+				    <h2> <%= t('tie.new.title') %> </h2>
+				  </div>	
+					<div class="two_columns_container">
+						<div class="form_column_left">
+							<p class="colum_field_title"><%= t('message.one') %></p>
+							<%= f.text_area :message,   :class =>"new_tie_text_area" %>
+						</div>
+		
+						<div class="form_column_right">
+							<div class="select_relations">
+						  		<%= f.select :relation_name, @tie.sender.relations.sort.map{ |r| [ r.name, r.name ] } %>
+							</div>
+						</div>
+					</div>
+					<div class="form_bottom">
+						<%= submit_tag t('contact.new.submit'), :class => "button" %>
+					</div>
+				</div>
+			<% end %>
+    	</div>
+	</div>
 </div>

data/app/views/ties/_suggestions.html.erb

@@ -8,6 +8,7 @@
     });
 
     });
+
   <% end %>
 
   <div class="block">

data/app/views/ties/new.js.erb

@@ -3,6 +3,8 @@ if(!show_add_contact){
 	var show_add_contact = true;
 }
 
+<%= toolbar(:profile => @tie.receiver_subject).html_safe %>
+
 $('#content').html("<%= escape_javascript(render(:partial => "ties/new")) %>");
 
 $('#close_add_contact').click(function() {

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

@@ -30,4 +30,4 @@
 
 <div class="row">
   <%= will_paginate @users %>
-</div>
+</div>

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

@@ -1,5 +1,5 @@
 <% content_for :headers do %>
-  <%= javascript_include_tag 'ajax.paginate' %>
+  <%= javascript_include_tag 'jquery.ba-url','ajax.paginate' %>
 <% end %>
 
 <% toolbar if user_signed_in? %>
@@ -12,8 +12,6 @@
   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>
 
-
-
 <div class="space_center"></div>
 
 <div id="my_conferences">

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

@@ -1,5 +1,5 @@
 <% content_for :sidebar do %>
-  <%= render :partial => 'sidebar_show' %>
+  <%= render :partial => 'sidebar_index' %>
 <% end %>
 
 <% toolbar :profile => @user %>
@@ -13,6 +13,7 @@
 <%= render :partial => "users/groups",
            :locals  => { :user => @user } %>
 
-<%= render :partial => "activities/activities",
-           :locals  => { :activities => @user.profile_wall(current_subject),
+<%= render :partial => "activities/index",
+           :locals  => { :activities => @user.wall(:profile, :for => current_subject).
+                                              paginate(:page => params[:page]),
                          :owner => @user } %>

data/config/locales/en.yml

@@ -1,19 +1,45 @@
 en:
+  actor:
+    name: "Name"
   action:
     send: "Send"
     accept: "Accept"
   account:
     one: "Account"
   activity:
-    one: "Activity"
-    other: "Activities"
-    input: "What do you do?"
     confirm_delete: "Delete activity?"
     delete: "Delete"
-    to_comment: "Comment"
+    input: "What do you do?"
+    last: "Last Activities"
     like: "I like"
+    one: "Activity"
+    other: "Activities"
+    to_comment: "Comment"
     unlike: "Already I do not like"
-    last: "Last Activities"
+    verb:
+        follow:
+          title: "%{subject} added %{contact} as contact."
+          message: "%{name} added you as contact."
+        make-friend:
+          title: "%{subject} and %{contact} are now connected."
+          message: "%{name} also added you as contact."
+  avatar:
+    crop_image: "Crop the uploaded image"
+    crop_submit: "Crop"
+    destroy: "Delete"
+    destroy_sure: "Are you sure you wan't to delete the selected avatar?"
+    error:
+      no_file: "You have to select a file"
+      no_image_file: "The file you uploaded isn't valid, it must be an image file"
+    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."
+    preview: "Preview"
+    profile_change: "Change your avatar"
+    set_default: "Set as default"
+    set_default_sure: "Are you sure you wan't to set this avatar as default?"
+    upload: "Upload"
   browse: "Browse"
   comment:
     input: "Write a comment..."
@@ -21,6 +47,7 @@ en:
   contact:
     one: "Contact"
     other: "Contacts"
+    all_n: "All contacts (%{count})"
     new:
       link: "+ Add contact"
       title: "Add %{name} as contact"
@@ -63,21 +90,21 @@ en:
       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.'
   edit:
-    aboutme: "About me"
-    actualcity: "Actual City"
-    address: "Address"
-    birthday: "BirthDay"
-    contact: "Contact information"
-    email: "E-mail"
-    experience: "Experience"
-    fax: "Fax"
-    group_info: "Group information"
-    mobile: "Mobile"
-    organization: "Organization"
-    personal_info: "Personal information"
-    phone: "Phone"
+    aboutme: "About me --NOTE: use profile.<class>.about"
+    actualcity: "Actual City --NOTE: use profile.actualcity"
+    address: "Address --NOTE: use profile.address"
+    birthday: "BirthDay --NOTE: use profile.<class>.birthday"
+    contact: "Contact information --NOTE: use profile.contact"
+    email: "E-mail --NOTE: use profile.email"
+    experience: "Experience --NOTE: use profile.experience"
+    fax: "Fax --NOTE: use profile.fax"
+    group_info: "Group information --NOTE: use profile.<class>.info"
+    mobile: "Mobile --NOTE: use profile.mobile"
+    organization: "Organization --NOTE: use profile.organization"
+    personal_info: "Personal information --NOTE: use profile.<class>.info"
+    phone: "Phone --NOTE: use profile.phone"
     profile: "Edit profile"
-    website: "Website"
+    website: "Website --NOTE: use profile.website"
   forgot_password: "Forgot you password?"
   frontpage:
     collaborate:
@@ -124,6 +151,8 @@ en:
     one: "Inbox"
   location:
     message: "You are here > %{location}"
+    base: "You are here"
+    separator: " > "
   menu:
     options: "Menu Options"
     information: "Information"
@@ -135,12 +164,35 @@ en:
     other: "Messages"
     sentbox: "Sentbox"
     trash: "Trash"
+    send: "Send a message"
   password:
     forgot: "Do you forgot your password?"
   post:
     confirm_delete: "Delete post?"
   profile:
     one: "Profile"
+    age: "Age"
+    group:
+      about: "About us"
+      birthday: "Anniversary"
+      experience: "Area of expertise"
+      info: "Group information"
+    user:
+      about: "About me"
+      birthday: "Birthday"
+      experience: "Experience"
+      info: "Personal information"
+    actualcity: "Actual City"
+    address: "Address"
+    contact: "Contact information"
+    country: "Country"
+    email: "E-mail"
+    fax: "Fax"
+    mobile: "Mobile"
+    organization: "Organization"
+    phone: "Phone"
+    profile: "Edit profile"
+    website: "Website"      
   public:
     other: "Everybody"
   representation:
@@ -158,18 +210,21 @@ en:
   sign_up: "Sign up"
   socialstream: "SocialStream"
   tie:
-    activity:
-      add_contact: %{active} add %{pasive} as a contact
     add:
       bookmark: "Bookmark"
-      contact: "Add Contact"
+      contact: "Add contact as"
       follow: "Follow"
+      like: "Like"
       partner: "Add Partner"
+    category:
+      new: "New category"
+    edit:
+      contact: "Contact: %{type}"
+    new:
+      title: "Add New Contact"
     pending:
       other: "Pending requests"
       all: "All"
-    private_messages:
-        add_contact: %{name} add you as a contact
     suggestion:
       one: "Suggestion"
       other: "Suggestions"