diff --git a/services/web/app/coffee/Features/Notifications/NotificationsHandler.coffee b/services/web/app/coffee/Features/Notifications/NotificationsHandler.coffee index b54fd95b3f..ef20351c90 100644 --- a/services/web/app/coffee/Features/Notifications/NotificationsHandler.coffee +++ b/services/web/app/coffee/Features/Notifications/NotificationsHandler.coffee @@ -14,7 +14,7 @@ module.exports = statusCode = if res? then res.statusCode else 500 if err? or statusCode != 200 e = new Error("something went wrong getting notifications, #{err}, #{statusCode}") - logger.err err:err + logger.err err:err, "something went wrong getting notifications" callback(null, []) else if !unreadNotifications? diff --git a/services/web/app/views/project/list/notifications.jade b/services/web/app/views/project/list/notifications.jade index 209d4477fc..8e0ee56f43 100644 --- a/services/web/app/views/project/list/notifications.jade +++ b/services/web/app/views/project/list/notifications.jade @@ -1,17 +1,15 @@ -span(ng-controller="NotificationsController") - .col-md-12 - .row - ul.list-unstyled.notifications-list( - ng-if="notifications.length > 0", - ng-cloak - ) - li.notification_entry( - ng-repeat="unreadNotification in notifications", - ) - .row(ng-hide="unreadNotification.hide") - .col-xs-12 - .alert.alert-warning - span(ng-bind-html="unreadNotification.html") - button(ng-click="dismiss(unreadNotification)").close.pull-right - span(aria-hidden="true") × - span.sr-only #{translate("close")} +span(ng-controller="NotificationsController").userNotifications + ul.list-unstyled.notifications-list( + ng-if="notifications.length > 0", + ng-cloak + ) + li.notification_entry( + ng-repeat="unreadNotification in notifications", + ) + .row(ng-hide="unreadNotification.hide") + .col-xs-12 + .alert.alert-warning + span(ng-bind-html="unreadNotification.html") + button(ng-click="dismiss(unreadNotification)").close.pull-right + span(aria-hidden="true") × + span.sr-only #{translate("close")} diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 516dca37dc..ad0423c7e3 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -107,7 +107,7 @@ module.exports = sixpack: url: "" notifications: - url: "http://localhost:3033" + url: "http://localhost:3042" templates: user_id: process.env.TEMPLATES_USER_ID or "5395eb7aad1f29a88756c7f2" diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index 7cc23a3d8a..877f1881f9 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -28,6 +28,13 @@ } } +.userNotifications { + ul { + margin-bottom:0px; + } + +} + ul.folders-menu { margin: 0; .subdued {