social_stream-base 0.9.19 → 0.9.20

data/app/assets/javascripts/contacts.js

@@ -2,9 +2,3 @@
 //= require jquery.ba-url
 //= require ajax.paginate
 //
-// edit
-//= require ui.checkbox
-
-$(function() {
-	$('input[id^="relation_custom"]').checkBox();
-});

data/app/assets/javascripts/relation_customs.js

@@ -1,85 +1,32 @@
-//= require ui.checkbox
-
-var relations;
-
-function checkBoxId(id) {
+function getDomId(id) {
   return id.match(/\d+$/)[0];
 }
 
-function checkBoxType(id) {
-  return id.match(/(.*)_\d+$/)[1]
-}
-
-function checkBoxValue(id) {
-  return $('label[for$=' + id +']').html(); 
-}
-
-function checkBoxOrder(id) {
-  return parseInt($('label[for$=' + id +']').attr("order"));
-}
-
-function checkBoxIdByOrder(order) {
-  return $('label[order$=' + order +']').attr("for");
-}
-
-
-function checkBoxEnable(id) {
-	$('div[contain$='+id+']').addClass("checked-option");
-
-        switch (checkBoxType(id)) {
-
-	case "relation_custom":
-		if ($('#' + id).parents().hasClass('edit_contact')) {
-			break;
-		};
-
-		$(':checkbox[id^="relation_custom"]:checked:not(#' + id + ')').checkBox('changeCheckStatus', false);
-		$('div[contain$='+id+'] div.options').show();
-
-		$.ajax({
-			url: "../permissions",
-			context: document.body,
-			data: { relation_id: checkBoxId(id) },
-                        dataType: "script"
-		});
-
-                break;
-
-	case "permission":
-                $('input[id="relation_custom_permission_ids_' + checkBoxId(id) + '"]').attr('checked', 'checked');
-                $('label[for="relation_custom_permission_ids_' + checkBoxId(id) + '"]').parent().show();
-
-                break;
-
-        default:
-          alert("Unknown type of checkBox: " + checkBoxType(id));
-        }
+function selectRelation(radio){
+		$("#permissions").html("");
+	$('#relation_customs_list div.options').hide();
+
+	$(radio).siblings('div.options').show();
+
+	$.ajax({
+		url: "../permissions",
+		context: document.body,
+		data: { relation_id: getDomId($(radio).attr('id')) },
+		dataType: "script"
+	});
+
+};
+
+function selectPermission(box){
+	var id = getDomId($(box).attr('id'));
+	var input = $('input[id="relation_custom_permission_ids_' + id + '"]');
+	var label = $('label[for="relation_custom_permission_ids_' + id + '"]');
+
+	if ($(box).is(':checked')) {
+		input.attr('checked', 'checked');
+		label.parent().show();
+	} else {
+		input.removeAttr('checked');
+		label.parent().hide();
+	}
 }
-
-function checkBoxDisable(id) {
-	$('div[contain$='+id+']').removeClass("checked-option");
-
-        switch (checkBoxType(id)) {
-
-	case "relation_custom":
-       		if ($('#' + id).parents().hasClass('edit_contact')) {
-			break;
-		};
-
-	        $("#permissions").html("");
-		$("#permissions").hide();
-
-		$('div[contain$='+id+'] div.options').hide();
-
-                break;
-
-	case "permission":
-                $('input[id="relation_custom_permission_ids_' + checkBoxId(id) + '"]').removeAttr('checked');
-                $('label[for="relation_custom_permission_ids_' + checkBoxId(id) + '"]').parent().hide();
-
-                break;
-        default:
-          alert("Unknown type of checkBox: " + checkBoxType(id));
-
-        }
-} 

data/app/assets/javascripts/settings.js

@@ -1,35 +1,14 @@
-var notifications_open = false;
-var api_key_open = false;
-
 closeAllSettings = function() {
-    $("#notifications_settings_content").hide("slow");
-    $("#notifications_settings_briefing").show("slow");
-    notifications_open = false;
-    $("#api_key_settings_content").hide("slow");
-    $("#api_key_settings_briefing").show("slow");
-    api_key_open = false;
-}
-showNotificationsSettings = function() {
-    if (notifications_open) {
-        $("#notifications_settings_content").hide("slow");
-        $("#notifications_settings_briefing").show("slow");
-        notifications_open = false;
-    } else {
-        closeAllSettings();
-        $("#notifications_settings_content").show("slow");
-        $("#notifications_settings_briefing").hide("slow");
-        notifications_open = true;
-    }
-}
-showApiKeySettings = function() {
-    if (api_key_open) {
-        $("#api_key_settings_content").hide("slow");
-        $("#api_key_settings_briefing").show("slow");
-        api_key_open = false;
-    } else {
-        closeAllSettings();
-        $("#api_key_settings_content").show("slow");
-        $("#api_key_settings_briefing").hide("slow");
-        api_key_open = true;
-    }
+  $(".settings_content").hide("slow");
+  $(".settings_briefing").show("slow");
 }
+showSettings = function(name) {
+  closeAllSettings();
+  if($("#" + name + "_content").css("display") == "none") {
+    $("#" + name + "_briefing").hide("slow");
+    $("#" + name + "_content").show("slow");
+  } else {
+    $("#" + name + "_briefing").show("slow");
+    $("#" + name + "_content").hide("slow");
+  }
+}

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

@@ -76,7 +76,7 @@ button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;co
 .block .center{ text-align:center;}
 .block .close {  float:right;  vertical-align:top;}
 .block .content{ padding: 5px 4px 5px 4px; }
-.block .header{vertical-align: middle;	background: transparent url(title_background.png) scroll 0px;
+.block .header{vertical-align: middle;	background: #DEEFF8;
 	padding-left: 10px;	display: block;  height:20px; font-weight:bold;}
 .block .header_icon{ margin-top: 2px;  width:14px;  height:14px; }
 .block .header_icon_right {	float: right;	padding-right: 5px;	padding-top: 3px;}
@@ -122,6 +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;}
 
 /********* Links SECTION **********/
 .contact_link a{  text-decoration:none;}

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

@@ -33,8 +33,9 @@ span.ui-radio-state-checked-hover {
 	background-position: 0 -200px;
 }
 
-#relation_customs input {
+#relation_customs input, #relation_customs button{
 	float: left;
+	padding: 3px 10px 3px 10px;
 }
 
 #relation_customs span {
@@ -160,13 +161,17 @@ span.privacy_span_new {
   margin-top: 10px;
 }
 
-#permissions_list_block{
+#permissions_list{
 	width: 50%;
 	float: left;
 	text-align: center;
 	display: block;
 }
 
