social_stream 0.4.2 → 0.4.3

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

@@ -1,15 +1,8 @@
-<% content_for :headers do %>
-<%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
-<% end %>
-
 <%= location(
 	link_to(image_tag("btn/message_" + @box + ".png", :class => "menu_icon")+t('message.' + @box), conversations_path(:box => @box),:remote => true)
 ) %>
 
 
-<% content_for :javascript do %>
-  $('.pagination a').attr('data-remote', 'true');
-<% end %>
 
 <br class="clearfloat" />
 <div class="space_center">

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

@@ -7,13 +7,6 @@
 <br class="clearfloat" />
 <div class="space_center">
 </div>
-<div id="new_message">
-	<% if @box.present? %>
-    <%= link_to 'Back', conversations_path(:box => @box, :page => params[:page]), :remote => true %>
-	<% else %>
-    <%= link_to 'Back', conversations_path(:page => params[:page]), :remote => true %>
-	<% end %>
-</div>
 <div class="space_center">
 </div>
 <div class="conversation_full">  

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

@@ -2,6 +2,14 @@
   <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% toolbar %>
+<% content_for :headers do %>
+<%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>
+<% end %>
+
+<% content_for :javascript do %>
+  $('.pagination a').attr('data-remote', 'true');
+<% end %>
+
+<% toolbar :option => :messages %>
 
 <%= render :partial => 'index' %>

data/app/views/conversations/index.js.erb

@@ -5,3 +5,4 @@ $('.pagination a').attr('data-remote', 'true');
 
 $("head").append($("<%= escape_javascript(stylesheet_link_tag "messages.css", :media => "screen, projection") %>"));
 
+<%= toolbar :option => :messages %>

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

@@ -2,7 +2,7 @@
   <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% toolbar %>
+<% toolbar :option => :messages %>
 
 <% content_for :headers do %>
 <%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>

data/app/views/conversations/show.js.erb

@@ -4,6 +4,8 @@ $("head").append($("<%= escape_javascript(stylesheet_link_tag "messages.css", :m
 
 $("head").append($("<%= escape_javascript(javascript_include_tag 'ckeditor/ckeditor.js','ckeditor/adapters/jquery.js','jquery.scrollTo.min.js', 'jquery.validate')  %>"));
 
+<%= toolbar :option => :messages %>
+
 $('.cont_conversation').validate();
 <% unless @box.eql?'trash' %>
 	$('#body').ckeditor(

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

@@ -17,6 +17,12 @@
   });
 <% end %>
 
+<%= location(
+  link_to(image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.other'), groups_path),
+  link_to(image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new.action'), new_group_path('group' => { '_founder' => current_subject.slug }))
+) %>
+<div class="space_center"></div>
+
 <%= form_for @group do |f| %>
 	<% f.object._founder = current_subject.slug %>
 	<%= f.hidden_field :_founder %>
@@ -34,9 +40,10 @@
 		</div>
 	<% end %>
 	<div class="block">
-	  <div class="form_row center">
+	  <div class="form_row">
 	    <h2><%= t('group.new.action') %></h2>
-	  </div>	
+	  </div>
+		<div class="space_center"></div>	
 		<div class="form_row">
 			<div class="form_label">
 				<%= f.label t('group.new.name') %>

data/app/views/groups/new.html.erb

@@ -3,6 +3,10 @@
   <%= javascript_include_tag 'jquery.fcbkcomplete.min', 'jquery.validate' %>
 <% end %>   
 
-<% toolbar%>
+<% toolbar :option => 'groups' %>
+
+<% content_for :sidebar do %>
+  <%= render :partial => "sidebar_index" %>
+<% end %>
 
 <%= render :partial => 'new' %>

data/app/views/layouts/_header.erb

@@ -1,3 +1,6 @@
+<% content_for :headers do %>
+  <%= javascript_include_tag 'hoverIntent','superfish' %>
+<% end %>
 <div id="headerFront">
   <div class="banner_top banner_top_height">
     <div id="header_left">
@@ -18,9 +21,28 @@
     </div>
     <div id="header_right">
       <% if user_signed_in? %>
+        <div id="account">
+          <ul class="sf-menu">
+            <li class="current" >
+              <%# link_to t('account.one')+ '<span class='+'sf-sub-indicator> »</span>' , '#' , :class=>"sf-with-ul" %>
+              <a href="#" class="sf-with-ul" id="btn_menu_config">Account<span class="sf-sub-indicator"> »</span></a>
+
+              <ul>
+                <li>
+                  <%= link_to 'Configurations', '#' %>
+                </li>
+                <li>
+                  <%= link_to 'Notifications', '#' %>
+                </li>
+                <li class="current">
+                  <%= link_to 'Privacy', '#' %>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </div>
         <div class="menu_list menu_white" id="menu_account">
           <ul>
-            <li class="btn_menu_config"><%= link_to t('account.one'), '#' %></li>
             <li class="pipe">|</li>
             <li class="pipe"><%= render :partial => 'layouts/representation' %></li>
             <li class="pipe"> | </li>

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

@@ -3,7 +3,7 @@
   <%= link_to(current_user.name, current_user) %>
   <%= t('representation.action') %>
   <%= form_for(Representation.new(current_subject), :url => representation_path) do |f| %>
-    <%= f.select :subject_dom_id, current_user.represented.unshift(current_user).map{ |s| [ s.name, dom_id(s) ] } %>
+    <%= f.select :subject_dom_id, current_user.represented.unshift(current_user).map{ |s| [ s.name, dom_id(s) ] }, :class=>"button" %>
     <%= f.submit t('representation.change') %>
   <% end %>
 

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

@@ -2,7 +2,7 @@
 <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% toolbar %>
+<% toolbar :option => :messages %>
 
 <% content_for :headers do %>
 <%= stylesheet_link_tag "messages.css", :media => "screen, projection" %>

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

@@ -5,6 +5,9 @@ $("head").append($("<%= escape_javascript(stylesheet_link_tag "fcbkComplete.css"
 
 $("head").append($("<%= escape_javascript(javascript_include_tag 'jquery.fcbkcomplete.min','jquery.validate','ckeditor/ckeditor.js','ckeditor/adapters/jquery.js') %>"));
 
+<%= toolbar :option => :messages %>
+
+
 var recipients = $("#_recipients").fcbkcomplete({
         json_url: "<%= contacts_path(:format => :json) %>",
 	cache: true,

data/app/views/profiles/_profile.html.erb

@@ -1,8 +1,13 @@
+<%= location(
+  link_to(image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), [current_subject, :profile])
+) %>
+<div class="space_center"></div>
+<h2><%=t('menu.information')%></h2>
 <div class="space_center"></div>
 <div class="block" id="personal_info" >
   <div class="header">
     <div class="header_text">
-      <%=t('profile.' + current_subject.class.to_s.downcase + '.info')%>
+      <%=t('profile.' + @profile.subject.class.to_s.downcase + '.info')%>
     </div>
     <div class="header_icon_right">
       <%= link_to (image_tag('/images/btn/edit.png')),  :controller => :profiles , :action => :edit, :section => "about_me"%>
@@ -147,7 +152,7 @@
 <div class="block" id="experience_info">
   <div class="header">
     <div class="header_text">
-      <%=t('profile.' + current_subject.class.to_s.downcase + '.experience')%>
+      <%=t('profile.' + @profile.subject.class.to_s.downcase + '.experience')%>
     </div>
     <div class="header_icon_right">
       <%= link_to (image_tag('/images/btn/edit.png')),  :controller => :profiles , :action => :edit, :section => "my_experience"%>
@@ -180,15 +185,15 @@
 <% end %>
 <div class="space_center"></div>
 <% if (@profile.to_param==current_user.to_param and @profile.authentication_token) %>
-<div class="block" id="developer_info">
-  <div class="header">
-    <div class="header_text">
-      ApiKey: <%= @profile.authentication_token %>
-    </div>
-    <div class="header_icon_right">
-      <%= link_to (image_tag('/images/btn/edit.png')), :controller => :api,
-                           :action => :create_key %>
-    </div>
-  </div>
-</div>
+	<div class="block" id="developer_info">
+	  <div class="header">
+	    <div class="header_text">
+	      ApiKey: <%= @profile.authentication_token %>
+	    </div>
+	    <div class="header_icon_right">
+	      <%= link_to (image_tag('/images/btn/edit.png')), :controller => :api,
+	                           :action => :create_key %>
+	    </div>
+	  </div>
+	</div>
 <% end %>

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

@@ -15,9 +15,32 @@
   });
 <% end %>
 
+<%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'),
+      :controller => :profiles , :action => :edit, :section => "about_me")
+  when "contact_info" 
+    level2 = link_to(image_tag("btn/edit.png", :class => "menu_icon")+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'),
+      :controller => :profiles , :action => :edit, :section => "my_experience")
+	end
+else
+  level2 = link_to(image_tag("btn/edit.png", :class => "menu_icon")+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]),
+  level2
+) %>
+<div class="space_center"></div>
+
 <%= form_for(@profile, :url => [current_subject, :profile], :remote => true) do |f| %>
 
-<div class="block">
+<div class="block" id="profile_form">
   <% if !params[:section].present? or params[:section].eql?("about_me") %>
 		<% content_for :javascript do %>
 	    $(function () {
@@ -156,11 +179,13 @@
   <% end %>
 
   <% if params[:section].present? %>
-  <%= hidden_field_tag("section", params[:section]) %>
+    <%= hidden_field_tag("section", params[:section]) %>
   <% end %>
   <div class="form_row space_center">
-    <%= f.submit "Update", :class => "button" %>&nbsp;
-    <button class="button" onclick="window.location.href='<%= polymorphic_path(current_subject) %>';">Cancel</button>
+    <%= f.submit t('button.update'), :class => "button" %>&nbsp;
+    <button class="button" onclick="window.location.href='<%= polymorphic_path(current_subject) %>';">
+    	<%= t('button.cancel')%>
+		</button>
   </div>
 
 <% end %>

data/app/views/profiles/update.js.erb

@@ -1,11 +1,11 @@
 
   if ($("#profile_notice").length == 0){
-    $("#content").prepend('<div id="profile_notice" class="notice"></div>');  
+    $("#profile_form").prepend('<div id="profile_notice" class="notice"></div>');  
   } 
 	
 <% if @profile.valid? %>
 
-  $("#profile_notice").html("<h2>Form Submitted!</h2><br/>");
+  $("#profile_notice").html("<h2>Form Submitted!</h2>");
 	$("#profile_notice").removeClass('error');
   $("#profile_notice").addClass('success');
 	
@@ -32,7 +32,7 @@
 	
 <% else %>
   $("#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/>");
+	 +"<ul><% @profile.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul>");
 	$("#profile_notice").removeClass('success');
 	$("#profile_notice").addClass('error'); 
 

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

@@ -6,7 +6,7 @@
 
 <%= menu_options[:contacts] || capture do %>
   <li>
-    <%= link_to( image_tag("btn/btn_friend.png", :class => "menu_icon")+t('contact.other'), '#') %>
+    <%= 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| %>
       <li>

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

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

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

@@ -1,4 +1,16 @@
 <div id="logo_index">
-  <div class="center"><span class="title_bold" ><%= subject.name %></span></div>
-  <%= link_to image_tag(subject.logo.url, :alt => subject.name , :size => "119x108"), subject %>
+  <% if subject == current_subject %>
+    <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 %>    
+        <div class="logo_menu logo_caption">    
+          <%= link_to t('avatar.profile_change'), avatars_path  %>
+        </div>
+      </div>        
+    </div>        
+  <% else %>
+    <div class="center"><span class="title_bold" ><%= subject.name %></span></div>
+    <%= link_to image_tag(subject.logo.url, :alt => subject.name , :size => "119x119"), subject %>
+  <% end %>
 </div>

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

@@ -1,5 +1,5 @@
 <li>
-  <%= link_to( image_tag("btn/new.png", :class => "menu_icon")+t('message.other'), '#') %>
+  <%= link_to( image_tag("btn/new.png", :class => "menu_icon")+t('message.other'), '#', :id => "messages_menu") %>
   <ul>
     <li>
       <%= link_to( image_tag("btn/message_new.png", :class => "menu_icon")+ t('message.new'), new_message_path) %>

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

@@ -9,17 +9,28 @@
   <% 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).first.relation_name), '#') %>
+      <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon")+t('tie.edit.contact', :type => current_subject.ties_to(subject).first.relation_name), edit_tie_path(current_subject.ties_to(subject).first) %>
      </li>
     <% else %>
       <li >
-        <%= link_to(image_tag("btn/btn_friend.png", :class => "menu_icon")+t('tie.add.contact'), '#') %>
-      </li>
+      <%= link_to(image_tag("btn/btn_friend.png", :class => "menu_icon")+t('tie.add.contact'), '#', :id => 'contacts_menu') %>
+        <ul>
+          <% current_subject.relations.sort.each do |r| %>
+            <li>
+            <%= link_to image_tag("btn/twitter-follow-icon.png", :size => "19x19", :class => "menu_icon") + r.name,
+                        ties_path('tie[sender_id]'   => current_subject.actor_id,
+                                  'tie[receiver_id]' => subject.actor_id,
+                                  'tie[relation_id]' => r.id),
+                        :method => :post   %>
+            </li>
 
-      <li>
-        <li>
-          <%= link_to(image_tag("btn/twitter-follow-icon.png", :size => "19x19", :class => "menu_icon")+t('tie.add.follow'), '#') %>
-        </li>
+          <% end %>
+          <li>
+          <%= link_to image_tag("btn/twitter-follow-icon.png", :size => "19x19", :class => "menu_icon") + t('tie.relation.new'),
+                      new_tie_path('tie[sender_id]'   => current_subject.actor_id,
+                                   'tie[receiver_id]' => subject.actor_id) %>
+          </li>
+        </ul>
       </li>
     <% end %>
   <% end %>

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

