From 7727368f349c0d26e8e5bbc4a9c001d25853c41a Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Sat, 17 Jan 2015 14:41:30 -0800
Subject: [PATCH] turned the challenges list into a modal

---
 public/css/main.less           |  2 +-
 public/js/main.js              |  4 ++--
 views/challenges/show.jade     | 34 ++++++++++++++--------------------
 views/partials/challenges.jade | 15 ++++++---------
 4 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/public/css/main.less b/public/css/main.less
index 4c5cfbd1fb..79c82a3e23 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -29,7 +29,7 @@ html {
 
 body {
   padding-top: 80px;
-  margin-bottom: 75px;
+  margin-bottom: 60px;
 }
 
 .footer {
diff --git a/public/js/main.js b/public/js/main.js
index 431cb9a5f7..056b7f1ad8 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -31,8 +31,8 @@ $(document).ready(function() {
       });
   });
 
-  $('.skip-challenge').on('click', function() {
-      $('#skip-dialog').modal('show');
+  $('.all-challenges').on('click', function() {
+      $('#all-challenges-dialog').modal('show');
   });
 
   $('.next-button').on('click', function() {
diff --git a/views/challenges/show.jade b/views/challenges/show.jade
index 1696f653b6..673c2acb85 100644
--- a/views/challenges/show.jade
+++ b/views/challenges/show.jade
@@ -1,21 +1,22 @@
 extends ../layout
 block content
     .row
-        .col-sm-12.col-md-8.col-xs-12
+        .col-sm-12.col-md-12.col-xs-12
             .panel.panel-primary
-                .panel-heading #{name} (takes #{time} minutes)
+                .panel-heading.text-center #{name} (takes #{time} minutes)
                 .panel.panel-body
                     .embed-responsive.embed-responsive-16by9
                         iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}')
-                    h3 Steps:
-                    h4
-                        ol
-                            for step in steps
-                                li!= step
-                    .btn.btn-primary.btn-big.btn-block.completed-challenge I've completed this challenge
-                    .ten-pixel-break
-                    .btn.btn-success.btn-large.btn-block.skip-challenge I want to skip this challenge for now
-                #complete-dialog.modal
+                    .col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2
+                        h3 Steps:
+                        h4
+                            ol
+                                for step in steps
+                                    li!= step
+                        .btn.btn-primary.btn-big.btn-block.completed-challenge I've completed this challenge
+                        .ten-pixel-break
+                        .btn.btn-success.btn-big.btn-block.all-challenges Show me all the challenges
+                #complete-dialog.modal(tabindex='-1')
                     .modal-dialog.animated.zoomIn.fast-animation
                         .modal-content
                             .modal-header
@@ -32,16 +33,9 @@ block content
                                              = phrase
                                 - else
                                     a.animated.fadeIn.delay-2.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
-                #skip-dialog.modal
+                #all-challenges-dialog.modal(tabindex='-1')
                     .modal-dialog.animated.zoomIn.fast-animation
                         .modal-content
                             .modal-header
                                 a.close(href='#', data-dismiss='modal', aria-hidden='true') ×
-                                .text-center
-                                    h1.animated.zoomInDown No problem.
-                                    h2.animated.zoomInDown You can retry this challenge any time.
-                                    .animated.zoomInUp.delay-1
-                                        span.landing-icon.ion-skip-forward.text-success
-                                a.animated.fadeIn.delay-2.btn.btn-lg.btn-primary.btn-block.next-button(aria-hidden='true') Take me to my next challenge
-        .col-sm-12.col-md-4.col-xs-12
-            include ../partials/challenges
\ No newline at end of file
+                                    include ../partials/challenges
\ No newline at end of file
diff --git a/views/partials/challenges.jade b/views/partials/challenges.jade
index 14f1049c02..fddc2177e6 100644
--- a/views/partials/challenges.jade
+++ b/views/partials/challenges.jade
@@ -1,10 +1,7 @@
-.panel.panel-primary
-    .panel-heading Challenges
-    .panel-body
-        ol(start='0')
-            for challenge in challenges
-                li
-                    a(href="/challenges/#{challenge.challengeNumber}", class="#{ (cc && cc[challenge.challengeNumber] > 0) ? 'strikethrough' : '' }") #{challenge.name}
-                    | &nbsp; (#{challenge.time} mins)
+ol(start='0')
+    for challenge in challenges
+        li
+            a(href="/challenges/#{challenge.challengeNumber}", class="#{ (cc && cc[challenge.challengeNumber] > 0) ? 'strikethrough' : '' }") #{challenge.name}
+            | &nbsp; (#{challenge.time} mins)
 
-        a.btn.btn-primary(href="/done-with-first-100-hours", class="#{ ((cc && cc[53] === 0) || (!cc)) ? 'disabled' : '' }") I've finished all Free Code Camp challenges and all the Easy and Medium CoderByte Challenges
\ No newline at end of file
+a.btn.btn-primary(href="/done-with-first-100-hours", class="#{ ((cc && cc[53] === 0) || (!cc)) ? 'disabled' : '' }") I've finished all Free Code Camp challenges and all the Easy and Medium CoderByte Challenges
\ No newline at end of file