+#permissions_list input.permission {
+	float: left;
+}
+
 #privacy_rules{
 	width: 45%;
 	float: right;
@@ -193,6 +198,7 @@ span.privacy_span_new {
 #relation_custom_permissions_input ol li{
 	font-family: sans-serif;
 	padding: 5px 0px 5px 0px;
+	display: block;
 }
 
 #relation_custom_permissions_input label {

data/app/controllers/contacts_controller.rb

@@ -3,13 +3,17 @@ class ContactsController < ApplicationController
   before_filter :exclude_reflexive, :except => [ :index, :pending ]
 
   def index
-    @contacts =
+    @total_contacts =
       Contact.sent_by(current_subject).
               joins(:receiver).merge(Actor.alphabetic).
+              positive.
+              select("actors.name")
+
+    @contacts =
+      @total_contacts.
               merge(Actor.letter(params[:letter])).
               merge(Actor.name_search(params[:search])).
-              related_by_param(params[:relation]).
-              active
+              related_by_param(params[:relation])
 
     respond_to do |format|
       format.html { @contacts = @contacts.page(params[:page]).per(10) }

data/app/controllers/messages_controller.rb

@@ -47,7 +47,7 @@ class MessagesController < ApplicationController
     @receipt = @actor.send_message(@recipients, params[:body], params[:subject])
     if (@receipt.errors.blank?)
       @conversation = @receipt.conversation
