scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-26 00:36:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

Notification changes on settings page [SCI 3084] (#1517)

Browse source 
* Fix css and update text settings
This commit is contained in:
aignatov-bio 2019-02-22 13:20:51 +01:00 committed by GitHub
parent 5f78d83f9c
commit 606708987f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/stylesheets/system_notifications.scss
View file

@ -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;
}

3
app/assets/stylesheets/themes/main_navigation.scss
View file

@ -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 {

14
app/views/system_notifications/index.html.erb
View file

@ -20,16 +20,16 @@
<div class="system-notifications-container">
<%= render partial: "list", locals: { notifications: @system_notifications[:notifications] } %>
</div>
<div class="text-center">
<% if @system_notifications[:more_notifications_url] && @system_notifications[:notifications].present? %>
<a class="btn btn-default btn-more-notifications"
<div class="text-center">
<% if @system_notifications[:more_notifications_url] && @system_notifications[:notifications].present? %>
<a class="btn btn-default btn-more-notifications"
href="<%= @system_notifications[:more_notifications_url] %>"
data-remote="true">
<%= t("system_notifications.index.more_notifications") %></a>
<% else %>
<span class="no_notification_meessage"><%= t("system_notifications.index.no_notifications") %></span>
<% end %>
</div>
<% else %>
<span class="no-notification-message"><%= t("system_notifications.index.no_notifications") %></span>
<% end %>
</div>
</div>
<%= javascript_include_tag("system_notifications/index") %>

2
app/views/users/settings/account/preferences/index.html.erb
View file

@ -152,7 +152,7 @@
</div>
<div class="row">
<div class="col-sm-2">
<span class="system-message hidden-sm"><i class="fas fa-chess-rook" aria-hidden="true"></i></span>
<span class="system-message hidden-sm"><i class="fas fa-gift" aria-hidden="true"></i></span>
</div>
<div class="col-sm-10">
<strong><%=t 'notifications.form.system_message' %></strong>

4
config/locales/en.yml
View file

@ -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."