Download as
Browse Code »

Commit dfdbb0ea68cafcd3549fae822eb248a56a086827

Authored by Victor Costa
2 parents e562726f 47b59b20
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'rails3' into rails3_stable

Showing 24 changed files with 109 additions and 107 deletions   Show diff stats
app/views/comment/notifier/notification.html.erb
View file @e562726
... ... @@ -1,19 +0,0 @@
1   -<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
2   -
3   -<%= word_wrap(_('%{sender} (%{sender_link}) created a new comment on your article "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
4   -
5   -<%= word_wrap(_('Title: %s') % @comment_title) %>
6   -
7   -<%= _("Comment:") %>
8   --------------------------------------------------------------------------------
9   -<%= word_wrap(@comment_body) %>
10   --------------------------------------------------------------------------------
11   -
12   -<%= _('Access the address below to view this comment:') %>
13   -<%= url_for @comment_url %>
14   -
15   -<%= _("Greetings,") %>
16   -
17   ---
18   -<%= _('%s team.') % @environment %>
19   -<%= url_for @url %>
app/views/comment/notifier/notification.text.erb 0 → 100644
  Diff comments   View file @dfdbb0e
... ... @@ -0,0 +1,19 @@
  1 +<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
  2 +
  3 +<%= word_wrap(_('%{sender} (%{sender_link}) created a new comment on your article "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
  4 +
  5 +<%= word_wrap(_('Title: %s') % @comment_title) %>
  6 +
  7 +<%= _("Comment:") %>
  8 +-------------------------------------------------------------------------------
  9 +<%= word_wrap(@comment_body) %>
  10 +-------------------------------------------------------------------------------
  11 +
  12 +<%= _('Access the address below to view this comment:') %>
  13 +<%= url_for @comment_url %>
  14 +
  15 +<%= _("Greetings,") %>
  16 +
  17 +--
  18 +<%= _('%s team.') % @environment %>
  19 +<%= url_for @url %>
... ...
app/views/pending_task_notifier/notification.html.erb
View file @e562726
... ... @@ -1,25 +0,0 @@
1   -<%= _("Dear %s") % @person.name %>,
2   -
3   -<%= _("You have %d pending task(s).") % @tasks.size %>
4   -
5   -<%= @tasks.map{|i| " * #{i.description}"}.join("\n") %>
6   -
7   -<%= _("Click in address below to process task(s):") %>
8   -
9   -<%= @url_for_pending_tasks %>
10   -<% @organizations_with_pending_tasks.each do |organization| %>
11   -<% pending_tasks = @person.pending_tasks_for_organization(organization) %>
12   -<%= _("%s has %d pending task(s).") % [organization.name, pending_tasks.size] %>
13   -
14   -<%= pending_tasks.map{|i| " * #{i.information}"}.join("\n") %>
15   -
16   -<%= _("Click in address below to process task(s):") %>
17   -
18   -<%= url_for(:host => @default_hostname, :controller => 'tasks', :profile => organization.identifier) %>
19   -<% end %>
20   -
21   -<%= _('Greetings,') %>
22   -
23   ---
24   -<%= _('%s team.') % @environment %>
25   -<%= @url %>
app/views/pending_task_notifier/notification.text.erb 0 → 100644
  Diff comments   View file @dfdbb0e
... ... @@ -0,0 +1,25 @@
  1 +<%= _("Dear %s") % @person.name %>,
  2 +
  3 +<%= _("You have %d pending task(s).") % @tasks.size %>
  4 +
  5 +<%= @tasks.map{|i| " * #{i.description}"}.join("\n") %>
  6 +
  7 +<%= _("Click in address below to process task(s):") %>
  8 +
  9 +<%= @url_for_pending_tasks %>
  10 +<% @organizations_with_pending_tasks.each do |organization| %>
  11 +<% pending_tasks = @person.pending_tasks_for_organization(organization) %>
  12 +<%= _("%s has %d pending task(s).") % [organization.name, pending_tasks.size] %>
  13 +
  14 +<%= pending_tasks.map{|i| " * #{i.information}"}.join("\n") %>
  15 +
  16 +<%= _("Click in address below to process task(s):") %>
  17 +
  18 +<%= url_for(:host => @default_hostname, :controller => 'tasks', :profile => organization.identifier) %>
  19 +<% end %>
  20 +
  21 +<%= _('Greetings,') %>
  22 +
  23 +--
  24 +<%= _('%s team.') % @environment %>
  25 +<%= @url %>
... ...
app/views/scrap/notifier/notification.html.erb
View file @e562726
... ... @@ -1,16 +0,0 @@
1   -<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
2   -
3   -<%= word_wrap(_('%{sender} (%{sender_link}) has left the following scrap for you:') % { :sender => @sender, :sender_link => url_for(@sender_link) }) %>
4   -
5   --------------------------------------------------------------------------------
6   -<%= word_wrap(@scrap_content) %>
7   --------------------------------------------------------------------------------
8   -
9   -<%= _('View this scrap on the wall') %>:
10   -<%= url_for @wall_url %>
11   -
12   -<%= _("Greetings,") %>
13   -
14   ---
15   -<%= _('%s team.') % @environment %>
16   -<%= url_for @url %>
app/views/scrap/notifier/notification.text.erb 0 → 100644
  Diff comments   View file @dfdbb0e
... ... @@ -0,0 +1,16 @@
  1 +<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
  2 +
  3 +<%= word_wrap(_('%{sender} (%{sender_link}) has left the following scrap for you:') % { :sender => @sender, :sender_link => url_for(@sender_link) }) %>
  4 +
  5 +-------------------------------------------------------------------------------
  6 +<%= word_wrap(@scrap_content) %>
  7 +-------------------------------------------------------------------------------
  8 +
  9 +<%= _('View this scrap on the wall') %>:
  10 +<%= url_for @wall_url %>
  11 +
  12 +<%= _("Greetings,") %>
  13 +
  14 +--
  15 +<%= _('%s team.') % @environment %>
  16 +<%= url_for @url %>
... ...
app/views/task_mailer/invitation_notification.html.erb
View file @e562726
... ... @@ -1 +0,0 @@
1   -<%= @message %>
2 0 \ No newline at end of file
app/views/task_mailer/invitation_notification.text.erb 0 → 100644
  Diff comments   View file @dfdbb0e
... ... @@ -0,0 +1 @@
  1 +<%= @message %>
0 2 \ No newline at end of file
... ...
app/views/task_mailer/target_notification.html.erb
View file @e562726
... ... @@ -1,10 +0,0 @@
1   -<%= _('Hello %s,') % @target %>
2   -
3   -<%= word_wrap(@message) %>
4   -
5   -<%= word_wrap(_('Access your list of tasks or your control panel to see this and other pending actions that need your attention.')) %>
6   -<%= @tasks_url %>
7   -
8   ---
9   -<%= _('%s team.') % @environment %>
10   -<%= @url %>
app/views/task_mailer/target_notification.text.erb 0 → 100644
  Diff comments   View file @dfdbb0e
... ... @@ -0,0 +1,10 @@
  1 +<%= _('Hello %s,') % @target %>
  2 +
  3 +<%= word_wrap(@message) %>
  4 +
  5 +<%= word_wrap(_('Access your list of tasks or your control panel to see this and other pending actions that need your attention.')) %>
  6 +<%= @tasks_url %>
  7 +
  8 +--
  9 +<%= _('%s team.') % @environment %>
  10 +<%= @url %>
... ...
app/views/task_mailer/task_activated.text.erb 0 → 120000
  Diff comments   View file @dfdbb0e
... ... @@ -0,0 +1 @@
  1 +task_cancelled.text.erb
0 2 \ No newline at end of file
... ...
app/views/task_mailer/task_activated.text.plain.html.erb
View file @e562726
... ... @@ -1 +0,0 @@
1   -task_cancelled.text.plain.html.erb
2 0 \ No newline at end of file
app/views/task_mailer/task_cancelled.text.erb 0 → 100644
  Diff comments   View file @dfdbb0e
... ... @@ -0,0 +1,9 @@
  1 +<%= _('Dear %s,') % @requestor %>
  2 +
  3 +<%= word_wrap(@message) %>
  4 +
  5 +<%= _('Greetings,') %>
  6 +
  7 +--
  8 +<%= _('%s team.') % @environment %>
  9 +<%= @url %>
... ...
app/views/task_mailer/task_cancelled.text.plain.html.erb
View file @e562726
... ... @@ -1,9 +0,0 @@
1   -<%= _('Dear %s,') % @requestor %>
2   -
3   -<%= word_wrap(@message) %>
4   -
5   -<%= _('Greetings,') %>
6   -
7   ---
8   -<%= _('%s team.') % @environment %>
9   -<%= @url %>
app/views/task_mailer/task_created.text.erb 0 → 120000
  Diff comments   View file @dfdbb0e
... ... @@ -0,0 +1 @@
  1 +task_cancelled.text.erb
0 2 \ No newline at end of file
... ...
app/views/task_mailer/task_created.text.plain.html.erb
View file @e562726
... ... @@ -1 +0,0 @@
1   -task_cancelled.text.plain.html.erb
2 0 \ No newline at end of file
app/views/task_mailer/task_finished.text.erb 0 → 120000
  Diff comments   View file @dfdbb0e
... ... @@ -0,0 +1 @@
  1 +task_cancelled.text.erb
0 2 \ No newline at end of file
... ...
app/views/task_mailer/task_finished.text.plain.html.erb
View file @e562726
... ... @@ -1 +0,0 @@
1   -task_cancelled.text.plain.html.erb
2 0 \ No newline at end of file
app/views/user_mailer/activation_code.html.erb
View file @e562726
... ... @@ -1,9 +0,0 @@
1   -<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
2   -
3   -<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %>
4   -
5   -<%= _("Greetings,") %>
6   -
7   ---
8   -<%= _('%s team.') % @environment %>
9   -<%= url_for @url %>
app/views/user_mailer/activation_code.text.erb 0 → 100644
  Diff comments   View file @dfdbb0e
... ... @@ -0,0 +1,9 @@
  1 +<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
  2 +
  3 +<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %>
  4 +
  5 +<%= _("Greetings,") %>
  6 +
  7 +--
  8 +<%= _('%s team.') % @environment %>
  9 +<%= url_for @url %>
... ...
app/views/user_mailer/activation_email_notify.html.erb
View file @e562726
... ... @@ -1,12 +0,0 @@
1   -<%= _('Hello %s,') % @name %>
2   -
3   -<%= _('Your email %s was just activated.') % [@email] %>
4   -
5   -<%= _('You can access your e-mail from anywhere, using the following address:') %>
6   -<%= @webmail %>
7   -
8   -<%= _('Greetings,') %>
9   -
10   ---
11   -<%= _('%s team.') % @environment %>
12   -<%= @url %>
app/views/user_mailer/activation_email_notify.text.erb 0 → 100644
  Diff comments   View file @dfdbb0e
... ... @@ -0,0 +1,12 @@
  1 +<%= _('Hello %s,') % @name %>
  2 +
  3 +<%= _('Your email %s was just activated.') % [@email] %>
  4 +
  5 +<%= _('You can access your e-mail from anywhere, using the following address:') %>
  6 +<%= @webmail %>
  7 +
  8 +<%= _('Greetings,') %>
  9 +
  10 +--
  11 +<%= _('%s team.') % @environment %>
  12 +<%= @url %>
... ...
plugins/comment_group/public/comment_group_macro.js
  Diff comments   View file @dfdbb0e
... ... @@ -5,7 +5,7 @@ jQuery(document).ready(function($) {
5 5  
6 6 var val = anchor.split('-'); //anchor format = #comment-\d+
7 7 if(val.length!=2 || val[0]!='#comment') return;
8   - if($('div[data-macro=comment_group_plugin/allow_comment]').length==0) return; //comment_group_plugin/allow_comment div must exists
  8 + if($('div[data-macro=comment_group_plugin\\/allow_comment]').length==0) return; //comment_group_plugin/allow_comment div must exists
9 9 var comment_id = val[1];
10 10 if(!/^\d+$/.test(comment_id)) return; //test for integer
11 11  
... ...
script/noosfero-plugins
  Diff comments   View file @dfdbb0e
... ... @@ -104,8 +104,10 @@ _enable(){
104 104 plugins_features_dir="$NOOSFERO_DIR/features/plugins"
105 105 cd $plugins_public_dir
106 106 test -d "$source/public" && ln -s "$source/public" "$plugin"
107   - cd $plugins_features_dir
108   - test -d "$NOOSFERO_DIR/features" && test -d "$source/features" && ln -s "$source/features" "$plugin"
  107 + if [ -d "$NOOSFERO_DIR/features" ]; then
  108 + cd $plugins_features_dir
  109 + test -d "$source/features" && ln -s "$source/features" "$plugin"
  110 + fi
109 111 _say "$plugin enabled"
110 112 run "$source/after_enable.rb"
111 113 needs_migrate=true
... ...