social_stream 0.19.2 → 0.19.3

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

@@ -1,40 +1,46 @@
 
 <div id="contacts_cheesecake"></div>
-<div id="contacts_filter">
-  <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :contacts_filter_input %>    
+<div id="sector_form" style="display:none;">
+  <%= render :partial => "sector_form" %>
 </div>
-<div id="contacts_selector_modifiers">
-  <span id="contacts_selector_clear">Unselect all</span>
-</div>
-<div id="contacts_grid">
-  <div id="contacts_grid_saving" style="display:none;">
-    <%= image_tag('loading.gif') %>
+<div id="contacts_explorer">
+  <div id="contacts_filter">
+    <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :contacts_filter_input %>    
   </div>
-  <div id="contacts_grid_selected">
-    <br class="clearfloat">
+  <div id="contacts_selector_modifiers">
+    <span id="contacts_selector_clear">Unselect all</span>
   </div>
-  <div id="contacts_grid_available">
-    <% @actors.each do |actor|%>
-      <%= render :partial => "actors/actor_cheesecake", :locals => {:actor => actor} %>
-    <% end %>
+  <div id="contacts_grid">
+    <div id="contacts_grid_saving" style="display:none;">
+      <%= image_tag('loading.gif') %>
+    </div>
+    <div id="contacts_grid_selected">
+      <div id="contacts_grid_selected_hint"><%= t('cheesecake.select.hint') %></div>
+      <br class="clearfloat">
+    </div>
+    <div id="contacts_grid_available">
+      <% @actors.each do |actor|%>
+        <%= render :partial => "actors/actor_cheesecake", :locals => {:actor => actor} %>
+      <% end %>
+    </div>
   </div>
-</div>
-<div id="contacts_save" style="display:none;">
-  <form action="<%= update_cheesecake_path %>" method="get" data-remote="true" id="contacts_save_form">
-     <input type="submit" id="contacts_save_button" value="<%= t('cheesecake.changes.save') %>">
-     <input type="hidden" id="contacts_save_changes" name="contacts_save_changes">
-  </form>
-</div>
-<div id="contacts_changes_button" style="display:none;">
-  <%= t('cheesecake.changes.details') %> (<span id="contacts_changes_button_total">0</span>)
-</div>
-<br class="clearfloat"> 
-<div id="contacts_changes">
-  <div id="contacts_changes_title">
-   <%= t('cheesecake.changes.details') %>
+  <div id="contacts_changes_button" style="display:none;">
+    <%= t('cheesecake.changes.details') %> (<span id="contacts_changes_button_total">0</span>)
   </div>
-  <div id="contacts_changes_details">
-
+  <div id="contacts_save" style="display:none;">
+    <form action="<%= update_cheesecake_path %>" method="get" data-remote="true" id="contacts_save_form">
+       <input type="submit" id="contacts_save_button" value="<%= t('cheesecake.changes.save') %>">
+       <input type="hidden" id="contacts_save_changes" name="contacts_save_changes">
+    </form>
+  </div>
+  <br class="clearfloat"> 
+  <div id="contacts_changes">
+    <div id="contacts_changes_title">
+     <%= t('cheesecake.changes.details') %>
+    </div>
+    <div id="contacts_changes_details">
+  
+    </div>
   </div>
 </div>
 <%= javascript_tag do %>
@@ -50,36 +56,36 @@
   var unselected_actor_click = function(){
     var clone = $(this).clone();
     clone.attr("id",$(this).attr("id") + "_selected");
-    $(this).slideToggle("fast",function(){
+    $(this).fadeOut("fast",function(){
       clone.hide();
       $(this).before(clone);
-      $("#contacts_grid_selected br.clearfloat").before($(this));
+      $("#contacts_grid_selected_hint").before($(this));
       $(this).off("click.unselected_actor");
       $(this).on("click.selected_actor", selected_actor_click);
-      if($("#contacts_grid_selected").css("display")=="none"){
-        $("#contacts_grid_selected").slideToggle("fast");
+      if($("#contacts_grid_selected_hint").css("display")!="none"){
         $("#contacts_selector_modifiers").css("opacity",1);
+        $("#contacts_grid_selected_hint").hide();
       }
       var height = 336 - Math.ceil(($("#contacts_grid_selected").children().length - 1) / 10) * 28;
       if(height != $("#contacts_grid_available").height())
         $("#contacts_grid_available").animate({height: height});
-      $(this).slideToggle("fast");
+      $(this).fadeIn("fast");
     });
   };
   var selected_actor_click = function(){
     var clone = $("#" + $(this).attr("id") + "_selected");
-    $(this).slideToggle("fast",function(){
+    $(this).fadeOut("fast",function(){
       clone.before($(this));
       $(this).off("click.selected_actor");
       $(this).on("click.unselected_actor", unselected_actor_click);
-      if($("#contacts_grid_selected").children().length <= 1){
-        $("#contacts_grid_selected").slideToggle("fast");
+      if($("#contacts_grid_selected").children().length <= 2){
         $("#contacts_selector_modifiers").css("opacity",0);
+        $("#contacts_grid_selected_hint").fadeIn("fast");
       }
       var height = 336 - Math.ceil(($("#contacts_grid_selected").children().length - 1) / 10) * 28;
       if(height != $("#contacts_grid_available").height())
         $("#contacts_grid_available").animate({height: height});
-      $(this).slideToggle("fast");
+      $(this).fadeIn("fast");
       clone.remove();
     });
   };
@@ -102,13 +108,5 @@
       });
     }
   });
-  $("#contacts_save_form").submit(function(){
-    if($(".contacts_changes_tipsy_menu").length != 0){
-      $("#contacts_changes_button").tipsy("hide");
-    }
-    $("#contacts_grid_saving").show();
-    cheese.disable();
-    $("#contacts_save_button").val("<%= t('cheesecake.changes.saving') %>").attr("disabled","true");
-  });
   <%= render :partial => 'cheesecake' %>
 <% end %>

data/base/app/views/cheesecake/_sector_form.html.erb

@@ -0,0 +1 @@
+Sector form in construction. Please, be patient :D

data/base/app/views/toolbar/_home.html.erb

@@ -8,7 +8,7 @@
 </div>
 
 <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
-  <%= render :partial => 'chat/index' %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => true} %>
 <% end %>
 
 <div class="block space_center">

data/base/config/locales/en.yml

@@ -97,6 +97,8 @@ en:
       none: "No changes"
       save: "Save changes"
       saving: "Saving..."
+    select:
+      hint: "Select by clicking the portraits"
   comment:
     input: "Write a comment..."
     confirm_delete: "Delete comment?"

data/base/config/locales/es.yml

@@ -97,6 +97,8 @@ es:
       none: "Sin cambios"
       save: "Guardar cambios"
       saving: "Guardando..."
+    select:
+      hint: "Selecciona haciendo click en los retratos"
   comment:
     input: "Comentar..."
     confirm_delete: "¿Borrar commentario?"

data/base/config/locales/rails.es.yml

@@ -0,0 +1,192 @@
+es:
+  date:
+    abbr_day_names:
+    - dom
+    - lun
+    - mar
+    - mié
+    - jue
+    - vie
+    - sáb
+    abbr_month_names:
+    - 
+    - ene
+    - feb
+    - mar
+    - abr
+    - may
+    - jun
+    - jul
+    - ago
+    - sep
+    - oct
+    - nov
+    - dic
+    day_names:
+    - domingo
+    - lunes
+    - martes
+    - miércoles
+    - jueves
+    - viernes
+    - sábado
+    formats:
+      default: ! '%d/%m/%Y'
+      long: ! '%d de %B de %Y'
+      short: ! '%d de %b'
+    month_names:
+    - 
+    - enero
+    - febrero
+    - marzo
+    - abril
+    - mayo
+    - junio
+    - julio
+    - agosto
+    - septiembre
+    - octubre
+    - noviembre
+    - diciembre
+    order:
+    - :day
+    - :month
+    - :year
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: alrededor de 1 hora
+        other: alrededor de %{count} horas
+      about_x_months:
+        one: alrededor de 1 mes
+        other: alrededor de %{count} meses
+      about_x_years:
+        one: alrededor de 1 año
+        other: alrededor de %{count} años
+      almost_x_years:
+        one: casi 1 año
+        other: casi %{count} años
+      half_a_minute: medio minuto
+      less_than_x_minutes:
+        one: menos de 1 minuto
+        other: menos de %{count} minutos
+      less_than_x_seconds:
+        one: menos de 1 segundo
+        other: menos de %{count} segundos
+      over_x_years:
+        one: más de 1 año
+        other: más de %{count} años
+      x_days:
+        one: 1 día
+        other: ! '%{count} días'
+      x_minutes:
+        one: 1 minuto
+        other: ! '%{count} minutos'
+      x_months:
+        one: 1 mes
+        other: ! '%{count} meses'
+      x_seconds:
+        one: 1 segundo
+        other: ! '%{count} segundos'
+    prompts:
+      day: Día
+      hour: Hora
+      minute: Minutos
+      month: Mes
+      second: Segundos
+      year: Año
+  errors:
+    format: ! '%{attribute} %{message}'
+    messages:
+      accepted: debe ser aceptado
+      blank: no puede estar en blanco
+      confirmation: no coincide con la confirmación
+      empty: no puede estar vacío
+      equal_to: debe ser igual a %{count}
+      even: debe ser par
+      exclusion: está reservado
+      greater_than: debe ser mayor que %{count}
+      greater_than_or_equal_to: debe ser mayor que o igual a %{count}
+      inclusion: no está incluido en la lista
+      invalid: no es válido
+      less_than: debe ser menor que %{count}
+      less_than_or_equal_to: debe ser menor que o igual a %{count}
+      not_a_number: no es un número
+      not_an_integer: debe ser un entero
+      odd: debe ser impar
+      record_invalid: ! 'La validación falló: %{errors}'
+      taken: ya está en uso
+      too_long: es demasiado largo (%{count} caracteres máximo)
+      too_short: es demasiado corto (%{count} caracteres mínimo)
+      wrong_length: no tiene la longitud correcta (%{count} caracteres exactos)
+    template:
+      body: ! 'Se encontraron problemas con los siguientes campos:'
+      header:
+        one: No se pudo guardar este/a %{model} porque se encontró 1 error
+        other: No se pudo guardar este/a %{model} porque se encontraron %{count} errores
+  helpers:
+    select:
+      prompt: Por favor seleccione
+    submit:
+      create: Crear %{model}
+      submit: Guardar %{model}
+      update: Actualizar %{model}
+  number:
+    currency:
+      format:
+        delimiter: .
+        format: ! '%n %u'
+        precision: 2
+        separator: ! ','
+        significant: false
+        strip_insignificant_zeros: false
+        unit: €
+    format:
+      delimiter: .
+      precision: 3
+      separator: ! ','
+      significant: false
+      strip_insignificant_zeros: false
+    human:
+      decimal_units:
+        format: ! '%n %u'
+        units:
+          billion: mil millones
+          million: millón
+          quadrillion: mil billones
+          thousand: mil
+          trillion: billón
+          unit: ''
+      format:
+        delimiter: ''
+        precision: 1
+        significant: true
+        strip_insignificant_zeros: true
+      storage_units:
+        format: ! '%n %u'
+        units:
+          byte:
+            one: Byte
+            other: Bytes
+          gb: GB
+          kb: KB
+          mb: MB
+          tb: TB
+    percentage:
+      format:
+        delimiter: ''
+    precision:
+      format:
+        delimiter: ''
+  support:
+    array:
+      last_word_connector: ! ', y '
+      two_words_connector: ! ' y '
+      words_connector: ! ', '
+  time:
+    am: am
+    formats:
+      default: ! '%A, %d de %B de %Y %H:%M:%S %z'
+      long: ! '%d de %B de %Y %H:%M'
+      short: ! '%d de %b %H:%M'
+    pm: pm

