social_stream 0.11.1 → 0.11.2

data/.gitignore

@@ -11,4 +11,5 @@ nbproject
 lib/generators/social_stream/templates/public/images/tmp/
 **.*swp
 spec/dummy/documents/pictures/*
+spec/dummy/documents/documents/*
 .code_swarm

data/base/app/assets/javascripts/activities.js.erb

@@ -1,5 +1,6 @@
 //= require jquery.livequery
 //= require chosen.jquery
+//= require jquery.tipsy
 //
 //initial state
 $(function() {
@@ -7,6 +8,10 @@ $(function() {
   $('#new_<%= SocialStream.activity_forms.first %>').show();
   $('#select_<%= SocialStream.activity_forms.first %>').addClass('selected');
   $('#security').chosen();
+  // Remove width calculation
+  $('#securities input.default').css('width', '');
+
+  setActivityPrivacyTooltips();
 });
 
 
@@ -192,3 +197,21 @@ $('#left_scroll img').livequery("click",function(){
 
 });
 
+setActivityPrivacyTooltips = function(activityId) {
+  var fullId = '.activity_audience';
+  var summaryId = '.activity_audience_summary';
+
+  if (activityId != undefined) {
+    fullId = '#' + activityId + ' ' + fullId;
+    summaryId = '#' + activityId + ' ' + summaryId;
+  }
+
+  $(fullId).hide();
+  $(summaryId).tipsy({
+    html: true,
+    title: function(){
+      return $(this).siblings('.activity_audience').html();
+    }
+  });
+};
+

data/base/app/assets/javascripts/invitations.js

@@ -1 +1,8 @@
 //= require jquery.validate
+
+$(function() {
+jQuery.validator.addMethod("emails", function(value, element){
+      return this.optional(element) || /^((, *)*((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)+$/i.test(value);
+  }," Please enter valid email addresses.");    
+  $(".invitation_form").validate({errorClass: "validation_error"});
+});

data/base/app/assets/javascripts/profiles.js

@@ -2,5 +2,8 @@
 //= require jquery.fcbkcomplete
 
 $(function() {
-	$(".edit_profile").validate();
+  jQuery.validator.addMethod("phone", function(value, element){
+      return this.optional(element) || /^((\((\+?)\d+\))?|(\+\d+)?)[ ]*-?(\d+[ ]*\-?[ ]*\d*)+$/.test(value);
+    }, " Please enter a valid telephone number");
+	$(".edit_profile").validate({errorClass: "validation_error"});
 });

data/base/app/assets/stylesheets/activities.css.scss

@@ -1,10 +1,16 @@
 /*
  *= require jquery-ui
  *= require chosen
+ *= require tipsy
  */
 
 @import "colors";
 
+/* Fixes to tipsy, the plugin for tooltips */
+
+.tipsy{ background-image: url(../assets/tipsy.gif); }
+.tipsy-inner { background-color: $secondary-color; color: $sentence-color; }
+
 /****************** WALL - ACTIVITIES *********************/
 #wrapper_activities {}
 #wall{	text-align:center;}
@@ -19,6 +25,10 @@
 #activities_share_btn {	text-align: right;	padding: 5px 16px 0px 10px;	vertical-align: middle;}
 #securities{  display:inline-block;  text-align:left; float: left; padding-left:5px;}
 
+#security_chzn .chzn-choices {
+	padding-left: 20px;
+	background: url('btn/btn_security.png') no-repeat 10px center;
+}
 /******************* WALL - ACTIVITY ***************/
 .super_activity{width: 95%;}
 .activity {	text-align:left;	display: block;	vertical-align: top;	padding: 10px 0px 5px 0px;
@@ -76,8 +86,3 @@
 .copy_new_comment{visibility: hidden; padding:6px; padding-bottom: 1.5em;font-size:inherit; line-height: 1.15em;
                   margin-bottom:7px;}
 .input_new_comments_container{min-height: 30px; position: relative;  }
-/*********** DROP DOWN**********/
-#security_chzn .chzn-choices {
-	padding-left: 20px;
-	background: url('btn/btn_security.png') no-repeat 10px center;
-}

data/base/app/assets/stylesheets/base.css.scss

@@ -34,7 +34,7 @@ margin-top: auto; margin-bottom:auto; background-image:none; padding-bottom: 9px
     margin-left: auto;
     margin-right: auto;
 }
-.notice ul, .success ul, .alert ul, .error ul, .validation ul{
+.notice ul, .success ul, .alert ul, .error ul, .validation ul, #error_explanation ul{
   margin-left:40px;
   
 }
