From 4fa1e2f405b4d6e85f2040dc5f82aaa648985f7e Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 12 Apr 2016 23:27:58 -0700 Subject: [PATCH] Make flyer show up in various views (but not in all, avoiding the map and wiki view problems) --- server/views/account/show.jade | 3 ++- server/views/challenges/showBonfire.jade | 1 + server/views/challenges/showHTML.jade | 1 + server/views/challenges/showJS.jade | 1 + server/views/challenges/showStep.jade | 1 + server/views/challenges/showVideo.jade | 1 + server/views/challenges/showZiplineOrBasejump.jade | 1 + server/views/partials/flyer.jade | 7 +++++++ 8 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 server/views/partials/flyer.jade diff --git a/server/views/account/show.jade b/server/views/account/show.jade index df88282365..568fd5ea4d 100644 --- a/server/views/account/show.jade +++ b/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) \ No newline at end of file + a(href='/challenges/' + removeOldTerms(challenge.name))= removeOldTerms(challenge.name) diff --git a/server/views/challenges/showBonfire.jade b/server/views/challenges/showBonfire.jade index 8ab0684c4a..6bb918d579 100644 --- a/server/views/challenges/showBonfire.jade +++ b/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") diff --git a/server/views/challenges/showHTML.jade b/server/views/challenges/showHTML.jade index 0d08346825..7835148327 100644 --- a/server/views/challenges/showHTML.jade +++ b/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") diff --git a/server/views/challenges/showJS.jade b/server/views/challenges/showJS.jade index eae63ab02a..3939b29bed 100644 --- a/server/views/challenges/showJS.jade +++ b/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") diff --git a/server/views/challenges/showStep.jade b/server/views/challenges/showStep.jade index 1249b842a2..d276c836c8 100644 --- a/server/views/challenges/showStep.jade +++ b/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 diff --git a/server/views/challenges/showVideo.jade b/server/views/challenges/showVideo.jade index bf3d45636b..f29911013e 100644 --- a/server/views/challenges/showVideo.jade +++ b/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 diff --git a/server/views/challenges/showZiplineOrBasejump.jade b/server/views/challenges/showZiplineOrBasejump.jade index 19197c1795..5c3639a8d6 100644 --- a/server/views/challenges/showZiplineOrBasejump.jade +++ b/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 diff --git a/server/views/partials/flyer.jade b/server/views/partials/flyer.jade new file mode 100644 index 0000000000..6b1d374006 --- /dev/null +++ b/server/views/partials/flyer.jade @@ -0,0 +1,7 @@ +.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