social_stream-base 2.0.0.beta3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b083770d40a45ea0f4a805492af2099c37be402
-  data.tar.gz: 3ef6df8d031778b94c0bdc8bfe6fb531cf5e2b78
+  metadata.gz: 1f681843094d843a366613ea257bd210c929df88
+  data.tar.gz: 766f9f46ce33c10b437f3ebe4f5e1d1428ddb743
 SHA512:
-  metadata.gz: 27d419481f415fed4dc8c4e2fbe706a2df8269d70f0539bf1764af2c8767345b839dc8c6cac9ab18db0a90bfde0dbec42fedc555d24e803b1f9c39b6921990ed
-  data.tar.gz: 45123f46b4897d99bdcfc2d34e36b11f3fec3b3821712b86cbfa4a653191b171ec8d697c53e552088b31dbfad6f4b10a6e467e9f7adf60c329fa1389c2fc1c7c
+  metadata.gz: ff7cc4294acf5f340b883dd8be40461f829c54200d762f3f25022fa13fc69876fe3a2a190e9403159ec0943b9d667dafaaff64069c925b684c8afc6c7d6108b7
+  data.tar.gz: 26c2c1a5ea6b0c9b4358de9c3419a27428f23a70824486c3d7772053423bb07d1bc9b81536d67a7d925c521d01895a0ac016b8f0fd1558ff1af30c489a580f1d

data/app/assets/javascripts/social_stream/object.js

