gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve wikis with hotkey and update the flash to allow links

Browse Source
This commit is contained in:
Michael Q Larson
2015-04-05 17:35:08 -07:00
parent 32f9a61d5d
commit ef57ec58c2
5 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/wiki.js
View File

@ -64,8 +64,8 @@ exports.returnNextWiki = function(req, res, next) {
} }
wiki = wiki.pop(); wiki = wiki.pop();
if (wiki === undefined) { if (wiki === undefined) {
req.flash('errors', { req.flash('success', {
msg: "It looks like you've read all our current Wiki entries. Let us know if you'd like to contribute to our wiki!" 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'); return res.redirect('../wiki/a-guide-to-our-wiki');
} }

4
public/css/main.less
View File

@ -899,6 +899,10 @@ iframe.iphone {
height: 40px; height: 40px;
} }
.alert a {
text-decoration: underline;
}
//uncomment this to see the dimensions of all elements outlined in red //uncomment this to see the dimensions of all elements outlined in red
//* { //* {
// border-color: red; // border-color: red;

2
views/account/show.jade
View File

@ -98,8 +98,6 @@ block content
.hidden-xs.col-sm-12 .hidden-xs.col-sm-12
#cal-heatmap.img-center #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. script.
$(document).ready(function() { $(document).ready(function() {
var cal = new CalHeatMap(); var cal = new CalHeatMap();

37
views/partials/flash.jade
View File

@ -1,18 +1,19 @@
if messages.errors .col-xs-12
.alert.alert-danger.fade.in if messages.errors
button.close(type='button', data-dismiss='alert') .alert.alert-danger.fade.in
span.ion-close-circled button.close(type='button', data-dismiss='alert')
for error in messages.errors span.ion-close-circled
div= error.msg for error in messages.errors
if messages.info div!= error.msg
.alert.alert-info.fade.in if messages.info
button.close(type='button', data-dismiss='alert') .alert.alert-info.fade.in
span.ion-close-circled button.close(type='button', data-dismiss='alert')
for info in messages.info span.ion-close-circled
div= info.msg for info in messages.info
if messages.success div!= info.msg
.alert.alert-success.fade.in if messages.success
button.close(type='button', data-dismiss='alert') .alert.alert-success.fade.in
span.ion-close-circled button.close(type='button', data-dismiss='alert')
for success in messages.success span.ion-close-circled
div= success.msg for success in messages.success
div!= success.msg

2
views/partials/universal-head.jade
View File

@ -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/jquery/2.1.3/jquery.min.js")
script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.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="//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 include meta
title #{title} | Free Code Camp title #{title} | Free Code Camp
meta(charset='utf-8') meta(charset='utf-8')