social_stream 0.22.1 → 0.23.1

data/base/app/assets/stylesheets/cheesecake.css.scss

@@ -46,7 +46,7 @@
   padding: 0px;
   margin: 0px;
   overflow: hidden;
-  height: 450px;
+  height: 425px;
 }
 #contacts_filter {
   width: 290px;
@@ -219,7 +219,7 @@
   width: 24px;
   height: 24px;
   float: left;
-  padding: 2px 2px 0px 2px;
+  padding: 2px 2px 2px 2px;
   background-color: $fill-color;
 }
 #contacts_grid_selected .actor img {
@@ -274,6 +274,7 @@
 }
 #sector_form {
   width: 300px;
+  height: 425px;
   float: right;
 }
 #sector_form .title {
@@ -314,7 +315,8 @@
   color: $main-color;
   background: $auxiliar-color;
   width: 260px;
-  height: 20px;
+  height: 14px;
+  line-height: 12px;
   text-align: center;
   font-size: 15px;
   font-weight: bold;
@@ -328,6 +330,7 @@
   text-align: center;
   font-size: 11px;
   padding: 5px 0px 5px 0px;
+  cursor: pointer;
 }
 #sector_form .subsector .title .edited_subsector_name {
   font-size: 11px;

data/base/app/models/activity_object.rb

@@ -20,6 +20,19 @@ class ActivityObject < ActiveRecord::Base
   has_many :activity_object_activities, :dependent => :destroy
   has_many :activities, :through => :activity_object_activities
 
