From 66fda23dac9e5f11d808acde69f9a6738042f41a Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 12 Apr 2016 23:41:24 -0700 Subject: [PATCH] Improve style on flash notification and make flyer conditional on logged in user with at least 6 points Lower case model json file --- common/models/{Flyer.json => flyer.json} | 0 server/views/layout.jade | 2 +- server/views/partials/flyer.jade | 15 ++++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) rename common/models/{Flyer.json => flyer.json} (100%) diff --git a/common/models/Flyer.json b/common/models/flyer.json similarity index 100% rename from common/models/Flyer.json rename to common/models/flyer.json diff --git a/server/views/layout.jade b/server/views/layout.jade index f64024fdf9..eefd4090e0 100644 --- a/server/views/layout.jade +++ b/server/views/layout.jade @@ -6,7 +6,7 @@ html(lang='en') body.top-and-bottom-margins include partials/scripts include partials/navbar + include partials/flash .container - include partials/flash block content include partials/footer diff --git a/server/views/partials/flyer.jade b/server/views/partials/flyer.jade index 6b1d374006..92d99e5c21 100644 --- a/server/views/partials/flyer.jade +++ b/server/views/partials/flyer.jade @@ -1,7 +1,8 @@ -.container - .row.flashMessage.negative-30 - .col-xs-12 - #billBoard.alert.alert-info.fade.in(style="display: none;") - button.close(type='button', data-dismiss='alert') - span.ion-close-circled#dismissBill - #billContent +if (user && user.points > 5) + .container + .row.flashMessage.negative-30 + .col-xs-12 + #billBoard.alert.alert-info.fade.in(style="display: none;") + button.close(type='button', data-dismiss='alert') + span.ion-close-circled#dismissBill + #billContent