Download as
Browse Code »

Commit cc70638a652146bc309836f8a6345511c5a980c3

Authored by MoisesMachado
1 parent 6d178f39
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem121: added a cancel buton to the display_submit_tag 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1190 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 6 additions and 3 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @cc70638
@@ -176,8 +176,11 @@ module ApplicationHelper @@ -176,8 +176,11 @@ module ApplicationHelper
176 end 176 end
177 alias_method :display_form_field, :labelled_form_field 177 alias_method :display_form_field, :labelled_form_field
178 178
179 - def display_submit_tag(label)  
180 - content_tag('p', submit_tag( label, :class => 'submit'), :class => 'submitline') 179 + # FIXME: do not use window.history on the cancel button, instead go to the page where the user come from
  180 + def display_submit_tag(label, options = {})
  181 + cancel_button = ''
  182 + cancel_button = "<input type='button' class='bt_cancel' value='" + _('Cancel') + "' onclick='window.history.back()'> " if options[:with_cancel]
  183 + content_tag('p', submit_tag( label, :class => 'submit') + cancel_button, :class => 'submitline')
181 end 184 end
182 185
183 186
app/views/profile_editor/organization_info.rhtml
  Diff comments   View file @cc70638
@@ -5,5 +5,5 @@ @@ -5,5 +5,5 @@
5 <%= f.text_field(:legal_form) %> 5 <%= f.text_field(:legal_form) %>
6 <%= f.text_field(:economic_activity) %> 6 <%= f.text_field(:economic_activity) %>
7 <%= f.text_area(:management_information) %> 7 <%= f.text_area(:management_information) %>
8 - <%= display_submit_tag(_('Save')) %> 8 + <%= display_submit_tag(_('Save'), :with_cancel => true) %>
9 <% end %> 9 <% end %>