social_stream-base 0.9.27 → 0.9.28

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

@@ -10,7 +10,7 @@ img {	border: 0px;}
 div {	margin: 0px;	padding: 0px;	font-family: Helvetica;	font-size: 11px;}
 .AbsWrap {	width: 100%;	position: relative;}
 .rowWrap {	width: 100%;}
-a:link,a:visited {	color: $main-color;	text-decoration: inherit;}
+a:link,a:visited {	color: $main-color;	font-size: inherit; text-decoration: inherit;}
 a:hover {	text-decoration: underline;}
 .clearfloat {	clear: both;	height: 0px;}
 h2{padding-left:10px;}
@@ -48,6 +48,7 @@ label.validation_error{color: $error-color;background-color: $error-background;b
         background-image: url('btn/warning.png');}
 .error, #error_explanation {border-color: $error-color; color: $error-color;background-color: $error-background;
                             background-image: url('btn/error.png');}
+.error h2, #error_explanation h2{ color: $error-color;}
 
 /************Forms SECTION **************/
 input.other_blue{	background-color:$auxiliar-color !important;	border:0px;	cursor:pointer; line-height:135%;

data/app/assets/stylesheets/footer.css.scss

@@ -4,7 +4,7 @@
 #sponsor{width:960px;margin:0 auto;color:$details-color; }
 
 #footer{width: 960px;margin-left: auto;margin-right: auto;padding: 0;position: relative; text-align:center;
-	clear:left;font-size:0.9166em;line-height:1.6363;color:$details-color;padding:0.75em 0;}
+	clear:left;font-size:0.9166em;line-height:1.6363;color:$details-color;padding:0.75em 0; background: $secondary-color}
 #footer ul, #sponsor ul{list-style-type:none;margin:0 0.5em; }
 #footer ul li,#sponsor ul li{display:inline-block;margin-right:0.25em;position:relative;}
 #footer ul li#trade_mark,#sponsor ul li#trademark{font-weight:bold;color:$sentence-color;}

data/app/assets/stylesheets/header.css.scss

@@ -1,11 +1,11 @@
 @import "colors";
 
 /****************** HEADER STRUCTURE ******/
-#headerFront {	width: 100%;	padding: 0;	background: $header-color;  padding: 2px 0px 0px 0px;}
+#headerFront {	width: 100%;	padding: 0;	background: $header-color;  padding: 0px 0px 0px 0px;}
 #header_left {	left: 0px;	float: left;	padding-left: 15px; padding-right: 5px; width:155px;}
 #header_right {	right: 0px;	float: right; padding-right: 10px;  }
-.banner_top{	width: 960px;	margin-left: auto;	margin-right: auto;	margin-top: 3px;  padding-bottom: 3px;
-	position: relative; }
+.banner_top{	width: 960px;	margin-left: auto;	margin-right: auto;	margin-top: 0px;  padding-bottom: 0px;
+	position: relative; background: $header-color; }
 .banner_top_height{	height:23px;}
 
 /********** CONTENT ************/

data/app/assets/stylesheets/messages.css.scss