-      flash[:success]="Your message was sent"
+      flash[:success]= t('mailboxer.sent')
       redirect_to conversation_path(@conversation, :box => :sentbox)
     else
       render :action => :new

data/app/controllers/search_controller.rb

@@ -1,11 +1,10 @@
 class SearchController < ApplicationController
   include ActionView::Helpers::SanitizeHelper
-  
+
   helper_method :get_search_query
 
   RESULTS_SEARCH_PER_PAGE=12
   MIN_QUERY=2
-  
   def index
     if params[:search_query].blank? or too_short_query
     @search_result = []
@@ -31,10 +30,11 @@ class SearchController < ApplicationController
     models = SocialStream.quick_search_models if mode.to_s.eql? "quick"
     models.map! {|model_sym| model_sym.to_s.classify.constantize}
     result = ThinkingSphinx.search(get_search_query, :classes => models)
+    result = authorization_filter result
     if mode.to_s.eql? "quick"
-      result.page(1).per(7)
+      result = Kaminari.paginate_array(result).page(1).per(7)
     else
-      result.page(params[:page]).per(RESULTS_SEARCH_PER_PAGE)
+      result = Kaminari.paginate_array(result).page(params[:page]).per(RESULTS_SEARCH_PER_PAGE)
     end
     return result
   end
@@ -42,7 +42,9 @@ class SearchController < ApplicationController
   def focus_search
     @search_class_sym = params[:focus].singularize.to_sym unless params[:focus].blank?
     search_class = @search_class_sym.to_s.classify.constantize
-    ThinkingSphinx.search(get_search_query, :classes => [search_class]).page(params[:page]).per(RESULTS_SEARCH_PER_PAGE)
+    result = ThinkingSphinx.search(get_search_query, :classes => [search_class])
+    result = authorization_filter result
+    return Kaminari.paginate_array(result).page(params[:page]).per(RESULTS_SEARCH_PER_PAGE)
   end
 
   def too_short_query
@@ -52,7 +54,8 @@ class SearchController < ApplicationController
 
   def get_search_query
     search_query = ""
-    bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
+    param = strip_tags(params[:search_query]) || ""
+    bare_query = param unless bare_query.html_safe?
     search_query_words = bare_query.strip.split
     search_query_words.each_index do |i|
       search_query+= search_query_words[i] + " " if i < (search_query_words.size - 1)
@@ -60,4 +63,17 @@ class SearchController < ApplicationController
     end
     return search_query.strip
   end
+
+  def authorization_filter results
+    filtered_results = Array.new
+    results.each do |result|
+      puts result
+      if result.is_a? SocialStream::Models::Object
+        filtered_results << result if can? :read, result
+      else
+      filtered_results << result
+      end
+    end
+    return filtered_results
+  end
 end

data/app/controllers/settings_controller.rb

@@ -1,5 +1,5 @@
 class SettingsController < ApplicationController
-  
+    
   before_filter :authenticate_user!
   
   def index

data/app/models/contact.rb

@@ -50,6 +50,12 @@ class Contact < ActiveRecord::Base
 
   scope :active, where(arel_table[:ties_count].gt(0))
 
+  scope :positive, lambda {
+    select("DISTINCT contacts.*").
+      joins(:relations).
+      merge(Relation.where(:type => Relation.positive_names))
+  }
+
   scope :not_reflexive, where(arel_table[:sender_id].not_eq(arel_table[:receiver_id]))
 
   scope :pending, active.
@@ -128,7 +134,7 @@ class Contact < ActiveRecord::Base
   # a {Relation::Public public relation}
   #
   def action
-    if ties_count > 0 && relations.where(:type => ['Relation::Custom', 'Relation::Public']).any?
+    if ties_count > 0 && relations.where(:type => Relation.positive_names).any?
       'edit'
     else
       replied? ? 'reply' : 'new'

