social_stream 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 978d9e87fb278626d427da3ada3ffd333defe398
-  data.tar.gz: b230736937ad6c26148ea5e92b74ef9417089c44
+  metadata.gz: bc06263fd2bffcf4bec63bfe7f4c5a9184caeed0
+  data.tar.gz: 8f0e46f8b9f88a0c8e1dee0b556347c0755261e5
 SHA512:
-  metadata.gz: a88183687d93df8c329a3d7b1f760150effe0ec36efd54d77fc66f7f805eabba11934223b50e9afe64896b0c126e1ac8ae56af678b6e98b3beb4e86cebb43b8a
-  data.tar.gz: 03bf445c73f5974b0daee3ae54b11b4767f534c92d2fea64b9ca86775e63583db17cdb6f3ba57f5cd0c0cfe4e69d1fb69fb8414243d0ca4472a517d830d37c84
+  metadata.gz: ea106a1702192f94169d86773e8b103fa915df56515cd3ef8a932545a70986d49b703fd7eecc407045f2d8a4a3e6309a6c750e86003f33be6ab8c8e46217af19
+  data.tar.gz: 08e85db4c099875c13e14cd99ee9769285eabeeb2c55b3694a08d4a170cd25074d48877c6c6d0b6600d2e8904328df6308427470e2cabfdeadf2548f6b7299e1

data/Rakefile

@@ -25,4 +25,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb', 'app/**/*.rb')
 end
 
-import 'lib/tasks/i18n.rake'
+import 'base/lib/tasks/i18n.rake'

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

