social_stream-base 0.9.30 → 0.9.31

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

@@ -4,8 +4,8 @@
 #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: 0px;  padding-bottom: 0px;
-	position: relative; background: $header-color; }
+.banner_top{	width: 960px;	margin-left: auto;	margin-right: auto;	margin-top: 0px;
+	position: relative; background: $header-color; padding: 3px; }
 .banner_top_height{	height:23px;}
 
 /********** CONTENT ************/

data/app/controllers/conversations_controller.rb

@@ -50,7 +50,7 @@ class ConversationsController < ApplicationController
     else
       @receipts = @mailbox.receipts_for(@conversation).not_trash
     end
-    render :action => :show
+    redirect_to :action => :show
     @receipts.mark_as_read
 
   end

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

@@ -16,3 +16,6 @@
 <% else %>
   <%= render :partial => 'destroy' %>
 <% end %>
+<% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
+  <%= render :partial => 'chat/settings' %>
+<% end %>

data/app/views/toolbar/_home.html.erb

@@ -8,7 +8,7 @@
 </div>
 
 <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
-  <%= render :partial => 'xmpp/chat' %>
+  <%= render :partial => 'chat/index' %>
 <% end %>
 
 <div class="block space_center">

data/config/locales/en.yml

@@ -91,7 +91,8 @@ en:
   comment:
     input: "Write a comment..."
     confirm_delete: "Delete comment?"
-    name: "a comment"
+    name: "comment"
+    one: "a comment"
     view_all: "View all comments"
   contact:
     all_n: "All contacts (%{count})"

data/config/locales/es.yml

@@ -91,7 +91,8 @@ es:
   comment:
     input: "Comentar..."
     confirm_delete: "¿Borrar commentario?"
-    name: "un comentario"
+    name: "comentario"
+    one: "un comentario"
     view_all: "Ver todos los comentarios"
   contact:
     all_n: "Todos los contactos (%{count})"
@@ -452,7 +453,7 @@ es:
     name: "Social Stream"
   subject:
     this_is_you: "¡Eres tú!"
-  sure: "¿Seguro?"
+  sure: "¿Confirmar?"
   time:
     ago: "hace %{time}"
   unknown: "Desconocido"

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.30".freeze
+    VERSION = "0.9.31".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 9
-  - 30
-  version: 0.9.30
+  - 31
+  version: 0.9.31
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 +01:00
+date: 2011-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency