social_stream-base 0.6.3 → 0.6.5

data/app/views/relation/customs/_list.html.erb

@@ -1,36 +1,19 @@
-<table class="tableCheckBoxOptions">  
-
-  <tr><td colspan="2"><div class="slider-header"><%= current_subject.name %></div></td></tr>
-
-  <tr><td rowspan="<%= list.size + 1 %>">
-      <div class="slider-div">
-        <p>
-        <div id="slider-range"></div>
-        </p>
-      </div>
-    </td>
-  </tr>
-
-  <% order = 0 %>
-  <% list.sort.each do |r| %>
-    <tr><td>
-      <div contain=<%= dom_id r %> class="checkboxOptionLeft">
-        <input id=<%= dom_id r %> type="checkbox"/>
-        <label for="<%= dom_id r %>" order="<%= order %>"><%= r.name %></label>
+<table class="tableCheckBoxOptions">
+  <% list.each do |r| %>
+    <%= raw cycle("<tr><td>", "<td>", :name => "begin_cell") %>
+      <div contain="<%= dom_id(r) %>" class="checkboxOptionLeft">
+        <input id=<%= dom_id(r) %> type="checkbox"/>
+        <label for=<%= dom_id(r) %>><%=r.name%></label>
       </div>
-    </td></tr>
-    <% order += 1 %>
+    <%= raw cycle("</td>", "</td></tr>", :name => "end_cell") %>
   <% end %>
 
-  <tr><td colspan="2"><div class="slider-footer"><%= t 'relation_public.name' %></div></td><tr>
+  <%= raw("</tr>") if list.size.odd? %>
+
 </table>
 
 <%= javascript_tag do %>
   $(function() {
-    relations = <%= list.sort.reverse.map{ |r| h(r.name) }.to_json.html_safe %>; 
-
     $('input[id^="relation_custom"]').checkBox();
-
-    initSlider();
   })
 <% end %>

data/app/views/relation/customs/create.js.erb

@@ -1,7 +1,7 @@
 <% if @custom.errors.present? %>
   $('#new_relation_custom_input_block').html("<%= escape_javascript render(:partial => 'relation/customs/form') %>");
 <% else %>
-  // Hide #permissions
+  // Hide #relations and #permissions
   $('#permissions').html("");
   $('#permissions').hide();
 
@@ -10,9 +10,8 @@
   $('#new_relation_custom_input_block').hide();
   $('#new_relation_custom_title_block').show();
 
-
   // Refresh list
-  $('#relation_custom_list').html("<%= escape_javascript render(:partial => 'relation/customs/list', :object => @custom.sphere.customs.reload) %>");
+  $('#relation_customs_list').html("<%= escape_javascript render(:partial => 'relation/customs/list', :object => current_subject.relation_customs) %>");
 
   // Select relation_custom
   $('#' + '<%= dom_id @custom %>').checkBox('changeCheckStatus', true);

data/app/views/relation/customs/index.html.erb

@@ -0,0 +1,67 @@
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "relation_customs.css", :media => "screen, projection" %>
+  <%= javascript_include_tag 'ui.checkbox'%>
+<% end %> 
+
+<% toolbar :profile => current_subject, :option => 'contacts' %>
+
+<%= javascript_tag do %>
+  <%= render :partial => 'relation/customs/jquery' %>
+<% end %>
+
+<div id="wrapper_section">   
+
+  <p class="pageTitle"><%= t 'relation_custom.title' %></p>
+
+  <div id="relation_customs" class="privacy_block_section first_block_section">
+    <p class="sectionTitle"><%= t 'relation_custom.choose' %></p>
+
+    <div class="privacy_add_element">
+      <div id="new_relation_custom_title_block"> 
+        <a href="#"><span id="new_relation_custom_title" class="privacy_span_new"><%= t('relation_custom.new') %></span></a>
+      </div> 
+      <div id="new_relation_custom_input_block"> 
+        <%= render :partial => 'relation/customs/form' %>
+      </div>
+    </div>
+
+    <%= javascript_tag do %>
+      $(function() {
+        $("#new_relation_custom_input_block").hide();
+
+        $("#new_relation_custom_title").click(function() {
+          $("#new_relation_custom_title_block").hide();
+          $("#new_relation_custom_input_block").show();
+        });
+
+        $("#loading").hide();
+
+        $("#loading").ajaxStart(function(){
+           $(this).show();
+        });
+
+        $("#loading").ajaxStop(function(){
+           $(this).hide();
+        });
+
+      })
+    <% end %>
+
+    <div id="relation_customs_list">
+      <%= render :partial => 'relation/customs/list', :object => @customs %>
+    </div>
+
+</div>
+
+
+  <div id="permissions" class="privacy_block_section">
+  </div>
+
+  <div id="loading"></div>
+
+  <%= javascript_tag do %>
+    $(function() {
+      $("#permissions").hide();
+    })
+  <% end %>
+</div> 

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