data/app/models/relation.rb

@@ -24,6 +24,9 @@
 # It sets the {Audience} that has access to it, and the {Permission Permissions} that rule that access.
 #
 class Relation < ActiveRecord::Base
+  Positive = %w{ custom public }
+  Negative = %w{ reject }
+
   belongs_to :actor
 
   has_many :relation_permissions, :dependent => :destroy
@@ -81,7 +84,17 @@ class Relation < ActiveRecord::Base
         normalize(r, options).id
       end
     end
- 
+
+    # Positive relation names: [ 'Relation::Custom', 'Relation::Public' ]
+    def positive_names
+      Positive.map{ |r| "Relation::#{ r.classify }" }
+    end
+
+    # Negative relations: [ 'Relation::Reject' ]
+    def negative_names
+      Negative.map{ |r| "Relation::#{ r.classify }" }
+    end
+
     # All the relations that allow subject to perform action
     #
     # Options:

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

@@ -1,3 +1,4 @@
+
 <% if can? :create, new_post(receiver) %>
 <div id="activities_header" class="content_size">
   <% SocialStream.activity_forms.each do |element| %>
@@ -24,12 +25,12 @@
 
 <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) %>
+    <%= 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.contacts.#{ receiver.class.to_s.underscore }", :receiver => receiver.name %>" 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) %>" class="default" disabled="disabled">
         </li>
       </ul>
     </div>

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

@@ -4,6 +4,6 @@
 <% if controller.controller_name == "contacts" %>
 
 <br/>
-<%= link_to(t('contact.delete'), contact_path(contact), :action => :destroy, :confirm => t('contact.confirm_delete'), :remote => true) %>
+<%= link_to(t('contact.delete'), contact_path(contact), :method => :delete, :confirm => t('contact.confirm_delete'), :remote => true) %>
 
 <% end %>

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

@@ -17,7 +17,7 @@
     <div class="space_center"></div>
     <div class="row" >
       <div class="center">
-        <%= link_to t('contact.all_n', :count => current_subject.contact_subjects(:direction => :sent).count), contacts_path %> -
+        <%= link_to t('contact.all_n', :count => @total_contacts.count("DISTINCT contacts.id")), contacts_path %> -
         <% Actor.distinct_initials.
                  contacted_from(current_subject).
                  merge(Tie.related_by(current_subject.relation_customs.find_by_id(params[:relation]))).

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

@@ -26,10 +26,10 @@
 </div>
 <% unless @box.eql?'trash' %>
 <div class="action">
