social_stream-base 0.6.3 → 0.6.5

data/app/models/user.rb

@@ -29,8 +29,12 @@ class User < ActiveRecord::Base
 
   # Subjects this user can acts as
   def represented
+    candidates = contact_actors(:direction => :sent).map(&:id)
+
     contact_subjects(:direction => :received) do |q|
-      q.joins(:sent_ties => { :relation => :permissions }).merge(Permission.represent)
+      q.joins(:sent_ties => { :relation => :permissions }).
+        merge(Permission.represent).
+        where(:id => candidates)
     end
   end
   

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

@@ -19,7 +19,10 @@
 </div>
 
 <div id="activities_share_btn">
-<div id="securities"><%= select_tag :_relation_ids, grouped_options_for_select(current_subject.grouped_activity_relations(receiver)), :id => 'security', :multiple => nil %></div>
-<%= submit_tag(t('share'), :class => "myButtonBlue", :id => "masterSubmitButton") %>
+<% if current_subject == receiver %>
+  <div id="securities"><%= select_tag :_relation_ids, options_for_select(current_subject.activity_relations(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => nil %></div>
+<% end %>
+
+  <%= submit_tag(t('share'), :class => "myButtonBlue", :id => "masterSubmitButton") %>
 </div>
 <% end %>

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

@@ -1,11 +1,11 @@
 <div class="activity_options">
   <ul class="activity_options" >
     <li><div class="post_time_ago"><%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %></div></li>
-    <% if activity.is_root? && user_signed_in? && current_subject.activity_relations?(activity.receiver, :in => activity.relations) %>
+    <% if activity.is_root? && user_signed_in? %>
     <li><div class="verb_comment"> · <%= link_to t('activity.to_comment'), "#", :class => "to_comment" %> </div></li>
     <% end %>
     <li><div class="verb_like" id="like_<%= dom_id(activity) %>"> · <%= link_like(activity)%></div></li>
-    <% if activity.direct_object.present? && !activity.direct_object.is_a?(Actor) %>
+    <% if activity.delete_object_by?(current_subject) %>
       <li><div class="verb_delete"> · <%= link_to t('activity.delete'), activity.direct_object , :confirm => t('confirm_delete', :scope => activity.direct_object.class.to_s.underscore), :method => :delete,  :remote => true %> </div></li>
     <% end %>
   </ul>

data/app/views/activities/_walls.html.erb

@@ -9,7 +9,7 @@
 
 <div id="tabs" class="block">
   <ul class="activity_tabs">
-    <li><%= link_to "<span>#{ h owner.name }</span>".html_safe, "#wall-profile" %></li>
+    <li><%= link_to "<span>#{ h truncate_name owner.name }</span>".html_safe, "#wall-profile" %></li>
 
     <% owner.relation_customs.sort.each do |r| %>
       <li><%= link_to "<span>#{ h r.name }</span>".html_safe,

data/app/views/contacts/_contact.html.erb

@@ -1,4 +1,4 @@
-<div id="contact_<%=dom_id(contact.receiver_subject)%>" class="row contact">
+<%= div_for contact, :class => 'row' do %>
   <div class="logo">
     <%= link_to(image_tag(contact.receiver.logo.url(:contact)),
                 contact.receiver_subject) %>
@@ -14,7 +14,7 @@
       <%= contact_to(contact.receiver) %>
     </div>
   </div>
-  <div class="close"><%=link_to('X','#')%></div>
+  <div class="close"><%= link_to 'X', contact, :method => :delete, :remote => true %></div>
   <div class="space_center">
   </div>  
-</div>
+<% end %>

data/app/views/contacts/_form.html.erb

@@ -10,9 +10,6 @@
 	
   function checkBoxEnable(id) {
     $('div[contain$=' + id + ']').addClass("checked-option");
-
-    var sphere = $("#"+id).attr("optionOf");
-    $(':checkbox[optionOf$='+sphere+']:checked:not(#'+id+')').checkBox('changeCheckStatus', false);
   }
 
   function checkBoxDisable(id) {
@@ -24,24 +21,21 @@
   <%= form_for @contact do |f| %>
     <%= hidden_field_tag "contact[relation_ids][]", "gotcha" %>
 
-    <% current_subject.spheres.each do |sphere| %>
-      <div class="sphere-name"><%= sphere.name %></div>
-      <ul>
-      <% sphere.customs.sort.each do |relation| %>
-        <li>
-          <div contain="<%= dom_id relation %>">
-            <input id="<%= dom_id relation %>" name="contact[relation_ids][]" value="<%= relation.id %>" type="checkbox" optionOf="<%= sphere.name %>" <%= raw('checked="checked"') if @contact.relation_ids.include?(relation.id) %> />
-            <label for="<%= dom_id relation %>">
-              <%= relation.name %>
-            </label>
-          </div>
-        </li>
-      <% end %>
-      </ul>
+    <ul>
+    <% current_subject.relation_customs.each do |relation| %>
+      <li>
+        <div contain="<%= dom_id relation %>">
+          <input id="<%= dom_id relation %>" name="contact[relation_ids][]" value="<%= relation.id %>" type="checkbox" <%= raw('checked="checked"') if @contact.relation_ids.include?(relation.id) %> />
+          <label for="<%= dom_id relation %>">
+            <%= relation.name %>
+          </label>
+        </div>
+      </li>
     <% end %>
+    </ul>
 
-    <div id="contact-new">
-      <%= link_to t('contact.type.new'), spheres_path %>
+    <div id="relation-new">
+      <%= link_to t('contact.type.new'), relation_customs_path %>
     </div>
 
     <div id="contact-message">
@@ -50,7 +44,7 @@
     </div>
 
     <div id="contact-submit">
-      <%= submit_tag t("contact.#{ controller.action_name }.submit"), :class => "button" %>
+      <%= submit_tag t("contact.#{ f.object.action }.submit"), :class => "button" %>
     </div>
   <% end %>
 </div>

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

@@ -13,7 +13,7 @@
     </div>
     <div class="sub-block">
       <div class="name black" >
-        <%=link_to(contact.name, contact)%>
+        <%=link_to(truncate_name(contact.name), contact)%>
       </div>
       <div class="link">
         <%= contact_to(contact) %>

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

@@ -1,16 +1,4 @@
 <% if current_subject.suggestion.present? %>
-  <% content_for :javascript do %>
-
-    $(".suggestions .close").livequery("click",function(){
-    temp = $(this);
-    $.get("<%=suggestion_contacts_path%>", function(data) {
-    temp.parents(".contact").replaceWith(data);
-    });
-
-    });
-
-  <% end %>
-
   <div class="block">
     <div class="header">
       <%= image_tag('btn/notifications.png', :class => "header_icon") %>
@@ -21,7 +9,7 @@
     <div class="content">
       <div class="suggestions">
         <% if (sgs = current_subject.suggestions(2)).present? %>
-          <%= render :partial => 'contacts/contact', :collection => sgs %>
+          <%= render sgs %>
         <%end%>
       </div>
     </div>

data/app/views/contacts/destroy.js.erb

@@ -0,0 +1,6 @@
+<% 
+  new_contact = @contact.pending? ? current_subject.pending_contacts.last : current_subject.suggestion 
+  render_string = new_contact.present? ? render(new_contact) : ""
+%>
+
+$('#<%= dom_id(@contact) %>').replaceWith("<%= escape_javascript render_string %>");

data/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.edit.title', :name => @contact.receiver.name), edit_contact_path(@contact.to_param)) %>
+                    t("contact.#{ @contact.action }.title", :name => @contact.receiver.name), edit_contact_path(@contact.to_param)) %>
 
 <%= render :partial => 'form' %>

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

@@ -8,7 +8,7 @@
 </div>
 <div class="content_left">
 	<div class="sender_name">
-		<%= link_to conversation.last_sender.name, conversation.last_sender.subject %>
+		<%= link_to truncate_name(conversation.last_sender.name), conversation.last_sender.subject %>
 	</div>
 	<div class="date">
 		<%= t('time.ago', :time => time_ago_in_words(conversation.updated_at)) %>

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

@@ -4,7 +4,7 @@
       <%=link_to(image_tag(group.logo.url(:actor), :class => 'btn_group', :alt => group.name, :title => group.name), group) %>
     </div>
     <div class="group_title">
-      <%=link_to(group.name, group)%>
+      <%=link_to(truncate_name(group.name), group)%>
     </div>
   <% end %>
 </li>

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

@@ -10,7 +10,7 @@
       </div>
       <div class="sub-block">
         <div class="name black" >
-          <%= link_to group.name, group %>
+          <%= link_to truncate_name(group.name), group %>
         </div>
         <div class="brief">
           <%= t 'follower.n', :count => group.follower_count %>,

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

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

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

@@ -2,12 +2,23 @@
   <div>
     <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('socialstream'), new_user_registration_url)%>
     <br/>
-    <table width="50%" style="border-style: solid; border-color: #2A3890; margin:10px; border-width: 2px;">
-      <tr>
-        <td><img src="http://<%= ActionMailer::Base.default_url_options[:host] +@sender.logo.url(:profile)%>" alt="<%=@sender.name%>"></td>
-        <td>"<%= @message%>"</td>
-      </tr>
-    </table>
+    <div style="position: absolute;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;">
+        <img src="http://<%= ActionMailer::Base.default_url_options[:host] +@sender.logo.url(:profile)%>" alt="<%=@sender.name%>">
+      </div>
+      <div style=" margin: 5px 5px 5px 5px;">
+        <p style="font-weight: bold; "><%= @sender.name %>
+          <% if @sender.profile.organization? %>
+            <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @sender.profile.organization%></span>
+          <% end %>
+        </p>       
+        <% if @message.blank? %>
+          <p style="text-align: justify;"><%= t('invitation.join_me')%></p>         
+        <%else%>
+          <p style="text-align: justify; font-style: italic;">"<%= @message%>"</p>
+        <%end%>
+      </div>
+    </div>
   </div>
   <div>
     <div>

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

@@ -1,5 +1,10 @@
-<%= @sender.name %> has invited you to <%= t('socialstream')%>: <%= new_user_registration_path%>
-"<%= @message%>"
+<%= @sender.name %> has invited you to <%= t('socialstream')%>: <%= new_user_registration_url%>
+
+<% if @message.blank? %>
+  <%= t('invitation.join_me')%>         
+<%else%>
+  "<%= @message%>"
+<%end%>
 
 <%= t('frontpage.main_title') %>
 

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

@@ -4,24 +4,28 @@
   <% else %>
     <%= link_to(image_tag(current_user.logo.url(:representation), :width => 20, :height => 20, :class => 'menu_icon'), current_user) %>
   <% end %> 
-  <%= link_to(current_user.name, current_user) %>
-
-  <%= t('representation.action') %>
+  <%= link_to(truncate_name(current_user.name), current_user) %>
 </div>
 
+
 <% representations = current_user.represented.unshift(current_user) - [current_subject] %>
 
-<div id="representations_menu">
+<% if !representations.empty? %>
+
+<span id="representation_text"><%= t('representation.action') %></span>
+
+<div id="representations_menu">	
   <ul class="sf-menu" >
     <li id="representation_li">
-      <a href="#" class="sf-with-ul" id="current_subject_avatar_img" style="background: transparent url('<%= image_path current_subject.logo.url(:representation)%>') no-repeat left top;"><%= current_subject.name %><span class="sf-sub-indicator"> »</span></a>
+      <a href="#" class="sf-with-ul" id="current_subject_avatar_img" style="background: transparent url('<%= image_path current_subject.logo.url(:representation)%>') no-repeat left top;"><%= truncate_name current_subject.name %><span class="sf-sub-indicator"> »</span></a>
       <ul>
         <% representations.each do |representation| %>
         <li>
-        <%= link_to representation.name, { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
+        <%= link_to truncate_name(representation.name), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
        </li>
         <% end %>
       </ul>
     </li>
   </ul>
 </div>
+<% end %>

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

@@ -10,7 +10,7 @@
                     <%= link_to t('settings.main'), settings_path, :id => "btn_menu_settings" %>
                 </li>
                 <li class="current">
-                    <%= link_to t('account.privacy'), spheres_path %>
+                    <%= link_to t('account.privacy'), relation_customs_path %>
                 </li>
             </ul>
         </li>

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

@@ -8,7 +8,7 @@
 	<div class="header">
 		<div class="content_left">
 			<div class="sender_name">
-				<%= link_to message.sender.name, message.sender.subject %>
+				<%= link_to truncate_name(message.sender.name), message.sender.subject %>
 			</div>
 			<div class="date">
 				<%= t('time.ago', :time => time_ago_in_words(message.updated_at)) %>

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

@@ -46,7 +46,7 @@
 	
 
 	<% unless @recipient.nil? %>
-		$("#_recipients").trigger("addItem",[{"title": "<%= @recipient.name %>", "value": "<%= @recipient.id %>"}]);
+		$("#_recipients").trigger("addItem",[{"title": "<%= truncate_name @recipient.name %>", "value": "<%= @recipient.id %>"}]);
 	<% end %>
 
   $(".new_message").validate();

data/app/views/notifications/_notification.html.erb

@@ -2,9 +2,13 @@
 
 <div class="notification"></div>
 <div class="sender_photo">
-  <%= link_to image_tag(notification.object.sender.logo.url(:actor),
-      :title => notification.object.sender.name, :alt => notification.object.sender.name),
-      notification.object.sender.subject %>
+  <%if notification.object.nil? %>
+    <%= image_tag('logos/actor/user.png',:title => "unknown", :alt => "unknown")%>
+  <%else%>
+    <%= link_to image_tag(notification.object.sender.logo.url(:actor),
+        :title => notification.object.sender.name, :alt => notification.object.sender.name),
+        notification.object.sender.subject %>
+  <%end%>
 </div>
 <div class="content_left">
   <div class="date">

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

@@ -5,10 +5,4 @@
   <%= f.hidden_field :_contact_id %>
 
   <%= render :partial => object.class.to_s.tableize+'/fields' , :locals => {:f => f} %>	
-
-  <% if current_subject != receiver %>
-    <% current_subject.activity_relations(receiver, :from => :receiver).each do |r| %>
-      <%= f.hidden_field "_relation_ids][", :value => r.id %>
-    <% end %>
-  <% end %>
 <% end %>

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

@@ -80,12 +80,6 @@ end %>
   <% end %>
   
   <% if !params[:section].present? or params[:section].eql?("about_me") %>
-		<% content_for :javascript do %>
-	    $(function () {
-	        $( "#profile_birthday" ).datepicker({ yearRange: '1900:<%= Time.now.utc.to_date.year%>',
-	                                          changeYear: true, maxDate: '+0d', defaultDate: '-30y'});
-	    });
-	  <% end %>
     <div class="row">
 	    <div class="form_row">
 	        <h2><%=t('profile.' + current_subject.class.to_s.downcase + '.info')%></h2>
@@ -94,10 +88,10 @@ end %>
 		  <%= f.fields_for :actor do |actor_form| %>
 		    <div class="form_row">
 		      <div class="form_label">
-		       <%= f.label t('actor.name') %>
+		       <%= f.label t('actor.name') %><span class="needed"> (*)</span>
 		      </div>
 		      <div class="form_field">
-		       <%= actor_form.text_field :name, :class => "required form_tag"  %>
+		       <%= actor_form.text_field :name, :class => "required form_tag"%>
 		      </div>
 		    </div>
       <%end%>
@@ -118,7 +112,7 @@ end %>
 	      <%= f.label t('profile.' + current_subject.class.to_s.downcase + '.birthday')%>
 	    </div>
 	    <div class="form_field">
-	      <%= f.text_field( :birthday , :class => "date form_tag") %>
+	      <%= date_select "profile", "birthday", :order => [:day, :month, :year], :end_year=> Date.today.year, :start_year=> (Date.today.year - 100) %>
 	    </div>
 	  </div>
 
@@ -146,6 +140,7 @@ end %>
 	  <div class="form_row">
 	    <%= f.text_area :description, :maxlength => 200, :rows => 10, :class => "form_tag_long" %>
 	  </div>
+	  <div class="form_row needed"><%=t('required')%></div>
   <% end %>
   <% if !params[:section].present? or params[:section].eql?("contact_info") %>
     <div class="form_row">
@@ -205,6 +200,7 @@ end %>
   <% if params[:section].present? %>
     <%= hidden_field_tag("section", params[:section]) %>
   <% end %>
+  
   <div class="form_row space_center">
     <%= f.submit t('button.update'), :class => "button" %>&nbsp;
     <button class="button" onclick="window.location.href='<%= polymorphic_path(current_subject) %>';">

data/app/views/relation/customs/_form.html.erb

@@ -1,7 +1,7 @@
-<% @custom ||= @sphere.customs.build %>
+<% @custom ||= Relation::Custom.new(:actor_id => current_subject.actor_id) %>
 
 <%= form_for @custom, :remote => true do |f| %>
-  <%= f.hidden_field :sphere_id %>
+  <%= f.hidden_field :actor_id %>
 
   <% if @custom.errors.any? %>
     <div id="error_explanation">

data/app/views/{spheres → relation/customs}/_jquery.erb

@@ -26,28 +26,9 @@ function checkBoxEnable(id) {
 
         switch (checkBoxType(id)) {
 
-	case "sphere":
-		$(':checkbox[id^="sphere"]:checked:not(#' + id + ')').checkBox('changeCheckStatus', false);
-
-		var sphereSelected = checkBoxId(id);
-
-		$.ajax({
-			url: "<%= relation_customs_path %>",
-			context: document.body,
-			data: { sphere_id: sphereSelected },
-                        dataType: "script"
-		});
-
-                break;
-
 	case "relation_custom":
 		$(':checkbox[id^="relation_custom"]:checked:not(#' + id + ')').checkBox('changeCheckStatus', false);
 
-                var value = relations.length - checkBoxOrder(id) - 2;
-		$("#slider-range").slider("value", value);
-
-		$( "#relation" ).val(checkBoxValue(id));
-
 		$.ajax({
 			url: "<%= permissions_path %>",
 			context: document.body,
@@ -73,19 +54,10 @@ function checkBoxDisable(id) {
 
         switch (checkBoxType(id)) {
 
-	case "sphere":
-                $("#permissions").html("");
-		$("#permissions").hide();
-		$("#relations").hide();
-
-                break;
-
 	case "relation_custom":
                 $("#permissions").html("");
 		$("#permissions").hide();
 
-		$("#slider-range").slider("value", relations.length - 1);
-	        
                 break;
 
 	case "permission":
@@ -98,33 +70,3 @@ function checkBoxDisable(id) {
 
         }
 } 
-
-
-function initSlider() {
-  /* TODO: get relations from checkboxOptions */
-  relations.unshift("<%= t 'relation_public.name' %>");
-  relations.push("<%= current_subject.name %>");
-
-  $("#relation").val(relations[relations.length - 1]);
-
-  $("#slider-range").slider({
-    orientation: "vertical",
-    range: "min",
-    min: 0,
-    max: relations.length - 1,
-    step: 1,
-    value: relations.length - 1,
-    slide: function(event, ui) {
-      $('#relation').val(relations[ui.value]);
-      },
-    stop: function(event, ui) {
-      var order = relations.length - ui.value - 2;
-      if (order >= 0 && order < relations.length - 2) {
-        var id = '#' + checkBoxIdByOrder(order);
-        $(id).checkBox('changeCheckStatus', true);
-      } else {
-        $(':checkbox[id^="relation_custom"]:checked').checkBox('changeCheckStatus', false);
-      }
-    }
-  });
-};