From e9da8afd5aa7737895bf0e877c000083a05d353f Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Wed, 15 Jul 2015 22:43:28 -0700 Subject: [PATCH] add gitter issue modal, add twitch announcement to news --- views/challengeMap/show.jade | 34 +++++++++++++++++----------------- views/partials/footer.jade | 4 ++-- views/stories/news-nav.jade | 7 +++---- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade index 70512ed0dd..9445341ee4 100644 --- a/views/challengeMap/show.jade +++ b/views/challengeMap/show.jade @@ -83,20 +83,20 @@ block content li.large-p.negative-10 a(href="/challenges/#{challenge.name}")= challenge.name - //#announcementModal.modal(tabindex='-1') - // .modal-dialog.animated.fadeInUp.fast-animation - // .modal-content - // .modal-header.challenge-list-header Our chat is slow right now - // a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × - // .modal-body - // h3.text-left Please note that Gitter.im, our chat client, is really slow right now. - // h3.text-left Gitter is working to fix this ASAP. If you can't join our chat room, please try again later. - // h3.text-left Thank you for your patience. In the meantime, happy coding! - // a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up - //script. - // $(document).ready(function () { - // if (!localStorage || !localStorage.gitter) { - // $('#announcementModal').modal('show'); - // localStorage.gitter = "true"; - // } - // }); + #announcementModal.modal(tabindex='-1') + .modal-dialog.animated.fadeInUp.fast-animation + .modal-content + .modal-header.challenge-list-header Our chat is slow right now + a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × + .modal-body + h3.text-left Please note that Gitter.im, our chat client, isn't working properly right now. + h3.text-left Gitter is working to fix this ASAP. If you can't join our chat room, please try again later. + h3.text-left Thank you for your patience. In the meantime, happy coding! + a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up + script. + $(document).ready(function () { + if (!localStorage || !localStorage.gitter1) { + $('#announcementModal').modal('show'); + localStorage.gitter1 = "true"; + } + }); diff --git a/views/partials/footer.jade b/views/partials/footer.jade index fe25c7723a..76d9721053 100644 --- a/views/partials/footer.jade +++ b/views/partials/footer.jade @@ -2,7 +2,7 @@ .col-xs-12.hidden-xs.hidden-sm a.ion-speakerphone(href='http://blog.freecodecamp.com', target='_blank')  Blog   a.ion-social-github(href="http://github.com/freecodecamp", target='_blank')  GitHub   - a.ion-social-twitch-outline(href="/twitch")  Twitch  + a.ion-social-twitch-outline(href="//twitch.tv/freecodecamp", target='_blank')  Twitch  a.ion-social-linkedin(href="/linkedin")  LinkedIn  a.ion-social-facebook(href="/field-guide/how-can-i-find-other-free-code-camp-campers-in-my-city")  Facebook   a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank')  Twitter   @@ -12,7 +12,7 @@ span.sr-only Free Code Camp's Blog a.ion-social-github(href="http://github.com/freecodecamp", target='_blank') span.sr-only Free Code Camp on GitHub - a.ion-social-twitch-outline(href="/twitch") + a.ion-social-twitch-outline(href="//twitch.tv/freecodecamp", target='_blank') span.sr-only Free Code Camp Live Pair Programming on Twitch.tv a.ion-social-linkedin(href="/linkedin") span.sr-only Free Code Camp LinkedIn Alumni Network diff --git a/views/stories/news-nav.jade b/views/stories/news-nav.jade index 043c6a00a6..8ecbfe9c1f 100644 --- a/views/stories/news-nav.jade +++ b/views/stories/news-nav.jade @@ -14,10 +14,9 @@ .spacer .row .col-xs-12.col-sm-8.col-sm-offset-2.well - h3.text-center Your workspace selfie should be part of our upcoming mosaic. - img.img-responsive(src='https://www.evernote.com/l/Ajm69Uj6uvJLzo7PAj8wGjjbSvGyN0ME-5YB/image.png') - p.large-p Take a selfie of you at your workspace with Free Code Camp open. - p.large-p Share it on Instagram, Twitter or Facebook with the hashtag #freecodecamp. + h3.text-center Watch us Code Games Live All Weekend + img.img-responsive.img-center(src='https://www.evernote.com/l/AjnoItzbAtJEfKPD85t0waxHGgpMyr_G_qkB/image.png') + p.large-p We'll build JavaScript games all weekend and stream it all live. You should follow our Twitch.tv channel. See you there! .spacer #search-results