social_stream 2.0.0.beta3 → 2.0.0

data/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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