github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

cleanup layout of notifications

Browse source
This commit is contained in:
Henry Oswald 2016-02-04 14:28:31 +00:00
parent 9d61a58710
commit f136486f4b
4 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/coffee/Features/Notifications/NotificationsHandler.coffee
View file

@ -14,7 +14,7 @@ module.exports =
statusCode = if res? then res.statusCode else 500 statusCode = if res? then res.statusCode else 500
if err? or statusCode != 200 if err? or statusCode != 200
e = new Error("something went wrong getting notifications, #{err}, #{statusCode}") 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, []) callback(null, [])
else else
if !unreadNotifications? if !unreadNotifications?

32
services/web/app/views/project/list/notifications.jade
View file

@ -1,17 +1,15 @@
span(ng-controller="NotificationsController") span(ng-controller="NotificationsController").userNotifications
.col-md-12 ul.list-unstyled.notifications-list(
.row ng-if="notifications.length > 0",
ul.list-unstyled.notifications-list( ng-cloak
ng-if="notifications.length > 0", )
ng-cloak li.notification_entry(
) ng-repeat="unreadNotification in notifications",
li.notification_entry( )
ng-repeat="unreadNotification in notifications", .row(ng-hide="unreadNotification.hide")
) .col-xs-12
.row(ng-hide="unreadNotification.hide") .alert.alert-warning
.col-xs-12 span(ng-bind-html="unreadNotification.html")
.alert.alert-warning button(ng-click="dismiss(unreadNotification)").close.pull-right
span(ng-bind-html="unreadNotification.html") span(aria-hidden="true") ×
button(ng-click="dismiss(unreadNotification)").close.pull-right span.sr-only #{translate("close")}
span(aria-hidden="true") ×
span.sr-only #{translate("close")}

2
services/web/config/settings.defaults.coffee
View file

@ -107,7 +107,7 @@ module.exports =
sixpack: sixpack:
url: "" url: ""
notifications: notifications:
url: "http://localhost:3033" url: "http://localhost:3042"
templates: templates:
user_id: process.env.TEMPLATES_USER_ID or "5395eb7aad1f29a88756c7f2" user_id: process.env.TEMPLATES_USER_ID or "5395eb7aad1f29a88756c7f2"

7
services/web/public/stylesheets/app/project-list.less
View file

@ -28,6 +28,13 @@
} }
} }
.userNotifications {
ul {
margin-bottom:0px;
}
}
ul.folders-menu { ul.folders-menu {
margin: 0; margin: 0;
.subdued { .subdued {