+  has_many :activity_object_properties,
+           :dependent => :destroy
+  has_many :object_properties,
+           :through => :activity_object_properties,
+           :source => :property
+  has_many :activity_object_holders,
+           :class_name  => "ActivityObjectProperty",
+           :foreign_key => :property_id,
+           :dependent   => :destroy
+  has_many :object_holders,
+           :through => :activity_object_holders,
+           :source  => :activity_object
+
   validates_presence_of :object_type
 
   scope :authored_by, lambda { |subject|
@@ -42,4 +55,9 @@ class ActivityObject < ActiveRecord::Base
   def acts_as_actor?
     object_type == "Actor"
   end
+
+  def object_holder_hash
+
+  end
+
 end

data/base/app/models/activity_object_property.rb

@@ -0,0 +1,5 @@
+class ActivityObjectProperty < ActiveRecord::Base
+  belongs_to :activity_object
+  belongs_to :property,
+             :class_name => "ActivityObject"
+end

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

@@ -51,7 +51,7 @@
 
 <%= javascript_tag do %>
   $(function(){  
-    SocialStream.Wall.setup();  
+    SocialStream.Wall.init();  
   });
 <% end %>
 

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

@@ -5,7 +5,7 @@
 
 <%= javascript_tag do %>
   $(function(){  
-    SocialStream.Timeline.setup();  
+    SocialStream.Timeline.init();  
   });
 <% end %>
 

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

@@ -1,4 +1,5 @@
 $(function(){
+  //Cheesecake settings
   var cheesecakeData = {
     container: {
       id: "contacts_cheesecake",
@@ -33,10 +34,14 @@ $(function(){
     rMax : 200,
     center: {x : 220, y : 220}
   };
+  //Adding Cheesecake settings the sectors and users information from social_stream
   cheesecakeData.sectors = <%= raw(current_subject.cheesecake_json) %>.sectors;
+  //Cheesecake is created
   var cheese = new socialCheesecake.Cheesecake(cheesecakeData);
+  //We dont use synchronized callbacks for focus
   cheese.syncSectorFocusCallbacks = false;
-  cheese.onSectorFocusBegin = function(cheesecake,callback){
+  //Callback when a sector focusing begins
+  socialCheesecake.eventCallbackHandlers.onSectorFocusBegin = function(cheesecake,callback){
     if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){
       $("#sector_editor").data("prepare")(cheese);
       $("#sector_editor").data("show")();
@@ -44,7 +49,8 @@ $(function(){
       $("#contacts_grid_available").fadeOut("fast", callback);      
     }
   };
-  cheese.onSectorFocusEnd = function(cheesecake){
+  //Callback when a sector focusing ends
+  socialCheesecake.eventCallbackHandlers.onSectorFocusEnd = function(cheesecake){
     if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){
       
     }else{
@@ -53,7 +59,8 @@ $(function(){
       $("#edit_sector_button").fadeIn("fast");
     }
   };
-  cheese.onSectorUnfocusBegin = function(cheesecake,callback){
+  //Callback when a sector unfocusing begins
+  socialCheesecake.eventCallbackHandlers.onSectorUnfocusBegin = function(cheesecake,callback){
     if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){
       
     }else{
@@ -62,7 +69,8 @@ $(function(){
       $("#edit_sector_button").fadeOut("fast");
     }
   };
-  cheese.onSectorUnfocusEnd = function(cheesecake){
+  //Callback when a sector unfocusing ends
+  socialCheesecake.eventCallbackHandlers.onSectorUnfocusEnd = function(cheesecake){
     if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){
       
     }else{
@@ -73,14 +81,40 @@ $(function(){
       $("#sector_editor").data("hide")();
     }
   };
-  cheese.onSubsectorAdded = function(subsector){
-    $("#sector_editor").data("prepare")(subsector.getCheesecake(),subsector);
+  //Callback when adding a new subsector begins
+  socialCheesecake.eventCallbackHandlers.onSubsectorAddedBegin = function(subsector){
+    var cheesecake = subsector.getCheesecake();
+    $("#edit_sector_button").off("click.edit");
+    $("#edit_sector_button").fadeOut("fast",function(){
+      $("#edit_sector_button").html("<%= escape_javascript image_tag "btn/cheese_close_edit.png" %>");
+      $("#edit_sector_button").fadeIn("fast");
+    });
+    $("#sector_editor").data("prepare")(cheesecake, subsector, true);
+    $("#sector_editor").data("show")(function(){
+      $("#edit_sector_button").on("click.close_edit", cheesecake, $("#edit_sector_button").data("close_edit_sector_click"));
+    });
+    $(".subsector .content").each(function(){
+        if($(this).is(':visible')){
+          $(this).stop().slideToggle(500);
+        }
+    });
+    $("#sector_editor").data("prepare")(cheesecake,subsector,false);
+    $(".add_subsector").each(function(){
+      $(this).off("click");
+    });
+  };
+  //Callback when adding a new subsector ends
+  socialCheesecake.eventCallbackHandlers.onSubsectorAddedEnd = function(subsector){
+    $("#sector_editor").data("prepare")(subsector.getCheesecake(),subsector,false);
   };
   $("#contacts_filter_input").keyup(function(){
     cheese.filter($("#contacts_filter_input").val());
     //TODO: Make users unfiltered visible again
   });
-  cheese.onChange = function(cheesecake){
+  //Callback when any change is made (added peopel, removed, edited or added secto, etc)
+  //This updates the changes hiddend field (sent when saving changes) and the detailed
+  //changes display
+  socialCheesecake.eventCallbackHandlers.onChange = function(cheesecake){
     var initial = cheesecake.getInitialState();
     var changes = cheesecake.getChanges();
     if((changes.actors)&&(changes.actors.length==0)&&(changes.sectors)&&(changes.sectors.length==0)&&(changes.subsectors)&&(changes.subsectors.length==0)){
@@ -162,7 +196,8 @@ $(function(){
       }
     }
     $("#contacts_changes_details").html(changes_html);
-  }
+  }  
+  //Tipsy for displaying detailed changes
   $('#contacts_changes_button').tipsy({
     delayIn: 0,
     delayOut: 0,
@@ -178,8 +213,7 @@ $(function(){
   });
   $("#contacts_save_changes").val(JSON.stringify(cheese.getChanges()));
   $("#contacts_save_form").off("submit.disable");
-  $("#contacts_save_form").on("submit.disable",function(){
-    
+  $("#contacts_save_form").on("submit.disable",function(){    
     if($(".contacts_changes_tipsy_menu").length != 0){
       $("#contacts_changes_button").tipsy("hide");
     }

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

@@ -24,16 +24,6 @@
       <% end %>
     </div>
   </div>
-  <div id="contacts_changes_button" style="display:none;">
-    <%= t('cheesecake.changes.details') %> (<span id="contacts_changes_button_total">0</span>)
-  </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>
-  <br class="clearfloat"> 
   <div id="contacts_changes">
     <div id="contacts_changes_title">
      <%= t('cheesecake.changes.details') %>
@@ -43,16 +33,23 @@
     </div>
   </div>
 </div>
+<div id="contacts_changes_button" style="display:none;">
+    <%= t('cheesecake.changes.details') %> (<span id="contacts_changes_button_total">0</span>)
+  </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>
+  <br class="clearfloat">
 <%= javascript_tag do %>
+  //Tweak to remove right bar
   $("#center_body").css("width","782px");
   $("#center_body").css("max-width","782px");
   $("#content").css("width","782px");
   $("#contacts_filter_input").Watermark("<%= escape_javascript(I18n.t('search.name')) %>");
-  $("#contacts_grid_extra").click(function(){
-    $("#contacts_grid").css("overflow-y","scroll");
-    $("#contacts_grid").scrollTo("+=308px", 800, {axis:'y'});
-    $("#contacts_grid_extra").css("opacity",0);
-  });
+  //When clicking an unselected actor
   var unselected_actor_click = function(){
     var clone = $(this).clone();
     clone.attr("id",$(this).attr("id") + "_selected");
@@ -72,6 +69,7 @@
       $(this).fadeIn("fast");
     });
   };
+  //When clicking an selected actor
   var selected_actor_click = function(){
     var clone = $("#" + $(this).attr("id") + "_selected");
     $(this).fadeOut("fast",function(){
@@ -89,6 +87,7 @@
       clone.remove();
     });
   };
+  //Unselecting all actors
   $("#contacts_selector_clear").on("click",function(){
     $("#contacts_grid_selected .actor").each(function(){
       var evt = document.createEvent("MouseEvents");
@@ -98,6 +97,7 @@
     });
   });
   $(".actor").on("click.unselected_actor",unselected_actor_click);
+  //Detailed changes display
   $("#contacts_changes_button").click(function(){
     if($(".contacts_changes_tipsy_menu").length != 0){
       $("#contacts_changes_button").tipsy("hide");
@@ -112,120 +112,7 @@
       });
     }
   });
-  $("#sector_editor").data("show", function(callback){
-    $("#contacts_explorer").stop().animate({width: 0},500);
-    $("#sector_editor").stop().animate({width: 300},500, function(){
-      if(callback) callback();
-    });
-  });
-  $("#sector_editor").data("hide", function(callback){
-    $("#sector_editor").stop().animate({width: 0},500);
-    $("#contacts_explorer").stop().animate({width: 300},500, function(){
-      if(callback) callback();
-    });
-  });
-  $("#sector_editor").data("prepare", function(cheese, newSubsector){
-    var sector = cheese.getFocusedSector();
-    var newIndex = -1;
-    if(newSubsector){
-      newIndex = newSubsector.getIndex();
-    }
-    if(sector){
-      var subsector_count = sector.subsectors.length;
-      var maxReached = (subsector_count==4);
-      $("#form_sector_name").val(sector.label);
-      $("#edited_sector_name").html(sector.label);
-      $("#form_sector_name").off("keyup");
-      $("#form_sector_name").on("keyup",function(){
-        $("#edited_sector_name").html($("#form_sector_name").val());
-        sector.changeLabel($("#form_sector_name").val());
-      });
-      if(maxReached){
-        $(".add_subsector").each(function(){
-          if($(this).is(':visible')){
-            $(this).slideToggle();
-          }
-        })
-      }
-      for(var i = 3; i >= 0; i--){
-        (function(){
-          var subsector = sector.subsectors[i];
-          var index = i;
-          var recentlyCreated = (newIndex != -1)&&(newIndex == index);
-          if(subsector){
-            if(!$("#subsector_" + i).is(':visible')){
-              $("#subsector_" + i).slideToggle();
-            }
-            if(recentlyCreated || ((newIndex == -1)&&(i == 0))){
-              if(!$("#subsector_" + i).find(".content").is(':visible')){
-                $("#subsector_" + i).find(".content").slideToggle();
-              }
-            }else{
-              if($("#subsector_" + i).find(".content").is(':visible')){
-                $("#subsector_" + i).find(".content").slideToggle();
-              }
-            }
-            if(!maxReached){
-              if(sector.subsectors[i+1]==undefined){
-                $("#add_subsector_" + (i+1)).off("click");
-                if(!$("#add_subsector_" + (i+1)).is(':visible')){
-                  $("#add_subsector_" + (i+1)).slideToggle();
-                }
-                $("#add_subsector_" + (i+1)).on("click",function(){
-                  cheese.addNewSubsector(index+1);
-                  $(".subsector .content").each(function(){
-                    if($(this).is(':visible')){
-                      $(this).slideToggle();
-                    }
-                  });
-                });
-              }
-              $("#add_subsector_" + i).off("click");
-              if(!$("#add_subsector_" + i).is(':visible')){
-                $("#add_subsector_" + i).slideToggle();
-              }
-              $("#add_subsector_" + i).on("click",function(){
-                 cheese.addNewSubsector(index);
-                 $(".subsector .content").each(function(){
-                    if($(this).is(':visible')){
-                      $(this).slideToggle();
-                    }
-                  });
-              });
-            }
-            $("#form_subsector_name_" + i).val(subsector.label);
-            $("#edited_subsector_name_" + i).html(subsector.label);
-            $("#form_subsector_name_" + i).off("keyup");
-            $("#form_subsector_name_" + i).on("keyup", [i,subsector],function(event){
-              $("#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);
-            });
-          }else{
-            $("#subsector_" + i).hide();
-            $("#add_subsector_" + i).off("click");
-            $("#add_subsector_" + i).hide();
-          }
-        })();
-      }
-    }
-  });
+  //Opening editing sector form
   $("#edit_sector_button").data("edit_sector_click", function(event){
     var cheese = event.data;
     $("#edit_sector_button").off("click.edit");
@@ -233,11 +120,12 @@
       $("#edit_sector_button").html("<%= escape_javascript image_tag "btn/cheese_close_edit.png" %>");
       $("#edit_sector_button").fadeIn("fast");
     });
-    $("#sector_editor").data("prepare")(cheese);
+    $("#sector_editor").data("prepare")(cheese, null, false);
     $("#sector_editor").data("show")(function(){
       $("#edit_sector_button").on("click.close_edit", cheese, $("#edit_sector_button").data("close_edit_sector_click"));
     });
   });
+  //Closing editing sector form
   $("#edit_sector_button").data("close_edit_sector_click", function(event){
     var cheese = event.data;
     $("#edit_sector_button").off("click.close_edit");

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

@@ -68,7 +68,7 @@
 			</div>
 		</div>
 		<div class="form_row less_padding">
-      <div class="add_subsector" id="add_subsector_<%= i %>">
+      <div class="add_subsector" id="add_subsector_<%= i %>" style="display:none;">
         +
       </div>
     </div>
@@ -78,6 +78,7 @@
 
 <%= javascript_tag do %>
   $(function(){
+    //Toggling between subsectors forms
     $(".subsector .title").off("click.toggle");
     $(".subsector .title").on("click.toggle",function(){
       if(!$(this).parent().find(".content").is(':visible')){
@@ -89,22 +90,180 @@
         $(this).parent().find(".content").slideToggle();
       }
     })
-  });
-  $(".permissions_field").each(function(){
-    $(this).tipsy({
-      delayIn: 500,
-      delayOut: 200,
-      gravity: 'e',
-      offset: 100,
-      opacity: 1,
-      className: 'permissions_explanation_tipsy_menu',
-      html: true,
-      hoverable: true,
-      title: function(){
-        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);
+    //Tipsy for permission fields 
+    $(".permissions_field").each(function(){
+      $(this).tipsy({
+        delayIn: 500,
+        delayOut: 200,
+        gravity: 'e',
+        offset: 100,
+        opacity: 1,
+        className: 'permissions_explanation_tipsy_menu',
+        html: true,
+        hoverable: true,
+        title: function(){
+          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);
+        }
+      });
+    });
+    //Showing form
+    $("#sector_editor").data("show", function(callback){
+      $("#contacts_explorer").stop().animate({width: 0},500);
+      $("#sector_editor").stop().animate({width: 300},500, function(){
+        if(callback) callback();
+      });
+    });
+    //Hidding form
+    $("#sector_editor").data("hide", function(callback){
+      $("#sector_editor").stop().animate({width: 0},500);
+      $("#contacts_explorer").stop().animate({width: 300},500, function(){
+        if(callback) callback();
+      });
+    });
+    //Preparing form
+    $("#sector_editor").data("prepare", function(cheese, newSubsector, noAdding){
+      var sector = cheese.getFocusedSector();
+      var newIndex = -1;
+      var defaultPermissions = "true,true,true,false,false";
+      if(newSubsector != undefined){
+        //newSubsector is used when we prepare the form just after creating a subsector
+        newIndex = newSubsector.getIndex();
+      }
+      if(noAdding == undefined){
+        //noAdding tweat when creating a subsector
+        noAdding = false;
       }
+      if(sector){
+        var subsector_count = sector.subsectors.length;
+        var maxReached = (subsector_count==4);
+        $("#form_sector_name").val(sector.label);
+        $("#edited_sector_name").html(sector.label);
+        $("#form_sector_name").off("keyup");
+        $("#form_sector_name").on("keyup",function(){
+          $("#edited_sector_name").html($("#form_sector_name").val());
+          sector.changeLabel($("#form_sector_name").val());
+        });
+        if(maxReached){
+          $(".add_subsector").each(function(){
+            /*if($(this).is(':visible')){
+              $(this).slideToggle();
+            }*/
+            $(this).hide(); 
+          })
+        }
+        for(var i = 3; i >= 0; i--){
+          (function(){
+            var subsector = sector.subsectors[i];
+            var index = i;
+            var recentlyCreated = (newIndex != -1)&&(newIndex == index);
+            if(subsector){
+              if(noAdding && (newIndex != -1)){
+                //Tweat to move permissions fields when a subsector is created below
+                if(i > newIndex){
+                  $("#subsector_" + i).find(".permissions_field").data("fromString")($("#subsector_" + (i-1)).find(".permissions_field").data("toString")());
+                }else if(i == newIndex){
+                  $("#subsector_" + i).find(".permissions_field").data("fromString")(defaultPermissions);
+                }
+              }
+              //Sliding content with different times as Cheesecake animation durations change
+              if(!noAdding && (recentlyCreated || ((newIndex == -1)&&(i == 0)))){
+                if(!$("#subsector_" + i).find(".content").is(':visible')){
+                  var time = 1000;
+                  if(subsector_count==2){
+                    time = 2200;
+                  }else if(subsector_count==3){
+                    time = 1000;
+                  }else if(subsector_count==4){
+                    time = 650;
+                  }
+                  $("#subsector_" + i).find(".content").stop().slideToggle(time);
+                }
+              }else{
+                $("#subsector_" + i).find(".content").hide();
+              }
+              $("#subsector_" + i).stop().show();
+              //Adding buttons are only shonw if the maximum was not reached
+              if(!maxReached){
+                if(sector.subsectors[i+1]==undefined){
+                  $("#add_subsector_" + (i+1)).off("click");
+                  if(!$("#add_subsector_" + (i+1)).is(':visible')){
+                    $("#add_subsector_" + (i+1)).stop().slideToggle();
+                  }
+                  if(!noAdding){
+                    $("#add_subsector_" + (i+1)).on("click",function(){
+                     $("#add_subsector_" + (index+1)).off("click");
+                     cheese.addNewSubsector(index+1);
+                    });
+                  }
+                }
+                $("#add_subsector_" + i).off("click");
+                if(!$("#add_subsector_" + i).is(':visible')){
+                  $("#add_subsector_" + i).stop().slideToggle();
+                }
+                if(!noAdding){
+                  $("#add_subsector_" + i).on("click",function(){
+                     $("#add_subsector_" + index).off("click");
+                     cheese.addNewSubsector(index);
+                  });
+                }
+              }
+              $("#form_subsector_name_" + i).val(subsector.label);
+              $("#edited_subsector_name_" + i).html(subsector.label);
+              $("#form_subsector_name_" + i).off("keyup");
+              $("#form_subsector_name_" + i).on("keyup", [i,subsector],function(event){
+                $("#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).find(".positive_message").hide();
+                    $("." + label_class).find(".negative_message").show();
+                  }
+                }
+                update_state();
+                permission_field.on("change",update_state);
+              });
+            }else{
+              $("#subsector_" + i).hide();
+              //$("#add_subsector_" + i).off("click");
+              //$("#add_subsector_" + i).hide();
+            }
+          })();
+        }
+      }
+    });
+    // toString and fromString methods for permissions fields
+    // to move permissions fileds from one sector to another
+    $(".permissions_field").each(function(){
+      var permissionsField = $(this)
+      permissionsField.data("toString", function(){
+        var permissions = []
+        permissionsField.find("input").each(function(){
+          permissions.push($(this).is(":checked"));
+        });
+        return permissions.toString();
+      });
     });
-  });  
+    $(".permissions_field").each(function(){
+      var permissionsField = $(this)
+      permissionsField.data("fromString", function(values){      
+        var permissions = values.split(",");
+        for(var i in permissions){
+          permissions[i] = (permissions[i] === "true");
+          permissionsField.find("input").eq(i).attr('checked', permissions[i]);
+        }
+        console.log(permissions);
+      });
+    });
+  });
+  
 <% end %>