@@ -120,6 +120,7 @@
 }
 .conversations .unread .subject {
 	font-weight: bold;
+	font-size: 12px;
 }
 .conversations .conversation .date {
 	color: $details-color;

data/app/helpers/subjects_helper.rb

@@ -10,6 +10,6 @@ module SubjectsHelper
   # Return the truncated name
   def truncate_name(name, options={})
     options = {:length => NAME_MAX_LENGTH, :separator => ' '}.merge options
-    truncate(name,options)
+    h truncate(name,options)
   end
 end

data/app/models/activity.rb

@@ -204,12 +204,9 @@ class Activity < ActiveRecord::Base
   def notify
     return true if !notificable?
     #Avaible verbs: follow, like, make-friend, post, update
-    actionview = ActivitiesController.new.view_context
 
     if ['like','follow','make-friend','post','update'].include? verb and !contact.reflexive?
-      notification_subject = actionview.render :partial => 'notifications/activities/' + verb + "_subject", :locals => {:activity => self}
-      notification_body = actionview.render :partial =>  'notifications/activities/' + verb + "_body", :locals => {:activity => self}
-      receiver.notify(notification_subject, notification_body, self)
+      receiver.notify("You have a new notification", "Youre not supposed to see this", self)
     end
     true
   end

data/app/views/message_mailer/new_message_email.html.erb

@@ -8,7 +8,7 @@
     <div>
       <div style="padding: 10px 5px 5px 5px;">
         <span style="font-weight: bold;"><%= truncate_name(@message.sender.name)%></span>
-         has sent a new message to <%= @receiver.subject.is_a?(Group) ? @receiver.name : "you" %>
+        <%= t('mailboxer.message_mailer.has_sent_new.' + @receiver.subject.class.to_s.downcase, :receiver => @receiver.name) %>
       </div>
       <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
         <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">

data/app/views/message_mailer/new_message_email.text.erb

@@ -1,5 +1,5 @@
 <% self.class.send :include, SubjectsHelper %>
-<%=truncate_name(@message.sender.name)%> has sent a new message to <%= @receiver.subject.is_a?(Group) ? @receiver.name : "you" %>
+<%=truncate_name(@message.sender.name)%> <%= t('mailboxer.message_mailer.has_sent_new.' + @receiver.subject.class.to_s.downcase, :receiver => @receiver.name) %>
 
 -----------------------------------------------
 <%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>

data/app/views/message_mailer/reply_message_email.html.erb

@@ -8,7 +8,7 @@
     <div>
       <div style="padding: 10px 5px 5px 5px;">
         <span style="font-weight: bold;"><%= truncate_name(@message.sender.name)%></span> 
-        has sent a reply to <%= @receiver.subject.is_a?(Group) ? @receiver.name : "you" %>
+        <%= t('mailboxer.message_mailer.has_sent_reply.' + @receiver.subject.class.to_s.downcase, :receiver => @receiver.name) %>
       </div>
       <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
         <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">

data/app/views/message_mailer/reply_message_email.text.erb

@@ -1,5 +1,5 @@
 <% self.class.send :include, SubjectsHelper %>
-<%= truncate_name(@message.sender.name)%> has sent a reply to <%= @receiver.subject.is_a?(Group) ? @receiver.name : "you" %>
+<%= truncate_name(@message.sender.name)%> <%= t('mailboxer.message_mailer.has_sent_reply.' + @receiver.subject.class.to_s.downcase, :receiver => @receiver.name) %>
 
 -----------------------------------------------
 "<%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>"

data/app/views/notification_mailer/new_notification_email.html.erb

@@ -9,11 +9,7 @@
       
       <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
         <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
-          <%if @notification.notified_object.nil? %>
-            <img src="http://<%= ActionMailer::Base.default_url_options[:host] +User.new.logo.url(:profile)%>" >
-          <%else%>
-            <img src="http://<%= ActionMailer::Base.default_url_options[:host] +@notification.notified_object.sender.logo.url(:profile)%>" alt="<%=@notification.notified_object.sender.name%>">
-          <%end%>
+          <img src="<%= root_url + @notification.notified_object.sender.logo.url(:profile)%>" alt="<%=@notification.notified_object.sender.name%>">
         </div>
         <div style=" margin: 5px 5px 5px 5px;">
           <p style="font-weight: bold; "><%= @notification.notified_object.sender.name %>
@@ -21,11 +17,9 @@
               <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @notification.notified_object.sender.profile.organization%></span>
             <% end %>
           </p>
-          <p>
-            <%= strip_tags decode_notification @notification.subject,@notification.notified_object %>
-          </p>       
-          <p style="text-align: justify; font-style: italic;">
-            <%= raw decode_notification @notification.body,@notification.notified_object %>
+          <p style="text-align: justify;">
+            <%= render :partial => "notifications/activities/#{ @notification.notified_object.verb }", 
+                       :locals =>{:activity => @notification.notified_object}%>
           </p>
         </div>
       </div>
@@ -36,4 +30,4 @@
       </div>
     </div>
   </body>
-</html>
+</html>

data/app/views/notification_mailer/new_notification_email.text.erb

@@ -1,6 +1,7 @@
 <% self.class.send :include, Mailboxer::NotificationDecoder %>
-<%= strip_tags decode_notification @notification.subject,@notification.notified_object %>
+
 -----------------------------------------------
-<%= strip_tags decode_notification @notification.body,@notification.notified_object  %>
+<%= render :partial => "notifications/activities/#{ @notification.notified_object.verb }", 
+                     :locals =>{:activity => @notification.notified_object}%>
 -----------------------------------------------
 Visit <%= notifications_url %> and check all your notifications.

data/app/views/notifications/_notification.html.erb

@@ -16,11 +16,9 @@
   </div>
 </div>
 <div class="content_right">
-  <div class="subject">
-    <%= raw decode_notification notification.subject,notification.notified_object %>
-  </div>
   <div class="briefing">
-    <%= raw decode_notification notification.body, notification.notified_object %>
+    <%= render :partial => "notifications/activities/#{ notification.notified_object.verb }", 
+                           :locals =>{:activity => notification.notified_object} %>
   </div>
   <div class="clearfloat">
   </div>

data/app/views/notifications/activities/_follow.html.erb

@@ -0,0 +1,10 @@
+<div class="subject">
+  <%= raw t('notification.follow.'+ activity.receiver.subject.class.to_s.underscore, 
+   :sender => link_to(truncate_name(activity.sender.name), polymorphic_url(activity.sender.subject)),
+   :who => t('notification.who.'+ activity.receiver.subject.class.to_s.underscore,
+              :name => truncate_name(activity.receiver.name))) %>
+</div>
+<div class="briefing">
+  <%= link_to(t('notification.confirm', :sender => truncate_name(activity.sender.name)),
+              edit_contact_url(activity.receiver.contact_to!(activity.sender),:s => activity.receiver.slug)) %>
+</div>

data/app/views/notifications/activities/_follow.text.erb

@@ -0,0 +1,8 @@
+<%= raw t('notification.follow.'+ activity.receiver.subject.class.to_s.underscore, 
+ :sender => truncate_name(activity.sender.name), 
+ :who => t('notification.who.'+ activity.receiver.subject.class.to_s.underscore,
+            :name => truncate_name(activity.receiver.name))) %>
+-----------------------------------------------
+<%= t('notification.look', :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>
+<%= t('notification.confirm', :sender => truncate_name(activity.sender.name)) %> <%= edit_contact_url(activity.receiver.contact_to!(activity.sender),
+                                                                                      :s => activity.receiver.slug)%>

data/app/views/notifications/activities/_like.html.erb

@@ -0,0 +1,30 @@
+<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
+  <div class="subject">
+    <%= raw t('notification.fan', 
+          :sender => link_to(truncate_name(activity.sender.name), polymorphic_url(activity.sender.subject)),
+          :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
+                    :receiver => truncate_name(activity.receiver.name)))%>
+  </div>
+  <div class="briefing">
+    <%= raw t('notification.look', 
+              :sender => link_to(truncate_name(activity.sender.name), polymorphic_url(activity.sender.subject))) %>
+  </div>
+<% else %>
+  <div class="subject">
+    <%= raw t('notification.like.'+ activity.receiver.subject.class.to_s.underscore, 
+              :sender => link_to(truncate_name(activity.sender.name), polymorphic_url(activity.sender.subject)),
+              :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
+                        :receiver => truncate_name(activity.receiver.name)),
+              :thing => link_to(t(activity.direct_object.class.to_s.underscore+'.name'),
+                        polymorphic_url( activity.direct_object))) %>
+  </div>
+  <div class="briefing">
+    <% if activity.direct_object.respond_to? :text %>
+      "<%= link_to(activity.direct_object.text.truncate(100, :separator =>' '),
+                  polymorphic_url( activity.direct_object))%>"
+    <% else%>
+      <%= link_to(t('notification.watch_it'),
+                  polymorphic_url( activity.direct_object))%>
+    <%end%>
+  </div>
+<% end %>