@@ -57,7 +57,7 @@ SocialStream.Comment = (function(SS, $, undefined){
   };
 
   var hideNewActivityCommentElements = function(options){
-    var newDiv = $('#activity_' + options.parentActivityId).find('div.new_comment');
+    var newDiv = $('#comments_activity_' + options.parentActivityId).siblings('div.new_comment');
 
     newDiv.find("textarea").val('');
 

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

@@ -3,14 +3,18 @@
 SocialStream.SearchHeader = (function(SS, $, undefined){
   var callback = new SS.Callback();
 
+  var nav, mat;
+
   var initMat = function() {
-    var searchNav = $('.search-nav');
-    $('input.search-query', searchNav).on('input', searchQuery);
-    $('.mat div', searchNav).hide();
+    nav = $('.search-nav');
+    $('input.search-query', nav).focus(focusMat);
+    $('input.search-query', nav).on('input', searchQuery);
+
+    mat = $('.mat', nav);
+    $('div', mat).hide();
   };
 
   var searchQuery = function() {
-    var nav = $('.search-nav');
     var input = $('input.search-query', nav);
     var mat = $('.mat', nav);
     var minQuery = input.attr('data-min_query');
@@ -44,6 +48,24 @@ SocialStream.SearchHeader = (function(SS, $, undefined){
     });
   };
 
+  var focusMat = function() {
+    mat.show();
+
+    $('html').on('click.close-search-header', closeMat);
+  };
+
+  var closeMat = function(e) {
+    eventMat = $(e.target).closest('.quick-search');
+    
+    if (eventMat.length > 0) {
+      return;
+    }
+
+    mat.hide();
+
+    $('html').off('click.close-search-header');
+  };
+  
   callback.register('show', initMat);
 
   return callback.extend({

data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass

@@ -73,6 +73,7 @@ input#group_name
   a 
     float: right
     margin-right: 10px
+    margin-bottom: 20px
   .new_relation_custom
     .btn
       @include btn-secundary 

data/base/app/assets/stylesheets/social_stream/base/footer/layout/_footer.css.sass

@@ -1,5 +1,5 @@
 footer
-  text-align: center
+  text-align: left
   clear: both
   padding-top: 30px
   ul

data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/_devise.css.sass

@@ -19,14 +19,16 @@
         font-size: 12px
 
 
-#forgot-pass
-  .password
+#forgot-pass,
+#confirmation,
+#login
+  .password,
+  .confirmation
     @include box-shadow(0px 0px 13px rgba(50, 50, 50, 0.15))
     @include border-radius (15px)
     background-color: $white
     color: #8c8c8c
     h3
-      text-align: right
       font-size: 22px
     input
       &[type="password"]

data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/layout/_devise.css.sass

@@ -26,42 +26,12 @@
     .soften
       clear: both
 
+#error_explanation
+  h2
+    font-size: 20px
+    color: #BB5A5A
+    text-align: center
+    ul
+      text-align: center
 
 
-#forgot-pass
-  @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-  .forgot-img
-    @extend .hidden-phone
-    @extend .hidden-tablet
-    width: 40%
-    float: left
-    margin-left: 4%
-    img
-      width: 100%
-  .forgot
-    width: 60%
-    display: inline
-    header
-      h2
-        margin-left: 40%
-      #new_user
-        margin-left: 46%
-        @extend .hidden-phone
-    .password
-      width: 27%
-      float: right
-      display: inline-block
-      padding: 5px 15px
-      margin: 27px 20% 0 14px
-      h3
-        margin-top: 0px
-      #remember
-        display: inilne
-        float: left
-      input
-        &[type="submit"]
-          float: right
-          display: inline-block
-      .soften
-        clear: both
-        margin: 39px 0 10px

data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/layout/_frontpage.css.sass

@@ -23,6 +23,8 @@
     @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
     @include centered
     float: left
+    background: none
+    border: none
     .characteristics
       width: 27%
       margin-left: 2.9%
@@ -43,12 +45,11 @@
       display: inline !important
       label
         display: inline-block
-        margin-top: 6px
+        margin-top: 5px
     input
       &[type="submit"]
         float: right
         display: inline
-        margin-top: 10px
     .soften
       clear: both
 
@@ -75,6 +76,7 @@
 #forgot-pass,
 #registration
   .options
+    margin-top: 3px
     a
       border-right: 1px solid #ccc
       padding-right: 6px

data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-1200px-min.css.sass

@@ -39,9 +39,12 @@
       label
         font-size: 16px/23px
 
-  #forgot-pass
-    .password
+  #forgot-pass,
+  #confirmation,
+  #login
+    .password,
+    .confirmation
       h2
         font-size: 38px
       h4
-        font-size: 20.5depx
+        font-size: 20.5px

data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-767px-max.css.sass

@@ -24,7 +24,7 @@
       padding: 0
       float: none
       h3
-        margin: 17px 12px 20px 0
+        margin: 0px 12px 0px 0
       form.new_user
         padding: 0 10px
         .login_data
@@ -59,9 +59,13 @@
 
 
 
-  #forgot-pass
+  #forgot-pass,
+  #confirmation,
+  #login
     margin-left: 0
-    .forgot
+    .forgot,
+    .instructions,
+    .change
       @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
       margin-top: 0px
       padding: 0 
@@ -75,10 +79,10 @@
         width: 96% !important
         padding-left: 4%
 
-      .password
+      .password,
+      .confirmation
         width: 90%
         padding: 1% 5%
-        margin: 2% 0 0 0
         float: none
         form
           margin: 0

data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-768px-979px.css.sass

@@ -21,14 +21,13 @@
       margin-top: 18px
 
 
-  #forgot-pass
+  #forgot-pass,
+  #confirmation
     h2
       margin-left: 2% !important
     #new_user
       margin-left: 4% !important
-    .password
-      width: 40% !important
-      margin-right: 0 !important
+
 
 
  

data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass

@@ -82,7 +82,8 @@ header
         margin-top: 18px
         position: absolute
         z-index: 6
-        .query_too_short
+        .query_too_short,
+        .no_results
           padding-top: 23px
           text-align: center
         .results
@@ -162,4 +163,4 @@ header
           margin: 0 0 0
         
       .dropdown-toggle
-        margin-right: 5px
+        margin-right: 5px

data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass

@@ -1,6 +1,6 @@
 @mixin btn-primary
   @include ie7-inline-block()
-  padding: 4px 12px
+  padding: 3px 12px 2px
   margin-bottom: 0
   font-size: $baseFontSize
   line-height: $baseLineHeight
@@ -15,7 +15,6 @@
   @include box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05))
   @include transition(background 1s, color, 1s)
   @include border-radius(7px)
-
   a
     color: $gray
   

data/base/app/controllers/groups_controller.rb

@@ -16,6 +16,10 @@ class GroupsController < ApplicationController
     create! do |success, failure|
       success.html {
         self.current_subject = resource
+
+        flash[:notice] += t('representation.notice',
+                             :subject => resource.name)
+
         redirect_to :home
       }
     end

data/base/app/controllers/home_controller.rb

@@ -1,3 +1,18 @@
 class HomeController < ApplicationController
   before_filter :authenticate_user!
+
+  def index
+    respond_to do |format|
+      format.html
+      format.json { render json: home_json }
+    end
+  end
+
+  private
+
+  def home_json
+    {
+      name: current_subject.name
+    }.to_json
+  end
 end

data/base/app/controllers/search_controller.rb

@@ -35,7 +35,7 @@ class SearchController < ApplicationController
           @search_result
         )
 
-        render :json => json_obj
+        render :json => json_obj.as_json(helper: self)
       }
 
       format.js
@@ -45,8 +45,8 @@ class SearchController < ApplicationController
   private
 
   def search mode
-    page =  ( mode == "quick" ? 1 : params[:page] )
-    limit = ( mode == "quick" ? 7 : RESULTS_SEARCH_PER_PAGE )
+    page =  ( mode == :quick ? 1 : params[:page] )
+    limit = ( mode == :quick ? 7 : RESULTS_SEARCH_PER_PAGE )
 
     SocialStream::Search.search(params[:q],
                                 current_subject,

data/base/app/decorators/avatars_controller_decorator.rb

@@ -0,0 +1 @@
+AvatarsController.send :include, SocialStream::Controllers::Avatars

data/base/app/overrides/avatars/_crop/add_actor_id.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "avatars/_crop", 
+                     :name => "add_actor_id", 
+                     :insert_after => "code[erb-loud]:contains('form_for')", 
+                     :text => "<%= hidden_field_tag 'actor_id', avatarable.id %>")

data/base/app/overrides/avatars/_form/add_actor_id.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "avatars/_form", 
+                     :name => "add_actor_id", 
+                     :insert_after => "code[erb-loud]:contains('form_for')", 
+                     :text => "<%= hidden_field_tag 'actor_id', avatarable.id %>")

data/base/app/views/contacts/_new_modal.html.erb

@@ -5,10 +5,10 @@
       <h3><%= t 'contact.new.modal.title' %></h3>
     </div>
     <div class="modal-body">
-      <%= label_tag 'actors', t('actor.title.other') %>
+      <%= label_tag 'actors', Array.wrap(type).map{ |t| t('title.other', scope: t) }.to_sentence %>
       <%= text_field_tag 'actors', '', 'data-path' => actors_path(stranger: true, sender_id: Actor.normalize_id(sender)), 'data-type' => Array.wrap(type).compact.join(','), placeholder: t('contact.new.modal.placeholder.actors') %>
 
-      <%= label_tag 'relations', t('activerecord.attributes.contact.relation_ids') %>
+      <%= label_tag 'relations', t('contact.new_modal.label.relations') %>
       <%= select_tag 'relations', contact_select_options(sender.options_for_contact_select), multiple: true, "data-placeholder" => t('contact.new.modal.placeholder.actors') %>
     </div>
     <div class="modal-footer">

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

@@ -1,19 +1,24 @@
 <section id="confirmation">
-  <header>
-    <h2>Resend confirmation instructions</h2>
-  </header>
-  <section class="confirmation">
-    <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
-      <%= devise_error_messages! %>
+  <section class="instructions">
+    <header>
+      <h3>
+        Resend confirmation instructions
+      </h3>
+    
+      <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method  => :post }) do |f| %>
+        <%= devise_error_messages! %>
+    </header>
+    <section class="confirmation">
+      <%= f.label :email %>
 