data/base/db/migrate/20110912074426_add_reject_relation.rb

@@ -12,7 +12,7 @@ class AddRejectRelation < ActiveRecord::Migration
           logger.warn "Public contact #{ t.contact_id } has #{ contact.ties_count }, when expecting 1"
         end
 
-        t.update_attribute :relation_id, t.sender.relation_reject.id
+        t.update_attribute :relation_id, Relation::Reject.instance.id
       end
   end
 
@@ -21,7 +21,7 @@ class AddRejectRelation < ActiveRecord::Migration
       includes(:relation, :contact).
       merge(Relation.where(:type => 'Relation::Reject')).
       each do |t|
-        t.update_attribute :relation_id, t.sender.relation_public.id
+        t.update_attribute :relation_id, Relation::Public.instance.id
       end
 
     Relation::Reject.destroy_all

data/base/db/migrate/20120201185454_singleton_single_relations.rb

@@ -0,0 +1,46 @@
+class SingletonSingleRelations < ActiveRecord::Migration
+  def up
+    Tie.record_timestamps = false
+    Audience.record_timestamps = false
+
+    r_new = Relation::Public.instance
+
+    Relation::Public.all.each do |r|
+      next if r == r_new
+
+      # Reassign r -> r_new
+      r.ties.each do |t|
+        t.update_column(:relation_id, r_new.id)
+      end
+
+      r.audiences.each do |a|
+        a.update_column(:relation_id, r_new.id)
+      end
+
+      # Delete r
+      r.delete
+    end
+
+    r_new = Relation::Reject.instance
+
+    Relation::Reject.all.each do |r|
+      next if r == r_new
+
+      # Reassign r -> r_new
+      r.ties.each do |t|
+        t.update_column(:relation_id, r_new.id)
+      end
+
+      r.audiences.each do |a|
+        a.update_column(:relation_id, r_new.id)
+      end
+
+      # Delete r
+      r.delete
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.14.2".freeze
+    VERSION = "0.14.3".freeze
   end
 end

data/base/lib/tasks/db/populate.rake

@@ -125,7 +125,7 @@ namespace :db do
       # = Ties
       available_actors.each do |a|
         actors = available_actors.dup - Array(a)
-        relations = a.relation_customs + Array.wrap(a.relation_reject)
+        relations = a.relation_customs + Array.wrap(Relation::Reject.instance)
         break if actors.size==0        
         if CHEESECAKE     
           actor = Actor.first

data/base/spec/controllers/posts_controller_spec.rb

@@ -55,7 +55,7 @@ describe PostsController do
       describe "with public relation" do
         before do
           contact = @user.contact_to!(@user)
-          relation = @user.relation_public
+          relation = Relation::Public.instance
           model_assigned_to @user.contact_to!(@user), relation
           @current_model = Factory(:post, :author_id => @user.actor_id,
                                           :owner_id  => @user.actor_id,
@@ -146,7 +146,7 @@ describe PostsController do
         describe "with public relation" do
           before do
             contact = @group.contact_to!(@group)
-            relation = @group.relation_public
+            relation = Relation::Public.instance
             model_assigned_to contact, relation
             @current_model = Factory(:post,  :author_id => contact.sender.id,
                                              :owner_id  => contact.receiver.id,