data/app/views/notifications/activities/_like.text.erb

@@ -0,0 +1,23 @@
+<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
+  <%= raw t('notification.fan', 
+        :sender => truncate_name(activity.sender.name),
+        :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
+                  :receiver => truncate_name(activity.receiver.name)))%>
+-----------------------------------------------
+<% else %>
+  <%= raw t('notification.like.'+ activity.receiver.subject.class.to_s.underscore, 
+            :sender => truncate_name(activity.sender.name),
+            :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
+                      :receiver => truncate_name(activity.receiver.name)),
+            :thing => t(activity.direct_object.class.to_s.underscore+'.name')) %>
+-----------------------------------------------
+  <% if activity.direct_object.respond_to? :text %>
+    "<%= activity.direct_object.text.truncate(100, :separator =>' ')%>"
+    <%= t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
+  <% else%>
+--><%= t('notification.watch', :url => polymorphic_url( activity.direct_object))%>
+  <%end%>  
+<% end %>
+
+<%= raw t('notification.look', 
+          :sender => truncate_name(activity.sender.name)) %>: <%=polymorphic_url(activity.sender.subject)%>

data/app/views/notifications/activities/_make-friend.html.erb

@@ -0,0 +1,10 @@
+<div class="subject">
+  <%= raw t('notification.makefriend.'+ activity.receiver.subject.class.to_s.underscore, 
+   :sender => link_to(truncate_name(activity.sender.name), polymorphic_url(activity.sender.subject)),
+   :who => t('notification.who.'+ activity.receiver.subject.class.to_s.underscore,
+              :name => truncate_name(activity.receiver.name))) %>
+</div>
+<div class="briefing">
+  <%= raw t('notification.look', 
+   :sender => link_to(truncate_name(activity.sender.name), polymorphic_url(activity.sender.subject))) %>
+</div>