@@ -108,8 +108,9 @@ button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;co
 .block .field{  display:inline;  padding: 0px;  width:50%;}
 .block .form_tag{color: $main-color; padding: 5px 5px 5px 5px;  border:1px solid $input-border-color; width:90%;}
 .block .form_tag_long{color: $main-color;	padding: 5px 5px 5px 5px;  border:1px solid $input-border-color; width:91%;}
-.block .form_label{display:inline-block;  width:25%; font-weight:bold; vertical-align:10%; padding-top:3px;}
+.block .form_label{display:inline-block;  width:25%; font-weight:bold; vertical-align:top; padding-top:7px;}
 .block .form_field{  display:inline-block;  padding: 0px;  width:73%;}
+.block #form_select.form_field{ padding: 3px 0px;}
 .block .form_row {display: block; padding:5px; padding-left:20px;}
 .block .form_sub_row {display: block; padding:5px; padding-left:30px;}
 .block .label{  display:inline-block;  width:49%; }

data/base/app/assets/stylesheets/frontpage.css.scss

@@ -38,7 +38,8 @@ span.find{  padding-right:5px;}
 #icon_meet{  background: transparent url(frontpage/meet.png);  width:56px;  height:57px;}
 #icon_collaborate{  background: transparent url(frontpage/collaborate.png);  width:56px;  height:57px;}
 .icon_text{  text-align:center;  width:100%;  font-weight:bold;}
-#join_form{  float:right;  padding-right:50px;}
+#join_form{  margin: 15px 0px; text-align:center;}
+#join_form input[type="submit"] {font-size: 17px; padding: 6px 20px;}
 .sentences{  width:80%;  display:inline-block;  vertical-align:top;  padding-top:10px;}
 .sentences ul,.sentences li{  list-style-type:none;  font-size:14px;  margin-left:10px;  padding-top:3px;}
 .sentences li.purple{  list-style-image:url("frontpage/purple_sq.png");}

data/base/app/assets/stylesheets/header.css.scss

@@ -14,14 +14,15 @@
 #logo{  width:218px;  height:50px;  float:left;  vertical-align:top; }
 #logo_txt {color: $text-over-main;	display: inline;	vertical-align: top;	padding-top: 2px; }
 .div_login {	color:$text-over-main;	width:65%;	display:inline-block;	text-align: right;	vertical-align: top;
-	padding-top: 5px;	font-weight:normal;	margin-top:3px;  float:right; }
+	font-weight:normal;	 float:right; }
 .div_login #username{	height:10px; }
-.div_login, .input_username{	position:relative;	padding: 0px;	border: 0px; }
+.div_login .input_username{	position:relative;	padding: 2px;	border: 0px; }
 .div_login #login_button{	width:61px;	height:18px; }
 .div_login #login_data{display: block;}
 .div_login .login_data_block{ display: inline-block; padding-left: 10px;}
-.div_login .login_data_block input{ width: 250px;}
-.div_login .subtexto{	padding-top: 8px;	height:20px;	font-size: 11px; }
+.div_login .login_data_block input{ width: 200px;}
+.div_login .login_data_block input[type=submit]{ width: 70px;}
+.div_login .options{ height:20px;	font-size: 11px;}
 .div_login .a_border{	border-right:thin solid;	padding-right:7px;	text-decoration:underline; }
 #new_representation {	display: inline-block;}
 #header_notifications a{color: white; padding: 4px 10px 6px 11px;

data/base/app/controllers/groups_controller.rb

@@ -15,15 +15,9 @@ class GroupsController < InheritedResources::Base
                     tagged_with(params[:tag]).
                     page(params[:page]).per(10)
 
-    index! do |format|
-      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
-    end
   end
 
   def show
-    show! do |format|
-      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
-    end
   end
 
   def create

data/base/app/controllers/search_controller.rb

@@ -22,10 +22,6 @@ class SearchController < ApplicationController
         end
       end
     end
-    respond_to do |format|
-      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
-      format.js
-    end
   end
 
   private

data/base/app/controllers/users_controller.rb

@@ -10,15 +10,10 @@ class UsersController < InheritedResources::Base
                   tagged_with(params[:tag]).
                   page(params[:page]).per(10)
 
-    index! do |format|
-      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
-    end
+
   end
 
   def show
-    show! do |format|
-      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
-    end
   end
 
   # Supported through devise

data/base/app/models/activity.rb

@@ -262,13 +262,26 @@ class Activity < ActiveRecord::Base
   end
 
   # The {Relation} with which activity is shared
-  def audience_in_words(subject)
-    visible_relations =
-      relations.select{ |r| r.actor_id == Actor.normalize_id(subject) || r.is_a?(Relation::Public) }
+  def audience_in_words(subject, options = {})
+    options[:details] ||= :full
 
