social_stream 0.11.7 → 0.11.8

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

@@ -1,3 +1,4 @@
 //= require jquery.fcbkcomplete
 //= require jquery.validate
 //= require jquery.cleditor.min
+//= require jquery.ae.image.resize

data/base/app/assets/javascripts/social_stream-base.js

@@ -2,5 +2,6 @@
 //= require jquery_ujs
 //= require jquery-ui
 //= require modernizr
+//= require jquery.lightbox-with-resize-plugin
 //
 //= require_tree .

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

@@ -122,7 +122,7 @@ button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;co
 .block .select_relations{ padding-top:20px; text-align: center; }
 #form_participants{vertical-align:60%;}
 
-div.chzn-container ul.chzn-choices li.search-field input.default{ cursor:pointer;}
+div.chzn-container ul.chzn-choices li.search-field input{ cursor:pointer;}
 
 /********* Links SECTION **********/
 .contact_link a{  text-decoration:none;}

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

@@ -32,6 +32,7 @@
 .message .body{
 	padding: 5px 5px 5px 5px;
 	border: 1px solid $secondary-color;
+	word-wrap: break-word;
 }
 .message .content_left {
 	float:left;

data/base/app/controllers/contacts_controller.rb

@@ -3,14 +3,8 @@ class ContactsController < ApplicationController
   before_filter :exclude_reflexive, :except => [ :index, :pending ]
 
   def index
-    @total_contacts =
-      Contact.sent_by(current_subject).
-              joins(:receiver).merge(Actor.alphabetic).
-              positive.
-              select("actors.name")
-
     @contacts =
-      @total_contacts.
+      total_contacts.
               merge(Actor.letter(params[:letter])).
               merge(Actor.name_search(params[:search])).
               related_by_param(params[:relation])
@@ -46,6 +40,8 @@ class ContactsController < ApplicationController
   end
 
   def pending
+    total_contacts
+
     @contacts = current_subject.pending_contacts
 
     respond_to do |format|
@@ -88,4 +84,12 @@ class ContactsController < ApplicationController
       end
     }.to_json
   end
+
+  def total_contacts
+    @total_contacts ||=
+      Contact.sent_by(current_subject).
+              joins(:receiver).merge(Actor.alphabetic).
+              positive.
+              select("actors.name")
+  end
 end

data/base/app/controllers/groups_controller.rb

@@ -1,4 +1,6 @@
 class GroupsController < InheritedResources::Base
+  before_filter :authenticate_user!, :except => [ :index, :show ]
+
   # Set group founder to current_subject
   # Must do before authorization
   before_filter :set_founder, :only => :new
@@ -29,6 +31,15 @@ class GroupsController < InheritedResources::Base
     end
   end
 
+  def destroy
+    destroy! do |success, failure|
+      success.html {
+        self.current_subject = current_user
+        redirect_to :home
+      }
+    end
+  end
+
   protected
 
   # Overwrite resource method to support slug
@@ -40,8 +51,6 @@ class GroupsController < InheritedResources::Base
   private
 
   def set_founder
-    return unless user_signed_in?
-
     params[:group]               ||= {}
     params[:group][:_contact_id] ||= current_subject.ego_contact.id
   end

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

@@ -24,13 +24,27 @@
 </div>
 
 <div id="securities">
-  <% if current_subject == receiver %>
+  <% if current_subject == receiver %>  
+    <%= javascript_tag do %>
+      var relation_public = <%= receiver.relation_public.id %>;
+      var public_selected = false;
+      var relation_options = <%= escape_javascript(current_subject.activity_relations(receiver).sort.map{ |r| r.id }.to_json) %>;
+      var relation_public_pos = 0;
+      for(id in relation_options){
+        if(relation_options[id]==relation_public){
+          break;
+        }else{
+          relation_public_pos++;
+        }
+      }
+      //For security with check "var default_security_width = '100px';" in activities.js.erb
+    <% end %>
     <%= 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.myself.contacts.#{ receiver.class.to_s.underscore }") %>
   <% 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.outside.contacts.#{ receiver.class.to_s.underscore }", :receiver => truncate_name(receiver.name,:length => 15) %>" class="default" disabled="disabled">
