social_stream-base 0.7.4 → 0.7.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. data/app/assets/javascripts/posts.js +1 -0
  2. data/app/assets/stylesheets/activities.css +2 -1
  3. data/app/assets/stylesheets/base.css +1 -1
  4. data/app/assets/stylesheets/header.css +2 -0
  5. data/app/controllers/comments_controller.rb +6 -0
  6. data/app/controllers/contacts_controller.rb +1 -1
  7. data/app/helpers/notifications_helper.rb +10 -1
  8. data/app/mailers/notification_mailer.rb +31 -0
  9. data/app/models/activity.rb +4 -1
  10. data/app/models/actor.rb +3 -1
  11. data/app/models/user.rb +7 -4
  12. data/app/views/activities/_index.html.erb +3 -4
  13. data/app/views/activities/_wall.html.erb +5 -0
  14. data/app/views/contacts/_contact.html.erb +1 -1
  15. data/app/views/groups/show.js.erb +2 -0
  16. data/app/views/home/index.js.erb +2 -0
  17. data/app/views/message_mailer/new_message_email.html.erb +4 -3
  18. data/app/views/message_mailer/new_message_email.text.erb +2 -1
  19. data/app/views/message_mailer/reply_message_email.html.erb +4 -3
  20. data/app/views/message_mailer/reply_message_email.text.erb +2 -1
  21. data/app/views/notification_mailer/new_notification_email.html.erb +30 -9
  22. data/app/views/notifications/activities/_follow_subject.html.erb +1 -1
  23. data/app/views/notifications/activities/_like_subject.html.erb +2 -2
  24. data/app/views/notifications/activities/_make-friend_subject.html.erb +1 -1
  25. data/app/views/notifications/activities/_post_subject.html.erb +1 -1
  26. data/app/views/notifications/activities/_update_body.html.erb +1 -1
  27. data/app/views/notifications/activities/_update_subject.html.erb +1 -1
  28. data/app/views/posts/show.html.erb +8 -0
  29. data/app/views/subjects/_show.js.erb +2 -0
  30. data/app/views/users/show.js.erb +2 -0
  31. data/config/locales/en.yml +2 -2
  32. data/lib/mailboxer/notification_decoder.rb +5 -0
  33. data/lib/social_stream-base.rb +4 -0
  34. data/lib/social_stream/base/version.rb +1 -1
  35. data/lib/social_stream/toolbar_config.rb +3 -3
  36. data/social_stream-base.gemspec +1 -1
  37. data/vendor/assets/stylesheets/smoothness/jquery-ui-1.7.3.custom.css +1 -1
  38. data/vendor/assets/stylesheets/smoothness/jquery-ui-1.8.4.custom.css +1 -1
  39. metadata +14 -6
@@ -0,0 +1 @@
1
+ //= require jquery.scrollTo.min
@@ -22,7 +22,8 @@
22
22
  display: inline-block; color: #000; width: 100%; font-size: 13px; color: #2A3890;}
23
23
  .actor_logo { width: 38px; padding: 8px 0px 5px 5px; display: inline-block; vertical-align: top;}
