social_stream-base 0.9.19 → 0.9.20
Sign up to get free protection for your applications and to get access to all the features.
- data/app/assets/javascripts/contacts.js +0 -6
- data/app/assets/javascripts/relation_customs.js +28 -81
- data/app/assets/javascripts/settings.js +12 -33
- data/app/assets/stylesheets/base.css.scss +2 -1
- data/app/assets/stylesheets/relation_customs.css.scss +8 -2
- data/app/controllers/contacts_controller.rb +7 -3
- data/app/controllers/messages_controller.rb +1 -1
- data/app/controllers/search_controller.rb +22 -6
- data/app/controllers/settings_controller.rb +1 -1
- data/app/models/contact.rb +7 -1
- data/app/models/relation.rb +14 -1
- data/app/views/activities/_new.html.erb +3 -2
- data/app/views/contacts/_link.html.erb +1 -1
- data/app/views/contacts/index.html.erb +1 -1
- data/app/views/conversations/_conversation.html.erb +3 -3
- data/app/views/conversations/_conversation_full.html.erb +3 -3
- data/app/views/devise/registrations/_delete_account.html.erb +20 -0
- data/app/views/devise/registrations/_edit_user.html.erb +87 -0
- data/app/views/devise/registrations/edit.html.erb +16 -93
- data/app/views/layouts/_header_dropdown_menu.html.erb +0 -3
- data/app/views/messages/_form.html.erb +1 -1
- data/app/views/permissions/_index.html.erb +2 -2
- data/app/views/permissions/index.js.erb +7 -2
- data/app/views/relation/customs/_list.html.erb +12 -5
- data/app/views/relation/customs/create.js.erb +4 -2
- data/app/views/relation/customs/index.html.erb +0 -5
- data/app/views/search/_form.html.erb +1 -1
- data/app/views/settings/_api_key.html.erb +3 -3
- data/app/views/settings/_index.html.erb +6 -1
- data/app/views/settings/_notifications.html.erb +3 -3
- data/app/views/settings/index.html.erb +4 -1
- data/config/locales/en.yml +31 -12
- data/config/locales/es.yml +33 -10
- data/config/routes.rb +10 -11
- data/lib/mailboxer/notification_decoder.rb +13 -4
- data/lib/social_stream/base/version.rb +1 -1
- metadata +6 -6
- data/app/assets/images/title_background.png +0 -0
- data/vendor/assets/javascripts/ui.checkbox.js +0 -309
@@ -1,98 +1,21 @@
|
|
1
1
|
<% toolbar :profile => current_subject %>
|
2
|
-
|
2
|
+
<% content_for :sidebar do %>
|
3
|
+
<%= render :partial => 'home/sidebar' %>
|
4
|
+
<% end %>
|
3
5
|
<%= location(t('account.one'),
|
4
|
-
link_to(t('
|
6
|
+
link_to(t('settings.main'), settings_path)
|
5
7
|
) %>
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
<% content_for :javascript do %>
|
10
|
-
$(".user_edit").validate({errorClass: "validation_error"});
|
11
|
-
<%end%>
|
12
|
-
|
13
|
-
<div class="space_center"></div>
|
14
|
-
<h2><%= t('account.edit') %></h2>
|
15
|
-
<div class="space_center"></div>
|
16
|
-
|
17
|
-
<div class="block" id="password_form">
|
18
|
-
<div class="header">
|
19
|
-
<div class="header_text">
|
20
|
-
<%=t("account.password.change")%>
|
21
|
-
</div>
|
22
|
-
</div>
|
23
|
-
<div class="space_center"></div>
|
24
|
-
<div >
|
25
|
-
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
|
26
|
-
<div class="form_row">
|
27
|
-
<div class="form_label">
|
28
|
-
<%= f.label t('account.password.new') %>
|
29
|
-
</div>
|
30
|
-
<div class="form_field">
|
31
|
-
<%= f.password_field :password, :class => "form_tag" %>
|
32
|
-
</div>
|
33
|
-
</div>
|
34
|
-
<div class="form_row">
|
35
|
-
<div class="form_label">
|
36
|
-
<%= f.label t('account.password.retype') %>
|
37
|
-
</div>
|
38
|
-
<div class="form_field">
|
39
|
-
<%= f.password_field :password_confirmation, :class => "form_tag" %>
|
40
|
-
</div>
|
41
|
-
</div>
|
42
|
-
<div class="form_row">
|
43
|
-
<div class="form_label">
|
44
|
-
<%= f.label :current_password %>
|
45
|
-
</div>
|
46
|
-
<div class="form_field">
|
47
|
-
<%= f.password_field :current_password, :class => "form_tag" %>
|
48
|
-
</div>
|
49
|
-
</div>
|
50
|
-
<div class="form_row space_center">
|
51
|
-
<%= f.submit t('button.update'), :class => "button" %>
|
52
|
-
</div>
|
53
|
-
<% end%>
|
54
|
-
</div>
|
55
|
-
</div>
|
56
|
-
<div class="block" id="email_form">
|
57
|
-
<div class="header">
|
58
|
-
<div class="header_text">
|
59
|
-
<%=t("account.email.change")%>
|
60
|
-
</div>
|
61
|
-
</div>
|
62
|
-
<div class="space_center"></div>
|
63
|
-
<div >
|
64
|
-
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
|
65
|
-
<div class="form_row">
|
66
|
-
<div class="form_label">
|
67
|
-
<%= f.label :email %>
|
68
|
-
</div>
|
69
|
-
<div class="form_field">
|
70
|
-
<%= f.email_field :email, :class => "required form_tag" %>
|
71
|
-
</div>
|
72
|
-
</div>
|
73
|
-
<div class="form_row">
|
74
|
-
<div class="form_label">
|
75
|
-
<%= f.label :current_password %>
|
76
|
-
</div>
|
77
|
-
<div class="form_field">
|
78
|
-
<%= f.password_field :current_password, :class => "required form_tag" %>
|
79
|
-
</div>
|
80
|
-
</div>
|
81
|
-
<div class="form_row space_center">
|
82
|
-
<%= f.submit t('button.update'), :class => "button" %>
|
83
|
-
</div>
|
84
|
-
<% end%>
|
85
|
-
</div>
|
8
|
+
<br class="clearfloat" />
|
9
|
+
<div class="space_center">
|
86
10
|
</div>
|
87
|
-
<
|
88
|
-
|
89
|
-
<div class="header_text">
|
90
|
-
<%=t("account.cancel")%>
|
91
|
-
</div>
|
92
|
-
</div>
|
93
|
-
<div class="space_center"></div>
|
94
|
-
<div class="form_row">
|
95
|
-
Unhappy? <b><%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</b>
|
96
|
-
</div>
|
11
|
+
<h2><%= t('settings.for')%> <%= current_subject.name %></h2>
|
12
|
+
<div class="space_center">
|
97
13
|
</div>
|
98
|
-
|
14
|
+
<%= render :partial => "edit_user"%>
|
15
|
+
|
16
|
+
<%= render :partial => "settings/notifications" %>
|
17
|
+
<% if current_subject.respond_to? :authentication_token%>
|
18
|
+
<%= render :partial => "settings/api_key" %>
|
19
|
+
<% end %>
|
20
|
+
<%= render :partial => "settings/contacts" %>
|
21
|
+
<%= render :partial => "delete_account"%>
|
@@ -4,9 +4,6 @@
|
|
4
4
|
<a href="#" class="sf-with-ul" id="current_subject_avatar_img" style="background: transparent url('<%= image_path current_subject.logo.url(:representation)%>') no-repeat left top;"><%= truncate_name current_subject.name, :length => 15 %><span class="sf-sub-indicator"> »</span></a>
|
5
5
|
<ul>
|
6
6
|
<%= render :partial => 'layouts/header_dropdown_menu_sessions'%>
|
7
|
-
<li>
|
8
|
-
<%= link_to t('account.edit'), edit_user_registration_path %>
|
9
|
-
</li>
|
10
7
|
<li>
|
11
8
|
<%= link_to t('settings.main'), settings_path, :id => "btn_menu_settings" %>
|
12
9
|
</li>
|
@@ -33,7 +33,7 @@
|
|
33
33
|
<%= text_area_tag :body, nil,:rows =>6, :cols=> 53, :class => "required form_tag", :maxlength => 5000 %>
|
34
34
|
</div>
|
35
35
|
<div class="actions center">
|
36
|
-
<%= submit_tag
|
36
|
+
<%= submit_tag t('mailboxer.send'), :name => :send_message, :class => "button" %>
|
37
37
|
</div>
|
38
38
|
</div>
|
39
39
|
<% end %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<div id="columns_container">
|
2
2
|
|
3
|
-
<div id="
|
3
|
+
<div id="permissions_list">
|
4
4
|
|
5
5
|
<p class="sectionTitle"><%= raw t('permission.of_relation.choose', :name => h(@relation.name)) %></p>
|
6
6
|
|
@@ -9,7 +9,7 @@
|
|
9
9
|
<tr>
|
10
10
|
<td>
|
11
11
|
<div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
|
12
|
-
<input id=<%= dom_id p %>
|
12
|
+
<input id=<%= dom_id p %> class="permission" type="checkbox"/>
|
13
13
|
<label for=<%= dom_id p %>><%= p.description(:brief) %></label>
|
14
14
|
<div class="clearfloat"></div>
|
15
15
|
</div>
|
@@ -1,10 +1,15 @@
|
|
1
1
|
$('#permissions').html("<%= escape_javascript render(:partial => 'index') %>");
|
2
|
-
|
2
|
+
|
3
3
|
<% default_permissions.each do |p| %>
|
4
4
|
<% if @relation.permission_ids.include? p.id %>
|
5
|
-
$('
|
5
|
+
$('#<%= dom_id p %>').attr('checked', 'checked');
|
6
6
|
<% else %>
|
7
7
|
$('label[for="relation_custom_permission_ids_' + <%= p.id %> + '"]').parent().hide();
|
8
8
|
<% end %>
|
9
9
|
<% end %>
|
10
|
+
|
11
|
+
$('#permissions_list input.permission').change(function(){
|
12
|
+
selectPermission(this);
|
13
|
+
});
|
14
|
+
|
10
15
|
$('#permissions').show();
|
@@ -2,8 +2,8 @@
|
|
2
2
|
<% list.each do |r| %>
|
3
3
|
<%= raw cycle("<tr><td>", "<td>", :name => "begin_cell") %>
|
4
4
|
<div contain="<%= dom_id(r) %>" class="checkboxOptionLeft">
|
5
|
-
<input id
|
6
|
-
<label for
|
5
|
+
<input id="<%= dom_id(r) %>" type="radio" name="relation_custom"/>
|
6
|
+
<label for="<%= dom_id(r) %>"><%=r.name%></label>
|
7
7
|
<div class="options">
|
8
8
|
<%= link_to image_tag("btn/edit.png", :class => "menu_icon", :title => t('relation_custom.edit')), '#', :class => "relation_custom_edit_link" %>
|
9
9
|
<%= link_to image_tag("btn/delete.png", :class => "menu_icon", :title => t('relation_custom.delete')), r, :class => "relation_custom_delete_link", :method => :delete, :confirm => t('relation_custom.confirm_delete') %>
|
@@ -37,9 +37,11 @@
|
|
37
37
|
</table>
|
38
38
|
|
39
39
|
<%= javascript_tag do %>
|
40
|
-
$(function()
|
41
|
-
$('
|
42
|
-
|
40
|
+
$(function(){
|
41
|
+
$('#relation_customs_list :radio').change(function(){
|
42
|
+
selectRelation(this);
|
43
|
+
});
|
44
|
+
|
43
45
|
$('.relation_custom_edit_link').click(function() {
|
44
46
|
$(this).parent().hide();
|
45
47
|
$(this).parent().siblings('label').hide();
|
@@ -52,5 +54,10 @@
|
|
52
54
|
|
53
55
|
return false;
|
54
56
|
});
|
57
|
+
|
58
|
+
$("#new_relation_custom_title").click(function() {
|
59
|
+
$("#new_relation_custom_title_block").hide();
|
60
|
+
$("#new_relation_custom_input_block").show();
|
61
|
+
});
|
55
62
|
})
|
56
63
|
<% end %>
|
@@ -13,7 +13,9 @@
|
|
13
13
|
// Refresh list
|
14
14
|
$('#relation_customs_list').html("<%= escape_javascript render(:partial => 'relation/customs/list', :object => current_subject.relation_customs) %>");
|
15
15
|
|
16
|
-
|
17
|
-
$(
|
16
|
+
|
17
|
+
$(function(){
|
18
|
+
selectRelation($('#' + '<%= dom_id @custom %>'));
|
19
|
+
});
|
18
20
|
<% end %>
|
19
21
|
|
@@ -10,11 +10,6 @@
|
|
10
10
|
|
11
11
|
<%= javascript_tag do %>
|
12
12
|
$(function() {
|
13
|
-
$("#new_relation_custom_title").click(function() {
|
14
|
-
$("#new_relation_custom_title_block").hide();
|
15
|
-
$("#new_relation_custom_input_block").show();
|
16
|
-
});
|
17
|
-
|
18
13
|
$("#loading").hide();
|
19
14
|
|
20
15
|
$("#loading").ajaxStart(function(){
|
@@ -10,7 +10,7 @@
|
|
10
10
|
<li><%= link_to content_tag(:span,t('search.show_all'),:class => params[:focus].blank? ? 'global selected' : 'global'), search_path(:search_query => params[:search_query]), :remote => true %></li>
|
11
11
|
<% SocialStream.extended_search_models.each do |model_sym| %>
|
12
12
|
<% selected_class = (params[:focus].present? and params[:focus].pluralize.downcase.eql?(model_sym.to_s.pluralize.downcase)) ? 'selected' : ''%>
|
13
|
-
<% disabled =ThinkingSphinx.count(get_search_query, :classes => [model_sym.to_s.classify.constantize])==0 %>
|
13
|
+
<% disabled = ThinkingSphinx.count(get_search_query, :classes => [model_sym.to_s.classify.constantize])==0 %>
|
14
14
|
<% disabled_class = (disabled ? 'disabled' : '') %>
|
15
15
|
<li>
|
16
16
|
<% unless disabled %>
|
@@ -4,15 +4,15 @@
|
|
4
4
|
<%= t('settings.api_key.name')%>
|
5
5
|
</div>
|
6
6
|
<div class="header_icon_right">
|
7
|
-
|
7
|
+
<%= link_to (image_tag('btn/edit.png')), "javascript:showSettings(\"api_key_settings\");" %>
|
8
8
|
</div>
|
9
9
|
</div>
|
10
|
-
<div
|
10
|
+
<div id="api_key_settings_briefing" class="settings_briefing content">
|
11
11
|
<div class="form_row">
|
12
12
|
<%= t('settings.api_key.briefing')%>
|
13
13
|
</div>
|
14
14
|
</div>
|
15
|
-
<div class="content" id="api_key_settings_content" style="display:none;">
|
15
|
+
<div class="content settings_content" id="api_key_settings_content" style="display:none;">
|
16
16
|
<div class="settings_block">
|
17
17
|
<div class="form_row">
|
18
18
|
<%=t('settings.api_key.explanation') %>: <span id="api_token"><%= current_subject.authentication_token.blank? ? t('settings.api_key.empty') : current_subject.authentication_token %></span>
|
@@ -1,12 +1,17 @@
|
|
1
|
-
<%= location(link_to(image_tag("btn/btn_config.png", :class => "btn_config")+t('account.one')+": "+t('account.settings')))%>
|
2
1
|
<br class="clearfloat" />
|
3
2
|
<div class="space_center">
|
4
3
|
</div>
|
5
4
|
<h2><%= t('settings.for')%> <%= current_subject.name %></h2>
|
6
5
|
<div class="space_center">
|
7
6
|
</div>
|
7
|
+
<% if current_subject==current_user %>
|
8
|
+
<%= render :partial => "devise/registrations/edit_user", :locals => { :resource => current_user, :resource_name => :user }%>
|
9
|
+
<% end %>
|
8
10
|
<%= render :partial => "notifications" %>
|
9
11
|
<% if current_subject.respond_to? :authentication_token%>
|
10
12
|
<%= render :partial => "api_key" %>
|
11
13
|
<% end %>
|
12
14
|
<%= render :partial => "contacts" %>
|
15
|
+
<% if current_subject==current_user %>
|
16
|
+
<%= render :partial => "devise/registrations/delete_account", :locals => { :resource => current_user, :resource_name => :user }%>
|
17
|
+
<% end %>
|
@@ -4,15 +4,15 @@
|
|
4
4
|
<%= t('settings.notifications.name')%>
|
5
5
|
</div>
|
6
6
|
<div class="header_icon_right">
|
7
|
-
|
7
|
+
<%= link_to (image_tag('btn/edit.png')), "javascript:showSettings(\"notifications_settings\");" %>
|
8
8
|
</div>
|
9
9
|
</div>
|
10
|
-
<div
|
10
|
+
<div id="notifications_settings_briefing" class="settings_briefing content">
|
11
11
|
<div class="form_row">
|
12
12
|
<%= t('settings.notifications.briefing')%>
|
13
13
|
</div>
|
14
14
|
</div>
|
15
|
-
<div class="content" id="notifications_settings_content" style="display:none;">
|
15
|
+
<div class="content settings_content" id="notifications_settings_content" style="display:none;">
|
16
16
|
<%= form_tag update_all_settings_path, :method => :put do %>
|
17
17
|
<ul>
|
18
18
|
<div class="settings_block">
|
@@ -6,10 +6,13 @@
|
|
6
6
|
<%= render :partial => 'home/sidebar' %>
|
7
7
|
<% end %>
|
8
8
|
|
9
|
-
<% toolbar %>
|
9
|
+
<% toolbar :profile => current_subject %>
|
10
10
|
|
11
11
|
<% content_for :javascript do %>
|
12
12
|
|
13
13
|
<% end %>
|
14
|
+
<%= location(t('account.one'),
|
15
|
+
link_to(t('settings.main'), settings_path)
|
16
|
+
) %>
|
14
17
|
|
15
18
|
<%= render :partial => 'index' %>
|
data/config/locales/en.yml
CHANGED
@@ -19,6 +19,8 @@ en:
|
|
19
19
|
attributes:
|
20
20
|
contact:
|
21
21
|
relation_ids: "Contact type"
|
22
|
+
relation/custom:
|
23
|
+
name: "Name"
|
22
24
|
user:
|
23
25
|
email: "Email"
|
24
26
|
name: "Name"
|
@@ -43,9 +45,14 @@ en:
|
|
43
45
|
one: "Activity"
|
44
46
|
other: "Activities"
|
45
47
|
privacy:
|
46
|
-
|
47
|
-
|
48
|
-
|
48
|
+
myself:
|
49
|
+
contacts:
|
50
|
+
group: "All members"
|
51
|
+
user: "Your contacts"
|
52
|
+
outside:
|
53
|
+
contacts:
|
54
|
+
group: "Members of %{receiver}"
|
55
|
+
user: "Contacts of %{receiver}"
|
49
56
|
sending: "Sending"
|
50
57
|
title: "Activities"
|
51
58
|
to_comment: "Comment"
|
@@ -222,15 +229,21 @@ en:
|
|
222
229
|
base: "You are here"
|
223
230
|
separator: " > "
|
224
231
|
mailboxer:
|
232
|
+
delete: "Delete"
|
233
|
+
delete_confirm: "Do you want to move '%{object}' to trash?"
|
225
234
|
form:
|
226
235
|
body: "Body"
|
227
236
|
recipients: "Recipients"
|
228
237
|
subject: "Subject"
|
238
|
+
mark_as_read: "Mark as read"
|
229
239
|
message_mailer:
|
230
240
|
subject_new: "%{subject}"
|
231
241
|
subject_reply: "%{subject}"
|
232
242
|
notification_mailer:
|
233
243
|
subject: "%{subject}"
|
244
|
+
reply: "Reply"
|
245
|
+
send: "Send message"
|
246
|
+
sent: "Your message was sent"
|
234
247
|
menu:
|
235
248
|
options: "Menu Options"
|
236
249
|
information: "Information"
|
@@ -376,15 +389,6 @@ en:
|
|
376
389
|
write: "Write your query ..."
|
377
390
|
wrong: "There seems to be a problem with the search engine"
|
378
391
|
settings:
|
379
|
-
error: "Some errors raised when saving your changes"
|
380
|
-
for: "Settings for"
|
381
|
-
main: "Settings"
|
382
|
-
manage:
|
383
|
-
name: "Admin Contacs"
|
384
|
-
briefing: "Settings contacts preferences"
|
385
|
-
explanation: "Change contacts permissions"
|
386
|
-
one: "Settings"
|
387
|
-
success: "Your settings where correctly changed"
|
388
392
|
api_key:
|
389
393
|
briefing: "Manage your API key"
|
390
394
|
confirm: "Are you sure?"
|
@@ -392,6 +396,17 @@ en:
|
|
392
396
|
explanation: "This is your API key"
|
393
397
|
name: "API Key"
|
394
398
|
regenerate: "Regenerate API key"
|
399
|
+
cancel_account:
|
400
|
+
briefing: "Lets you cancel your account"
|
401
|
+
email_change:
|
402
|
+
briefing: "Change your email"
|
403
|
+
error: "Some errors raised when saving your changes"
|
404
|
+
for: "Settings for"
|
405
|
+
main: "Settings"
|
406
|
+
manage:
|
407
|
+
name: "Admin Contacs"
|
408
|
+
briefing: "Settings for contacts"
|
409
|
+
explanation: "Change contacts permissions"
|
395
410
|
notifications:
|
396
411
|
briefing: "Settings about notifications behaviour and mail alerts"
|
397
412
|
name: "Notifications"
|
@@ -399,6 +414,10 @@ en:
|
|
399
414
|
name: "Send me an email when I receive a notification"
|
400
415
|
always: "Always"
|
401
416
|
never: "Never"
|
417
|
+
one: "Settings"
|
418
|
+
password_change:
|
419
|
+
briefing: "Change your password"
|
420
|
+
success: "Your settings where correctly changed"
|
402
421
|
share: "Share"
|
403
422
|
sign_in: "Sign in"
|
404
423
|
sign_out: "Sign out"
|
data/config/locales/es.yml
CHANGED
@@ -19,6 +19,8 @@ es:
|
|
19
19
|
attributes:
|
20
20
|
contact:
|
21
21
|
relation_ids: "El tipo de contacto"
|
22
|
+
relation/custom:
|
23
|
+
name: "Nombre"
|
22
24
|
user:
|
23
25
|
email: "Correo"
|
24
26
|
name: "Nombre"
|
@@ -43,9 +45,14 @@ es:
|
|
43
45
|
one: "Actividad"
|
44
46
|
other: "Actividades"
|
45
47
|
privacy:
|
46
|
-
|
47
|
-
|
48
|
-
|
48
|
+
myself:
|
49
|
+
contacts:
|
50
|
+
group: "Todos los integrantes"
|
51
|
+
user: "Tus contacts"
|
52
|
+
outside:
|
53
|
+
contacts:
|
54
|
+
group: "Integrantes de %{receiver}"
|
55
|
+
user: "Contactos de %{receiver}"
|
49
56
|
sending: "Enviando"
|
50
57
|
title: "Actividades"
|
51
58
|
to_comment: "Comentar"
|
@@ -195,7 +202,7 @@ es:
|
|
195
202
|
submit:
|
196
203
|
relation_custom:
|
197
204
|
create: "Guardar"
|
198
|
-
update: "
|
205
|
+
update: "Guardar"
|
199
206
|
home: "Inicio"
|
200
207
|
inbox:
|
201
208
|
one: "Entrada"
|
@@ -219,15 +226,21 @@ es:
|
|
219
226
|
base: "Estás aquí"
|
220
227
|
separator: " > "
|
221
228
|
mailboxer:
|
229
|
+
delete: "Borrar"
|
230
|
+
delete_confirm: "¿Quieres enviar '%{object}' a la papelera?"
|
222
231
|
form:
|
223
232
|
body: "Mensaje"
|
224
233
|
recipients: "Para"
|
225
234
|
subject: "Asunto"
|
235
|
+
mark_as_read: "Marcar como leido"
|
226
236
|
message_mailer:
|
227
237
|
subject_new: "%{subject}"
|
228
238
|
subject_reply: "%{subject}"
|
229
239
|
notification_mailer:
|
230
|
-
subject: "%{subject}"
|
240
|
+
subject: "%{subject}"
|
241
|
+
reply: "Contestar"
|
242
|
+
send: "Enviar mensaje"
|
243
|
+
sent: "Tu mensaje fue enviado"
|
231
244
|
menu:
|
232
245
|
options: "Opciones"
|
233
246
|
information: "Información"
|
@@ -371,11 +384,6 @@ es:
|
|
371
384
|
write: "Escribe tu búsqueda..."
|
372
385
|
wrong: "Parece que hay un problema con el motor de búsqueda"
|
373
386
|
settings:
|
374
|
-
error: "Hubo errores al guardar los cambios"
|
375
|
-
for: "Ajustes para"
|
376
|
-
main: "Ajustes principales"
|
377
|
-
one: "Ajustes"
|
378
|
-
success: "Ajustes guardados con éxito"
|
379
387
|
api_key:
|
380
388
|
briefing: "Gestiona tu clave API"
|
381
389
|
confirm: "¿Estás seguro?"
|
@@ -383,6 +391,17 @@ es:
|
|
383
391
|
explanation: "Ésta es tu clave API"
|
384
392
|
name: "Clave API"
|
385
393
|
regenerate: "Regenerar clave API"
|
394
|
+
cancel_account:
|
395
|
+
briefing: "Te permite cancelar tu cuenta"
|
396
|
+
email_change:
|
397
|
+
briefing: "Cambia tu email"
|
398
|
+
error: "Hubo errores al guardar los cambios"
|
399
|
+
for: "Ajustes para"
|
400
|
+
main: "Ajustes"
|
401
|
+
manage:
|
402
|
+
name: "Administrar contactos"
|
403
|
+
briefing: "Ajustes de contactos"
|
404
|
+
explanation: "Cambiar los permisos de contactos"
|
386
405
|
notifications:
|
387
406
|
briefing: "Ajustes sobre notificaciones y alertas por correo"
|
388
407
|
name: "Notificaciones"
|
@@ -390,6 +409,10 @@ es:
|
|
390
409
|
name: "Mandarme un correo cuando me llega una notificación"
|
391
410
|
always: "Siempre"
|
392
411
|
never: "Nunca"
|
412
|
+
one: "Ajustes"
|
413
|
+
password_change:
|
414
|
+
briefing: "Cambia tu contraseña"
|
415
|
+
success: "Ajustes guardados con éxito"
|
393
416
|
share: "Compartir"
|
394
417
|
sign_in: "Entrar"
|
395
418
|
sign_out: "Salir"
|
data/config/routes.rb
CHANGED
@@ -14,17 +14,6 @@ Rails.application.routes.draw do
|
|
14
14
|
match 'home' => 'home#index', :as => :home
|
15
15
|
match 'home' => 'home#index', :as => :user_root # devise after_sign_in_path_for
|
16
16
|
|
17
|
-
##API###
|
18
|
-
match 'api/keygen' => 'api#create_key', :as => :api_keygen
|
19
|
-
match 'api/user/:id' => 'api#users'
|
20
|
-
match 'api/me' => 'api#users'
|
21
|
-
match 'api/me/home/' => 'api#activity_atom_feed', :format => 'atom', :as => :api_my_home
|
22
|
-
match 'api/me/contacts' => 'contacts#index', :format => 'json'
|
23
|
-
match 'api/subjects/:s/contacts' => 'contacts#index', :format => 'json'
|
24
|
-
match 'api/user/:id/public' => 'api#activity_atom_feed', :format => 'atom'
|
25
|
-
match 'api/user/:id/public' => 'api#activity_atom_feed', :format => 'atom'
|
26
|
-
##/API##
|
27
|
-
|
28
17
|
# Webfinger
|
29
18
|
match '.well-known/host-meta',:to => 'frontpage#host_meta'
|
30
19
|
|
@@ -87,4 +76,14 @@ Rails.application.routes.draw do
|
|
87
76
|
(SocialStream.objects - [ :actor ]).each do |object|
|
88
77
|
resources object.to_s.pluralize
|
89
78
|
end
|
79
|
+
|
80
|
+
##API###
|
81
|
+
match 'api/keygen' => 'api#create_key', :as => :api_keygen
|
82
|
+
match 'api/user/:id' => 'api#users', :as => :api_user
|
83
|
+
match 'api/me' => 'api#users', :as => :api_me
|
84
|
+
match 'api/me/home/' => 'api#activity_atom_feed', :format => 'atom', :as => :api_my_home
|
85
|
+
match 'api/me/contacts' => 'contacts#index', :format => 'json', :as => :api_contacts
|
86
|
+
match 'api/subjects/:s/contacts' => 'contacts#index', :format => 'json', :as => :api_subject_contacts
|
87
|
+
match 'api/user/:id/public' => 'api#activity_atom_feed', :format => 'atom', :as => :api_user_activities
|
88
|
+
##/API##
|
90
89
|
end
|
@@ -20,7 +20,7 @@ module Mailboxer
|
|
20
20
|
:receiver => truncate_name(activity.receiver.name)))
|
21
21
|
notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
|
22
22
|
end
|
23
|
-
|
23
|
+
|
24
24
|
if activity.direct_object.present?
|
25
25
|
object = activity.direct_object
|
26
26
|
object = object.subject if object.is_a? Actor
|
@@ -28,10 +28,19 @@ module Mailboxer
|
|
28
28
|
url_for(:controller=> object.class.to_s.underscore.pluralize, :action=> :show,
|
29
29
|
:id=> object.id, :only_path => false)))
|
30
30
|
notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.underscore)
|
31
|
-
|
31
|
+
|
32
|
+
|
33
|
+
|
34
|
+
if object.respond_to? :text
|
35
|
+
notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.text.truncate(100, :separator =>' '),
|
32
36
|
url_for(:controller=> object.class.to_s.underscore.pluralize, :action=> :show,
|
33
|
-
:id=> object.id, :only_path => false)))
|
34
|
-
|
37
|
+
:id=> object.id, :only_path => false)))
|
38
|
+
elsif SocialStream.objects.include? :document and object.is_a? Document
|
39
|
+
notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.file_file_name.truncate(100, :separator =>' '),
|
40
|
+
url_for(:controller=> object.class.to_s.underscore.pluralize, :action=> :show,
|
41
|
+
:id=> object.id, :only_path => false)))
|
42
|
+
|
43
|
+
end
|
35
44
|
#notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
|
36
45
|
|
37
46
|
else
|
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:
|
4
|
+
hash: 19
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 9
|
9
|
-
-
|
10
|
-
version: 0.9.
|
9
|
+
- 20
|
10
|
+
version: 0.9.20
|
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-10-
|
19
|
+
date: 2011-10-14 00:00:00 +02:00
|
20
20
|
default_executable:
|
21
21
|
dependencies:
|
22
22
|
- !ruby/object:Gem::Dependency
|
@@ -628,7 +628,6 @@ files:
|
|
628
628
|
- app/assets/images/mini-loading.gif
|
629
629
|
- app/assets/images/right.png
|
630
630
|
- app/assets/images/tipsy.gif
|
631
|
-
- app/assets/images/title_background.png
|
632
631
|
- app/assets/javascripts/activities.js.erb
|
633
632
|
- app/assets/javascripts/contacts.js
|
634
633
|
- app/assets/javascripts/conversations.js
|
@@ -793,6 +792,8 @@ files:
|
|
793
792
|
- app/views/conversations/show.js.erb
|
794
793
|
- app/views/devise/passwords/edit.html.erb
|
795
794
|
- app/views/devise/passwords/new.html.erb
|
795
|
+
- app/views/devise/registrations/_delete_account.html.erb
|
796
|
+
- app/views/devise/registrations/_edit_user.html.erb
|
796
797
|
- app/views/devise/registrations/edit.html.erb
|
797
798
|
- app/views/devise/registrations/new.html.erb
|
798
799
|
- app/views/devise/sessions/new.html.erb
|
@@ -1062,7 +1063,6 @@ files:
|
|
1062
1063
|
- vendor/assets/javascripts/jquery.watermarkinput.js
|
1063
1064
|
- vendor/assets/javascripts/menu.js
|
1064
1065
|
- vendor/assets/javascripts/superfish.js
|
1065
|
-
- vendor/assets/javascripts/ui.checkbox.js
|
1066
1066
|
- vendor/assets/stylesheets/carousel.css
|
1067
1067
|
- vendor/assets/stylesheets/chosen-sprite.png
|
1068
1068
|
- vendor/assets/stylesheets/chosen.css
|
Binary file
|