Refactor announcement feature

server/model-config.json

@@ -66,5 +66,9 @@
   "userIdentity": {
     "dataSource": "db",
     "public": true
+  },
+  "flyer": {
+    "dataSource": "db",
+    "public": true
   }
 }

server/views/account/show.jade

@@ -1,5 +1,6 @@
 extends ../layout
 block content
+    include ../partials/flyer
     script(src="/bower_components/cal-heatmap/cal-heatmap.min.js")
     script.
         var challengeName = 'Profile View';
@@ -170,4 +171,4 @@ block content
                                     if (challenge.solution)
                                         a(href='/challenges/' + removeOldTerms(challenge.name) + '?solution=' + encodeURIComponent(encodeFcc(challenge.solution)), target='_blank')= removeOldTerms(challenge.name)
                                     else
-                                        a(href='/challenges/' + removeOldTerms(challenge.name))= removeOldTerms(challenge.name)
+                                        a(href='/challenges/' + removeOldTerms(challenge.name))= removeOldTerms(challenge.name)

server/views/challenges/showBonfire.jade

@@ -4,6 +4,7 @@ block content
     link(rel='stylesheet', href='/bower_components/CodeMirror/addon/lint/lint.css')
     link(rel='stylesheet', href='/bower_components/CodeMirror/theme/monokai.css')
     link(rel='stylesheet', href='/css/ubuntu.css')
+    include ../partials/flyer
     .row
         .col-md-4.col-lg-3
             .scroll-locker(id = "scroll-locker")

server/views/challenges/showHTML.jade

@@ -4,6 +4,7 @@ block content
     link(rel='stylesheet', href='/bower_components/CodeMirror/addon/lint/lint.css')
     link(rel='stylesheet', href='/bower_components/CodeMirror/theme/monokai.css')
     link(rel='stylesheet', href='/css/ubuntu.css')
+    include ../partials/flyer
     .row
         .col-md-3.col-lg-3
             .scroll-locker(id = "scroll-locker")

server/views/challenges/showJS.jade

@@ -4,6 +4,7 @@ block content
     link(rel='stylesheet', href='/bower_components/CodeMirror/addon/lint/lint.css')
     link(rel='stylesheet', href='/bower_components/CodeMirror/theme/monokai.css')
     link(rel='stylesheet', href='/css/ubuntu.css')
+    include ../partials/flyer
     .row
         .col-md-4.col-lg-3
             .scroll-locker(id = "scroll-locker")

server/views/challenges/showStep.jade

@@ -1,5 +1,6 @@
 extends ../layout-wide
 block content
+    include ../partials/flyer
     .row
         .col-md-8.col-md-offset-2
             for step, index in description

server/views/challenges/showVideo.jade

@@ -1,5 +1,6 @@
 extends ../layout-wide
 block content
+    include ../partials/flyer
     .row
         .col-xs-12.col-sm-12.col-md-4
             h4.text-center.challenge-instructions-title= name

server/views/challenges/showZiplineOrBasejump.jade

@@ -1,5 +1,6 @@
 extends ../layout-wide
 block content
+    include ../partials/flyer
     .row
         .col-md-4
             h4.text-center.challenge-instructions-title= name

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

server/views/partials/flash.jade

@@ -1,20 +1,21 @@
-.row.flashMessage
-    .col-xs-12
-        if (messages.errors || messages.error)
-          .alert.alert-danger.fade.in
-            button.close(type='button', data-dismiss='alert')
-              span.ion-close-circled
-            for error in (messages.errors || messages.error)
-              div!= error.msg || error
-        if messages.info
-          .alert.alert-info.fade.in
-            button.close(type='button', data-dismiss='alert')
-              span.ion-close-circled
-            for info in messages.info
-              div!= info.msg
-        if messages.success
-          .alert.alert-success.fade.in
-            button.close(type='button', data-dismiss='alert')
-              span.ion-close-circled
-            for success in messages.success
-              div!= success.msg
+.container
+    .row.flashMessage.negative-30
+        .col-xs-12
+            if (messages.errors || messages.error)
+              .alert.alert-danger.fade.in
+                button.close(type='button', data-dismiss='alert')
+                  span.ion-close-circled
+                for error in (messages.errors || messages.error)
+                  div!= error.msg || error
+            if messages.info
+              .alert.alert-info.fade.in
+                button.close(type='button', data-dismiss='alert')
+                  span.ion-close-circled
+                for info in messages.info
+                  div!= info.msg
+            if messages.success
+              .alert.alert-success.fade.in
+                button.close(type='button', data-dismiss='alert')
+                  span.ion-close-circled
+                for success in messages.success
+                  div!= success.msg

server/views/partials/flyer.jade

@@ -0,0 +1,8 @@
+if (user && user.points > 5)
+    .container
+        .row.flashMessage.negative-30
+            .col-xs-12
+                #bill-board.alert.alert-info.fade.in(style='display: none;')
+                    button.close(type='button', data-dismiss='alert')
+                        span.ion-close-circled#dismiss-bill
+                    #bill-content