data/app/views/notifications/activities/_make-friend.text.erb

@@ -0,0 +1,7 @@
+<%= raw t('notification.makefriend.'+ activity.receiver.subject.class.to_s.underscore, 
+ :sender => truncate_name(activity.sender.name),
+ :who => t('notification.who.'+ activity.receiver.subject.class.to_s.underscore,
+            :name => truncate_name(activity.receiver.name))) %>
+-----------------------------------------------
+<%= raw t('notification.look', 
+ :sender => link_to(truncate_name(activity.sender.name), polymorphic_url(activity.sender.subject))) %>

data/app/views/notifications/activities/_post.html.erb

@@ -0,0 +1,22 @@
+<div class="subject">
+  <%= raw t('notification.post.'+ activity.receiver.subject.class.to_s.underscore, 
+   :sender => link_to(truncate_name(activity.sender.name), 
+                      polymorphic_url(activity.sender.subject)),
+   :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
+              :receiver => truncate_name(activity.receiver.name)),
+   :thing => link_to(t(activity.direct_object.class.to_s.underscore+'.one'),
+                     polymorphic_url(activity.direct_object))) %>
+</div>
+<div class="briefing">
+  <% if activity.direct_object.respond_to? :text %>
+    "<%= link_to(activity.direct_object.text.truncate(100, :separator =>' '),
+                     polymorphic_url(activity.direct_object))%>"
+  <% else%>
+    <%= link_to(t('notification.watch_it'),
+                polymorphic_url( activity.direct_object))%>
+  <%end%>
+  <% if SocialStream.activity_forms.include? :document and activity.direct_object.is_a? Document %>
+    
+  <% end%>
+</div>
+ 

data/app/views/notifications/activities/_post.text.erb

@@ -0,0 +1,17 @@
+
+<%= raw t('notification.post.'+ activity.receiver.subject.class.to_s.underscore, 
+ :sender => truncate_name(activity.sender.name),
+ :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
+            :receiver => truncate_name(activity.receiver.name)),
+ :thing => t(activity.direct_object.class.to_s.underscore+'.one')) %>
+-----------------------------------------------
+
+<% if activity.direct_object.respond_to? :text %>
+  "<%=activity.direct_object.text.truncate(100, :separator =>' ')%>"
+--><%= t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
+<% else%>
+  <%= t('notification.watch', :url => polymorphic_url(activity.direct_object))%>
+<% end%>
+
+<%= raw t('notification.look', 
+          :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>

data/app/views/notifications/activities/_update.html.erb

@@ -0,0 +1,18 @@
+<div class="subject">
+  <%= raw t('notification.update.'+ activity.receiver.subject.class.to_s.underscore, 
+   :sender => link_to(truncate_name(activity.sender.name), 
+                      polymorphic_url(activity.sender.subject)),
+   :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
+              :receiver => truncate_name(activity.receiver.name)),
+   :thing => link_to(t(activity.direct_object.class.to_s.underscore+'.one'),
+                     polymorphic_url( activity.direct_object))) %>
+</div>
+<div class="briefing">
+  <% if activity.direct_object.respond_to? :text %>
+    "<%= link_to(activity.direct_object.text.truncate(100, :separator =>' '),
+                     polymorphic_url(activity.direct_object))%>"
+  <% else%>
+    <%= link_to(t('notification.watch_it'),
+                polymorphic_url( activity.direct_object))%>
+  <%end%>
+</div>

data/app/views/notifications/activities/_update.text.erb

