diff --git a/app/assets/stylesheets/system_notifications.scss b/app/assets/stylesheets/system_notifications.scss index 8cf7f8a12..57cbe24be 100644 --- a/app/assets/stylesheets/system_notifications.scss +++ b/app/assets/stylesheets/system_notifications.scss @@ -25,6 +25,7 @@ &:hover { background: $color-concrete; + color: $color-emperor; opacity: .7; } @@ -101,8 +102,13 @@ } } - .no-notification-meessage { - padding: 20px 0; + .system-notifications-container { + display: inline-block; + width: 100%; + } + + .no-notification-message { + margin: 20px 0; } .title-container { @@ -124,10 +130,13 @@ margin-top: 10px; } } + #manage-module-system-notification-modal { + .modal-title { margin-left: 20px; } + .modal-body { margin: 20px; } diff --git a/app/assets/stylesheets/themes/main_navigation.scss b/app/assets/stylesheets/themes/main_navigation.scss index ce1c7e2f6..1cf0b5944 100644 --- a/app/assets/stylesheets/themes/main_navigation.scss +++ b/app/assets/stylesheets/themes/main_navigation.scss @@ -395,7 +395,8 @@ word-wrap: break-word; .system-notifications-no-recent { - padding: 0 0 10px 10px; + padding: 10px; + text-align: center; } .system-notifications-dropdown-header { diff --git a/app/views/system_notifications/index.html.erb b/app/views/system_notifications/index.html.erb index 058ae92bc..a7e3f8ab1 100644 --- a/app/views/system_notifications/index.html.erb +++ b/app/views/system_notifications/index.html.erb @@ -20,16 +20,16 @@
<%= render partial: "list", locals: { notifications: @system_notifications[:notifications] } %>
-
- <% if @system_notifications[:more_notifications_url] && @system_notifications[:notifications].present? %> - + <% if @system_notifications[:more_notifications_url] && @system_notifications[:notifications].present? %> + <%= t("system_notifications.index.more_notifications") %> - <% else %> - <%= t("system_notifications.index.no_notifications") %> - <% end %> -
+ <% else %> + <%= t("system_notifications.index.no_notifications") %> + <% end %> + <%= javascript_include_tag("system_notifications/index") %> diff --git a/app/views/users/settings/account/preferences/index.html.erb b/app/views/users/settings/account/preferences/index.html.erb index d80e29fc9..7b010a7f5 100644 --- a/app/views/users/settings/account/preferences/index.html.erb +++ b/app/views/users/settings/account/preferences/index.html.erb @@ -152,7 +152,7 @@
- +
<%=t 'notifications.form.system_message' %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 819d90d43..c100fbeb6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1872,8 +1872,8 @@ en: assignments_description: 'Assignment notifications appear whenever you get assigned to a team, project, task.' recent_notification: 'Recent changes' recent_notification_description: 'Recent changes notifications appear whenever there is a change on a task you are assigned to.' - system_message: 'System message' - system_message_description: 'System message notifications are specifically sent by site maintainers to notify all users about a system update.' + system_message: "What's New in SciNote" + system_message_description: 'You will be notified about new SciNote features, releases and improvements you can benefit from.' deliver: download_link: "Download link:" download_text: "Click the link to download the file."