24
24
  .activity_content { padding: 8px 0px 0px 0px; display: inline-block; color: #000; width: 90%;}
25
- .actor_name { font-weight: bold; color: #2A3890; font-size: 13px;}
25
+ .actor_name {font-size: 13px;}
26
+ .actor_name a{font-weight: bold;}
26
27
  .post a { color: #2A3890;}
27
28
 
28
29
  /***************** ACTIVITY OPTIONS ***/
@@ -8,7 +8,7 @@ img { border: 0px;}
8
8
  div { margin: 0px; padding: 0px; font-family: Helvetica; font-size: 11px;}
9
9
  .AbsWrap { width: 100%; position: relative;}
10
10
  .rowWrap { width: 100%;}
11
- a:link,a:visited { color: inherit; text-decoration: inherit;}
11
+ a:link,a:visited { color: #2A3890; text-decoration: inherit;}
12
12
  a:hover { text-decoration: underline;}
13
13
  .clearfloat { clear: both; height: 0px;}
14
14
  h2{padding-left:10px;}
@@ -28,6 +28,7 @@
28
28
 
29
29
  /******** MENU HEADER *******/
30
30
  #menu_home{ vertical-align: top; }
31
+ #menu_home a {color:white;}
31
32
  #menu_home span { float:left; padding-right: 5px; vertical-align: top; padding-top: 5px;}
32
33
  #menu_home ul{ list-style: none; margin: 0px; float:left;}
33
34
  #menu_home ul li{ line-height:20px; padding:5px 0px 5px 20px; vertical-align:top;}
@@ -53,6 +54,7 @@ li.btn_menu_browse{background: transparent url("btn/btn_browse.png") no-repeat l
53
54
  #account, #representation_li,#current_user_info, #representations_menu, #account_menu, #settings_menu {display:inline-block;vertical-align: top; height:22px; color:#FFF;}
54
55
  #representation_li{margin-left:10px;}
55
56
  #representation_text{display:inline;margin-left:2px;color:#FFF;}
57
+ #current_user_info a{color:white;}
56
58
  li.btn_menu_representation{}
57
59
  #menu_home ul li.pipe,#menu_account ul li.pipe{padding:0px 3px 0px 3px; margin:0px;}
58
60
  .menu_white{display:inline-block; color:#fff;}
@@ -8,5 +8,11 @@ class CommentsController < InheritedResources::Base
8
8
 
9
9
  destroy!
10
10
  end
11
+
12
+ def show
13
+ parent = resource.post_activity.parent
14
+ redirect_to polymorphic_path(parent.direct_object,:anchor => dom_id(parent))
15
+ end
16
+
11
17
 
12
18
  end
@@ -54,7 +54,7 @@ class ContactsController < ApplicationController
54
54
 
55
55
  respond_to do |format|
56
56
  format.html { @contacts = Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
57
- format.js { Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
57
+ format.js { @contacts = Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
58
58
  format.json { render :text => @contacts.map{ |c| { 'key' => c.receiver_id.to_s, 'value' => self.class.helpers.truncate_name(c.receiver.name) } }.to_json }
59
59
  end
60
60
  end
@@ -12,6 +12,14 @@ module NotificationsHelper
12
12
  :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))
13
13
  notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
14
14
 
15
+ if activity.receiver.subject.is_a?(User)
16
+ notification_text = notification_text.gsub(/\%\{whose\}/,"your")
17
+ notification_text = notification_text.gsub(/\%\{who\}/,"you")
18
+ else
19
+ notification_text = notification_text.gsub(/\%\{whose\}/,truncate_name(activity.receiver.name)+"'s")
20
+ notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
21
+ end
22
+
15
23
  if activity.direct_object.present?
16
24
  object = activity.direct_object
17
25
  object = object.subject if object.is_a? Actor
@@ -21,7 +29,8 @@ module NotificationsHelper
21
29
  notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.downcase)
22
30
  notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.text.truncate(100, :separator =>' '),
23
31
  url_for(:controller=> object.class.to_s.downcase.pluralize, :action=> :show,
24
- :id=> object.id, :only_path => false))) if object.respond_to? :text
32
+ :id=> object.id, :only_path => false))) if object.respond_to? :text
33
+
25
34
  #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
26
35
 
27
36
  else
@@ -0,0 +1,31 @@
1
+ #OVERRING WARNING
2
+ #We must override the NotificationMailer from Mailboxer to change the new_notification_email method
3
+ #refer to it for more info
4
+ #NOTE: There is just few lines different from original Mailboxer NotificationMailer. Please maintain it
5
+ #updated for correct behaviour
6
+ class NotificationMailer < ActionMailer::Base
7
+ default :from => Mailboxer.default_from
8
+ #Sends and email for indicating a new notification to a receiver.
9
+ #It calls new_notification_email.
10
+ def send_email(notification,receiver)
11
+ new_notification_email(notification,receiver)
12
+ end
13
+
14
+ include ActionView::Helpers::SanitizeHelper
15
+ include Mailboxer::NotificationDecoder
16
+
17
+ #Sends an email for indicating a new message for the receiver
18
+ def new_notification_email(notification,receiver)
19
+ @notification = notification
20
+ @receiver = receiver
21
+ #DIFFERENT FROM ORIGINAL----------------------
22
+ subject = notification.subject.to_s
23
+ #subject = notifications.subject_decoded
24
+ #END OF DIFFERENCE----------------------------
25
+ subject = strip_tags(subject) unless subject.html_safe?
26
+ mail(:to => receiver.send(Mailboxer.email_method), :subject => t('mailboxer.notification_mailer.subject', :subject => subject)) do |format|
27
+ format.text {render __method__}
28
+ format.html {render __method__}
29
+ end
30
+ end
31
+ end
@@ -16,9 +16,12 @@ class Activity < ActiveRecord::Base
16
16
 
17
17
  paginates_per 10
18
18
 
19
- belongs_to :contact
20
19
  belongs_to :activity_verb
21
20
 
21
+ belongs_to :contact
22
+ has_one :sender, :through => :contact
23
+ has_one :receiver, :through => :contact
24
+
22
25
  has_many :audiences, :dependent => :destroy
23
26
  has_many :relations, :through => :audiences
24
27
 
data/app/models/actor.rb CHANGED
@@ -28,6 +28,8 @@ class Actor < ActiveRecord::Base
28
28
  has_many :avatars,
29
29
  :validate => true,
30
30
  :autosave => true
31
+ has_one :avatar,
32
+ :conditions => { :active => true }
31
33
 
32
34
  has_many :sent_contacts,
33
35
  :class_name => 'Contact',
@@ -373,7 +375,7 @@ class Actor < ActiveRecord::Base
373
375
  end
374
376
 
375
377
  def avatar!
376
- avatars.active.first || avatars.build
378
+ avatar || avatars.build
377
379
  end
378
380
 
379
381
  # The 'like' qualifications emmited to this actor
data/app/models/user.rb CHANGED
@@ -12,7 +12,8 @@ class User < ActiveRecord::Base
12
12
  validates_presence_of :email
13
13
 
14
14
  validates_format_of :email, :with => Devise.email_regexp, :allow_blank => true
15
- # TODO: uniqueness of email, which is in actor
15
+
16
+ validate :email_must_be_uniq
16
17
 
17
18
  with_options :if => :password_required? do |v|
18
19
  v.validates_presence_of :password
@@ -45,9 +46,11 @@ class User < ActiveRecord::Base
45
46
  !persisted? || !password.nil? || !password_confirmation.nil?
46
47
  end
47
48
 
48
- def find_first(options)
49
- raise options.inspect
50
- end
49
+ private
50
+
51
+ def email_must_be_uniq
52
+ errors.add(:email, "is already taken") if User.find_by_email(email).present?
53
+ end
51
54
 
52
55
  class << self
53
56
  %w( email slug name ).each do |a|
@@ -8,8 +8,7 @@
8
8
  <%= render :partial => 'activities/new', :locals => { :receiver => owner } %>
9
9
  </div>
10
10
 
11
- <div id="wall">
12
- <%= render activities %>
13
- <%= paginate activities %>
14
- </div>
11
+ <%= render :partial => 'activities/wall',
12
+ :locals => { :activities => activities } %>
13
+
15
14
  </div>
@@ -0,0 +1,5 @@
1
+ <div id="wall">
2
+ <%= render activities %>
3
+ <%= paginate activities %>
4
+ </div>
5
+
@@ -5,7 +5,7 @@
5
5
  </div>
6
6
  <div class="sub-block">
7
7
  <div class="name">
8
- <%= link_to(contact.receiver_subject.name, contact.receiver_subject, :class => "contact_link") %>
8
+ <%= link_to(truncate_name(contact.receiver_subject.name), contact.receiver_subject, :class => "contact_link") %>
9
9
  </div>
10
10
  <div class="brief">
11
11
  <%= contact_brief(contact.receiver_subject) %>
@@ -0,0 +1,2 @@
1
+ <%= render :partial => 'subjects/show',
2
+ :locals => { :subject => @group } %>
@@ -0,0 +1,2 @@
1
+ $('#wall').replaceWith("<%= escape_javascript render(:partial => 'activities/wall', :locals => { :activities => current_subject.wall(:home).page(params[:page]) }) %>");
2
+ $.scrollTo('#wall', 1500,{axis:'y'});
@@ -1,3 +1,4 @@
1
+ <% self.class.send :include, SubjectsHelper %>
1
2
  <!DOCTYPE html>
2
3
  <html>
3
4
  <head>
@@ -6,8 +7,8 @@
6
7
  <body>
7
8
  <div>
8
9
  <div style="padding: 10px 5px 5px 5px;">
9
- <span style="font-weight: bold;"><%= @message.sender.name%></span>
10
- has sent you a new message: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %></h1>
10
+ <span style="font-weight: bold;"><%= truncate_name(@message.sender.name)%></span>
11
+ has sent a new message to <%= @receiver.subject.is_a?(Group) ? @receiver.name : "you" %>
11
12
  </div>
12
13
  <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
13
14
  <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
@@ -19,7 +20,7 @@
19
20
  <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @message.sender.profile.organization%></span>
20
21
  <% end %>
21
22
  </p>
22
- <p>
23
+ <p style="text-align: justify; font-style: italic;">
23
24
  <%= raw @message.body %>
24
25
  </p>
25
26
  </div>
@@ -1,4 +1,5 @@
1
- <%= @message.sender.name%> has sent you a new message: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
1
+ <% self.class.send :include, SubjectsHelper %>
2
+ <%=truncate_name(@message.sender.name)%> has sent a new message to <%= @receiver.subject.is_a?(Group) ? @receiver.name : "you" %>
2
3
 
3
4
  -----------------------------------------------
4
5
  <%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>
@@ -1,3 +1,4 @@
1
+ <% self.class.send :include, SubjectsHelper %>
1
2
  <!DOCTYPE html>
2
3
  <html>
3
4
  <head>
@@ -6,8 +7,8 @@
6
7
  <body>
7
8
  <div>
8
9
  <div style="padding: 10px 5px 5px 5px;">
9
- <span style="font-weight: bold;"><%= @message.sender.name%></span>
10
- has sent a reply: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
10
+ <span style="font-weight: bold;"><%= truncate_name(@message.sender.name)%></span>
11
+ has sent a reply to <%= @receiver.subject.is_a?(Group) ? @receiver.name : "you" %>
11
12
  </div>
12
13
  <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
13
14
  <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
@@ -19,7 +20,7 @@
19
20
  <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @message.sender.profile.organization%></span>
20
21
  <% end %>
21
22
  </p>
22
- <p>
23
+ <p style="text-align: justify; font-style: italic;">
23
24
  <%= raw @message.body %>
24
25
  </p>
25
26
  </div>
@@ -1,4 +1,5 @@
1
- <%= @message.sender.name%> has sent a reply: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
1
+ <% self.class.send :include, SubjectsHelper %>
2
+ <%= truncate_name(@message.sender.name)%> has sent a reply to <%= @receiver.subject.is_a?(Group) ? @receiver.name : "you" %>
2
3
 
3
4
  -----------------------------------------------
4
5
  "<%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>"
@@ -5,14 +5,35 @@
5
5
  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
6
6
  </head>
7
7
  <body>
8
- <h1><%= strip_tags decode_notification @notification.subject,@notification.notified_object %></h1>
9
- <blockquote>
10
- <p>
11
- <%= raw decode_notification @notification.body,@notification.notified_object %>
12
- </p>
13
- </blockquote>
14
- <p>
15
- Visit <%= link_to notifications_url,notifications_url %> and check all your notifications.
16
- </p>
8
+ <div>
9
+
10
+ <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
11
+ <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
12
+ <%if @notification.notified_object.nil? %>
13
+ <img src="http://<%= ActionMailer::Base.default_url_options[:host] +User.new.logo.url(:profile)%>" >
14
+ <%else%>
15
+ <img src="http://<%= ActionMailer::Base.default_url_options[:host] +@notification.notified_object.sender.logo.url(:profile)%>" alt="<%=@notification.notified_object.sender.name%>">
16
+ <%end%>
17
+ </div>
18
+ <div style=" margin: 5px 5px 5px 5px;">
19
+ <p style="font-weight: bold; "><%= @notification.notified_object.sender.name %>
20
+ <% if @notification.notified_object.sender.profile.organization? %>
21
+ <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @notification.notified_object.sender.profile.organization%></span>
22
+ <% end %>
23
+ </p>
24
+ <p>
25
+ <%= strip_tags decode_notification @notification.subject,@notification.notified_object %>
26
+ </p>
27
+ <p style="text-align: justify; font-style: italic;">
28
+ <%= raw decode_notification @notification.body,@notification.notified_object %>
29
+ </p>
30
+ </div>
31
+ </div>
32
+ <div style="padding: 10px 5px 5px 5px;">
33
+ <p>
34
+ Visit <%= link_to notifications_url,notifications_url %> and check all your notifications.
35
+ </p>
36
+ </div>
37
+ </div>
17
38
  </body>
18
39
  </html>
@@ -1,2 +1,2 @@
1
- %{sender} added you as contact.
1
+ %{sender} added %{who} as contact.
2
2
 
@@ -1,5 +1,5 @@
1
1
  <% if activity.direct_object.is_a? Actor %>
2
- %{sender} is now your fan.
2
+ %{sender} is now %{whose} fan.
3
3
  <% else %>
4
- %{sender} likes your %{object.name}
4
+ %{sender} likes %{whose} %{object.name}
5
5
  <% end %>
@@ -1,2 +1,2 @@
1
- %{sender} also added you as contact.
1
+ %{sender} also added %{who} as contact.
2
2
 
@@ -1 +1 @@
1
- %{sender} added a %{object} in your wall
1
+ %{sender} added a %{object} in %{whose} wall
@@ -1 +1 @@
1
- %{sender} updated a %{object} in your wall.
1
+ %{sender} updated a %{object} in %{whose} wall.
@@ -1 +1 @@
1
- %{sender.name} updated a %{object.name} in your wall
1
+ %{sender.name} updated a %{object.name} in %{whose} wall
@@ -1,2 +1,10 @@
1
+ <% content_for :javascript do %>
2
+ var message_hash = window.location.hash.match(/^.*activity_(\d+).*$/);
3
+ if (message_hash && message_hash > 0){
4
+ $.scrollTo('#activity_' + message_hash[1] ,1500,{axis:'y'});
5
+ }
6
+ <% end %>
7
+
1
8
  <%= render :partial => 'objects/show',
2
9
  :locals => { :object => @post } %>
10
+
@@ -0,0 +1,2 @@
1
+ $('#wall').replaceWith("<%= escape_javascript render(:partial => 'activities/wall', :locals => { :activities => subject.wall(:profile, :for => current_subject).page(params[:page]) }) %>");
2
+ $.scrollTo('#wall', 1500,{axis:'y'});
@@ -0,0 +1,2 @@
1
+ <%= render :partial => 'subjects/show',
2
+ :locals => { :subject => @user } %>
@@ -76,7 +76,7 @@ en:
76
76
  confirm_delete: "Delete comment?"
77
77
  contact:
78
78
  all_n: "All contacts (%{count})"
79
- addressbook: "Addressbook"
79
+ current: "Current"
80
80
  edit:
81
81
  title: "Edit contact to %{name}"
82
82
  submit: "Edit Contact"
@@ -88,7 +88,7 @@ en:
88
88
  one: "Contact"
89
89
  other: "Contacts"
90
90
  pending:
91
- other: "Pending requests"
91
+ other: "Pending"
92
92
  all: "All"
93
93
  all_n: "See all pending requests (%{count})"
94
94
  relation:
@@ -0,0 +1,5 @@
1
+ module Mailboxer
2
+ module NotificationDecoder
3
+
4
+ end
5
+ end
@@ -104,4 +104,8 @@ module SocialStream
104
104
  end
105
105
  end
106
106
 
107
+ module Mailboxer
108
+ autoload :NotificationDecoder, 'mailboxer/notification_decoder'
109
+ end
110
+
107
111
  require 'social_stream/base'
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Base
3
- VERSION = "0.7.4".freeze
3
+ VERSION = "0.7.5".freeze
4
4
  end
5
5
  end
@@ -42,9 +42,9 @@ module SocialStream
42
42
  :url => "#",
43
43
  :options => {:link => {:id => "contacts_menu"}},
44
44
  :items => [
45
- {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.addressbook'), :url => contacts_path},
46
- {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path},
47
- {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.pending.other'), :url => contacts_path(:pending=>true)}
45
+ {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.current'), :url => contacts_path},
46
+ {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.pending.other'), :url => contacts_path(:pending=>true)},
47
+ {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path}
48
48
  ]}
49
49
 
50
50
  #Subjects
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
35
35
  # OAuth provider
36
36
  s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')
37
37
  # Messages
38
- s.add_runtime_dependency('mailboxer','~> 0.4.2')
38
+ s.add_runtime_dependency('mailboxer','~> 0.4.3')
39
39
  # Avatar manipulation
40
40
  s.add_runtime_dependency('rmagick','~> 2.13.1')
41
41
  # Tagging
@@ -49,7 +49,7 @@
49
49
  .ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
50
50
  .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
51
51
  .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
52
- .ui-widget-content a { color: #222222; }
52
+ /* .ui-widget-content a { color: #222222; }*/
53
53
  .ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
54
54
  .ui-widget-header a { color: #222222; }
55
55
 
@@ -60,7 +60,7 @@
60
60
  .ui-widget .ui-widget { font-size: 1em; }
61
61
  .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
62
62
  .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(/images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
63
- .ui-widget-content a { color: #222222; }
63
+ /*.ui-widget-content a { color: #222222; }*/
64
64
  .ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
65
65
  .ui-widget-header a { color: #222222; }
66
66
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream-base
3
3
  version: !ruby/object:Gem::Version
4
- hash: 11
4
+ hash: 9
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 7
9
- - 4
10
- version: 0.7.4
9
+ - 5
10
+ version: 0.7.5
11
11
  platform: ruby
12
12
  authors:
13
13
  - GING - DIT - UPM
@@ -205,12 +205,12 @@ dependencies:
205
205
  requirements:
206
206
  - - ~>
207
207
  - !ruby/object:Gem::Version
208
- hash: 11
208
+ hash: 9
209
209
  segments:
210
210
  - 0
211
211
  - 4
212
- - 2
213
- version: 0.4.2
212
+ - 3
213
+ version: 0.4.3
214
214
  type: :runtime
215
215
  version_requirements: *id012
216
216
  - !ruby/object:Gem::Dependency
@@ -612,6 +612,7 @@ files:
612
612
  - app/assets/javascripts/invitations.js
613
613
  - app/assets/javascripts/layouts.js
614
614
  - app/assets/javascripts/messages.js
615
+ - app/assets/javascripts/posts.js
615
616
  - app/assets/javascripts/profiles.js
616
617
  - app/assets/javascripts/relation_customs.js
617
618
  - app/assets/javascripts/settings.js
@@ -685,6 +686,7 @@ files:
685
686
  - app/helpers/toolbar_helper.rb
686
687
  - app/helpers/users_helper.rb
687
688
  - app/mailers/invitation_mailer.rb
689
+ - app/mailers/notification_mailer.rb
688
690
  - app/models/ability.rb
689
691
  - app/models/activity.rb
690
692
  - app/models/activity_object.rb
@@ -713,6 +715,7 @@ files:
713
715
  - app/views/activities/_new.html.erb
714
716
  - app/views/activities/_options.html.erb
715
717
  - app/views/activities/_root.html.erb
718
+ - app/views/activities/_wall.html.erb
716
719
  - app/views/activities/_walls.html.erb
717
720
  - app/views/activities/index.js.erb
718
721
  - app/views/activity_objects/_activity_object.html.erb
@@ -765,9 +768,11 @@ files:
765
768
  - app/views/groups/index.js.erb
766
769
  - app/views/groups/new.html.erb
767
770
  - app/views/groups/show.html.erb
771
+ - app/views/groups/show.js.erb
768
772
  - app/views/home/_groups.html.erb
769
773
  - app/views/home/_sidebar.html.erb
770
774
  - app/views/home/index.html.erb
775
+ - app/views/home/index.js.erb
771
776
  - app/views/invitation_mailer/send_invitation.html.erb
772
777
  - app/views/invitation_mailer/send_invitation.text.erb
773
778
  - app/views/invitations/_new.html.erb
@@ -839,6 +844,7 @@ files:
839
844
  - app/views/settings/index.html.erb
840
845
  - app/views/settings/index.js.erb
841
846
  - app/views/subjects/_contacts.html.erb
847
+ - app/views/subjects/_show.js.erb
842
848
  - app/views/subjects/_subject.html.erb
843
849
  - app/views/toolbar/_home.html.erb
844
850
  - app/views/toolbar/_logo.html.erb
@@ -851,6 +857,7 @@ files:
851
857
  - app/views/users/index.js.erb
852
858
  - app/views/users/info.html.erb
853
859
  - app/views/users/show.html.erb
860
+ - app/views/users/show.js.erb
854
861
  - app/views/users/show.xml.builder
855
862
  - bin/social_stream
856
863
  - bin/social_stream_heroku
@@ -866,6 +873,7 @@ files:
866
873
  - lib/generators/social_stream/base/templates/initializer.rb
867
874
  - lib/generators/social_stream/base/templates/navigation.rb
868
875
  - lib/generators/social_stream/base/templates/relations.yml
876
+ - lib/mailboxer/notification_decoder.rb
869
877
  - lib/paperclip/social_stream.rb
870
878
  - lib/social_stream-base.rb
871
879
  - lib/social_stream/ability.rb