@@ -13,7 +13,7 @@
     </div>
     <div class="sub-block">
       <div class="name black" >
-        <%=link_to(user.name, user)%>
+        <%=link_to(truncate_name(user.name), user)%>
       </div>
       <div class="link">
         <%= contact_to(user) %>

data/app/views/users/show.html.erb

@@ -17,7 +17,7 @@
 <% end %>
 
 <%= location(link_to(image_tag("btn/btn_profile.png", :class => "btn_config")+t('profile.one')+": "+
-                      content_tag(:span, ( sanitize @user.name), :class=>"name_group")))%>
+                      content_tag(:span, ( truncate_name sanitize @user.name), :class=>"name_group")))%>
               
 <% toolbar :profile => @user %>
 

data/config/locales/en.yml

@@ -150,8 +150,6 @@ en:
   help: "Help"
   helpers:
     submit:
-      sphere:
-        create: "Save"
       relation_custom:
         create: "Save"
   home: "Home"
@@ -162,6 +160,7 @@ en:
     error: "Your request was unprocessable"
     invited: " has invited you to SocialStream!"
     join: "Invite other people to join SocialStream!"
+    join_me: "Join me at SocialStream!"
     one: "Invitation"
     other: "Invitations"
     success: "Your invitations have successfully been sent"
@@ -236,7 +235,7 @@ en:
   public:
     other: "Everybody"
   representation:
-    action: "representing"
+    action: "as"
     change: "Change"
   service:
     one: "Service"
@@ -245,46 +244,25 @@ en:
     description:
       brief:
         create: 
-          activity:
-            same_level: "Post to wall"
-        destroy:
-          activity:
-            nil: "Delete activities in wall"
+          activity: "Post to wall"
         follow:
-          nil:
-            nil: "Follow their activity"
+          nil: "Follow their activity"
         read:
-          activity:
-            same_and_lower_levels: "Read wall"
+          activity: "Read wall"
         represent:
-          nil:
-            nil: "Represent"
+          nil: "Represent"
       detailed:
         create:
-          activity:
-            same_level: "Post to \"%{sphere}\" wall at %{relation} level"
-            same_and_lower_levels: "Post to \"%{sphere}\" wall as %{relations} and %{public}"
-        destroy:
-          activity:
-            nil: "Delete the activities posted to \"%{sphere}\" wall by this %{relation}"
+          activity: "Post to \"%{relation}\" wall"
         follow:
-          nil:
-            nil: "Activities of the contacts at %{relation} level will appear in our home wall"
+          nil: "Activities of the contacts at %{relation} will appear in our home wall"
         read:
-          activity:
-            same_and_lower_levels: "Read posts in \"%{sphere}\" wall at levels %{relations} and %{public}"
-          tie:
-            same_and_lower_levels:
-              "See contacts in levels: %{relations} and %{public}"
+          activity: "Read posts in \"%{relation}\" wall"
+          tie: "See contacts in levels: %{relations} and %{public}"
         represent:
-          nil:
-            nil: "Represent me/us in the website"
-        update:
-          activity:
-            nil: "Update the wall activities posted by %{relation}"
-            weak_star_ties: "Update the wall activities posted in levels %{relations} and %{public}"
+          nil: "Represent me/us in the website"
     of_relation:
-      choose: "3. Permissions in <strong>%{name}</strong> level"
+      choose: "2. Permissions in <strong>%{name}</strong> level"
   privacy:
     intro: "Contacts at <strong>%{relation}</strong> level are only allowed to:"
     rule:
@@ -295,11 +273,12 @@ en:
     one: "Product"
     other: "Products"
   relation_custom:
-    in_sphere:
-      choose: "2. Levels in <strong>%{name}</strong> sphere"
-    new: "+ New level"
+    title: "Privacy & context"
+    choose: "1. Choose stream"
+    new: "+ New stream"
   relation_public:
     name: "Public"
+  required: "* These fields are required"
   settings:
     error: "Some errors raised when saving your changes"
     for: "Settings for"
@@ -325,10 +304,6 @@ en:
   sign_out: "Sign out"
   sign_up: "Sign up"
   socialstream: "SocialStream"
-  sphere:
-    title: "Privacy & context"
-    choose: "1. Choose sphere"
-    new: '+ New sphere'
   sure: "Are you sure?"
   time:
     ago: "%{time} ago"

data/config/routes.rb

@@ -27,13 +27,8 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :contacts do
-    collection do
-      get 'suggestion'
-    end
-  end
+  resources :contacts
 
-  resources :spheres
   namespace "relation" do
     resources :customs
   end

data/db/migrate/20110705103202_empty_ties_count.rb

@@ -2,10 +2,14 @@ class EmptyTiesCount < ActiveRecord::Migration
   def up
     change_column :contacts, :ties_count, :integer, :default => 0
 
+    ts_status = Contact.record_timestamps
     Contact.record_timestamps = false
