social_stream-base 0.9.30 → 0.9.31

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 (8) hide show
  1. data/app/assets/stylesheets/header.css.scss +2 -2
  2. data/app/controllers/conversations_controller.rb +1 -1
  3. data/app/views/settings/_index.html.erb +3 -0
  4. data/app/views/toolbar/_home.html.erb +1 -1
  5. data/config/locales/en.yml +2 -1
  6. data/config/locales/es.yml +3 -2
  7. data/lib/social_stream/base/version.rb +1 -1
  8. metadata +4 -4
data/app/assets/stylesheets/header.css.scss CHANGED
@@ -4,8 +4,8 @@
4
4
  #headerFront { width: 100%; padding: 0; background: $header-color; padding: 0px 0px 0px 0px;}
5
5
  #header_left { left: 0px; float: left; padding-left: 15px; padding-right: 5px; width:155px;}
6
6
  #header_right { right: 0px; float: right; padding-right: 10px; }
7
- .banner_top{ width: 960px; margin-left: auto; margin-right: auto; margin-top: 0px; padding-bottom: 0px;
8
- position: relative; background: $header-color; }
7
+ .banner_top{ width: 960px; margin-left: auto; margin-right: auto; margin-top: 0px;
8
+ position: relative; background: $header-color; padding: 3px; }
9
9
  .banner_top_height{ height:23px;}
10
10
 
11
11
  /********** CONTENT ************/
data/app/controllers/conversations_controller.rb CHANGED
@@ -50,7 +50,7 @@ class ConversationsController < ApplicationController
50
50
  else
51
51
  @receipts = @mailbox.receipts_for(@conversation).not_trash
52
52
  end
53
- render :action => :show
53
+ redirect_to :action => :show
54
54
  @receipts.mark_as_read
55
55
 
56
56
  end
data/app/views/settings/_index.html.erb CHANGED
@@ -16,3 +16,6 @@
16
16
  <% else %>
17
17
  <%= render :partial => 'destroy' %>
18
18
  <% end %>
19
+ <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
20
+ <%= render :partial => 'chat/settings' %>
21
+ <% end %>
data/app/views/toolbar/_home.html.erb CHANGED
@@ -8,7 +8,7 @@
8
8
  </div>
9
9
 
10
10
  <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
11
- <%= render :partial => 'xmpp/chat' %>
11
+ <%= render :partial => 'chat/index' %>
12
12
  <% end %>
13
13
 
14
14
  <div class="block space_center">
data/config/locales/en.yml CHANGED
@@ -91,7 +91,8 @@ en:
91
91
  comment:
92
92
  input: "Write a comment..."
93
93
  confirm_delete: "Delete comment?"
94
- name: "a comment"
94
+ name: "comment"
95
+ one: "a comment"
95
96
  view_all: "View all comments"
96
97
  contact:
97
98
  all_n: "All contacts (%{count})"
data/config/locales/es.yml CHANGED
@@ -91,7 +91,8 @@ es:
91
91
  comment:
92
92
  input: "Comentar..."
93
93
  confirm_delete: "¿Borrar commentario?"
94
- name: "un comentario"
94
+ name: "comentario"
95
+ one: "un comentario"
95
96
  view_all: "Ver todos los comentarios"
96
97
  contact:
97
98
  all_n: "Todos los contactos (%{count})"
@@ -452,7 +453,7 @@ es:
452
453
  name: "Social Stream"
453
454
  subject:
454
455
  this_is_you: "¡Eres tú!"
455
- sure: "¿Seguro?"
456
+ sure: "¿Confirmar?"
456
457
  time:
457
458
  ago: "hace %{time}"
458
459
  unknown: "Desconocido"
data/lib/social_stream/base/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Base
3
- VERSION = "0.9.30".freeze
3
+ VERSION = "0.9.31".freeze
4
4
  end
5
5
  end
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: 7
4
+ hash: 5
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 9
9
- - 30
10
- version: 0.9.30
9
+ - 31
10
+ version: 0.9.31
11
11
  platform: ruby
12
12
  authors:
13
13
  - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2011-11-16 00:00:00 +01:00
19
+ date: 2011-11-17 00:00:00 +01:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency