social_stream-base 0.5.2 → 0.6.0

data/app/assets/stylesheets/contacts.css

@@ -0,0 +1,91 @@
+#contact-form {
+  margin: 25px 45px 25px 45px;
+}
+
+#contact-form ul {
+  margin-left: 20px;
+  list-style-type: none;
+}
+
+#contact-form li {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  width: 50%;
+}
+
+div.sphere-name {
+  font-weight: bold;
+  color: #1F4A75;
+}
+
+#contact-new {
+  font-weight: bold;
+}
+
+#contact-message {
+  margin-top: 20px;
+}
+
+#contact-message label {
+  margin: 0;
+}
+
+#contact-submit {
+  clear: both;
+  padding: 5px 5px 5px 20px;
+  padding-left: 20px;
+  text-align: center;
+}
+
+.ui-radio-state-disabled, .ui-radio-state-checked-disabled, .ui-radio-state-disabled-hover, .ui-radio-state-checked-disabled-hover {
+  color: #999;
+}
+
+span.ui-checkbox, span.ui-radio {
+  display: block;
+  float: left;
+  width: 16px;
+  height: 17px;
+  background: url(icon_checkbox.png) 0 -40px no-repeat;
+}
+
+span.ui-helper-hidden {
+  display: none;
+}
+
+label {
+  display: block;
+  font-family: sans-serif;
+  padding: 2px;
+  margin-left: 20px;
+}
+
+span.ui-radio-state-hover, span.ui-checkbox-state-hover {
+  background-position: 0 -114px;
+}
+
+span.ui-checkbox-state-checked {
+  background-position: 0 -1px;
+}
+
+span.ui-checkbox-state-checked-hover {
+  background-position: 0 -75px;
+}
+
+span.ui-radio-state-checked-disabled-hover,span.ui-radio-state-checked-disabled, span.ui-radio-state-checked {
+  background-position: 0 -161px;
+}
+
+span.ui-radio-state-checked-hover {
+  background-position: 0 -200px;
+}
+
+.ui-helper-hidden-accessible {
+  position: absolute;
+  left: -999em;
+}
+
+.checked-option{
+  background-color: #dfecf1;
+}
+

data/{lib/generators/social_stream/base/templates/public/stylesheets/default → app/assets/stylesheets}/fcbkComplete.css

@@ -1,5 +1,5 @@
 /* TextboxList sample CSS */
