From d8929ac72d16d37c4f165ef767342b8a65f04daf Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Sat, 10 Jan 2015 22:59:24 -0800
Subject: [PATCH] make bonfire view consistent with other challenge views and
 make codemirror height larger and result code mirror pane read only with no
 cursor

---
 controllers/bonfire.js     | 21 +++++++++---
 controllers/challenges.js  |  1 -
 views/bonfire/bonfire.jade | 69 +++++++++++++++++++++++---------------
 3 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/controllers/bonfire.js b/controllers/bonfire.js
index 575b90ee7a..80455274fa 100644
--- a/controllers/bonfire.js
+++ b/controllers/bonfire.js
@@ -1,8 +1,19 @@
+var _ = require('lodash'),
+    debug = require('debug')('freecc:cntr:challenges'),
+    Challenge = require('./../models/Challenge');
+
 /**
  * Bonfire controller
  */
-module.exports = {
-  index : function(req,res) {
-    res.render('bonfire/bonfire.jade');
-  }
-};
+exports.index = function(req, res) {
+  Challenge.find({}, null, { sort: { challengeNumber: 1 } }, function(err, c) {
+    if (err) {
+      debug('Challenge err: ', err);
+      next(err);
+    }
+    res.render('bonfire/bonfire.jade', {
+      challenges: c,
+      cc: req.user ? req.user.challengesHash : undefined
+    });
+  });
+};
\ No newline at end of file
diff --git a/controllers/challenges.js b/controllers/challenges.js
index 162a3487f8..e686fc8b39 100644
--- a/controllers/challenges.js
+++ b/controllers/challenges.js
@@ -53,5 +53,4 @@ exports.returnChallenge = function(req, res, next) {
             challenges: c
         });
     });
-
 };
diff --git a/views/bonfire/bonfire.jade b/views/bonfire/bonfire.jade
index 6a10b75d01..fce17601c3 100644
--- a/views/bonfire/bonfire.jade
+++ b/views/bonfire/bonfire.jade
@@ -5,31 +5,46 @@ block content
     link(rel='stylesheet', href='/js/lib/codemirror/theme/monokai.css')
     script(src='/js/lib/codemirror/mode/javascript/javascript.js')
 
-    .col-sm-12
-      .col-sm-4.panel.
-        Challenge text goes here
-      .col-sm-8
-        form.code
-          .form-group.code
-            textarea(id='code')
-      #submitButton.btn.btn-primary
-      .col-sm-4.jumbotron
-        #codeOutput
+    .row
+        .col-sm-12.col-md-8.col-xs-12
+            .panel.panel-primary
+                .panel-heading Title
+                .panel.panel-body
+                    form.code
+                        .form-group.codeMirrorView
+                            textarea#codeEditor
+                    form.code
+                        .form-group.codeMirrorView
+                            textarea#codeOutput(enabled=false)
+                    #submitButton.btn.btn-primary.btn-big.btn-block Run my code
+                    #hintButton.btn.btn-info.btn-big.btn-block Show me hints
+                    script.
+                        var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor"), {
+                            lineNumbers: true,
+                            mode: "javascript",
+                            theme: 'monokai',
+                            runnable: true
+                        });
+                        myCodeMirror.setValue('2*2');
+                        myCodeMirror.setSize("100%", 500);
+                        $('#submitButton').on('click', function () {
+                            $('#codeOutput').empty();
+                            var js = myCodeMirror.getValue();
+                            var s = document.createElement('script');
+                            s.textContent = js;
+                            try {
+                                $('#codeOutput').append(eval(s.textContent));
+                            } catch (e) {
+                                $('#codeOutput').append(e);
+                            }
+                        });
 
-
-
-    script.
-      var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "javascript",
-        theme: 'monokai',
-        runnable: true
-      });
-      myCodeMirror.setValue('2*2');
-      $('#submitButton').on('click', function() {
-        $('#codeOutput').empty();
-        var js = myCodeMirror.getValue();
-        var s = document.createElement('script');
-        s.textContent = js;
-        $('#codeOutput').append(eval(s.textContent));
-      });
\ No newline at end of file
+                        var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), {
+                            lineNumbers: false,
+                            mode: "javascript",
+                            theme: 'monokai',
+                            readOnly: 'nocursor'
+                        });
+                        codeOutput.setSize("100%", 30);
+        .col-sm-12.col-md-4.col-xs-12
+            include ../partials/challenges
\ No newline at end of file