Download as
Browse Code »

Commit 74f018232c7d3385bb5137aca651490f3ae0c674

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent 8c296da0
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Replacing link by button on delete profile 

(ActionItem1716)
Showing 2 changed files with 10 additions and 6 deletions   Show diff stats
app/views/profile_editor/edit.rhtml
  Diff comments   View file @74f0182
@@ -76,14 +76,18 @@ @@ -76,14 +76,18 @@
76 76
77 <%= select_categories(:profile_data, _('Select the categories of your interest'), 2) %> 77 <%= select_categories(:profile_data, _('Select the categories of your interest'), 2) %>
78 78
79 - <% if user && user.has_permission?('destroy_profile', profile) %>  
80 - <%= link_to _('Delete profile'), {:action => :destroy_profile}, :id => 'delete-profile-link' %>  
81 - <% end %>  
82 -  
83 <% button_bar do %> 79 <% button_bar do %>
84 <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %> 80 <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
85 <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %> 81 <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
86 <% end %> 82 <% end %>
  83 +
  84 + <% if user && user.has_permission?('destroy_profile', profile) %>
  85 + <% button_bar(:id => 'delete-profile') do %>
  86 + <%= button(:remove, _('Delete profile'), {:action => :destroy_profile}) %>
  87 + <% end %>
  88 + <% end %>
  89 +
  90 +
87 <% end %> 91 <% end %>
88 92
89 <%# = generate_form :info, @info, {...} %> 93 <%# = generate_form :info, @info, {...} %>
public/stylesheets/application.css
  Diff comments   View file @74f0182
@@ -3503,8 +3503,8 @@ h1#agenda-title { @@ -3503,8 +3503,8 @@ h1#agenda-title {
3503 -webkit-border-radius: 3px; 3503 -webkit-border-radius: 3px;
3504 } 3504 }
3505 3505
3506 -.controller-profile_editor #delete-profile-link {  
3507 - float: right; 3506 +.controller-profile_editor #delete-profile {
  3507 + margin-top: 30px;
3508 } 3508 }
3509 3509
3510 .controller-profile_editor a.control-panel-groups { background-image: url(../images/control-panel/system-users.png) } 3510 .controller-profile_editor a.control-panel-groups { background-image: url(../images/control-panel/system-users.png) }