+        <input type="text" value="<%= t "activity.privacy.outside.contacts.#{ receiver.class.to_s.underscore }", :receiver => truncate_name(receiver.name,:length => 15) %>" disabled="disabled">
         </li>
       </ul>
     </div>

data/base/app/views/activities/index.js.erb

@@ -1 +1,3 @@
 $('#wall-<%= params[:section] || "profile" %>').html("<%= escape_javascript render(:partial => 'index', :locals => { :owner => parent, :activities => @activities }) %>");
+
+setActivityPrivacyTooltips();

data/base/app/views/comments/create.js.erb

@@ -2,4 +2,6 @@
 $("#comments_activity_<%= @comment.post_activity.parent.id %>").append("<%= escape_javascript(render @comment.post_activity) %>");
 $(".activities_comment_btn").hide();
 
+setActivityPrivacyTooltips("<%= escape_javascript dom_id(@comment.post_activity) %>");
+
 unblock_all_forms();

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

@@ -1,53 +1,71 @@
 <div class="title">
-	<h2><%= conversation.subject %></h2>
+  <h2><%= conversation.subject %></h2>
 </div>
 <div class="action">
-	<% unless @box.eql?'trash' %><%= link_to(image_tag('btn/btn_delete.png', :atl => t('mailboxer.delete'), :title => t('mailboxer.delete')),
-	conversation_path(conversation, :location => 'conversation', :box => @box),
-	:confirm => t('mailboxer.delete_confirm', :object => conversation.subject),
-	:method => :delete, :remote => true) %><% end %>
-</div>
-<div class="clearfloat">
+  <% unless @box.eql?'trash' %><%= link_to(image_tag('btn/btn_delete.png', :atl => t('mailboxer.delete'), :title => t('mailboxer.delete')),
+  conversation_path(conversation, :location => 'conversation', :box => @box),
+  :confirm => t('mailboxer.delete_confirm', :object => conversation.subject),
+  :method => :delete, :remote => true) %><% end %>
 </div>
+<div class="clearfloat"></div>
 <div class="participants">
-	<h3><%= t("message.participants") %>:</h3>
-	<% conversation.recipients.each do |recp| %>
-	<%= link_to image_tag(recp.logo.url(:contact), :title=>recp.name, :alt => recp.name), recp.subject %>
-	<% end %>
+  <h3><%= t("message.participants") %>:</h3>
+  <% conversation.recipients.each do |recp| %>
+  <%= link_to image_tag(recp.logo.url(:contact), :title=>recp.name, :alt => recp.name), recp.subject %>
+  <% end %>
 </div>
 <div class="messages">
-	<% @receipts.each do |receipt| %>
-	<% message = receipt.message %>
-	<% read_class = message.is_unread?(@actor) ? 'unread' : '' %>
-	<%= render :partial => "messages/message",:object => message, :locals => {:read_class => read_class} %>
-	<% end %>
+  <% @receipts.each do |receipt| %>
+  <% message = receipt.message %>
+  <% read_class = message.is_unread?(@actor) ? 'unread' : '' %>
+  <%= render :partial => "messages/message",:object => message, :locals => {:read_class => read_class} %>
+  <% end %>
 
-	<% unless @box.eql?'trash' %>
-	<br>
-	<%= form_tag conversation_path(conversation), :method => :put, :class => "cont_conversation" do %>
-	<% if @receipt and @receipt.errors.any? %>
-		<div class="error">
-			<h2><%= pluralize(@receipt.errors.count, "error") %> prohibited this message from being sent:</h2>
-			<ul>
-				<% @receipt.errors.full_messages.each do |msg| %>
-				<li>
-					<%= msg %>
-				</li>
-				<% end %>
-			</ul>
-		</div>
-	<% end %>
-		<div class="block">
-		<div class="form_row">
-			<%= t("message.answer") %>
-		</div>
-		<div class="form_row">
-			<%= text_area_tag :body, nil,:rows =>6, :cols=> 53, :class => "required form_tag" %>
-		</div>
-		<div class="actions center">
-			<%= submit_tag t('mailboxer.reply'), :name => :reply_all,:class => "button" %>
-		</div>
-	</div>
-	<% end %>
-	<%end %>
+  <% unless @box.eql?'trash' %>
+  <br>
+  <%= form_tag conversation_path(conversation), :method => :put, :class => "cont_conversation" do %>
+  <% if @receipt and @receipt.errors.any? %>
+  <div class="error">
+    <h2><%= pluralize(@receipt.errors.count, "error") %> prohibited this message from being sent:</h2>
+    <ul>
+      <% @receipt.errors.full_messages.each do |msg| %>
+      <li>
+        <%= msg %>
+      </li>
+      <% end %>
+    </ul>
+  </div>
+  <% end %>
+  <div class="block">
+    <div class="form_row">
+      <%= t("message.answer") %>
+    </div>
+    <div class="form_row">
+      <%= text_area_tag :body, nil,:rows =>6, :cols=> 53, :class => "required form_tag" %>
+    </div>
+    <div class="actions center">
+      <%= submit_tag t('mailboxer.reply'), :name => :reply_all,:class => "button" %>
+    </div>
+  </div>
+  <% end %>
+  <%end %>
 </div>