@@ -0,0 +1,15 @@
+<%= raw t('notification.update.'+ activity.receiver.subject.class.to_s.underscore, 
+ :sender => truncate_name(activity.sender.name),
+ :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
+            :receiver => truncate_name(activity.receiver.name)),
+ :thing => t(activity.direct_object.class.to_s.underscore+'.one')) %>
+-----------------------------------------------
+<% if activity.direct_object.respond_to? :text %>
+  "<%=activity.direct_object.text.truncate(100, :separator =>' ')%>"
+--><%= t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
+<% else%>
+  <%= t('notification.watch', :url => polymorphic_url( activity.direct_object))%>
+<% end%>
+
+<%= raw t('notification.look', 
+          :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>

data/app/views/notifications/index.js.erb

@@ -1,6 +1,6 @@
 $("#content").html("<%=escape_javascript(render :partial => 'index') %>");
 $("header").html("<%=escape_javascript(render :partial => 'layouts/header') %>");
 
-<%= location(link_to(image_tag("btn/btn_notification.png", :class => "menu_icon")+t('notification.other'), notifications_path,:remote => true)) %>
+<%= location(link_to(t('notification.other'), notifications_path,:remote => true)+' ('+@mailbox.notifications.not_trashed.unread.count.to_s+')') %>
 
 $('.pagination a').attr('data-remote', 'true');

data/config/locales/en.yml

@@ -91,6 +91,7 @@ en:
   comment:
     input: "Write a comment..."
     confirm_delete: "Delete comment?"
+    name: "a comment"
     view_all: "View all comments"
   contact:
     all_n: "All contacts (%{count})"
@@ -242,6 +243,14 @@ en:
       subject: "Subject"
     mark_as_read: "Mark as read"
     message_mailer:
+      has_sent_new: 
+        event: "has sent a new message to %{receiver}"
+        group: "has sent a new message to %{receiver}"
+        user: "has sent you a new message"
+      has_sent_reply: 
+        event: "has sent a reply to %{receiver}"
+        group: "has sent a reply to %{receiver}"
+        user: "has sent you a reply"
       subject_new: "%{subject}"
       subject_reply: "%{subject}"
     notification_mailer:
@@ -265,40 +274,46 @@ en:
     sentbox: "Sentbox"
     trash: "Trash"
   notification:
-    added:
-      other: "%{sender} added %{who} as contact."
-      user: "%{sender} added %{who} as contact."
-    confirm: "Confirm %{sender.name} as contact?"
+    all_text: "Read the whole text at %{url}"
+    confirm: "Confirm %{sender} as contact?"
     destroy_sure: "Do you want to delete this notification?"
     fan: "%{sender} is now %{whose} fan."
+    follow:
+      group: "%{sender} added %{who} as contact."
+      user: "%{sender} added %{who} as contact."
     like:
-      other: "%{sender} likes %{whose} %{object.name}." 
-      user: "%{sender} likes %{whose} %{object.name}."
-    look: "Take a look at %{sender.name}'s wall"
+      group: "%{sender} likes %{whose} %{thing}." 
+      user: "%{sender} likes %{whose} %{thing}."
+    look: "Take a look at %{sender}'s wall"
     makefriend:
-      other: "%{sender} also added %{who} as contact."
+      group: "%{sender} also added %{who} as contact."
       user: "%{sender} also added %{who} as contact."
     one: "Notification"
     other: "Notifications"
     post:
-      other: "%{sender} added a %{object} in %{whose} wall."
-      user: "%{sender} added a %{object} in %{whose} wall."
+      group: "%{sender} added %{thing} in %{whose} wall."
+      user: "%{sender} added %{thing} in %{whose} wall."
     read: "Mark as read"
     read_all: "Mark all as read"
     unread: "Mark as unread"
     update:
-      other: "%{sender} updated a %{object} in %{whose} wall."
-      user: "%{sender} updated a %{object} in %{whose} wall."
+      group: "%{sender} updated %{thing} in %{whose} wall."
+      user: "%{sender} updated %{thing} in %{whose} wall."
+    watch: "Watch it at %{url}"
+    watch_it: "Watch it!"
     who:
+      group: "%{name}"
       user: "you"
     whose: 
-      others: "%{receiver}'s"
+      group: "%{receiver}'s"
       user: "your"
   post:
     confirm_delete: "Delete post?"
     form:
       title: "Post"
     input: "What are you doing?"
+    name: "post"
+    one: "a post"
     title: "Posts"  
   preposition:
     and: "and"
@@ -437,6 +452,7 @@ en:
   sure: "Are you sure?"
   time:
     ago: "%{time} ago"
+  unknown: "Unknown"
   user:
     by: "By Users"
     one: "User"

data/config/locales/es.yml

@@ -90,6 +90,7 @@ es:
   comment:
     input: "Comentar..."
     confirm_delete: "¿Borrar commentario?"
+    name: "un comentario"
     view_all: "Ver todos los comentarios"
   contact:
     all_n: "Todos los contactos (%{count})"
@@ -239,6 +240,14 @@ es:
       subject: "Asunto"
     mark_as_read: "Marcar como leido"
     message_mailer:
+      has_sent_new: 
+        event: "ha mandad un nuevo mensaje a %{receiver}"
+        group: "ha mandad un nuevo mensaje a %{receiver}"
+        user: "te ha mandad un nuevo mensaje"
+      has_sent_reply: 
+        event: "ha mandad una respuesta a %{receiver}"
+        group: "ha mandad una respuesta a %{receiver}"
+        user: "te ha mandad una respuesta"
       subject_new: "%{subject}"
       subject_reply: "%{subject}"
     notification_mailer:
@@ -262,40 +271,46 @@ es:
     sentbox: "Salida"
     trash: "Papelera"
   notification:
-    added: 
-      other: "%{sender} añadió a %{who} como contacto."
-      user: "%{sender} te añadió como contacto."
-    confirm: "¿Confirmar contacto con %{sender.name}?"
+    all_text: "Lee el texto entero en %{url}"
+    confirm: "¿Confirmar contacto con %{sender}?"
     destroy_sure: "¿Borrar notificación?"
     fan: "%{sender} es ahora fan %{whose}."
+    follow: 
+      group: "%{sender} añadió a %{who} como contacto."
+      user: "%{sender} te añadió como contacto."
     like:
-      other: "A %{sender} le gusta el %{object.name} %{whose}." 
-      user: "A %{sender} le gusta tu %{object.name}."
-    look: "Écha un vistazo al muro de %{sender.name}"
+      group: "A %{sender} le gusta el %{thing} %{whose}." 
+      user: "A %{sender} le gusta tu %{thing}."
+    look: "Echa un vistazo al muro de %{sender}"
     makefriend:
-      other: "%{sender} también añadió a %{who} como contacto."
+      group: "%{sender} también añadió a %{who} como contacto."
       user: "%{sender} también te añadió como contacto."
     one: "Notificación"
     other: "Notificaciones"
     post:
-      other: "%{sender} añadió %{object} en el muro %{whose}."
-      user: "%{sender} añadió %{object} en tu muro."
+      group: "%{sender} añadió %{thing} en el muro %{whose}."
+      user: "%{sender} añadió %{thing} en tu muro."
     read: "Marcar como leída"
     read_all: "Marcar todas como leídas"
     unread: "Marcar como no leídas"
     update:
-      other: "%{sender} actualizó %{object} en el muro %{whose}."
-      user: "%{sender} actualizó %{object} en tu muro."
+      group: "%{sender} actualizó %{thing} en el muro %{whose}."
+      user: "%{sender} actualizó %{thing} en tu muro."
+    watch: "Échale un vistazo en %{url}"
+    watch_it: "¡Échale un vistazo!"
     who:
+      group: "%{name}"
       user: "tú"
     whose: 
+      group: "de %{receiver}"
       user: "tuyo"
-      others: "de %{receiver}"
   post:
     confirm_delete: "¿Borrar texto?"
     form:
       title: "Texto"
     input: "¿Qué quieres compartir?"
+    name: "publicación"
+    one: "una publicación"
     title: "Textos"
   profile:
     one: "Perfil"
@@ -432,6 +447,7 @@ es:
   sure: "¿Seguro?"
   time:
     ago: "hace %{time}"
+  unknown: "Desconocido"
   user:
     by: "Por usuarios"
     one: "Usuario"

data/lib/mailboxer/notification_decoder.rb

@@ -24,10 +24,10 @@ module Mailboxer
       if activity.direct_object.present?
         object = activity.direct_object
         object = object.subject if object.is_a? Actor
-        notification_text=notification_text.gsub(/\%\{object\}/,link_to(object.class.to_s.underscore,
+        notification_text=notification_text.gsub(/\%\{object\}/,link_to(t(object.class.to_s.underscore+".name"),
                                                                       url_for(:controller=> object.class.to_s.underscore.pluralize, :action=> :show, 
                                                                               :id=> object.id, :only_path => false)))
-        notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.underscore)
+        notification_text=notification_text.gsub(/\%\{object.name\}/,t(object.class.to_s.underscore+".name"))
         
         
           
@@ -44,8 +44,8 @@ module Mailboxer
         #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
       
       else
-        notification_text=notification_text.gsub(/\%\{object\}/,"nilclass")
-        notification_text=notification_text.gsub(/\%\{object.name\}/,"nilclass")
+        notification_text=notification_text.gsub(/\%\{object\}/,t('unknown'))
+        notification_text=notification_text.gsub(/\%\{object.name\}/,t('unknown'))
       end
 
       notification_text
@@ -55,7 +55,9 @@ module Mailboxer
       return if activity.nil?
       notification_text = notification_text.gsub(/\%\{sender\}/, truncate_name(activity.sender.name))
       notification_text = notification_text.gsub(/\%\{confirm\}/,t('notification.confirm'))
-      notification_text = notification_text.gsub(/\%\{look\}/,t('notification.look'))
+      notification_text = notification_text.gsub(/\%\{look\}/,t('notification.look') + ": "+
+                                     url_for(:controller=> activity.sender.subject.class.to_s.underscore.pluralize,
+                                             :action=> :show, :id=> activity.sender.subject.slug, :only_path => false))
       notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
 
       if activity.receiver.subject.is_a?(User)
@@ -70,15 +72,15 @@ module Mailboxer
       if activity.direct_object.present?
         object = activity.direct_object
         object = object.subject if object.is_a? Actor
-        notification_text=notification_text.gsub(/\%\{object\}/,object.class.to_s.underscore)
-        notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.underscore)
+        notification_text=notification_text.gsub(/\%\{object\}/,t(object.class.to_s.underscore+".name"))
+        notification_text=notification_text.gsub(/\%\{object.name\}/,t(object.class.to_s.underscore+".name"))
         notification_text=notification_text.gsub(/\%\{object.text\}/,object.text.truncate(100, :separator =>' ')) if object.respond_to? :text
       
         #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
       
       else
-        notification_text=notification_text.gsub(/\%\{object\}/,"nilclass")
-        notification_text=notification_text.gsub(/\%\{object.name\}/,"nilclass")
+        notification_text=notification_text.gsub(/\%\{object\}/,t('unknown'))
+        notification_text=notification_text.gsub(/\%\{object.name\}/,t('unknown'))
       end
 
       notification_text

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.27".freeze
+    VERSION = "0.9.28".freeze
   end
 end

data/spec/factories/activity.rb

@@ -1,7 +1,32 @@
+# Helpers for building the post activity
+#
+class ActivityObjectSpecHelper < ActiveRecord::Base
+  set_table_name "activity_objects"
+end
+
+class PostSpecHelper < ActiveRecord::Base
+  set_table_name "posts"
+
+  belongs_to :activity_object_spec_helper, :foreign_key => "activity_object_id"
+end
+
+Factory.define :activity_object_spec_helper do |a|
+  a.object_type "Post"
+end
+
+Factory.define :post_spec_helper do |p|
+  p.association :activity_object_spec_helper
+  p.text "Post spec helper"
+end
+
+#
+## End of helpers
+
 Factory.define :activity do |a|
   a.contact { Factory(:friend).contact }
   a.activity_verb { ActivityVerb["post"] }
   a.relation_ids  { |b| Array(b.sender.relation_custom('friend').id) }
+  a.activity_object_ids { Array(Factory(:post_spec_helper).activity_object_spec_helper.id) }
 end
 
 Factory.define :self_activity, :parent => :activity do |a|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 9
-  - 27
-  version: 0.9.27
+  - 28
+  version: 0.9.28
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 +01:00
+date: 2011-11-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -490,10 +490,6 @@ files:
 - app/assets/images/arrow-start.png
 - app/assets/images/arrow.png
 - app/assets/images/big-logo.png
-- app/assets/images/boxy/boxy-ne.png
-- app/assets/images/boxy/boxy-nw.png
-- app/assets/images/boxy/boxy-se.png
-- app/assets/images/boxy/boxy-sw.png
 - app/assets/images/btn/1-facebook.png
 - app/assets/images/btn/_notes/btn_certificates.png.mno
 - app/assets/images/btn/activity.png
@@ -730,7 +726,6 @@ files:
 - app/helpers/toolbar_helper.rb
 - app/helpers/users_helper.rb
 - app/mailers/invitation_mailer.rb
-- app/mailers/notification_mailer.rb
 - app/models/ability.rb
 - app/models/activity.rb
 - app/models/activity_object.rb
@@ -863,16 +858,16 @@ files:
 - app/views/notification_mailer/new_notification_email.text.erb
 - app/views/notifications/_index.html.erb
 - app/views/notifications/_notification.html.erb
-- app/views/notifications/activities/_follow_body.html.erb
-- app/views/notifications/activities/_follow_subject.html.erb
-- app/views/notifications/activities/_like_body.html.erb
-- app/views/notifications/activities/_like_subject.html.erb
-- app/views/notifications/activities/_make-friend_body.html.erb
-- app/views/notifications/activities/_make-friend_subject.html.erb
-- app/views/notifications/activities/_post_body.html.erb
-- app/views/notifications/activities/_post_subject.html.erb
-- app/views/notifications/activities/_update_body.html.erb
-- app/views/notifications/activities/_update_subject.html.erb
+- app/views/notifications/activities/_follow.html.erb
+- app/views/notifications/activities/_follow.text.erb
+- app/views/notifications/activities/_like.html.erb
+- app/views/notifications/activities/_like.text.erb
+- app/views/notifications/activities/_make-friend.html.erb
+- app/views/notifications/activities/_make-friend.text.erb
+- app/views/notifications/activities/_post.html.erb
+- app/views/notifications/activities/_post.text.erb
+- app/views/notifications/activities/_update.html.erb
+- app/views/notifications/activities/_update.text.erb
 - app/views/notifications/index.html.erb
 - app/views/notifications/index.js.erb
 - app/views/objects/_destroy.js.erb

data/app/mailers/notification_mailer.rb

@@ -1,34 +0,0 @@
-#OVERRING WARNING
-#We must override the NotificationMailer from Mailboxer to change the new_notification_email method
-#refer to it for more info
-#NOTE: There is just few lines different from original Mailboxer NotificationMailer. Please maintain it
-#updated for correct behaviour
-class NotificationMailer < ActionMailer::Base
-  default :from => Mailboxer.default_from
-  #Sends and email for indicating a new notification to a receiver.
-  #It calls new_notification_email.
-  def send_email(notification,receiver)
-    new_notification_email(notification,receiver)
-  end
-
-  include ActionView::Helpers::SanitizeHelper
-  #DIFFERENT FROM ORIGINAL----------------------
-  include Mailboxer::NotificationDecoder
-  #END OF DIFFERENCE----------------------------
-
-  #Sends an email for indicating a new message for the receiver
-  def new_notification_email(notification,receiver)
-    @notification = notification
-    @receiver = receiver
-    #DIFFERENT FROM ORIGINAL----------------------
-    subject = notification.subject.to_s
-    subject = decode_basic_notification(subject,notification.notified_object)
-    subject = subject.gsub(/\n/,'')
-    #END OF DIFFERENCE----------------------------
-    subject = strip_tags(subject) unless subject.html_safe?
-    mail(:to => receiver.send(Mailboxer.email_method,notification), :subject => t('mailboxer.notification_mailer.subject', :subject => subject)) do |format|
-      format.text {render __method__}
-      format.html {render __method__}
-    end
-  end
-end

data/app/views/notifications/activities/_follow_body.html.erb

@@ -1,2 +0,0 @@
-%{confirm}
-

data/app/views/notifications/activities/_follow_subject.html.erb

@@ -1,5 +0,0 @@
-<% if activity.receiver.subject.is_a?(User) %>
-  <%= t('notification.added.user') %>
-<% else %>
-  <%= t('notification.added.other') %>
-<% end %>

data/app/views/notifications/activities/_like_body.html.erb

@@ -1,5 +0,0 @@
-<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
-  %{look}
-<% else %>
-  "%{object.text}" 
-<% end %>

data/app/views/notifications/activities/_like_subject.html.erb

@@ -1,9 +0,0 @@
-<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
-  <%= t('notification.fan')%>
-<% else %>
-  <% if activity.receiver.subject.is_a?(User) %>
-    <%= t('notification.like.user') %>
-  <% else %>
-    <%= t('notification.like.other') %>
-  <% end %>
-<% end %>

data/app/views/notifications/activities/_make-friend_body.html.erb

@@ -1,2 +0,0 @@
-%{look}
-

data/app/views/notifications/activities/_make-friend_subject.html.erb

@@ -1,5 +0,0 @@
-<% if activity.receiver.subject.is_a?(User) %>
-  <%= t('notification.makefriend.user') %>
-<% else %>
-  <%= t('notification.makefriend.other') %>
-<% end %>

data/app/views/notifications/activities/_post_body.html.erb

@@ -1,6 +0,0 @@
-<% if activity.direct_object.respond_to? :text %>
-  "%{object.text}"
-<%end%>
-<% if SocialStream.activity_forms.include? :document and activity.direct_object.is_a? Document %>
-  %{object.image}
-<% end%>

data/app/views/notifications/activities/_post_subject.html.erb

@@ -1,6 +0,0 @@
-<% if activity.receiver.subject.is_a?(User) %>
-  <%= t('notification.post.user') %>
-<% else %>
-  <%= t('notification.post.other') %>
-<% end %>
- 

data/app/views/notifications/activities/_update_body.html.erb

@@ -1,5 +0,0 @@
-<% if activity.receiver.subject.is_a?(User) %>
-  <%= t('notification.update.user') %>
-<% else %>
-  <%= t('notification.update.other') %>
-<% end %>

data/app/views/notifications/activities/_update_subject.html.erb

@@ -1,5 +0,0 @@
-<% if activity.receiver.subject.is_a?(User) %>
-  <%= t('notification.update.user') %>
-<% else %>
-  <%= t('notification.update.other') %>
-<% end %>