diff --git a/app/assets/stylesheets/common/main_layout.css.scss b/app/assets/stylesheets/common/main_layout.css.scss index e4a607b4b..535ce6b4b 100644 --- a/app/assets/stylesheets/common/main_layout.css.scss +++ b/app/assets/stylesheets/common/main_layout.css.scss @@ -8,7 +8,7 @@ div#page { overflow: visible; margin: 0 30px; - div#upgrade-account-notice, div#sign-up-notice, div#tos-notice, div#ban-notice { + div#upgrade-account-notice, div#sign-up-notice, div#tos-notice, div#ban-notice, div#dmail-notice { margin: 1em 0; padding: 1em; text-align: center; diff --git a/app/logical/anonymous_user.rb b/app/logical/anonymous_user.rb index c2590a0d5..1de815e21 100644 --- a/app/logical/anonymous_user.rb +++ b/app/logical/anonymous_user.rb @@ -193,6 +193,10 @@ class AnonymousUser false end + def dmail_count + "" + end + %w(member banned privileged builder platinum contributor janitor moderator admin).each do |name| define_method("is_#{name}?") do false diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 5616d07d7..c7afa5599 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -48,6 +48,10 @@ <%= render "users/ban_notice" %> <% end %> + <% if CurrentUser.dmail_count.present? %> + <%= render "users/dmail_notice" %> + <% end %> + <% if cookies["accepted_tos"].blank? && !CurrentUser.is_privileged? %> <%= render "users/tos" %> <% end %> diff --git a/app/views/users/_dmail_notice.html.erb b/app/views/users/_dmail_notice.html.erb new file mode 100644 index 000000000..483a4a7e0 --- /dev/null +++ b/app/views/users/_dmail_notice.html.erb @@ -0,0 +1,3 @@ +