-ul.holder { margin: 0; border: 1px solid #999; 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: 4px 5px 0; }
 *: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"; }
@@ -9,7 +9,7 @@ ul.holder li.bit-input input { width: auto; overflow:visible; margin: 0; border:
 ul.holder li.bit-input input.smallinput { width: 20px; }
 
 /* Facebook demo CSS */      
-ul.holder { width: 500px; }
+ul.holder { width: 90%; }
 /*ul.holder { margin: 0 !important }*/
 ul.holder li.bit-box, #apple-list ul.holder li.bit-box { padding-right: 15px; position: relative; z-index:1000;}
 #apple-list ul.holder li.bit-input { margin: 0; }
@@ -22,7 +22,7 @@ ul.holder li.bit-box-focus a.closebutton, ul.holder li.bit-box-focus a.closebutt
 
 /* Autocompleter */
 
-.facebook-auto { display: none; position: absolute; /*width: 512px;*/ background: #eee; z-index:1001;}
+.facebook-auto { display: none; position: absolute; min-width: 120px !important; background: #eee; z-index:1001;}
 .facebook-auto .default { padding: 5px 7px; border: 1px solid #ccc; border-width: 0 1px 1px;font-family:"Lucida Grande","Verdana"; font-size:11px; }
 .facebook-auto ul { display: none; margin: 0; /*padding: 0;*/ overflow: auto; position:absolute; z-index:9999}
 .facebook-auto ul li { padding: 5px 12px; z-index: 1000; cursor: pointer; margin: 0; list-style-type: none; border: 1px solid #BDC7D8; border-width: 0 0px 1px; font: 11px "Lucida Grande", "Verdana"; background-color: #E1EEF5; width: 90% }

data/{lib/generators/social_stream/base/templates/public/stylesheets/default → app/assets/stylesheets}/frontpage.css

@@ -26,16 +26,16 @@ span.find{  padding-right:5px;}
 #frontpage_title{	font-size: 17px;	font-weight:bold;	color: #1F4A75;	vertical-align: top;	margin: 0px;
 	text-align: center;	padding: 0px;}
 .icon{  display:inline-block;  width:60px }
-#icon_share{  background: transparent url(/images/frontpage/share.png);  width:56px;  height:57px;}
-#icon_meet{  background: transparent url(/images/frontpage/meet.png);  width:56px;  height:57px;}
-#icon_collaborate{  background: transparent url(/images/frontpage/collaborate.png);  width:56px;  height:57px;}
+#icon_share{  background: transparent url(frontpage/share.png);  width:56px;  height:57px;}
+#icon_meet{  background: transparent url(frontpage/meet.png);  width:56px;  height:57px;}
+#icon_collaborate{  background: transparent url(frontpage/collaborate.png);  width:56px;  height:57px;}
 .icon_text{  text-align:center;  width:100%;  font-weight:bold;}
 #join_form{  float:right;  padding-right:50px;}
 .sentences{  width:80%;  display:inline-block;  vertical-align:top;  padding-top:10px;}
 .sentences ul,.sentences li{  list-style-type:none;  font-size:14px;  margin-left:10px;  padding-top:3px;}
-.sentences li.purple{  list-style-image:url("/images/frontpage/purple_sq.png");}
-.sentences li.green{  list-style-image:url("/images/frontpage/green_sq.png");}
-.sentences li.yellow{  list-style-image:url("/images/frontpage/yellow_sq.png");}
+.sentences li.purple{  list-style-image:url("frontpage/purple_sq.png");}
+.sentences li.green{  list-style-image:url("frontpage/green_sq.png");}
+.sentences li.yellow{  list-style-image:url("frontpage/yellow_sq.png");}
 #text_bottom_title{	font-size: 14px;	color: #000;	font-weight: bold;}
 
 
@@ -44,11 +44,11 @@ span.find{  padding-right:5px;}
 #caracteristics span {	float:left;	padding-right: 13px;	vertical-align: top;	padding-top: 5px;}
 #caracteristics ul{	list-style: none;	margin: 0px;	float:left;}
 #caracteristics ul li{	font-size:13px;	line-height:18px;	padding:7px 0 8px 30px;}
-li.participants{background: transparent url("/images/frontpage/right_webcam.gif") no-repeat left center;}
-li.organizers{background: transparent url("/images/frontpage/right_organizers.gif") no-repeat left center;}
-li.spaces{background: transparent url("/images/frontpage/right_people.gif") no-repeat left center;}
-li.comments{background: transparent url("/images/frontpage/right_comments.gif") no-repeat left center;}
-li.tags{background: transparent url("/images/frontpage/right_tags.gif") no-repeat left center;}
-li.networks{background: transparent url("/images/frontpage/right_social.gif") no-repeat left center;}
+li.participants{background: transparent url("frontpage/right_webcam.gif") no-repeat left center;}
+li.organizers{background: transparent url("frontpage/right_organizers.gif") no-repeat left center;}
+li.spaces{background: transparent url("frontpage/right_people.gif") no-repeat left center;}
+li.comments{background: transparent url("frontpage/right_comments.gif") no-repeat left center;}
+li.tags{background: transparent url("frontpage/right_tags.gif") no-repeat left center;}
+li.networks{background: transparent url("frontpage/right_social.gif") no-repeat left center;}
 
 

data/{lib/generators/social_stream/base/templates/public/stylesheets/default → app/assets/stylesheets}/header.css

@@ -32,10 +32,12 @@
 #menu_home ul{	list-style: none;	margin: 0px;	float:left;}
 #menu_home ul li{	line-height:20px;	padding:5px 0px 5px 20px; vertical-align:top;}
 
-li.btn_menu_home{background: transparent url("/images/btn/btn_home.png") no-repeat left center;}
-li.btn_menu_profile{background: transparent url("/images/btn/btn_profile.png") no-repeat left center;}
-li.btn_menu_browse{background: transparent url("/images/btn/btn_browse.png") no-repeat left center;}
-#btn_menu_config{background: transparent url("/images/btn/btn_config.png") no-repeat left center;}
+li.btn_menu_home{background: transparent url("btn/btn_home.png") no-repeat left center;}
+li.btn_menu_profile{background: transparent url("btn/btn_profile.png") no-repeat left center;}
+li.btn_menu_browse{background: transparent url("btn/btn_browse.png") no-repeat left center;}
+#btn_menu_settings{background: transparent url("btn/btn_config.png") no-repeat left center;}
+#btn_menu_account{background: transparent url("btn/btn_account.png") no-repeat left center;}
+#btn_menu_account_logout{background: transparent url("btn/btn_exit.png") no-repeat left center;}
 
 #menu_account{	vertical-align: top; height:23px; }
 #menu_account span {	float:right;	padding-right: 5px;	vertical-align: top;	padding-top: 5px;}
@@ -48,10 +50,9 @@ li.btn_menu_browse{background: transparent url("/images/btn/btn_browse.png") no-
 #menu_pipe ul li{	line-height:20px;	padding:5px 0px 5px 0px; vertical-align:top;}
 
 
-#account, #representation_li,#current_user_info, #representations_menu {display:inline-block;vertical-align: top; height:22px; color:#FFF;}
+#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;}
 
-li.btn_menu_exit{background: transparent url("/images/btn/btn_exit.png") no-repeat left center;}
 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;}
@@ -166,7 +167,7 @@ ul.sf-menu li li li.sfHover ul {
 	height:			12px;
 	text-indent: 	-999em;
 	overflow:		hidden;
-	background:		url('/images/btn/arrows-ffffff.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+	background:		url('btn/arrows-ffffff.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
 }
 a > .sf-sub-indicator {  /* give all except IE6 the correct values */
 	top:			.6em;
@@ -195,7 +196,7 @@ li.sfHover > a > .sf-sub-indicator {
 
 /*** shadows for all but IE6 ***/
 .sf-shadow ul {
-	background:	url('/images/btn/shadow.png') no-repeat bottom right;
+	background:	url('btn/shadow.png') no-repeat bottom right;
 	padding: 0 6px 9px 0;
   /*
 	-moz-border-rius-bottomleft: 17px;

data/{lib/generators/social_stream/base/templates/public/stylesheets/default → app/assets/stylesheets}/messages.css

@@ -45,6 +45,10 @@
 .message .date {
 	color: #6C6D6F;
 }
+.message ul {
+    margin: 0px 5px
+    ;padding-left:40px;
+}
 .conversation_full .messages .unread .header{
 	background-color: #E0E0FF;
 }
@@ -83,16 +87,16 @@
 	padding: 5px 5px 5px 5px;
 	width:549px;
 	height:40px;
-	border-bottom:1px solid #E0EEF5;
+	border-bottom:1px solid #FFF;
 }
 .conversations .conversation .content_left {
 	float:left;
-	width:25%;
+	width:20%;
 	padding: 7px 0px 0px 0px;
 }
 .conversations .conversation .content_right {
 	float:left;
-	width:60%;
+	width:55%;
 	padding: 7px 0px 0px 0px;
 }
 .conversations .conversation .sender_photo {

data/app/assets/stylesheets/settings.css

@@ -0,0 +1,9 @@
+/******************** Common ***********************/
+.settings_block {
+    display:block;
+    padding-left:10px;
+}
+#api_token {
+    font-weight: bold;
+    font-style: italic;
+}

data/{lib/generators/social_stream/base/templates/public/stylesheets/default → app/assets/stylesheets}/spheres.css

@@ -7,7 +7,7 @@ span.ui-checkbox, span.ui-radio {
 	float: left;
 	width: 16px;
 	height: 17px;
-	background: url(/images/icon_checkbox.png) 0 -40px no-repeat;
+	background: url(icon_checkbox.png) 0 -40px no-repeat;
 	cursor: pointer;
 }
 

data/app/controllers/activities_controller.rb

@@ -9,11 +9,11 @@ class ActivitiesController < InheritedResources::Base
   def collection
     rel = params[:section].to_i if params[:section].present?
 
-    # should be activities.paginate(:page => params[:page], :count => { :select => 'activity.id', :distinct => true }) but it is not working in Rails 3.0.3 
+    # should be activities.page(params[:page], :count => { :select => 'activity.id', :distinct => true }) but it is not working in Rails 3.0.3 
     @activities ||= association_chain[-1].
                       wall(:profile,
                            :for => current_subject,
                            :relation => rel).
-                      paginate(:page => params[:page])
+                      page(params[:page])
   end
 end

data/app/controllers/api_controller.rb

@@ -4,6 +4,10 @@ class ApiController < ApplicationController
   
   def create_key
     current_user.reset_authentication_token!
+    if params[:api_settings].present?
+      redirect_to settings_path(:api_settings => true)
+      return
+    end
     redirect_to :controller => :users, :action => :show, :id => current_user.to_param, :auth_token => params[:auth_token]
   end
   
@@ -24,7 +28,7 @@ class ApiController < ApplicationController
     # FIXME: why? check with Victor
     @subject ||= current_user
 
-    @activities = @subject.wall(:home).paginate(:page => params[:page], :per_page => 10)
+    @activities = @subject.wall(:home).page(params[:page]).per(10)
      
     respond_to do |format|
       format.atom

data/app/controllers/contacts_controller.rb

@@ -4,30 +4,30 @@ class ContactsController < ApplicationController
   def index
     @contacts =
       current_subject.
-        contacts(:direction => :sent){ |q|
+        contact_subjects(:direction => :sent, :relations => params[:relation]){ |q|
           q.alphabetic.
             letter(params[:letter]).
-            search(params[:search]).
-            merge(Tie.related_by(current_subject.relation_customs.find_by_id(params[:relation])))
+            search(params[:search])
         }
 
     respond_to do |format|
-      format.html { @contacts = @contacts.paginate(:page => params[:page], :per_page => 10) }
-      format.js { @contacts = @contacts.paginate(:page => params[:page], :per_page => 10) }
-      format.json { render :text => @contacts.map{ |c| { 'key' => c.name, 'value' => c.slug } }.to_json }
+      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 }
     end
   end
 
-  def new
-    @contact = Contact.new(current_actor, params[:id].to_i)
-  end
-
   def edit
-    @contact = Contact.new(current_actor, params[:id].to_i)
+    @contact = current_subject.sent_contacts.find params[:id]
   end
 
   def update
-    @contact = Contact.new(current_actor, params[:id].to_i)
+    @contact = current_subject.sent_contacts.find params[:id]
+
+    # This should be in the model
+    if params[:contact][:relation_ids].present?
+      params[:contact][:relation_ids].delete("gotcha")
+    end
 
     if @contact.update_attributes(params[:contact])
       redirect_to @contact.receiver_subject
@@ -37,7 +37,7 @@ class ContactsController < ApplicationController
   end
 
   def suggestion
-    @tie = current_subject.suggestion
+    @contact = current_subject.suggestion
     render :layout  => false
   end
 end

data/app/controllers/conversations_controller.rb

@@ -5,11 +5,11 @@ class ConversationsController < ApplicationController
   before_filter :check_current_subject_in_conversation, :only => [:show, :update, :destroy]
   def index
     if @box.eql?"inbox"
-      @conversations = @mailbox.inbox.paginate(:per_page => 9, :page => params[:page])
+      @conversations = Kaminari.paginate_array(@mailbox.inbox).page(params[:page]).per(9)
     elsif @box.eql?"sentbox"
-      @conversations = @mailbox.sentbox.paginate(:per_page => 9, :page => params[:page])
+      @conversations = Kaminari.paginate_array(@mailbox.sentbox).page(params[:page]).per(9)
     else
-      @conversations = @mailbox.trash.paginate(:per_page => 9, :page => params[:page])
+      @conversations = Kaminari.paginate_array(@mailbox.trash).page(params[:page]).per(9)
     end
   end
 

data/app/controllers/groups_controller.rb

@@ -9,7 +9,7 @@ class GroupsController < InheritedResources::Base
                     letter(params[:letter]).
                     search(params[:search]).
                     tagged_with(params[:tag]).
-                    paginate(:per_page => 10, :page => params[:page])
+                    page(params[:page]).per(10)
 
     index! do |format|
       format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }

data/app/controllers/invitations_controller.rb

@@ -0,0 +1,20 @@
+class InvitationsController < ApplicationController
+  
+  def new 
+    
+  end
+  
+  def create
+    
+    if params[:mails].present?
+      receivers = params[:mails].split(",")
+      receivers.each do |receiver|
+        InvitationMailer.send_invitation(receiver, current_subject, params[:message]).deliver
+      end
+      redirect_to new_invitation_path, :flash => { :success => t('invitation.success')}
+    else
+      redirect_to new_invitation_path, :flash => { :error => t('invitation.error')}
+    end
+    
+  end
+end

data/app/controllers/messages_controller.rb

@@ -35,7 +35,6 @@ class MessagesController < ApplicationController
 	# POST /messages
 	# POST /messages.xml
 	def create
-		@actor = current_subject
 		@recipients = Array.new
 		if params[:_recipients].present?
 			params[:_recipients].each do |recp_id|

data/app/controllers/notifications_controller.rb

@@ -5,12 +5,10 @@ class NotificationsController < ApplicationController
   before_filter :check_current_subject_is_owner, :only => [:show, :update, :destroy]
   
   def index
-      @notifications = @mailbox.notifications.paginate(:per_page => 10, :page => params[:page])
+    @notifications = @mailbox.notifications.not_trashed.page(params[:page]).per(10)
   end
 
   def show
-    render :action => :show
-    @actor.read @notification
     
   end
 
@@ -44,7 +42,7 @@ class NotificationsController < ApplicationController
   end
 
   def destroy
-    @notification.destroy
+    @notification.receipt_for(@actor).move_to_trash
     redirect_to notifications_path
   end
 

data/app/controllers/settings_controller.rb

@@ -0,0 +1,43 @@
+class SettingsController < ApplicationController
+  
+  before_filter :authenticate_user!
+  
+  def index
+  end
+
+  def update_all
+    success = false
+
+    #If no section selected, skips and gives error
+    if params[:settings_section].present?
+      section = params[:settings_section].to_s
+
+      #Updating notifications settings
+      if section.eql? "notifications"
+        #Notify by email setting
+        if params[:notify_by_email].present?
+          notify_by_email = params[:notify_by_email].to_s
+          current_subject.notify_by_email = false if notify_by_email.eql? "never"
+          current_subject.notify_by_email = true if notify_by_email.eql? "always"
+        end
+      end
+
+      #Here sections to add
+      #if section.eql? "section_name"
+      #   blah blah blah
+      #end
+
+      #Was everything ok?
+      success = current_subject.save
+    end
+
+    #Flashing and redirecting
+    if success
+      flash[:success] = t('settings.success')
+    else
+      flash[:error] = t('settings.error')
+    end
+    redirect_to :action => :index
+  end
+
+end

data/app/controllers/users_controller.rb

@@ -8,7 +8,7 @@ class UsersController < InheritedResources::Base
                   letter(params[:letter]).
                   search(params[:search]).
                   tagged_with(params[:tag]).
-                  paginate(:per_page => 10, :page => params[:page])
+                  page(params[:page]).per(10)
 
     index! do |format|
       format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }

data/app/helpers/activities_helper.rb

@@ -18,4 +18,12 @@ module ActivitiesHelper
       end
     end
   end
+
+  # Build a new activity based on the current_subject. Useful for authorization queries
+  def new_activity(receiver)
+    return Activity.new unless user_signed_in?
+
+    Activity.new :contact_id => current_subject.contact_to!(receiver).id,
+                 :relation_ids => receiver.activity_relations(current_subject, :from => :receiver).map(&:id)
+  end
 end

data/app/helpers/contacts_helper.rb

@@ -7,20 +7,16 @@ module ContactsHelper
   # to create new ties to actor
   def contact_to(a)
     if user_signed_in?
-      if current_subject.ties_to(a).present?
+      if current_subject.ties_to?(a)
         current_subject.ties_to(a).map(&:relation_name).join(", ")
       else
-        new_contact_link(Contact.new(current_subject, a))
+        link_to t("contact.new.link"),
+                edit_contact_path(current_subject.contact_to!(a)),
+                                  :title => t("contact.new.title",
+                                  :name => a.name)
       end
     else
       link_to t("contact.new.link"), new_user_session_path
     end
   end
-
-  def new_contact_link(contact)
-    link_to t("contact.new.link"),
-            new_contact_path(:id => contact.to_param),
-            :title => t("contact.new.title",
-                        :name => contact.receiver.name)
-  end
 end