scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-16 18:14:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #198 from Ducz0r/lm-fix-minor-things-in-notifications

Browse source 
Fix various minor things concerning notifications
This commit is contained in:
Luka Murn 2016-10-06 08:59:28 +02:00 • committed by GitHub
commit fe08022b2d
9 changed files with 50 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/navigation.js
View file

@ -15,8 +15,11 @@
function loadDropdownNotifications() {
var button = $('#notifications-dropdown');
var noRecentText =
$('.dropdown-notifications .notifications-no-recent');
button
.on('click', function() {
noRecentText.hide();
$.ajax({
url: button.attr('data-href'),
type: 'GET',
@ -29,6 +32,11 @@
$('.notifications-dropdown-header')
.after(data.html);
animateSpinner($('.notifications-dropdown-header'), false);
var ul = $('.dropdown-menu.dropdown-notifications');
if (ul.children('.notification').length === 0) {
noRecentText.show();
}
}
});
$('#count-notifications').hide();

4
app/assets/stylesheets/notifications.scss
View file

@ -33,6 +33,10 @@
&:hover {
background-color: $color-mystic;
}
&.no-notifications {
padding-left: 15px;
}
}
.unseen {

10
app/assets/stylesheets/themes/scinote.scss
View file

@ -107,6 +107,12 @@ table {
width: 450px;
word-wrap: break-word;
.notifications-no-recent {
padding-bottom: 10px;
padding-left: 10px;
padding-top: 10px;
}
.notification {
border-bottom: 1px solid $color-alto;
padding-bottom: 10px;
@ -159,6 +165,10 @@ table {
color: $color-wild-sand;
font-weight: bold;
padding: 8px;
a {
color: $color-white;
}
}
.notifications-dropdown-footer {

5
app/models/user_notification.rb
View file

@ -23,9 +23,6 @@ class UserNotification < ActiveRecord::Base
end
def self.seen_by_user(user)
where(user: user).map do |n|
n.checked = true
n.save
end
where(user: user).where(checked: false).update_all(checked: true)
end
end

3
app/views/shared/_navigation.html.erb
View file

@ -69,7 +69,8 @@
data-href="<%= unseen_notification_url(current_user) %>"></span>
</a>
<ul class="dropdown-menu dropdown-notifications">
<li class="notifications-dropdown-header"><span><%= t('notifications.title') %></span><span class="pull-right"><%= t('nav.user.settings') %></span></li>
<li class="notifications-dropdown-header"><span><%= t('notifications.title') %></span><span class="pull-right"><%= link_to t('nav.user.settings'), preferences_path %></span></li>
<li class="notifications-no-recent"><em><%= t('notifications.no_recent') %></em></li>
<li class="notifications-dropdown-footer"><%= link_to t('notifications.show_all'), notifications_path %></li>
</ul>
</li>

10
app/views/user_notifications/index.html.erb
View file

@ -1,11 +1,17 @@
<% provide(:head_title, raw(t("notifications.title"))) %>
<div class="notifications-container">
<div class="notifications-header">
<span><%= t('notifications.title') %></span><span class="pull-right"><%= t('nav.user.settings') %></span>
<span><%= t('notifications.title') %></span><span class="pull-right"><%= link_to t('nav.user.settings'), preferences_path %></span>
</div>
<div class="notifications-body">
<ul class="notifications-list">
<%= render 'list', notifications: @notifications %>
<% if @notifications.count > 0 %>
<%= render 'list', notifications: @notifications %>
<% else %>
<li class="notification no-notifications">
<em><%= t('notifications.no_notifications') %></em>
</li>
<% end %>
</ul>
</div>
<div class="notifications-footer">

3
config/locales/en.yml
View file

@ -1517,6 +1517,9 @@ en:
filter: "Filter"
show_all: "Show all notifications"
show_more: "Show more notifications"
no_notifications: "No notifications."
no_recent: "No recent notifications."
# This section contains general words that can be used in any parts of
# application.

2
db/migrate/20160928114915_create_user_notifications.rb
View file

@ -3,7 +3,7 @@ class CreateUserNotifications < ActiveRecord::Migration
create_table :user_notifications do |t|
t.belongs_to :user, index: true, foreign_key: true
t.belongs_to :notification, index: true, foreign_key: true
t.boolean :checked, default: false
t.boolean :checked, default: false, index: true
t.timestamps null: false
end

69
db/schema.rb
View file

@ -63,41 +63,6 @@ ActiveRecord::Schema.define(version: 20161004074754) do
add_index "assets", ["file_file_name"], name: "index_assets_on_file_file_name", using: :gist
add_index "assets", ["last_modified_by_id"], name: "index_assets_on_last_modified_by_id", using: :btree
create_table "billing_accounts", force: :cascade do |t|
t.string "braintree_customer_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
add_index "billing_accounts", ["braintree_customer_id"], name: "index_billing_accounts_on_braintree_customer_id", using: :btree
create_table "billing_plans", force: :cascade do |t|
t.string "braintree_plan_id", null: false
t.string "name", null: false
t.string "description"
t.integer "price_cents", default: 0, null: false
t.string "price_currency", default: "USD", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.boolean "main", default: false, null: false
t.integer "max_storage", limit: 8, default: 0
t.integer "position", default: 0, null: false
t.boolean "free", default: false, null: false
end
add_index "billing_plans", ["braintree_plan_id"], name: "index_billing_plans_on_braintree_plan_id", using: :btree
create_table "billing_subscriptions", force: :cascade do |t|
t.string "braintree_subscription_id"
t.integer "billing_account_id", null: false
t.integer "billing_plan_id", null: false
t.boolean "active", default: false, null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
add_index "billing_subscriptions", ["braintree_subscription_id"], name: "index_billing_subscriptions_on_braintree_subscription_id", using: :btree
create_table "checklist_items", force: :cascade do |t|
t.string "text", null: false
t.boolean "checked", default: false, null: false
@ -280,11 +245,8 @@ ActiveRecord::Schema.define(version: 20161004074754) do
t.integer "last_modified_by_id"
t.string "description"
t.integer "space_taken", limit: 8, default: 1048576, null: false
t.integer "billing_account_id"
t.integer "agile_crm_deal_id", limit: 8
end
add_index "organizations", ["billing_account_id"], name: "index_organizations_on_billing_account_id", using: :btree
add_index "organizations", ["created_by_id"], name: "index_organizations_on_created_by_id", using: :btree
add_index "organizations", ["last_modified_by_id"], name: "index_organizations_on_last_modified_by_id", using: :btree
add_index "organizations", ["name"], name: "index_organizations_on_name", using: :btree
@ -635,6 +597,7 @@ ActiveRecord::Schema.define(version: 20161004074754) do
t.datetime "updated_at", null: false
end
add_index "user_notifications", ["checked"], name: "index_user_notifications_on_checked", using: :btree
add_index "user_notifications", ["notification_id"], name: "index_user_notifications_on_notification_id", using: :btree
add_index "user_notifications", ["user_id"], name: "index_user_notifications_on_user_id", using: :btree
@ -665,20 +628,20 @@ ActiveRecord::Schema.define(version: 20161004074754) do
add_index "user_projects", ["user_id"], name: "index_user_projects_on_user_id", using: :btree
create_table "users", force: :cascade do |t|
t.string "full_name", null: false
t.string "initials", null: false
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
t.string "full_name", null: false
t.string "initials", null: false
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.integer "sign_in_count", default: 0, null: false
t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "avatar_file_name"
t.string "avatar_content_type"
t.integer "avatar_file_size"
@ -687,7 +650,7 @@ ActiveRecord::Schema.define(version: 20161004074754) do
t.datetime "confirmed_at"
t.datetime "confirmation_sent_at"
t.string "unconfirmed_email"
t.string "time_zone", default: "UTC"
t.string "time_zone", default: "UTC"
t.string "invitation_token"
t.datetime "invitation_created_at"
t.datetime "invitation_sent_at"
@ -695,13 +658,10 @@ ActiveRecord::Schema.define(version: 20161004074754) do
t.integer "invitation_limit"
t.integer "invited_by_id"
t.string "invited_by_type"
t.integer "invitations_count", default: 0
t.integer "tutorial_status", default: 0, null: false
t.integer "initial_billing_plan_id"
t.datetime "last_seen_at"
t.integer "agile_crm_contact_id", limit: 8
t.boolean "assignments_notification", default: true
t.boolean "recent_notification", default: true
t.integer "invitations_count", default: 0
t.integer "tutorial_status", default: 0, null: false
t.boolean "assignments_notification", default: true
t.boolean "recent_notification", default: true
end
add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
@ -717,8 +677,6 @@ ActiveRecord::Schema.define(version: 20161004074754) do
add_foreign_key "asset_text_data", "assets"
add_foreign_key "assets", "users", column: "created_by_id"
add_foreign_key "assets", "users", column: "last_modified_by_id"
add_foreign_key "billing_subscriptions", "billing_accounts"
add_foreign_key "billing_subscriptions", "billing_plans"
add_foreign_key "checklist_items", "checklists"
add_foreign_key "checklist_items", "users", column: "created_by_id"
add_foreign_key "checklist_items", "users", column: "last_modified_by_id"
@ -749,7 +707,6 @@ ActiveRecord::Schema.define(version: 20161004074754) do
add_foreign_key "my_modules", "users", column: "last_modified_by_id"
add_foreign_key "my_modules", "users", column: "restored_by_id"
add_foreign_key "notifications", "users", column: "generator_user_id"
add_foreign_key "organizations", "billing_accounts"
add_foreign_key "organizations", "users", column: "created_by_id"
add_foreign_key "organizations", "users", column: "last_modified_by_id"
add_foreign_key "project_comments", "comments"