Download as
Browse Code »

Commit 7f4d45eb5497b45077cb1f6b1334784be6f75db5

Authored by Antonio Terceiro
1 parent b8371f25
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Do not offer the option to disable e-mail 

(ActionItem1403)
Showing 1 changed file with 11 additions and 5 deletions   Show diff stats
app/views/mailconf/index.rhtml
  Diff comments   View file @7f4d45e
... ... @@ -14,17 +14,23 @@
14 14  
15 15  
16 16 <% if profile.user.enable_email %>
17   -
18   - <p><%= _("Disable e-Mail account below:") %></p>
19   - <ul><%= profile.email_addresses.map{|i| content_tag('li', i)}.join("\n") %></ul>
  17 + <h2><%= ('E-mail address') %></h2>
  18 + <ul>
  19 + <%= profile.email_addresses.map{|i| content_tag('li', i)}.join("\n") %>
  20 + </ul>
  21 + <h2><%= _('Configuration') %></h2>
  22 + <ul>
  23 + <li>
  24 + <%= link_to _('Mail configuration for POP and IMAP'), 'http://www.ynternet.org/move/infos-technique-pour-utiliser-multypass-pop3-smtp-imap-ftp-quotas...' %>
  25 + </li>
  26 + </ul>
20 27 <% button_bar do %>
21   - <%= button(:cancel, _('Disable e-Mail'), { :action => 'disable' }, :method => 'post') %>
22 28 <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
23 29 <% end %>
24 30  
25 31 <% else %>
26 32  
27   - <p><%= _("Enable e-Mail account below:") %></p>
  33 + <h2><%= _("Enable e-Mail account below:") %></h2>
28 34 <ul><%= profile.email_addresses.map{|i| content_tag('li', i)}.join("\n") %></ul>
29 35 <blockquote><%= _("You'll be able to access a webmail from your user menu.") %></blockquote>
30 36 <% button_bar do %>
... ...