-      <div><%= f.label :email %><br />
-      <%= f.email_field :email, :autofocus => true %></div>
+      <%= f.email_field :email, :autofocus => true %>
 
-      <div><%= f.submit "Resend confirmation instructions" %></div>
+      <%= f.submit "Resend confirmation instructions" %>
 
       <hr class="soften">
       
       <%= render "devise/shared/links" %>
+    </section>
     <% end %>
   </section>
 </section>

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

@@ -1,30 +1,27 @@
-<div id="login">
-  <h2>
-    <%= t('devise.passwords.update') %>
-  </h2>
-</div>
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
-<%= devise_error_messages! %>
-<%= f.hidden_field :reset_password_token %>
-<div class="line">
-  <div class="label">
-    <%= f.label :password %>
-  </div>
-  <div class="field">
-    <%= f.password_field :password, :class =>"field_x" %>
-  </div>
-</div>
-<div class="line">
-  <div class="label">
-    <%= f.label :password_confirmation %>
-  </div>
-  <div class="field">
-    <%= f.password_field :password_confirmation, :class =>"field_x" %>
-  </div>
-</div>
+<section id="login">
+  <section class="change">
+    <header>
+      <h3>
+        <%= t('devise.passwords.update') %>
+      </h3>
 
+      <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+      <%= devise_error_messages! %>
+      <%= f.hidden_field :reset_password_token %>
+    </header>
 
-  <%= f.submit "Change my password", :class =>"btn" %>
+    <div class="password">
+      <%= f.label :password %>
 
-  <% end %>
+      <%= f.password_field :password, :class =>"field_x" %>
+
+      <%= f.label :password_confirmation %>
+
+      <%= f.password_field :password_confirmation, :class =>"field_x" %>
+
+      <%= f.submit "Change my password", :class =>"btn" %>
+    </div>
+    <% end %>
+  </section>
+</section>