@@ -66,12 +66,12 @@ SocialStream.Object = (function(SS, $, undefined){
     return icon + ' ' + text + ' <b class="caret"></b>';
   };
 
-  var changeRelationSelect = function(type) {
-    $('[name$="[relation_ids][]"]').attr('name', type + '[relation_ids][]');
+  var changeRelationSelect = function(type, selector) {
+    $('[name$="[relation_ids][]"]', selector).attr('name', type + '[relation_ids][]');
   };
 
-  var changeOwner = function(type) {
-    $('[name$="[owner_id]"]').attr('name', type + '[owner_id]');
+  var changeOwner = function(type, selector) {
+    $('[name$="[owner_id]"]', selector).attr('name', type + '[owner_id]');
   };
 
   callback.register('show',

data/app/assets/javascripts/social_stream/tag.js

@@ -32,14 +32,13 @@ SocialStream.Tag = (function(SS, $, undefined) {
   };
 
   var select2InitSelection = function(element, callback) {
-    var selection = $(element).val().split(",").map(function(el) {
+    var selection = $(element).val().split(", ").map(function(el) {
       return { id: el, text: el };
     });
 
     callback(selection);
   };
 
-
   return {
     select2: select2
   };

data/app/assets/javascripts/social_stream/wall.js

@@ -30,6 +30,11 @@ SocialStream.Wall = (function(SS, $, undefined){
     }
   };
 
+  var changeParams = function(type) {
+    SS.Object.changeOwner(type, $('.wall_input form'));
+    SS.Object.changeRelationSelect(type, $('.wall_input form'));
+  };
+
   callback.register('show',
                     initInputAutosize,
                     SS.Object.new_);
@@ -39,7 +44,6 @@ SocialStream.Wall = (function(SS, $, undefined){
 
   return callback.extend({
     changeAction: changeAction,
-    changeOwner: SS.Object.changeOwner, 
-    changeRelationSelect: SS.Object.changeRelationSelect 
+    changeParams: changeParams 
   });
 }) (SocialStream, jQuery);

data/app/assets/stylesheets/social_stream/base/adjust/_adjust.css.sass

@@ -24,4 +24,7 @@ textarea
       @include border-radius(4px)
 
 #fdbk_tab
-  background-color: $blue !important
+  background-color: $blue !important
+
+.jcrop-tracker
+  background-color: rgba(255, 255, 255, .2)

data/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass

@@ -15,16 +15,19 @@
       input,
       textarea
         background-color: #f9f9f9
-      .accordion-body
-        @include gradient-vertical-three-colors($startColor: #e2e2e2, $midColor: #ededed, $colorStop: 3%, $endColor: #f1f1f1)
-        width: 100%
-      span
-        text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
-        color: #999
+      .briefing
+        background-color: white
+        color: $gray
+        span
+          @include border-radius(5px)
+          background-color: #D9EDF7
+          border: 1px solid #BCE8F1
+          color: #3A87AD
+          text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
         p
+          border-top: 5px solid #f9f9f9
           background-color: none
-          padding-top: 20px
-          padding-left: 1px
+      
 
       form.edit_profile
         input
@@ -37,11 +40,7 @@
         padding-top: 14px
         input
           &[type="file"]
-    section.accordion-group
-      border: none
-
-
-    
+        
     h5
       color: $grayLighter
       font-size: 17px

data/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass

@@ -1,6 +1,9 @@
 @import 'avatars_for_rails'
 
 #profile
+  @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+  float: left
+    margin-left: 2%
   #profile-info
     @include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
     float: left
@@ -10,25 +13,34 @@
     .comunication-info,
     .experience,
     .avatar
-      input,
-      textarea
-      .accordion-heading
-        .accordion-toggle
-          display: inline !important
-      .accordion-body
-        .accordion-inner
-          padding: 9px 15px 37px
-          label,
-          h6
-            margin-bottom: 0px
+      @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+      margin-left: 0px
+      .briefing
+        padding: 1px 0px 16px
+        min-height: 32px
+        span
+          margin-left: 11px
+          padding: 3px 8px 3px 7px
+        p
+          margin: -15px 26px 0 14px
+          padding: 20px 0px 5px 0px
+          width: 100%
+      .empty
+        float: left
+        padding: 8px 27px 9px 27px
+      .update
+        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+        background-color: $white
+        margin-left: 0px
+        padding: 12px 0px 3px 0px !important
+        form.edit_profile
+          padding: 0 14px
           input
             &[type="submit"]
               float: right
-              margin-top: 10px
-      span
-        display: inline-block
-        padding: 0px 27px 9px 27px
-        float: right
+              margin-top: -10px
+              margin-right: 9px
+      
 
     .personal,
     .comunication-info,
@@ -37,21 +49,13 @@
         &[type="text"],
         &[type="tel"],
         &[type="email"]
-          width: 95.5% !important
+          width: 95% !important
 
 
       textarea
-        width: 95.5% !important
+        width: 95% !important
 
-    .personal
-      .accordion-body
-        .accordion-inner
-          form
-            margin: 0 0 10px
-          input
-            &[type="submit"]
-              float: right
-              margin-top: 2px
+    
     .experience
       .briefing
         p
@@ -72,12 +76,13 @@
       margin: 16px
     p
       @include border-radius (15px)
-      margin: -15px 11px 0 0px
-      padding: 12px 10px 11px 0px
+      margin: -15px 11px 0 5px
+      padding: 12px 10px 11px 27px
       width: 325px
+      .update
+        margin-left: 22px
+
 
-    .accordion
-      margin-top: 20px
 
 
 #profile_birthday_3i,
@@ -91,5 +96,17 @@
     display: inline
   h4
     display: inline-block
+  .update
+    .jcrop-holder
+      width: 100% !important
+      div 
+        img
+          max-width: 90%
+          max-height: 90%
+          margin: 0 auto
+          position: relative
+        div 
+          img
+            visibility: hidden !important
 
 

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

@@ -24,5 +24,5 @@
       .avatar
         @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
         margin-left: 0px
-        .accordion-body
-          width: 98%
+        .update
+          @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)

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

@@ -19,7 +19,9 @@
       .comunication-info,
       .experience,
       .avatar
-        width: 97% !important
+        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+        .update
+          @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
     
 
 
@@ -29,14 +31,5 @@
 
 @media (max-width: 480px)
 
-  #profile
-    #profile-info
-      .tags,
-      .personal,
-      .comunication-info,
-      .experience,
-      .avatar
-        width: 96% !important
-        .accordion-heading
-          min-height: 40px
+
   

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

@@ -10,13 +10,12 @@
     @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
 
     #profile-info
-      @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-      float: left !important
-      margin: 0 0 0 2.5% !important
-      width: 80% !important
+      @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
       .tags,
       .personal,
       .comunication-info,
       .experience,
       .avatar
-        width: 97.5% !important
+        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+        .update
+          @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)

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

@@ -96,31 +96,7 @@
         a
           font-size: 16px !important
 
-  #profile
-    @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-    margin-left: 0px
-    #toolbar
-      @include grid-core-span(2, $fluidGridColumnWidth, $fluidGridGutterWidth)
-      float: left
-      margin-left: 0px
-    #profile-info
-      @include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
-      float: left
-      margin-left: 2%
-      .tags,
-      .personal,
-      .comunication-info,
-      .experience,
-      .avatar
-        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-        margin-left: 0px
-       
-     
-        .update
-          @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-        
-          
-
+  
 
   #documents
     #toolbar

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

@@ -70,24 +70,6 @@
 
 
 
-  #profile
-    @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-    margin-left: 0px
-
-    #profile-info
-      @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-      float: none
-      margin: 0px auto 0px
-      .tags,
-      .personal,
-      .comunication-info,
-      .experience,
-      .avatar
-        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-        .update
-          @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-
-
 
   #relation_customs
     #toolbar

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

@@ -55,21 +55,7 @@
           width: 127px
           margin-left: 3px
 
-  #profile
-    @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-
-    #profile-info
-      @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-      float: none
-      margin: 0px auto 0px
-      .tags,
-      .personal,
-      .comunication-info,
-      .experience,
-      .avatar
-        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-        .update
-          @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+  
           
 
 

data/app/controllers/conversations_controller.rb

@@ -27,18 +27,6 @@ class ConversationsController < ApplicationController
     @receipts.mark_as_read
   end
 
-  def new
-
-  end
-
-  def edit
-
-  end
-
-  def create
-
-  end
-
   def update
     if params[:untrash].present?
     @conversation.untrash(@actor)

data/app/views/devise/sessions/new.html.erb

@@ -1,5 +1,6 @@
 <section id="new_session">
 
+  <%= render partial: 'layouts/explanation' %>
   <%= render partial: 'devise/sessions/form' %>
   <%= render partial: 'frontpage/presentation' %>
 

data/app/views/layouts/_header_signed_out.erb

@@ -2,6 +2,4 @@
   <%= render partial: 'layouts/logo_out' %>
   <div class="brand">
   </div>
-  <% unless params[:controller].eql? 'devise/sessions' and params[:action].eql? 'new' %> 
-  <% end %>
 </header>

data/app/views/permissions/_index.html.erb

@@ -10,7 +10,7 @@
       <% default_permissions.each do |p| %>
         <li>
         <%= check_box_tag 'relation_custom[permission_ids][]', p.id, @relation.permission_ids.include?(p.id), id: "checkbox_relation_#{ @relation.id }_permission_#{ p.id }" %>
-        <%= label_tag "checkbox_relation_#{ @relation.id }_permission_#{ p.id }", p.description(:brief, subject: current_subject) %>
+        <%= label_tag "checkbox_relation_#{ @relation.id }_permission_#{ p.id }", p.description(:brief, subject: current_subject), title: p.description(:detailed, subject: current_subject, state: (@relation.permission_ids.include?(p.id) ? 'positive' : 'negative'), relation: @relation.name) %>
         </li>
       <% end %>
     </ul>

data/app/views/profiles/_avatar.html.erb

@@ -1,16 +1,15 @@
-<section class="accordion-group avatar">
-  <div class="accordion-heading">
-    <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion5" href="#collapseFive">
+<section class="avatar">
+  <header>
+    <%= render partial: 'edit_icon' %>
+    <h4>
       <%= t('avatar.profile_change') %>
-    </a>
-  </div>
+    </h4>
+  </header>
   <% if can? :update, @profile %>
-  <div id="collapseFive" class="accordion-body collapse">
-    <div class="accordion-inner">
-    <%= render partial: 'avatars/form',
-               object: @profile.actor,
-               as: :avatarable %>
+    <div class="update">
+      <%= render partial: 'avatars/form',
+                 object: @profile.actor,
+                 as: :avatarable %>
     </div>
   <% end %>
-  </div>
 </section>

data/app/views/profiles/_comunication-info.html.erb

@@ -1,9 +1,11 @@
-<section class="accordion-group comunication-info">
-  <div class="accordion-heading">
-    <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTree">
+<section class="comunication-info">
+  <header>
+    <%= render partial: 'edit_icon' %>
+    <h4>
       <%= t('profile.contact') %>
-    </a>
-
+    </h4>
+  </header>
+  <div class="briefing">
     <% if @profile.contact_present? %>
       <% if @profile.phone? %>
         <h5>
@@ -54,45 +56,43 @@
     <% end %>
   </div>
  
-
   <% if can? :update, @profile %>
-  <div id="collapseTree" class="accordion-body collapse">
-    <div class="accordion-inner">
-      <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
-        <h6>
-          <%= f.label :phone, t('profile.phone') %>
-        </h6>
-        <%= f.phone_field :phone %>
+  <div class="update">
 
-        <h6>
-          <%= f.label :mobile, t('profile.mobile') %>
-        </h6>
-        <%= f.phone_field :mobile %>
+    <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
+      <h6>
+        <%= f.label :phone, t('profile.phone') %>
+      </h6>
+      <%= f.phone_field :phone %>
 
-        <h6>
-          <%= f.label :fax, t('profile.fax') %>
-        </h6>
-        <%= f.phone_field :fax %>
+      <h6>
+        <%= f.label :mobile, t('profile.mobile') %>
+      </h6>
+      <%= f.phone_field :mobile %>
 
-        <h6>
-          <%= f.label :address, t('profile.address') %>
-        </h6>
-        <%= f.text_field :address %>
+      <h6>
+        <%= f.label :fax, t('profile.fax') %>
+      </h6>
+      <%= f.phone_field :fax %>
 
-        <h6>
-          <%= f.label :email, t('profile.email') %>
-        </h6>
+      <h6>
+        <%= f.label :address, t('profile.address') %>
+      </h6>
+      <%= f.text_field :address %>
 
-        <%= f.email_field :email, :class => "email" %>
+      <h6>
+        <%= f.label :email, t('profile.email') %>
+      </h6>
 
-        <h6>
-          <%= f.label :website, t('profile.website') %>
-        </h6>
-        <%= f.text_field :website, :class => "url" %>
+      <%= f.email_field :email, :class => "email" %>
 
-        <%= f.submit :class => "btn" %>
-      <% end %>
-    </div>
+      <h6>
+        <%= f.label :website, t('profile.website') %>
+      </h6>
+      <%= f.text_field :website, :class => "url" %>
+
+      <%= f.submit :class => "btn" %>
+    <% end %>
   <% end %>
   </div>
 </section>

data/app/views/profiles/_experience.html.erb

@@ -1,27 +1,27 @@
-<section class="accordion-group experience">
-  <div class="accordion-heading">
-    <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion4" href="#collapseFour">
+<section class="experience">
+  <header>
+    <%= render partial: 'edit_icon' %>
+    <h4>
       <%= t("profile.#{ @profile.subject.class.to_s.downcase }.experience") %>
-    </a>
-
-  
-      <% if @profile.experience? %>
-        <%= simple_format @profile.experience %>
-      <% else %>
-        <%= render partial: 'empty' %>
-      <% end %>
+    </h4>
+  </header>
 
+  <div class="briefing">
+    <% if @profile.experience? %>
+      <%= simple_format @profile.experience %>
+    <% else %>
+      <%= render partial: 'empty' %>
+    <% end %>
   </div>
+
   <% if can? :update, @profile %>
-    <div id="collapseFour" class="accordion-body collapse">
-    <div class="accordion-inner">
+    <div class="update">
       <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
-      
         <%= f.text_area :experience, :maxlength => 246, :rows => 5 %>
 
         <%= f.submit :class => "btn" %>
       <% end %>
-  <% end %>
     </div>
-  </div>
+  <% end %>
+
 </section>

data/app/views/profiles/_personal.html.erb

@@ -1,9 +1,11 @@
-<section class="accordion-group personal">
-  <div class="accordion-heading">
-    <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
+<section class="personal">
+  <header>
+    <%= render partial: 'edit_icon' %>
+    <h4>
       <%= t("profile.#{ @profile.subject.class.to_s.downcase }.info") %>
-    </a>
-  
+    </h4>
+  </header>
+  <div class="briefing">
     <% if @profile.personal_present? %>
       <% if @profile.organization? %>
         <h5>
@@ -61,15 +63,12 @@
     <% end %>
   </div>
 
-  <div id="collapseTwo" class="accordion-body collapse">
-    <div class="accordion-inner">
-      <% if can? :update, @profile %>
-
+  <div class="update">
+    <% if can? :update, @profile %>
       <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
         <h6>
           <span class="required">*</span>
           <%= f.label t('*actor.name') %>
-      
         </h6>
 
         <%= f.text_field :name, :class => "required" %>
@@ -103,6 +102,5 @@
         <%= f.submit :class => "btn" %>
       <% end %>
     <% end %>
-    </div>
   </div>
 </section>

data/app/views/profiles/_profile.html.erb

@@ -2,39 +2,31 @@
   <h2 class="colorfont">
     <%= t('profile.one') %>
   </h2>
-  <div class="accordion" id="accordion2">
-    <div class="accordion-group">
-      <% if can?(:update, @profile) || @profile.tags_present? %>
-        <%= render partial: "tags" %>
-      <% end %>
-    </div>
-    <div class="accordion-group">
-      <% if can?(:update, @profile) || @profile.personal_present? %>
-        <%= render partial: "personal" %>
-      <% end %>
-    </div>
-    <div class="accordion-group">
-      <% if can?(:update, @profile) || @profile.contact_present? %>
-        <%= render :partial => "comunication-info" %>
-      <% end %>
-    </div>
-    <div class="accordion-group">
-      <% if can?(:update, @profile) || @profile.experience? %>
-        <%= render :partial => "experience" %>
-      <% end %>
-    </div>
-    <div class="accordion-group">
-      <% if can?(:update, @profile) || @profile.personal_present? %>
-        <%= render :partial => "avatar" %>
-      <% end %>
-    </div>
+  <% if can?(:update, @profile) || @profile.tags_present? %>
+    <%= render partial: "tags" %>
+  <% end %>
 
-    <%= javascript_tag do %>
-      $(function() {
-        SocialStream.Profile.show({
-          section: "<%= params[:section ] %>"
-        });
+  <% if can?(:update, @profile) || @profile.personal_present? %>
+    <%= render partial: "personal" %>
+  <% end %>
+
+  <% if can?(:update, @profile) || @profile.contact_present? %>
+    <%= render :partial => "comunication-info" %>
+  <% end %>
+
+  <% if can?(:update, @profile) || @profile.experience? %>
+    <%= render :partial => "experience" %>
+  <% end %>
+
+  <% if can?(:update, @profile) || @profile.personal_present? %>
+    <%= render :partial => "avatar" %>
+  <% end %>
+
+  <%= javascript_tag do %>
+    $(function() {
+      SocialStream.Profile.show({
+        section: "<%= params[:section ] %>"
       });
-    <% end %>
-  </div>
+    });
+  <% end %>
 </div>

data/app/views/profiles/_tags.html.erb

@@ -1,22 +1,23 @@
-<section class="tags accordion-group">
-  <div class="accordion-heading">
-    <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
+<section class="tags">
+  <header>
+    <%= render partial: 'edit_icon' %>
+    <h4>
       <%= t('profile.tags.other') %>
-    </a>    
+    </h4>
+  </header>
+  <div class="briefing"> 
     <% if @profile.subject.tag_list.count > 0 %>
       <%= tag_list @profile.subject %>
     <% else %>
       <%= render partial: 'empty' %>
     <% end %>
-    <% if can?(:update, @profile) %>
   </div>
-  <div id="collapseOne" class="update accordion-body collapse">
-    <div class="accordion-inner">
+    <% if can?(:update, @profile) %>
+    <div class="update">
       <%= form_for(@profile, :url => [ @profile.subject, :profile ]) do |f| %>
         <%= f.text_field :tag_list, "data-path" => tags_path(format: :json) %>
         <%= f.submit :class => "btn" %>
       <% end %>
     </div>
   <% end %>
-  </div>
 </section>

data/config/locales/en.yml

@@ -518,8 +518,8 @@ en:
                 marked as public
           represent:
             nil:
-              positive: They WILL BE ABLE to change session and act as %{subject}
-              negative: They WILL NOT BE ABLE to change session and act as %{subject}
+              positive: They WILL BE ABLE to change session and act as %{name}
+              negative: They WILL NOT BE ABLE to change session and act as %{name}
           notify:
             nil:
               positive: Activities WILL BE notified to contacts at %{name}
@@ -605,7 +605,7 @@ en:
     one: Settings
     password_change:
       briefing: Change your password
-    success: Your settings where correctly changed
+    success: Your settings were correctly changed
   share: Share
   sign_in: Sign in
   sign_out: Sign out

data/config/locales/es.yml

@@ -504,8 +504,8 @@ es:
         detailed:
           create:
             activity:
-              positive: PODRÁN publicar actividades en vuestro muro
-              negative: NO PODRÁN publicar actividades en vuestro muro
+              positive: Los contactos en %{relation} PODRÁN publicar actividades en vuestro muro
+              negative: Los contactos en %{relation} NO PODRÁN publicar actividades en vuestro muro
           follow:
             nil:
               positive: Las actividades de los contactos en %{relation} APARECERÁN
@@ -514,18 +514,49 @@ es:
                 en vuestra página de inicio
           read:
             activity:
-              positive: PODRÁN leer las publicaciones que aparezcan en vuestro muro,
-                salvo las que compartas solo ciertas personas
-              negative: NO PODRÁN leer las publicaciones que aparezcan en vuestro
+              positive: Los contactos en %{relation} PODRÁN leer las publicaciones que aparezcan en vuestro muro,
+                salvo las que compartáis solo con otros roles
+              negative: Los contactos en %{relation} NO PODRÁN leer las publicaciones que aparezcan en vuestro
                 muro, salvo las que marques como públicas
           represent:
             nil:
-              positive: PODRÁN cambiar sesión para actuar en nombre de %{name}
-              negative: NO PODRÁN cambiar sesión para actuar en nombre de %{name}
+              positive: Los contactos en %{relation} PODRÁN cambiar sesión para actuar en nombre de %{name}
+              negative: Los contactos en %{relation} NO PODRÁN cambiar sesión para actuar en nombre de %{name}
           notify:
             nil:
               positive: Las actividades SE NOTIFICARÁN a los contactos en %{relation}
               negative: Las actividades NO SE NOTIFICARÁN a los contactos en %{relation}
+      user: 
+        brief:
+          create:
+            activity: Publicar en tu muro
+          read:
+            activity: Leer tu muro
+          represent:
+            nil: Administrarte
+          notify:
+            nil: Notificarles
+        detailed:
+          create:
+            activity:
+              positive: Los contactos en %{relation} PODRÁN publicar actividades en tu muro
+              negative: Los contactos en %{relation} NO PODRÁN publicar actividades en tu muro
+          follow:
+            nil:
+              positive: Las actividades de los contactos en %{relation} APARECERÁN
+                en tu página de inicio
+              negative: Las actividades de los contactos en %{relation} NO APARECERÁN
+                en tu página de inicio
+          read:
+            activity:
+              positive: Los contactos en %{relation} PODRÁN leer las publicaciones que aparezcan en tu muro,
+                salvo las que compartáis solo con otros roles
+              negative: Los contactos en %{relation} NO PODRÁN leer las publicaciones que aparezcan en tu
+                muro, salvo las que marques como públicas
+          represent:
+            nil:
+              positive: Los contactos en %{relation} PODRÁN cambiar sesión para actuar en tu nombre
+              negative: Los contactos en %{relation} NO PODRÁN cambiar sesión para actuar en tu nombre
     of_relation:
       choose: Permisos para <strong>%{name}</strong>
     postit: Gestiona los permisos de tus contactos y crea nuevos roles

data/lib/generators/social_stream/base/templates/initializer.rb

@@ -13,9 +13,8 @@ SocialStream.setup do |config|
 
   # Type of activities managed by actors
   # Remember you must add an "activity_object_id" foreign key column to your migration!
-  # Be sure to add the other modules of Social Stream you might be using (e.g. :document, :event, :link ).
   #
-  # config.objects = [ :post, :comment ]
+  # config.objects += [ :foo, :bar ]
 
   # Form for activity objects to be loaded
   # You can write your own activity objects
@@ -50,6 +49,3 @@ SocialStream.setup do |config|
   # Cleditor controls. It is used in new message editor, for example
   # config.cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"
 end
-
-# You can customize toolbar, sidebar and location bar from here
-# See https://github.com/ging/social_stream/wiki/How-to-customize-the-toolbar,-sidebar-and-location

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "2.0.0.beta3".freeze
+    VERSION = "2.0.0".freeze
   end
 end

data/lib/social_stream/controllers/objects.rb

@@ -57,15 +57,17 @@ module SocialStream
 
         private
 
+        # Memoize pattern to retrieve objects collection
         def collection
           collection_variable_get ||
             collection_variable_set(build_collection)
         end
 
+        # Uses the {ActivityObject#collection} method to retrieve the objects collection
         def build_collection
-          self.class.model_class. # @posts = Post
-            collection(profile_subject, current_subject).
-            page(params[:page])
+          self.class.model_class.                          # @posts = Post.
+            collection(profile_subject, current_subject).  #   collection(profile_subject, current_subject).
+            page(params[:page])                            #   page(params[:page])
         end
       end
 

data/lib/tasks/db/populate.rake

@@ -156,6 +156,7 @@ namespace :db do
         ties_start = Time.now
 
         SocialStream::Population::Actor.available.each do |a|
+          actors = SocialStream::Population::Actor.available
           actors.delete(a)
 
           relations = a.relation_customs + [ Relation::Reject.instance ]

data/social_stream-base.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.5.1')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 1.0.4')
+  s.add_runtime_dependency('avatars_for_rails', '~> 1.0.7')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
   # Select2 javascript library

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
+  version: 2.0.0
 platform: ruby
 authors:
 - GING - DIT - UPM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1236,9 +1236,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.0