-  <% link_to(image_tag('btn/btn_read.png', :alt => "Mark as read", :title => "Mark as read")) %>
-	<%= link_to(image_tag('btn/btn_delete.png', :alt => "Delete", :title => "Delete"),
+  <% link_to(image_tag('btn/btn_read.png', :alt => t('mailboxer.mark_as_read'), :title => t('mailboxer.mark_as_read'))) %>
+	<%= link_to(image_tag('btn/btn_delete.png', :alt => t('mailboxer.delete'), :title => t('mailboxer.delete')),
 	conversation_path(conversation, :location => @box, :box => @box, :page => params[:page]),
-	:confirm => 'Do you want to move "' + conversation.subject + '" to trash?',
+	:confirm => t('mailboxer.delete_confirm', :object => conversation.subject),
 	:method => :delete, :remote => true) %>
 </div>
 <% end %>

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

@@ -2,9 +2,9 @@
 	<h2><%= conversation.subject %></h2>
 </div>
 <div class="action">
-	<% unless @box.eql?'trash' %><%= link_to(image_tag('btn/btn_delete.png', :atl => "Delete", :title => "Delete"),
+	<% 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 => 'Do you want to move "' + conversation.subject + '" to trash?',
+	:confirm => t('mailboxer.delete_confirm', :object => conversation.subject),
 	:method => :delete, :remote => true) %><% end %>
 </div>
 <div class="clearfloat">
@@ -45,7 +45,7 @@
 			<%= text_area_tag :body, nil,:rows =>6, :cols=> 53, :class => "required form_tag" %>
 		</div>
 		<div class="actions center">
-			<%= submit_tag "Reply", :name => :reply_all,:class => "button" %>
+			<%= submit_tag t('mailboxer.reply'), :name => :reply_all,:class => "button" %>
 		</div>
 	</div>
 	<% end %>

data/app/views/devise/registrations/_delete_account.html.erb

@@ -0,0 +1,20 @@
+<div class="block" id="cancel_account">
+  <div class="header">
+    <div class="header_text">
+      <%= t("account.cancel")%>
+    </div>
+    <div class="header_icon_right">
+      <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"cancel_account\");" %>
+    </div>
+  </div>
+  <div id="cancel_account_briefing" class="settings_briefing content">
+    <div class="form_row">
+      <%= t('settings.cancel_account.briefing')%>
+    </div>
+  </div>
+  <div class="content settings_content" id="cancel_account_content" style="display:none;">
+    <div class="form_row">
+      Unhappy? <b><%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</b>
+    </div>
+  </div>
+</div>

data/app/views/devise/registrations/_edit_user.html.erb

@@ -0,0 +1,87 @@
+<% content_for :javascript do %>
+$(".user_edit").validate({errorClass: "validation_error"});
+<%end%>
+<div class="block" id="password_form">
+  <div class="header">
+    <div class="header_text">
+      <%= t("account.password.change")%>
+    </div>
+    <div class="header_icon_right">
+      <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"password_form\");" %>
+    </div>
+  </div>
+  <div id="password_form_briefing" class="settings_briefing content">
+    <div class="form_row">
+      <%= t('settings.password_change.briefing')%>
+    </div>
+  </div>
+  <div class="content settings_content" id="password_form_content" style="display:none;">
+    <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+    <div class="form_row">
+      <div class="form_label">
+        <%= f.label t('account.password.new') %>
+      </div>
+      <div class="form_field">
+        <%= f.password_field :password, :class => "form_tag" %>
+      </div>
+    </div>
+    <div class="form_row">
+      <div class="form_label">
+        <%= f.label t('account.password.retype') %>
+      </div>
+      <div class="form_field">
+        <%= f.password_field :password_confirmation, :class => "form_tag" %>
+      </div>
+    </div>
+    <div class="form_row">
+      <div class="form_label">
+        <%= f.label :current_password %>
+      </div>
+      <div class="form_field">
+        <%= f.password_field :current_password, :class => "form_tag" %>
+      </div>
+    </div>
+    <div class="form_row space_center">
+      <%= f.submit t('button.update'), :class => "button" %>
+    </div>
+    <% end%>
+  </div>
+</div>
+<div class="block" id="email_form">
+  <div class="header">
+    <div class="header_text">
+      <%= t("account.email.change")%>
+    </div>
+    <div class="header_icon_right">
+      <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"email_form\");" %>
+    </div>
+  </div>
+  <div id="email_form_briefing" class="settings_briefing content">
+    <div class="form_row">
+      <%= t('settings.email_change.briefing')%>
+    </div>
+  </div>
+  <div class="content settings_content" id="email_form_content" style="display:none;">
+    <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+    <div class="form_row">
+      <div class="form_label">
+        <%= f.label :email %>
+      </div>
+      <div class="form_field">
+        <%= f.email_field :email, :class => "required form_tag" %>
+      </div>
+    </div>
+    <div class="form_row">
+      <div class="form_label">
+        <%= f.label :current_password %>
+      </div>
+      <div class="form_field">
+        <%= f.password_field :current_password, :class => "required form_tag" %>
+      </div>
+    </div>
+    <div class="form_row space_center">
+      <%= f.submit t('button.update'), :class => "button" %>
+    </div>
+    <% end%>
+  </div>
+</div>