+
     Contact.all.each do |c|
       c.update_attribute(:ties_count, 0) if c.ties_count.nil?
     end
+
+    Contact.record_timestamps = ts_status
   end
 
   def down

data/db/migrate/20110712090343_remove_spheres.rb

@@ -0,0 +1,30 @@
+class RemoveSpheres < ActiveRecord::Migration
+  def up
+    remove_foreign_key "relations", :name => "relations_on_sphere_id"
+
+    remove_foreign_key "spheres", :name => "spheres_on_actor_id"
+
+    remove_column :relations, :sphere_id
+
+    drop_table :spheres
+  end
+
+  def down
+    add_column :relations, :sphere_id, :integer
+
+    add_index "relations", "sphere_id"
+
+    create_table "spheres", :force => true do |t|
+      t.string   "name"
+      t.integer  "actor_id"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    add_index "spheres", "actor_id"
+
+    add_foreign_key "relations", "spheres", :name => "relations_on_sphere_id"
+
+    add_foreign_key "spheres", "actors", :name => "spheres_on_actor_id"
+  end
+end

data/db/migrate/20110712142140_remove_permission_function.rb

@@ -0,0 +1,26 @@
+class RemovePermissionFunction < ActiveRecord::Migration
+  def up
+    remove_column :permissions, :function
+
+    ts = RelationPermission.record_timestamps
+    RelationPermission.record_timestamps = false
+
+    Permission.all.each do |p|
+      q = Permission.find_by_action_and_object p.action, p.object
+
+      next if p == q
+
+      p.relation_permissions.each do |rp|
+        rp.update_attribute :permission_id, q.id
+      end
+
+      p.reload.destroy
+    end
+
+    RelationPermission.record_timestamps = ts
+  end
+
+  def down
+    add_column :permissions, :function, :string
+  end
+end

data/lib/generators/social_stream/base/install_generator.rb

@@ -44,6 +44,10 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
     copy_file 'navigation.rb', 'config/navigation.rb'
   end
 
+  def create_mailboxer_custom_config
+    copy_file 'mailboxer_custom.rb', 'config/initializers/mailboxer.rb'
+  end
+
   def create_migration_file
     require 'rake'
     Rails.application.load_tasks

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

@@ -0,0 +1,13 @@
+Mailboxer.setup do |config|
+  
+  #Configures if you applications uses or no the email sending for Notifications and Messages
+  config.uses_emails = true
+  
+  #Configures the default from for the email sent for Messages and Notifications of Mailboxer
+  config.default_from = "no-reply@mailboxer.com"
+  
+  #Configures the methods needed by mailboxer
+  config.email_method = :mailboxer_email
+  #config.name_method = :name
+  #config.should_email_method = :should_email?
+end

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

@@ -0,0 +1,4 @@
+# Configures your navigation
+SimpleNavigation::Configuration.run do |navigation|
+
+end

data/lib/generators/social_stream/base/templates/relations.yml

@@ -11,35 +11,29 @@ user:
   friend:
     name: friend
     permissions:
-      - [ follow ]                            # follow the activities of the friend
-      - [ create,  activity, same_level ]     # let the friend create activities
-      - [ read,    activity, same_and_lower_levels ] # friend can read activities from the other friends and below
-    sphere: personal
+      - [ follow ]
+      - [ create,  activity ]
+      - [ read,    activity ]
   acquaintance:
     name: acquaintance
-    parent: friend # friend relation is stronger than acquaintance
     permissions:
-      - [ read,    activity, same_and_lower_levels ]
-    sphere: personal
-  partner:
-    name: partner
+      - [ read,    activity ]
+  colleague:
+    name: colleague
     permissions:
-      - [ read, activity, same_and_lower_levels ]
-    sphere: work
+      - [ follow ]
+      - [ create,  activity ]
+      - [ read, activity ]
 
 group:
   member:
     name: member
     permissions:
-      - [ represent ]                         # let the member act as the group
-      - [ create,  activity, same_and_lower_levels ] # let them member create activities
-      - [ read,    activity, same_and_lower_levels ] # read activities from other members
-      - [ read,    tie,      same_and_lower_levels ]
-    sphere: organization
+      - [ represent ]
+      - [ create,  activity ]
+      - [ read,    activity ]
+      - [ read,    tie ]
   partner:
     name: partner
-    parent: member # member is stronger than partner
     permissions:
-      - [ read,    activity, same_and_lower_levels ]
-    sphere: external_relations
-
+      - [ read,    activity ]

data/lib/social_stream/ability.rb

@@ -93,8 +93,7 @@ module SocialStream
       end
 
       # Privacy
-      can [:create, :read, :update, :destroy], Sphere, :actor_id => subject.try(:actor_id)
-      can [:create, :read, :update, :destroy], Relation::Custom, :sphere => { :actor_id => subject.try(:actor_id) }
+      can [:create, :read, :update, :destroy], Relation::Custom, :actor_id => subject.try(:actor_id)
     end
   end
 end