-    visible_relations.present? ?
-      I18n.t('activity.audience.visible', :audience => visible_relations.map(&:name).join(", ")) :
-      I18n.t('activity.audience.hidden', :audience => relations.map(&:actor).map(&:name).join(", "))
+    public_relation = relations.select{ |r| r.is_a?(Relation::Public) }
+
+    visibility, audience =
+      if public_relation.present?
+        [ :public, nil ]
+      else
+        visible_relations =
+          relations.select{ |r| r.actor_id == Actor.normalize_id(subject)}
+
+        if visible_relations.present?
+          [ :visible, visible_relations.map(&:name).join(", ") ]
+        else
+          [ :hidden, relations.map(&:actor).map(&:name).join(", ") ]
+        end
+      end
+
+    I18n.t "activity.audience.#{ visibility }.#{ options[:details] }", :audience => audience
   end
 
   private
@@ -279,9 +292,10 @@ class Activity < ActiveRecord::Base
   def fill_relations
     return if relation_ids.present?
 
+    # FIXME: repeated in SocialStream::Models::Object#_relation_ids
     self.relation_ids =
       if contact.reflexive?
-        Array(receiver.relation_public.id)
+        receiver.relation_customs.map(&:id)
       else
         receiver.relation_customs.allow(contact.sender, 'create', 'activity').map(&:id)
       end

data/base/app/models/actor.rb

@@ -333,9 +333,11 @@ class Actor < ActiveRecord::Base
   #
   #
   def activity_relations(subject, options = {})
-    return relation_customs if Actor.normalize(subject) == self
-
-    Array.new
+    if Actor.normalize(subject) == self
+      return relation_customs + Array.wrap(relation_public)
+    else
+      Array.new
+    end
   end
 
   # Are there any activity_relations present?

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

@@ -22,9 +22,19 @@
   <% end %> 	
 </div>
 