+<%= javascript_tag do %>
+$(document).ready(function(){  
+  $(".message .body img").each(function(){
+    var link = '<a href=\"' + $(this).attr('src') + '\" class=\"img_link\"><img style=\"max-width:490px;max-height:490px;\"src=\"' + $(this).attr('src') + '\"></a>';
+    $(this).after(link);
+    $(this).remove();
+    $(".message .body img").aeImageResize({ height: 490, width: 490 });
+    $(".message .body a.img_link").lightBox({
+      maxHeight: 920,
+      maxWidth: 920,
+      imageLoading: '../assets/lightbox-ico-loading.gif',
+      imageBtnClose: '../assets/lightbox-btn-close.gif',
+      imageBtnPrev: '../assets/lightbox-btn-prev.gif',
+      imageBtnNext: '../assets/lightbox-btn-next.gif',
+      imageBlank: '../assets/lightbox-blank.gif'
+    });
+  })  
+});
+<% end %> 

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

@@ -13,7 +13,7 @@ $('.cont_conversation').validate({errorClass: "validation_error"});
 <% unless @box.eql?'trash' %>
   $("#body").cleditor({
     width:493,
-    controls:  "<%= t('cleditor.controls')%>"   
+    controls:  "<%= SocialStream.cleditor_controls %>"    
   });
 
 		var message_hash = window.location.hash.match(/^.*message_(\d+).*$/);

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

@@ -6,7 +6,7 @@ $('.cont_conversation').validate({errorClass: "validation_error"});
 <% unless @box.eql?'trash' %>
   $("#body").cleditor({
     width:493,
-    controls:  "<%= t('cleditor.controls')%>"   
+    controls:  "<%= SocialStream.cleditor_controls %>"     
   });
 
 	var message_hash = window.location.hash.match(/^.*message_(\d+).*$/);

data/base/app/views/home/index.js.erb

@@ -1,2 +1,5 @@
 $('#wall').replaceWith("<%= escape_javascript render(:partial => 'activities/wall', :locals => { :activities => current_subject.wall(:home).page(params[:page]) }) %>");
+
+setActivityPrivacyTooltips();
+
 $.scrollTo('#wall', 1500,{axis:'y'});

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

@@ -28,6 +28,7 @@
             </li>            
             <li class="pipe">·</li>
             <li>
+              <%= link_to(t('notification.other'), notifications_path) %>
               <span id="header_notifications">
               <%= link_to( current_subject.mailbox.notifications.not_trashed.unread.count.to_s, notifications_path) %>
               </span>

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

