social_stream-base 0.6.3 → 0.6.5

data/app/assets/stylesheets/base.css

@@ -48,6 +48,7 @@ input.other_blue{	background:#497FC1;	border:0px;	cursor:pointer;  font-size:1.0
   margin-right:4px;	color:white;	padding:1px;}
 textarea.new_contact_text_area{ width:100%; height: 100px; color: #2A3890;}
 .colum_field_title{ text-align: center; }
+.needed{color:#D8000C;font-weight: normal;}
 .select_relations select{ font-size: 12px; color: white; background-color:#1F4A75;} 
 
 /************ Forms - Buttons  SECTION ***************************/

data/app/assets/stylesheets/contacts.css

@@ -18,7 +18,8 @@ div.sphere-name {
   color: #1F4A75;
 }
 
-#contact-new {
+#relation-new {
+  margin-left: 20px;
   font-weight: bold;
 }
 

data/app/assets/stylesheets/fcbkComplete.css

@@ -1,5 +1,5 @@
 /* TextboxList sample CSS */
-ul.holder { margin: 0; border: 1px solid #BDC7D8; overflow: hidden; height: auto !important; height: 1%; padding: 4px 5px 0; }
+ul.holder { margin: 0; border: 1px solid #BDC7D8; overflow: hidden; height: auto !important; height: 1%; padding: 5px; }
 *:first-child+html ul.holder { padding-bottom: 2px; } * html ul.holder { padding-bottom: 2px; } /* ie7 and below */
 ul.holder li { float: left; list-style-type: none; /*margin: 0 5px 4px 0;*/ white-space:nowrap;}
 ul.holder li.bit-box, ul.holder li.bit-input input { font: 11px "Lucida Grande", "Verdana"; }

data/app/assets/stylesheets/header.css

@@ -52,7 +52,7 @@ li.btn_menu_browse{background: transparent url("btn/btn_browse.png") no-repeat l
 
 #account, #representation_li,#current_user_info, #representations_menu, #account_menu, #settings_menu {display:inline-block;vertical-align: top; height:22px; color:#FFF;}
 #representation_li{margin-left:10px;}
-
+#representation_text{display:inline;margin-left:2px;color:#FFF;}
 li.btn_menu_representation{}
 #menu_home ul li.pipe,#menu_account ul li.pipe{padding:0px 3px 0px 3px; margin:0px;}
 .menu_white{display:inline-block; color:#fff;}
@@ -79,7 +79,7 @@ li.btn_menu_representation{}
 .sf-menu ul {
 	position:		absolute;
 	top:			-999em;
-	width:			10em; /* left offset of submenus need to match (see below) */
+	width:			17em; /* left offset of submenus need to match (see below) */
 }
 .sf-menu ul li {
 	width:			100%;

data/app/assets/stylesheets/messages.css

@@ -91,13 +91,13 @@
 }
 .conversations .conversation .content_left {
 	float:left;
-	width:20%;
-	padding: 7px 0px 0px 0px;
+	width:25%;
+	padding: 0px;
 }
 .conversations .conversation .content_right {
 	float:left;
 	width:55%;
-	padding: 7px 0px 0px 0px;
+	padding: 0px;
 }
 .conversations .conversation .sender_photo {
 	float:left;

data/app/controllers/contacts_controller.rb

@@ -13,7 +13,7 @@ class ContactsController < ApplicationController
     respond_to do |format|
       format.html { @contacts = Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
       format.js { @contacts = Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
-      format.json { render :text => @contacts.map{ |c| { 'key' => c.actor_id.to_s, 'value' => c.name } }.to_json }
+      format.json { render :text => @contacts.map{ |c| { 'key' => c.actor_id.to_s, 'value' => self.class.helpers.truncate_name(c.name) } }.to_json }
     end
   end
 
@@ -36,8 +36,13 @@ class ContactsController < ApplicationController
     end
   end
 
-  def suggestion
-    @contact = current_subject.suggestion
-    render :layout  => false
+  def destroy
+    @contact = current_subject.sent_contacts.find params[:id]
+    
+    @contact.relation_ids = [current_subject.relation_public.id]
+
+    respond_to do |format|
+      format.js
+    end
   end
 end

data/app/controllers/messages_controller.rb

@@ -1,86 +1,87 @@
 class MessagesController < ApplicationController
 
   before_filter :authenticate_user!
-	before_filter :get_mailbox, :get_box, :get_actor
-	
-	def index
-		redirect_to conversations_path(:box => @box)
-	end
-	# GET /messages/1
-	# GET /messages/1.xml
-	def show
-		if @message = Message.find_by_id(params[:id]) and @conversation = @message.conversation
-			if @conversation.is_participant?(@actor)
-				redirect_to conversation_path(@conversation, :box => @box, :anchor => "message_" + @message.id.to_s)
-			return
-			end
-		end
-	end
+  before_filter :get_mailbox, :get_box, :get_actor
+  def index
+    redirect_to conversations_path(:box => @box)
+  end
 
-	# GET /messages/new
-	# GET /messages/new.xml
-	def new
-		if params[:receiver].present?
-			@recipient = Actor.find_by_slug(params[:receiver])
-			return if @recipient.nil?
-			@recipient = nil if Actor.normalize(@recipient)==Actor.normalize(current_subject)
-		end
-	end
+  # GET /messages/1
+  # GET /messages/1.xml
+  def show
+    if @message = Message.find_by_id(params[:id]) and @conversation = @message.conversation
+      if @conversation.is_participant?(@actor)
+        redirect_to conversation_path(@conversation, :box => @box, :anchor => "message_" + @message.id.to_s)
+      return
+      end
+    end
+    redirect_to conversations_path(:box => @box)
+  end
 
-	# GET /messages/1/edit
-	def edit
+  # GET /messages/new
+  # GET /messages/new.xml
+  def new
+    if params[:receiver].present?
+      @recipient = Actor.find_by_slug(params[:receiver])
+      return if @recipient.nil?
+      @recipient = nil if Actor.normalize(@recipient)==Actor.normalize(current_subject)
+    end
+  end
 
-	end
+  # GET /messages/1/edit
+  def edit
 
-	# POST /messages
-	# POST /messages.xml
-	def create
-		@recipients = Array.new
-		if params[:_recipients].present?
-			params[:_recipients].each do |recp_id|
-				recp = Actor.find_by_id(recp_id)
-				next if recp.nil?
-				@recipients << recp
-			end
-		end
-		@receipt = @actor.send_message(@recipients, params[:body], params[:subject])
-		if (@receipt.errors.blank?)
-			@conversation = @receipt.conversation
+  end
+
+  # POST /messages
+  # POST /messages.xml
+  def create
+    @recipients = Array.new
+    if params[:_recipients].present?
+      params[:_recipients].each do |recp_id|
+        recp = Actor.find_by_id(recp_id)
+        next if recp.nil?
+        @recipients << recp
+      end
+    end
+    @receipt = @actor.send_message(@recipients, params[:body], params[:subject])
+    if (@receipt.errors.blank?)
+      @conversation = @receipt.conversation
       flash[:success]="Your message was sent"
-			redirect_to conversation_path(@conversation, :box => :sentbox)
-		else
-			render :action => :new
-		end
-	end
+      redirect_to conversation_path(@conversation, :box => :sentbox)
+    else
+      render :action => :new
+    end
+  end
 
-	# PUT /messages/1
-	# PUT /messages/1.xml
-	def update
+  # PUT /messages/1
+  # PUT /messages/1.xml
+  def update
 
-	end
+  end
 
-	# DELETE /messages/1
-	# DELETE /messages/1.xml
-	def destroy
+  # DELETE /messages/1
+  # DELETE /messages/1.xml
+  def destroy
 
-	end
+  end
 
-	private
+  private
 
-	def get_mailbox
-		@mailbox = current_subject.mailbox
-	end
+  def get_mailbox
+    @mailbox = current_subject.mailbox
+  end
 
-	def get_actor
-		@actor = Actor.normalize(current_subject)
-	end
+  def get_actor
+    @actor = Actor.normalize(current_subject)
+  end
 
-	def get_box
-		if params[:box].blank? or !["inbox","sentbox","trash"].include?params[:box]
-			@box = "inbox"
-		  return
-		end
-		@box = params[:box]
-	end
+  def get_box
+    if params[:box].blank? or !["inbox","sentbox","trash"].include?params[:box]
+      @box = "inbox"
+    return
+    end
+    @box = params[:box]
+  end
 
 end

data/app/controllers/relation/customs_controller.rb

@@ -2,15 +2,5 @@ class Relation::CustomsController < InheritedResources::Base
   before_filter :authenticate_user!
   load_and_authorize_resource :class => Relation::Custom
 
-  respond_to :js
-
-  belongs_to :sphere, :optional => true
-
-  def index
-    # Must authorize index, because Cancan does not filter collection with conditions.
-    # See https://github.com/ryanb/cancan/wiki/checking-abilities
-    authorize! :read, parent.customs.new
-
-    index!
-  end
+  respond_to :html, :js
 end

data/app/helpers/activities_helper.rb

@@ -31,7 +31,6 @@ module ActivitiesHelper
   def new_activity(receiver)
     return Activity.new unless user_signed_in?
 
-    Activity.new :contact_id => current_subject.contact_to!(receiver).id,
-    :relation_ids => current_subject.activity_relations(receiver, :from => :receiver).map(&:id)
+    Activity.new :contact_id => current_subject.contact_to!(receiver).id
   end
 end

data/app/helpers/notifications_helper.rb

@@ -1,8 +1,9 @@
 module NotificationsHelper
+  include SubjectsHelper, ActionView::Helpers::TextHelper
   def decode_notification notification_text, activity
     return if activity.nil?
-    notification_text = notification_text.gsub(/\%\{sender\}/, link_to(activity.sender.name, activity.sender.subject))
-    notification_text = notification_text.gsub(/\%\{sender.name\}/,activity.sender.name)
+    notification_text = notification_text.gsub(/\%\{sender\}/, link_to(truncate_name(activity.sender.name), activity.sender.subject))
+    notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
 
     if activity.direct_object.present?
       object = activity.direct_object

data/app/helpers/permissions_helper.rb

@@ -1,16 +1,16 @@
 module PermissionsHelper
   DEFAULT_PERMISSIONS =
     [
-      [ "read",    "activity", "same_and_lower_levels" ],
-      [ "create",  "activity", "same_level" ],
-      [ "follow", nil, nil],
-      [ "represent", nil, nil]
+      [ "read",    "activity" ],
+      [ "create",  "activity" ],
+      [ "follow", nil ],
+      [ "represent", nil ]
     ]
 
   def default_permissions
     @default_permissions ||=
       DEFAULT_PERMISSIONS.map{ |p|
-        Permission.find_or_create_by_action_and_object_and_function *p
+        Permission.find_or_create_by_action_and_object *p
       }
   end
 end

data/app/helpers/subjects_helper.rb

@@ -1,6 +1,15 @@
 module SubjectsHelper
+  
+  NAME_MAX_LENGHT = 30
+  
   # Return a link to this subject with the name
   def link_name(subject, options = {})
     link_to subject.name, subject, options
   end
+  
+  # Return the truncated name
+  def truncate_name(name, options={})
+    options = {:length => NAME_MAX_LENGHT, :separator => ' '}.merge options
+    truncate(name,options)
+  end
 end

data/app/helpers/toolbar_helper.rb

@@ -80,102 +80,23 @@ module ToolbarHelper
     @menu_options ||= {}
   end
 
-  def default_toolbar_menu
-    home_toolbar_menu
-  end
-
+  #Prints the home toolbar menu.
   def home_toolbar_menu
-    items = Array.new
-    #Notifications
-    items << {:key => :notifications,
-      :name => image_tag("btn/btn_notification.png")+t('notification.other')+' ('+ current_subject.mailbox.notifications.not_trashed.unread.count.to_s+')',
-      :url => notifications_path,
-      :options => {:link => {:id => "notifications_menu"}}}
-
-    #Messages
-    items << {:key => :messages,
-      :name => image_tag("btn/new.png")+t('message.other')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
-      :url => "#",
-      :options => {:link => {:id => "messages_menu"}},
-      :items => [
-        {:key => :message_new, :name => image_tag("btn/message_new.png")+ t('message.new'), :url => new_message_path},
-        {:key => :message_inbox, :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
-          :url => conversations_path, :options => {:link =>{:remote=> true}}},
-        {:key => :message_sentbox, :name => image_tag("btn/message_sentbox.png")+t('message.sentbox'), :url => conversations_path(:box => :sentbox), :remote=> true},
-        {:key => :message_trash, :name => image_tag("btn/message_trash.png")+t('message.trash'), :url => conversations_path(:box => :trash)}
-      ]}
-
-    #Documents if present
-    if SocialStream.activity_forms.include? :document
-      items << {:key => :resources,
-        :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t('resource.title'),
-        :url => "#",
-        :options => {:link => {:id => "resources_menu"}},
-        :items => [
-          {:key => :resources_documents,:name => image_tag("btn/btn_documents.png")+t('document.title'),:url => documents_path},
-          {:key => :resources_pictores,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => pictures_path},
-          {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => videos_path},
-          {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => audios_path}
-        ]}
-    end
-
-    #Contacts
-    relation_items = [{:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.other'), :url => new_invitation_path}]
-    current_subject.relation_customs.sort.each do |r|
-      relation_items << {:key => r.name + "_menu",
-        :name => image_tag("btn/btn_friend.png") + r.name,
-        :url => contacts_path(:relation => r.id)}
-    end
-    items << {:key => :contacts,
-      :name => image_tag("btn/btn_friend.png")+t('contact.other'),
-      :url => "#",
-      :options => {:link => {:id => "contacts_menu"}},
-      :items => relation_items}
-
-    #Subjects
-    items << {:key => :groups,
-      :name => image_tag("btn/btn_group.png")+t('group.other'),
-      :url => "#",
-      :options => {:link => {:id => "groups_menu"}},
-      :items => [{:key => :new_group ,:name => image_tag("btn/btn_group.png")+t('group.new.action'),:url => new_group_path('group' => { '_founder' => current_subject.slug })}]
-    }
-
-    return render_items items
+    default_home_toolbar_menu
   end
 
-  def profile_toolbar_menu(subject = current_subject)
-    items = Array.new
-
-    if subject!=current_subject
-      #Like button
-      items << {:key => :like_button,
-        :name => link_like_params(subject)[0],
-        :url => link_like_params(subject)[1],
-        :options => {:link => link_like_params(subject)[2]}}
-        
-      if user_signed_in?
-        #Relation button
-        items << {:key => :subject_relation,
-          :name => image_tag("btn/btn_friend.png") + contact_status(subject),
-          :url => edit_contact_path(current_subject.contact_to!(subject))
-        }
-        #Send message button
-        items << {:key => :send_message,
-          :name => image_tag("btn/btn_send.png")+t('message.send'),
-          :url => new_message_path(:receiver => subject.slug)
-        }
-      end
-    end
-    #Information button
-    items << {:key => :subject_info,
-      :name => image_tag("btn/btn_edit.png")+t('menu.information'),
-      :url => [subject, :profile]
-    }
-    return render_items items
+  #Prints the home profile menu.
+  def profile_toolbar_menu(subject=current_subject)
+    default_profile_toolbar_menu(subject)
   end
+ 
 
+  #Renders array of navigation items with simple_navigation
   def render_items(items)
     menu = render_navigation :items => items
     return raw menu
   end
+  
+  
+  include SocialStream::ToolbarConfig
 end

data/app/models/activity.rb

@@ -80,7 +80,7 @@ class Activity < ActiveRecord::Base
   }
 
   after_create  :increment_like_count
-  after_destroy :decrement_like_count
+  after_destroy :decrement_like_count, :delete_notifications
  
 
   #For now, it should be the last one
@@ -204,35 +204,50 @@ class Activity < ActiveRecord::Base
   def allow?(subject, action)
     return false if contact.blank?
 
-    # We do not support private activities by now
-    return false if relation_ids.blank?
-
     case action
     when 'create'
       return false if contact.sender_id != Actor.normalize_id(subject)
 
-      rels = Relation.normalize(relation_ids)
+      if relation_ids.present?
+        rels = Relation.normalize(relation_ids)
+
+        foreign_rels = rels.select{ |r| r.actor_id != contact.sender_id }
 
-      foreign_rels = rels.select{ |r| r.actor_id != contact.sender_id }
+        # Only posting to own relations
+        return true if foreign_rels.blank?
 
-      # Only posting to own relations
-      return true if foreign_rels.blank?
+        return Relation.
+                 allow(subject, action, 'activity', :in => foreign_rels).all.size == foreign_rels.size
+      else
+        if contact.reflexive?
+          return true
+        else
+          relation_ids = receiver.relation_customs.allow(sender, 'create', 'activity')
+
+          return relation_ids.present?
+        end
+      end
 
-      return Relation.
-               allow(subject, action, 'activity', :in => foreign_rels).all.size == foreign_rels.size
     when 'read'
       return true if [contact.sender_id, contact.receiver_id].include?(Actor.normalize_id(subject)) || relations.select{ |r| r.is_a?(Relation::Public) }.any?
     when 'update'
       return true if contact.sender_id == Actor.normalize_id(subject)
     when 'destroy'
-      return true if [contact.sender_id, contact.receiver_id].include?(Actor.normalize_id(subject))
+      # We only allow destroying to sender and receiver by now
+      return [contact.sender_id, contact.receiver_id].include?(Actor.normalize_id(subject))
     end
 
     Relation.
-      allow(subject, action, 'activity').
-      where('relations.id' => relation_ids).
-      any?
-   end
+      allow?(subject, action, 'activity', :in => self.relation_ids, :public => false)
+  end
+
+  # Can subject delete the object of this activity?
+  def delete_object_by?(subject)
+    subject.present? &&
+    direct_object.present? &&
+      ! direct_object.is_a?(Actor) &&
+      allow?(subject, 'destroy')
+  end
 
   private
 
@@ -258,4 +273,13 @@ class Activity < ActiveRecord::Base
 
     direct_activity_object.decrement!(:like_count)
   end
+  
+  # after_destroy callback
+  #
+  # Destroy any Notification linked with the activity
+  def delete_notifications
+    Notification.with_object(self).each do |notification|
+      notification.destroy
+    end
+  end
 end