From ef57ec58c2b8cffb2b69866cb29f9c5a6b3d49cd Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Sun, 5 Apr 2015 17:35:08 -0700
Subject: [PATCH] improve wikis with hotkey and update the flash to allow links

---
 controllers/wiki.js                |  4 ++--
 public/css/main.less               |  4 ++++
 views/account/show.jade            |  2 --
 views/partials/flash.jade          | 37 +++++++++++++++---------------
 views/partials/universal-head.jade |  2 ++
 5 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/controllers/wiki.js b/controllers/wiki.js
index dae71a39986..578c7820798 100644
--- a/controllers/wiki.js
+++ b/controllers/wiki.js
@@ -64,8 +64,8 @@ exports.returnNextWiki = function(req, res, next) {
     }
     wiki = wiki.pop();
     if (wiki === undefined) {
-      req.flash('errors', {
-        msg: "It looks like you've read all our current Wiki entries. Let us know if you'd like to contribute to our wiki!"
+      req.flash('success', {
+        msg: "You've read all our current Wiki entries. You can contribute to our Wiki <a href='https://github.com/FreeCodeCamp/freecodecamp/blob/nonprofit-show/seed_data/wikis.json'>here</a>."
       });
       return res.redirect('../wiki/a-guide-to-our-wiki');
     }
diff --git a/public/css/main.less b/public/css/main.less
index ddd7d6d0951..a660554f099 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -899,6 +899,10 @@ iframe.iphone {
   height: 40px;
 }
 
+.alert a {
+  text-decoration: underline;
+}
+
 //uncomment this to see the dimensions of all elements outlined in red
 //* {
 //  border-color: red;
diff --git a/views/account/show.jade b/views/account/show.jade
index 6b4a3d2c8e1..53888f8549a 100644
--- a/views/account/show.jade
+++ b/views/account/show.jade
@@ -98,8 +98,6 @@ block content
 
                     .hidden-xs.col-sm-12
                         #cal-heatmap.img-center
-                            script(src="//d3js.org/d3.v3.min.js")
-                            script(src="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.min.js")
                             script.
                                 $(document).ready(function() {
                                     var cal = new CalHeatMap();
diff --git a/views/partials/flash.jade b/views/partials/flash.jade
index cab3d7de095..415005645fa 100644
--- a/views/partials/flash.jade
+++ b/views/partials/flash.jade
@@ -1,18 +1,19 @@
-if messages.errors
-  .alert.alert-danger.fade.in
-    button.close(type='button', data-dismiss='alert')
-      span.ion-close-circled
-    for error in messages.errors
-      div= error.msg
-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
\ No newline at end of file
+.col-xs-12
+    if messages.errors
+      .alert.alert-danger.fade.in
+        button.close(type='button', data-dismiss='alert')
+          span.ion-close-circled
+        for error in messages.errors
+          div!= error.msg
+    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
diff --git a/views/partials/universal-head.jade b/views/partials/universal-head.jade
index 27ef5ba82eb..4928e35797d 100644
--- a/views/partials/universal-head.jade
+++ b/views/partials/universal-head.jade
@@ -1,6 +1,8 @@
 script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js")
 script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.min.js")
 script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js")
+script(src="//d3js.org/d3.v3.min.js")
+script(src="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.min.js")
 include meta
 title #{title} | Free Code Camp
 meta(charset='utf-8')