@@ -18,7 +18,7 @@ var recipients = $("#_recipients").fcbkcomplete({
 
   $("#body").cleditor({
     width:493,
-    controls:  "<%= t('cleditor.controls')%>"   
+    controls: "<%= SocialStream.cleditor_controls %>"    
   });
 
 <% unless @recipient.nil? %>

data/base/app/views/settings/_destroy.html.erb

@@ -0,0 +1,17 @@
+<div class="block">
+  <div class="header">
+    <div class="header_text">
+      <%= t("#{ current_subject.class.to_s.underscore }.destroy.one")%>
+    </div>
+  </div>
+  <div class="content">
+    <div class="form_row">
+      <%= t("#{ current_subject.class.to_s.underscore }.destroy.explanation") %>
+      <%= link_to t("#{ current_subject.class.to_s.underscore }.destroy.go_ahead"),
+          current_subject,
+          :method => :delete,
+          :confirm => t("#{ current_subject.class.to_s.underscore }.destroy.last_confirm") %>
+    </div>
+  </div>
+</div>
+

data/base/app/views/settings/_index.html.erb

@@ -11,7 +11,8 @@
 <% if current_subject.respond_to? :authentication_token%>
 <%= render :partial => "api_key" %>
 <% end %>
-<%= render :partial => "contacts" %>
 <% if current_subject==current_user %>
-<%= render :partial => "devise/registrations/delete_account", :locals => { :resource => current_user, :resource_name => :user }%>
+  <%= render :partial => "devise/registrations/delete_account", :locals => { :resource => current_user, :resource_name => :user }%>
+<% else %>
+  <%= render :partial => 'destroy' %>
 <% end %>

data/base/app/views/subjects/_show.js.erb

@@ -1,2 +1,5 @@
 $('#wall').replaceWith("<%= escape_javascript render(:partial => 'activities/wall', :locals => { :activities => subject.wall(:profile, :for => current_subject).page(params[:page]) }) %>");
+
+setActivityPrivacyTooltips();
+
 $.scrollTo('#wall', 1500,{axis:'y'});

data/base/config/locales/en.yml

@@ -185,6 +185,11 @@ en:
     all: "All groups"
     all_n: "All groups (%{count})"
     by: "By groups"    
+    destroy:
+      one: "Destroy group"
+      explanation: "All the activities, information and contacts of this group will be destroyed!"
+      go_ahead: "Yes, I am sure. Go ahead"
+      last_confirm: "This is your last chance. Are you really sure?"
     form:
       title: "Group"
     input: "What is the name of the group?"

data/base/config/locales/es.yml

@@ -170,7 +170,7 @@ es:
       default: "Encuentra"
       sentence1: "Descubre grupos y gente interesante"
       sentence2: "Encuentra la última actividad de tus contactos"
-    register: "¡Inscríbete ahora!"
+    register: "¡Regístrate ahora!"
     share:
       default: "Comparte"
       sentence1: "Tus proyectos y actividades"
@@ -182,6 +182,11 @@ es:
     all: "Todos los grupos"
     all_n: "Todos los grupos (%{count})"
     by: "Por grupos"
+    destroy:
+      one: "Destruir grupo"
+      explanation: "¡Todas las actividades, información y contactos de este grupo serán destruídos!"
+      go_ahead: "Sí, estoy seguro/a. ¡Adelante!"
+      last_confirm: "Es tu última oportunidad. ¿Realmente estás seguro/a?"
     form:
       title: "Grupo"
     input: "¿Cuál es el nombre del grupo?"

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.21".freeze
+    VERSION = "0.9.22".freeze
   end
 end

data/base/spec/controllers/contacts_controller_spec.rb

@@ -9,13 +9,20 @@ describe ContactsController do
     @user = @tie.sender_subject
   end
 
-  it "should be successful" do
+  it "should render index" do
     sign_in @user
 
     get 'index'
     response.should be_success
   end
 
+  it "should render pending" do
+    sign_in @user
+
+    get 'pending'
+    response.should be_success
+  end
+
   it "should render edit" do
     sign_in @user
 

data/base/spec/controllers/groups_controller_spec.rb

@@ -19,21 +19,19 @@ describe GroupsController do
     end
 
     it "should not render new" do
-      begin
-        get :new
+      get :new
 
-        assert false
-      rescue CanCan::AccessDenied 
-        assert true
-      end
+      response.should redirect_to(new_user_session_path)
     end
 
     context "faking a new group" do
-      before do
-        model_attributes[:_contact_id] = Factory(:user).ego_contact.id
-      end
+      it "should deny creating" do
+        post :create, :group => { :name => "Test",
+                                  :_contact_id => Factory(:user).ego_contact.id
+                                }
 
-      it_should_behave_like "Deny Creating"
+        response.should redirect_to(new_user_session_path)
+      end
     end
 
     context "an existing group" do
@@ -158,7 +156,6 @@ describe GroupsController do
       # it_should_behave_like "Allow Updating"
       it_should_behave_like "Allow Destroying"
     end
-
   end
 end