social_stream 0.20.2 → 0.21.0

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

@@ -6,12 +6,6 @@
                              :receiver => receiver
                            } %>
   <% end %>
-
-  <%= javascript_tag do %>
-  $(function(){  
-    activate_anti_rebounds();  
-  });
-  <% end %>
 </div>
 
 <div id="activity_form_select">
@@ -54,3 +48,10 @@
   <%= submit_tag(t('share'), :class => "button submitActivity", :id => "masterSubmitButton") %>
 </div>
 <% end %>
+
+<%= javascript_tag do %>
+  $(function(){  
+    SocialStream.Wall.setup();  
+  });
+<% end %>
+

data/base/app/views/activities/_wall.html.erb

@@ -3,3 +3,9 @@
   <%= paginate activities %>
 </div>
 
+<%= javascript_tag do %>
+  $(function(){  
+    SocialStream.Timeline.setup();  
+  });
+<% end %>
+

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

@@ -151,6 +151,23 @@
             $("#edited_subsector_name_" + event.data[0]).html($("#form_subsector_name_" + event.data[0]).val());
             event.data[1].changeLabel($("#form_subsector_name_" + event.data[0]).val());
           });
+          $("#subsector_" + i).find(".permissions_field .permission").each(function(){
+            var permission_field = $(this);
+            var update_state = function(){
+              var label_class = permission_field.attr("id").replace("form_", "edited_");
+              if(permission_field.is(":checked")){
+                $("." + label_class).removeClass("negative").addClass("positive");
+                $("." + label_class).find(".negative_message").hide();
+                $("." + label_class).find(".positive_message").show();
+              }else{
+                $("." + label_class).removeClass("positive").addClass("negative");
+                $("." + label_class).find(".positive_message").hide();
+                $("." + label_class).find(".negative_message").show();
+              }
+            }
+            update_state();
+            permission_field.on("change",update_state);
+          });
           $("#subsector_" + i).show();
         }else{
           if(sector.subsectors[i-1]){

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

@@ -38,7 +38,7 @@
 							<%= t('cheesecake.form.fields.name')%>:
 						</div>
 						<div class="form_field">
-							<input type="text" class="form_tag" class="form_subsector_name" id="form_subsector_name_<%= i %>" value="New subsector <%= i %>">
+							<input type="text" class="form_tag form_subsector_name" id="form_subsector_name_<%= i %>" value="New subsector <%= i %>">
 						</div>
 					</div>
 					<div class="form_row less_padding">
@@ -50,15 +50,22 @@
 						<div class="form_field permissions_field">
 							<% default_permissions.each_with_index do |p, i| %>
 								<div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
-									<input class="permission <%= dom_id p %>" type="checkbox"/>
-									<label for=<%= dom_id p %>><%= p.description(:brief) %></label>
+									<input id="form_subsector_<%= i %>_<%= dom_id p %>" class="permission <%= dom_id p %>" type="checkbox"/>
+									<label for="form_subsector_<%= i %>_<%= dom_id p %>"><%= p.description(:brief, :relation => "%RELATION_NAME%", :subject => current_subject) %></label>
 									<div class="clearfloat"></div>
 								</div>
 							<% end %>
 						</div>
 						<div class="permissions_explanation" style="display:none;">
 						  <% default_permissions.each_with_index do |p, i| %>
-                  <div class="permission <%= dom_id p %>"> <%= p.description(:detailed) %></div>
+                  <div class="permission <%= dom_id p %> positive edited_subsector_<%= i %>_<%= dom_id p %>">
+                    <div class="positive_message">
+                      <%= p.description(:detailed, :relation => "%RELATION_NAME%", :subject => current_subject, :state => "positive") %>
+                    </div>
+                    <div class="negative_message" style="display:none;">
+                      <%= p.description(:detailed, :relation => "%RELATION_NAME%", :subject => current_subject, :state => "negative") %>
+                    </div>
+                  </div>
               <% end %>
 					  </div>
 					</div>
@@ -86,7 +93,7 @@
   $(".permissions_field").each(function(){
     $(this).tipsy({
       delayIn: 500,
-      delayOut: 0,
+      delayOut: 200,
       gravity: 'e',
       offset: 100,
       opacity: 1,
@@ -94,7 +101,9 @@
       html: true,
       hoverable: true,
       title: function(){
-        return $(this).parent().find('.permissions_explanation').html();
+        var html = $(this).parent().find('.permissions_explanation').html();
+        var relation = $(this).parent().parent().find('.form_subsector_name').val();
+        return html.replace(/%RELATION_NAME%/g, relation);
       }
     });
   });  

data/base/app/views/comments/_new.html.erb

@@ -33,9 +33,8 @@
 <% end %>
 
 <%= javascript_tag do %>
-  $(document).ready(function() {
+  $(function() {
     $("#comment_text_<%= dom_id(activity) %>").Watermark("<%= I18n.t('comment.input') %>","#666");
-    activate_anti_rebounds(); 
  
     $("#comment_text_<%= dom_id(activity) %>")
         .change(function(){autoSize("<%= dom_id(activity) %>");})
@@ -43,5 +42,6 @@
         .keyup(function(){autoSize("<%= dom_id(activity) %>");});
     autoSize("<%= dom_id(activity) %>"); 
 
+    SocialStream.Wall.activateAntiRebounds();
   });
 <% end %>

data/base/app/views/comments/create.js.erb

@@ -5,6 +5,4 @@ $(".input_new_comments").each(function() {
   $(this).focus().val("").blur();   
 });
 
-setActivityPrivacyTooltips("<%= escape_javascript dom_id(@comment.post_activity) %>");
-
-unblock_all_forms();
+SocialStream.Timeline.newActivity("<%= escape_javascript dom_id(@comment.post_activity) %>");

data/base/app/views/notifications/activities/_post.html.erb

@@ -9,8 +9,5 @@
 </div>
 <div class="briefing">
   "<%= link_to(description_of(activity.direct_object), polymorphic_url(activity.direct_object))%>"
-  <% if SocialStream.activity_forms.include? :document and activity.direct_object.is_a? Document %>
-    
-  <% end%>
 </div>
  

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

@@ -10,7 +10,7 @@
         <td>
           <div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
             <input id=<%= dom_id p %> class="permission" type="checkbox"/>
-            <label for=<%= dom_id p %>><%= p.description(:brief) %></label>
+            <label for=<%= dom_id p %>><%= p.description(:brief, :subject => current_subject) %></label>
             <div class="clearfloat"></div>
           </div>
         </td>
@@ -28,7 +28,7 @@
     <%= raw t('privacy.intro', :relation => h(@relation.name)) %>
 
     <%= semantic_form_for @relation, :url => polymorphic_path(@relation, :section => 'rules'), :remote => true do |f| %>
-      <%= f.input :permissions, :as => :check_boxes, :collection => default_permissions.map{ |p| [p.description(:detailed, :relation => @relation.name, :subject => current_subject.name), p.id] } %>
+      <%= f.input :permissions, :as => :check_boxes, :collection => default_permissions.map{ |p| [p.description(:detailed, :relation => @relation.name, :subject => current_subject, :state => "positive"), p.id] } %>
       <%= f.submit t('button.save'), :class => 'button' %>
     <% end %>
   </div>

data/base/app/views/posts/create.js.erb

@@ -1,7 +1,4 @@
 //Display the new post
 $("#wall").prepend("<%= escape_javascript(render @post.post_activity) %>");
 
-setActivityPrivacyTooltips("<%= escape_javascript dom_id(@post.post_activity) %>");
-
-unblock_all_forms();
-
+SocialStream.Timeline.newActivity("<%= escape_javascript dom_id(@post.post_activity) %>");

data/base/config/locales/en.yml

@@ -380,29 +380,39 @@ en:
     other: "Everybody"
   permission:
     description:
-      brief:
-        create: 
-          activity: "Post to wall"
-        follow:
-          nil: "Follow their activity"
-        read:
-          activity: "Read wall"
-        represent:
-          nil: "Administrate"
-        notify:
-          nil: "Notify via email"
-      detailed:
-        create:
-          activity: "Post to \"%{relation}\" wall"
-        follow:
-          nil: "Activities of the contacts at %{relation} will appear in our home wall"
-        read:
-          activity: "Read posts in \"%{relation}\" wall"
-          tie: "See contacts in levels: %{relations} and %{public}"
-        represent:
-          nil: "Change session to act as %{subject}"
-        notify:
-          nil: "Updates of contacts at %{relation} will be sent to your email"
+      default:
+        brief:
+          create: 
+            activity: "Post to your wall"
+          follow:
+            nil: "Follow their activity"
+          read:
+            activity: "Read your wall"
+          represent:
+            nil: "Administrate"
+          notify:
+            nil: "Notify"
+        detailed:
+          create:
+            activity:
+              positive: "They WILL BE ABLE to post new activities to your wall"
+              negative: "They WILL NOT BE ABLE to post new activities to your wall"
+          follow:
+            nil:
+              positive: "Activities of the contacts at %{relation} WILL APPEAR in your home wall"
+              negative: "Activities of the contacts at %{relation} WILL APPEAR in your home wall"
+          read:
+            activity:
+              positive: "They WILL BE ABLE to read posts in your wall, except those shared with specific contacts"
+              negative: "They WILL NOT BE ABLE to read posts in your wall, except those 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}"
+          notify:
+            nil:
+              positive: "Activities WILL BE notified to contacts at %{name}"
+              negative: "Activities WILL NOT BE notified to contacts at %{name}"
     of_relation:
       choose: "2. Permissions in <strong>%{name}</strong> sphere"
   privacy:

data/base/config/locales/es.yml

@@ -379,33 +379,62 @@ es:
     other: "Todo el mundo"
   permission:
     description:
-      brief:
-        create: 
-          activity: "Publicar en el muro"
-        follow:
-          nil: "Seguir su actividad"
-        read:
-          activity: "Leer muro"
-        represent:
-          nil: "Administrar"
-        notify:
-          nil: "Notificar por email"
-      detailed:
-        create:
-          activity: "Publicar en el muro de\"%{relation}\""
-        follow:
-          nil: "Las actividades de los contactos en %{relation} aparecerán en tu página de inicio"
-        read:
-          activity: "Leer publicaciones en el muro de \"%{relation}\""
-          tie: "Ver contactos en los niveles: %{relations} y %{public}"
-        represent:
-          nil: "Cambiar sesión para actuar en nombre de %{subject}"
-        notify:
-          nil: "Las actividades de los contactos en %{relation} se te enviarán al email"
+      default:
+        brief:
+          create: 
+            activity: "Publicar en vuestro muro"
+          follow:
+            nil: "Seguir su actividad"
+          read:
+            activity: "Leer vuestro muro"
+          represent:
+            nil: "Administrar"
+          notify:
+            nil: "Notificar"
+        detailed:
+          create:
+            activity:
+              positive: "PODRÁN publicar actividades en vuestro muro"
+              negative: "NO PODRÁN publicar actividades en vuestro muro"
+          follow:
+            nil:
+              positive: "Las actividades de los contactos en %{relation} APARECERÁN en vuestra página de inicio"
+              negative: "Las actividades de los contactos en %{relation} NO APARECERÁN 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 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}"
+          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"
+        detailed:
+          create:
+            activity:
+              positive: "PODRÁN publicar actividades en tu muro"
+              negative: "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: "PODRÁN leer las publicaciones que aparezcan en tu muro, salvo las que compartas solo con ciertas personas"
+              negative: "NO PODRÁN leer las publicaciones que aparezcan en tu muro, salvo las que marques como públicas"
     of_relation:
       choose: "2. Permisos para <strong>%{name}</strong>"
   privacy:
-    intro: "Los contactos en <strong>%{relation}</strong> solo pueden:"
+    intro: "Los contactos en <strong>%{relation}</strong>:"
     rule:
       add: "Añadir"
       title: "Reglas de privacidad"

data/base/db/migrate/20120208135718_group_title_and_description_in_activity_object.rb

@@ -0,0 +1,52 @@
+class GroupTitleAndDescriptionInActivityObject < ActiveRecord::Migration
+  def up
+    ao_ts = ActivityObject.record_timestamps
+    ActivityObject.record_timestamps = false
+
+    change_table :activity_objects do |t|
+      t.string :title, :default => ""
+      t.text :description
+    end
+
+    # Fix 'comments' table
+    c_ts = Comment.record_timestamps
+    Comment.record_timestamps = false
+
+    Comment.all.each do |c|
+      # Remove comments that are not properly deleted
+      # https://github.com/ging/social_stream/issues/213
+      if c.activity_object.activities.blank?
+        c.destroy
+        next
+      end
+
+      c.activity_object.description = c.read_attribute(:text)
+      c.save!
+    end
+    change_table :comments do |t|
+      t.remove :text
+    end
+    Comment.reset_column_information
+    Comment.record_timestamps = c_ts
+
+    # Fix 'posts' table
+    p_ts = Post.record_timestamps
+    Post.record_timestamps = false
+
+    Post.all.each do |p|
+      p.activity_object.description = p.read_attribute(:text)
+      p.save!
+    end
+    change_table :posts do |t|
+      t.remove :text
+    end
+    Post.reset_column_information
+    Post.record_timestamps = p_ts
+
+    ActivityObject.record_timestamps = ao_ts
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration # Due to trans-gem oddities
+  end
+end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.15.2".freeze
+    VERSION = "0.16.0".freeze
   end
 end

data/base/spec/factories/activity.rb

@@ -12,11 +12,11 @@ end
 
 Factory.define :activity_object_spec_helper do |a|
   a.object_type "Post"
+  a.description "Post spec helper"
 end
 
 Factory.define :post_spec_helper do |p|
   p.association :activity_object_spec_helper
-  p.text "Post spec helper"
 end
 
 #

data/documents/db/migrate/20120208143721_documents_group_title_and_description_in_activity_object.rb

@@ -0,0 +1,28 @@
+class DocumentsGroupTitleAndDescriptionInActivityObject < ActiveRecord::Migration
+  def up
+    ao_ts = ActivityObject.record_timestamps
+    ActivityObject.record_timestamps = false
+
+    # Fix 'documents' table
+    d_ts = Document.record_timestamps
+    Document.record_timestamps = false
+
+    Document.all.each do |d|
+      d.activity_object.title = d.read_attribute(:title)
+      d.activity_object.description = d.read_attribute(:description)
+      d.save!
+    end
+    change_table :documents do |t|
+      t.remove :title
+      t.remove :description
+    end
+    Document.reset_column_information
+    Document.record_timestamps = d_ts
+
+    ActivityObject.record_timestamps = ao_ts
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration # Due to trans-gem oddities
+  end
+end

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.10.2".freeze
+    VERSION = "0.11.0".freeze
   end
 end