@@ -0,0 +1,102 @@
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "addContact.css", :media => "screen, projection" %>
+	 <%= javascript_include_tag 'addContact'%>
+<% end %> 
+
+<% toolbar :profile => @tie.receiver_subject, :option => 'contacts' %>
+
+<% read_starTies_activity_id = get_permission_id("read","star_ties","activity") %>
+<% follow_id = get_permission_id("follow",nil,nil) %>
+<% create_tie_activity_id = get_permission_id("create","tie","activity") %>
+
+<% content_for :javascript do %>
+  $(document).ready(function() { 
+    defaultRelations = ["friend","acquaintance","public"]
+    
+		relation_name = "<%=@tie.relation.name%>";
+		$(".dropdown dt a span").html(relation_name);   
+    $('input[name$="tie[relation_name]"]').val(relation_name);
+			
+		if (defaultRelations.indexOf(relation_name)==-1){
+
+			//Rellenar relations
+			var allowRead_starTies_activity = <%=(@tie.relation.permissions.find_by_id(read_starTies_activity_id)!=nil)%>
+			var allowFollow = <%=(@tie.relation.permissions.find_by_id(follow_id)!=nil)%>
+			var allowCreate_tie_activity = <%=(@tie.relation.permissions.find_by_id(create_tie_activity_id)!=nil)%>
+			
+			if(allowRead_starTies_activity){
+			   $("#<%= read_starTies_activity_id %>").attr('checked',true);
+			}
+			
+			if(allowFollow){
+			   $("#<%= follow_id %>").attr('checked',true);
+			}
+			
+			if(allowCreate_tie_activity){
+			   $("#<%= create_tie_activity_id %>").attr('checked',true);
+			}
+			
+      $("#relationPermissions").show();
+		}
+		
+	});
+<% end %>
+
+<div class="dialog_add_tie" id="new_tie">
+  <div class="content_add_user" >
+    <div class="activity_add_ties">
+      
+
+      <%= location(
+        link_to(image_tag("btn/btn_friend.png", :class => "menu_icon")+t('tie.edit.title'), edit_tie_path,:remote => true)
+      ) %>
+      
+      <%= form_for @tie do |f| %>  
+        <%= f.hidden_field :receiver_id %>
+        <%= f.hidden_field :sender_id %>
+        <%= f.hidden_field :relation_name %>
+             
+      <div class="block">
+                  
+        <div class="form_row center">
+         <h2> <%= t('tie.edit.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">  
+              <div id="relationsSelect" class="dropdown">
+              <dt><a href="#"><span><%= t('tie.relation.one') %></span></a></dt>
+              <dd>                
+                <ul>
+                <% (@tie.sender.relations.sort.map{ |r| [ r.name] }).each do |relationArray| %>
+                  <li><a href="#" class="option"><%=relationArray[0]%><span class="value"><%=relationArray[0]%></span></a></li>
+                <% end %>
+                  <li><a href="#" class="input_link">
+                   <span class="value"></span>
+                   <input type="text" class="input_select"/>
+                    </a></li>
+                </ul>
+              </dd>
+                </div>
+              </div>
+
+              <div id="relationPermissions">
+                <p class="relationPermision"><input type="checkbox" id="<%=read_starTies_activity_id%>" class="checkbox_permission" name="tie[relation_permissions][]" value="<%=read_starTies_activity_id%>">  <%= t('permissions.read.activity.star_ties', :user=> @tie.receiver.name) %></p>
+                <p class="relationPermision"><input type="checkbox" id="<%=follow_id%>"                 class="checkbox_permission" name="tie[relation_permissions][]" value="<%=follow_id%>">                  <%= t('permissions.follow', :user=> @tie.receiver.name) %></p>
+                <p class="relationPermision"><input type="checkbox" id="<%=create_tie_activity_id%>"    class="checkbox_permission" name="tie[relation_permissions][]" value="<%=create_tie_activity_id%>">     <%= t('permissions.create.activity.tie', :user=> @tie.receiver.name) %></p>
+              </div>
+            </div>
+          </div>
+          <div class="form_bottom">
+            <%= submit_tag t('contact.edit.submit'), :class => "button" %>
+          </div>
+        </div>
+      <% end %>
+      </div>
+  </div>
+</div>