Download as
Browse Code »

Commit 92d8b7be0e8b67e2b49f93fee87c66cb2455750c

Authored by Braulio Bhavamitra
1 parent e3bb9147
Exists in staging and in 39 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

rails4: fix asset pipeline use

Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
  Diff comments   View file @92d8b7b
@@ -39,4 +39,4 @@ @@ -39,4 +39,4 @@
39 <%= submit_button :save, c_('Save'), :cancel => {:action => 'index'}%> 39 <%= submit_button :save, c_('Save'), :cancel => {:action => 'index'}%>
40 <% end %> 40 <% end %>
41 41
42 -<%= javascript_include_tag '../plugins/custom_forms/field' %> 42 +<%= javascript_include_tag 'plugins/custom_forms/field' %>
plugins/custom_forms/views/custom_forms_plugin_myprofile/submissions.html.erb
  Diff comments   View file @92d8b7b
@@ -31,4 +31,4 @@ @@ -31,4 +31,4 @@
31 <%= button :back, _('Back to forms'), :action => 'index' %> 31 <%= button :back, _('Back to forms'), :action => 'index' %>
32 <% end %> 32 <% end %>
33 33
34 -<%= javascript_include_tag '../plugins/custom_forms/order' %> 34 +<%= javascript_include_tag 'plugins/custom_forms/order' %>
plugins/stoa/lib/stoa_plugin.rb
  Diff comments   View file @92d8b7b
@@ -24,7 +24,7 @@ class StoaPlugin &lt; Noosfero::Plugin @@ -24,7 +24,7 @@ class StoaPlugin &lt; Noosfero::Plugin
24 content_tag(:small, _('Confirm your birth date. Pay attention to the format: yyyy-mm-dd.'), :id => 'usp-birth-date-balloon'), :id => 'signup-birth-date', :style => 'display: none') + 24 content_tag(:small, _('Confirm your birth date. Pay attention to the format: yyyy-mm-dd.'), :id => 'usp-birth-date-balloon'), :id => 'signup-birth-date', :style => 'display: none') +
25 content_tag('div', required(labelled_form_field(_('CPF'), text_field_tag('cpf', ''))) + 25 content_tag('div', required(labelled_form_field(_('CPF'), text_field_tag('cpf', ''))) +
26 content_tag(:small, _('Confirm your CPF number.'), :id => 'usp-cpf-balloon'), :id => 'signup-cpf', :style => 'display: none') + 26 content_tag(:small, _('Confirm your CPF number.'), :id => 'usp-cpf-balloon'), :id => 'signup-cpf', :style => 'display: none') +
27 - javascript_include_tag('../plugins/stoa/javascripts/jquery.observe_field', '../plugins/stoa/javascripts/signup_complement') 27 + javascript_include_tag('plugins/stoa/javascripts/jquery.observe_field', 'plugins/stoa/javascripts/signup_complement')
28 } 28 }
29 end 29 end
30 30