-<% 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 => true, :title => t('relation_public.name') %></div>
-<% end %>
+<div id="securities">
+  <% if current_subject == receiver %>
+    <%= select_tag :_relation_ids, options_for_select(current_subject.activity_relations(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => true, :title => t("activity.privacy.contacts.#{ receiver.class.to_s.underscore }", :receiver => receiver.name) %>
+  <% else %>
+    <div id="security_chzn" class="chzn-container chzn-container-multi">
+      <ul class="chzn-choices">
+        <li class="search-field">
+        <input type="text" value="<%= t "activity.privacy.contacts.#{ receiver.class.to_s.underscore }", :receiver => receiver.name %>" class="default" disabled="disabled">
+        </li>
+      </ul>
+    </div>
+  <% end %>
+</div>
 
 <div id="activities_share_btn">
   <%= submit_tag(t('share'), :class => "button submitActivity", :id => "masterSubmitButton") %>

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

@@ -1,12 +1,21 @@
 <div class="activity_options">
-    <% if user_signed_in? %>
-      <div class="security"><%= image_tag('btn/btn_security.png', :title => activity.audience_in_words(current_subject)) %></div>
-    <% end %>
     <div class="post_time_ago"><%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %></div>
     <% if activity.is_root? && user_signed_in? %>
       <div class="verb_comment"> · <%= link_to t('activity.to_comment'), "#", :class => "to_comment" %> </div>
     <% end %>
-      <div class="verb_like" id="like_<%= dom_id(activity) %>"> · <%= link_like(activity)%></div>
+
+    <div class="verb_like" id="like_<%= dom_id(activity) %>"> · <%= link_like(activity)%></div>
+
+    <% if user_signed_in? %>
+      ·
+      <%= link_to activity.audience_in_words(current_subject, :details => :summary),
+                  '#',
+                  :class => 'activity_audience_summary' %>
+      <div class="activity_audience">
+        <%= activity.audience_in_words(current_subject) %>
+      </div>
+    <% end %>
+
     <% if activity.delete_object_by?(current_subject) %>
       <div class="verb_delete"> 
         · <%= link_to t('activity.delete'), activity.direct_object , :confirm => t('confirm_delete', 

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

@@ -9,7 +9,7 @@
 <% toolbar :option => :messages %>
 
 <% content_for :javascript do %>
-$('.cont_conversation').validate();
+$('.cont_conversation').validate({errorClass: "validation_error"});
 <% unless @box.eql?'trash' %>
   $("#body").cleditor({
     width:493,

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

@@ -2,7 +2,7 @@ $("#content").html("<%= escape_javascript(render :partial => 'show') %>");
 
 <%= toolbar :option => :messages %>
 
-$('.cont_conversation').validate();
+$('.cont_conversation').validate({errorClass: "validation_error"});
 <% unless @box.eql?'trash' %>
   $("#body").cleditor({
     width:493,

data/base/app/views/devise/registrations/edit.html.erb

@@ -7,7 +7,7 @@
 <%= devise_error_messages! %>
 
 <% content_for :javascript do %>
-  $(".user_edit").validate();
+  $(".user_edit").validate({errorClass: "validation_error"});
 <%end%>
 
 <div class="space_center"></div>

data/base/app/views/devise/registrations/new.html.erb

@@ -23,7 +23,7 @@
     </div>
     <div class="form_row">
       <div class="form_label" id="user_password_confirmation_label">
-        <%= f.label t('devise.passwords.confirm') %>
+        <%= f.label :password_confirmation %>
       </div>
       <div class="form_field"><%= f.password_field :password_confirmation, :class =>"form_tag"  %></div>
     </div>

data/base/app/views/devise/shared/_links.erb

@@ -1,25 +1,25 @@
 <%- if controller_name != 'sessions' %>
-  <%= link_to "Sign in", new_user_session_path %><br />
+  <%= link_to t('devise.links.sign_in'), new_user_session_path %><br />
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+  <%= link_to t('devise.links.sign_up'), new_registration_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+  <%= link_to t('devise.links.forgot_password'), new_password_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+  <%= link_to t('devise.links.confirmation_instructions'), new_confirmation_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+  <%= link_to t('devise.links.unlock_instructions'), new_unlock_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+    <%= link_to t('devise.links.sign_in_with', :provider => provider.to_s.titleize), omniauth_authorize_path(resource_name, provider) %><br />
   <% end -%>
 <% end -%>

data/base/app/views/frontpage/index.html.erb

@@ -57,13 +57,13 @@
     </div>
   </div>
   <div class="espacio"></div>
-  <div id="join_form">
-      <%= link_to image_tag("frontpage/join.gif", :alt=>"register"), new_user_registration_path, :class => "register_link" %>
-  </div>
 </div>
 
 <div id="wrapper_right">
   <%= render :partial => 'frontpage/caracteristics' %>
 </div>
 
+<div id="join_form">
+  <%= button_to t('frontpage.register'), new_user_registration_path, :method=> :get %>
+</div>
 <div id="espacio_body_bottom"></div>

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

@@ -1,6 +1,6 @@
 <% content_for :javascript do %>
   $(function() {
-    $(".new_group").validate();
+    $(".new_group").validate({errorClass: "validation_error"});
   });
   $("#group__participants").fcbkcomplete({
                 json_url: "<%= contacts_path(:form => true, :format => :json) %>",

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

@@ -1,6 +1 @@
-<% if user_signed_in? %>
 <%= render :partial => 'show' %>
-<% else %>
-<% toolbar :profile => @group %>
-<%= render :partial => 'show_frontpage' %>
-<% end %> 

data/base/app/views/invitations/_new.html.erb

@@ -1,8 +1,3 @@
-<% content_for :javascript do %>
-  $(function() {
-     $(".invitation_form").validate();
-  });
-<% end %>
 
 <div class="space_center"></div>
 

data/base/app/views/layouts/_header.erb

@@ -1,44 +1,5 @@
-<div id="headerFront">
-  <div class="banner_top banner_top_height">
-    <div id="header_left">
-      <div id="logo_txt">
-        <%= link_to(image_tag('header-logo.png', :alt => t('site.name')), root_path) %>   
-      </div>
-    </div>
-    <% if user_signed_in? %>
-      <%= render :partial => 'layouts/search' %>
-    <%end%>
-    <div id="header_right">
-       <% if user_signed_in? %>
-        <div class="menu_list menu_white" id="menu_home">
-          <ul>
-            <li>
-              <%= link_to(t('home'), root_path)%>
-            </li>   
-            <li class="pipe">·</li>
-            <li>
-              <%= link_to(t('profile.one'), current_subject)%>
-            </li>            
-            <li class="pipe">·</li>
-            <li>
-              <%= link_to(t('message.other'), conversations_path) %>
-              <span id="header_inbox_count">
-              <%= link_to(current_subject.mailbox.inbox(:unread => true).count.to_s, conversations_path) %>
-              </span>
-            </li>            
-            <li class="pipe">·</li>
-            <li>
-              <span id="header_notifications">
-              <%= link_to( current_subject.mailbox.notifications.not_trashed.unread.count.to_s, notifications_path) %>
-              </span>
-            </li>
-            <li class="pipe">·</li>
-            <li>
-              <%= render :partial => 'layouts/header_dropdown_menu' %>  
-            </li>
-          </ul>
-        </div>
-      <% end %>
-    </div>
-  </div>
-</div>
+<% if user_signed_in? %>
+<%= render :partial => 'layouts/header_signed_in' %>
+<% else %>
+<%= render :partial => 'layouts/header_signed_out' %>
+<% end %>