Commit 19151d352060d0d2140d04229249426865b18122
1 parent
77b787cc
Exists in
master
and in
3 other branches
Fix settings menu
Showing
1 changed file
with
6 additions
and
18 deletions
Show diff stats
settings_menu.html.erb
| @@ -11,29 +11,19 @@ | @@ -11,29 +11,19 @@ | ||
| 11 | <%= link_to(_('Location'), url_for(:controller => 'maps', :action => 'edit_location'), :class => 'control-panel-edit-location') %> | 11 | <%= link_to(_('Location'), url_for(:controller => 'maps', :action => 'edit_location'), :class => 'control-panel-edit-location') %> |
| 12 | </li> | 12 | </li> |
| 13 | 13 | ||
| 14 | - <li> | ||
| 15 | - <%= link_to(_('Mail settings'), url_for(:controller => 'mailconf'), :class => 'control-panel-mail') if profile.person? && MailConf.enabled? %> | ||
| 16 | - </li> | 14 | + <%= content_tag(:li, link_to(_('Mail settings'), url_for(:controller => 'mailconf'), :class => 'control-panel-mail')) if profile.person? && MailConf.enabled? %> |
| 17 | 15 | ||
| 18 | <li> | 16 | <li> |
| 19 | <%= link_to(_('Tasks'), url_for(:controller => 'tasks', :action => 'index'), :class => 'control-panel-todo') %> | 17 | <%= link_to(_('Tasks'), url_for(:controller => 'tasks', :action => 'index'), :class => 'control-panel-todo') %> |
| 20 | </li> | 18 | </li> |
| 21 | 19 | ||
| 22 | - <li> | ||
| 23 | - <%= link_to(_('Change Password'), url_for(:controller => 'account', :action => 'change_password'), :class => 'control-panel-change-password') if profile.person? %> | ||
| 24 | - </li> | 20 | + <%= content_tag(:li, link_to(_('Change Password'), url_for(:controller => 'account', :action => 'change_password'), :class => 'control-panel-change-password')) if profile.person? %> |
| 25 | 21 | ||
| 26 | - <li> | ||
| 27 | - <%= link_to(_('Manage friends'), url_for(:controller => 'friends', :action => 'index'), :class => 'control-panel-friends') if profile.person? %> | ||
| 28 | - </li> | 22 | + <%= content_tag(:li, link_to(_('Manage friends'), url_for(:controller => 'friends', :action => 'index'), :class => 'control-panel-friends')) if profile.person? %> |
| 29 | 23 | ||
| 30 | - <li> | ||
| 31 | - <%= link_to(_('Manage Members'), url_for(:controller => 'profile_members'), :class => 'control-panel-members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %> | ||
| 32 | - </li> | 24 | + <%= content_tag(:li, link_to(_('Manage Members'), url_for(:controller => 'profile_members'), :class => 'control-panel-members')) if profile.organization? && user.has_permission?(:manage_memberships, profile) %> |
| 33 | 25 | ||
| 34 | - <li> | ||
| 35 | - <%= link_to(_('Manage Products/Services'), url_for(:controller => 'manage_products'), :class => 'control-panel-products') if profile.enterprise? && environment.enabled?('products_for_enterprises') %> | ||
| 36 | - </li> | 26 | + <%= content_tag(:li, link_to(_('Manage Products/Services'), url_for(:controller => 'manage_products'), :class => 'control-panel-products')) if profile.enterprise? && environment.enabled?('products_for_enterprises') %> |
| 37 | 27 | ||
| 38 | <% if !environment.enabled?('disable_asset_enterprises') %> | 28 | <% if !environment.enabled?('disable_asset_enterprises') %> |
| 39 | <% if profile.is_validation_entity? %> | 29 | <% if profile.is_validation_entity? %> |
| @@ -52,9 +42,7 @@ | @@ -52,9 +42,7 @@ | ||
| 52 | <% end %> | 42 | <% end %> |
| 53 | <% end %> | 43 | <% end %> |
| 54 | 44 | ||
| 55 | - <li> | ||
| 56 | - <%= link_to(_('Manage my groups'), url_for(:controller => 'memberships'), :class => 'control-panel-groups') if profile.person? %> | ||
| 57 | - </li> | 45 | + <%= content_tag(:li, link_to(_('Manage my groups'), url_for(:controller => 'memberships'), :class => 'control-panel-groups')) if profile.person? %> |
| 58 | 46 | ||
| 59 | <li> | 47 | <li> |
| 60 | <%= link_to(_('Manage SPAM'), url_for(:controller => 'spam', :action => 'index'), :class => 'control-panel-manage-spam') %> | 48 | <%= link_to(_('Manage SPAM'), url_for(:controller => 'spam', :action => 'index'), :class => 'control-panel-manage-spam') %> |