lot of new files (will weed out later, some are probably not going to be used by us)

Gruntfile.js

@@ -14,10 +14,11 @@ module.exports = function(grunt) {
       options: {
 //         separator: ';'
       },
-      dist: {
+      js: {
         src: [
           'js_src/SettingsWindow.js',
           'js_src/UpdatePanel.js',
+          'js_src/Help.js',
           'js_src/d3dServerInterfacing.js',
           'js_src/verticalShapes.js',
           'js_src/buttonbehaviors.js',
@@ -42,18 +43,25 @@ module.exports = function(grunt) {
         mangle: true,
         beautify: false,
         compress: {},
-        report: 'min',
+//        report: 'min',
         preserveComments: 'false'
       },
-      build: {
+      js: {
         files: {
-//          'www/js/<%= pkg.name %>.min.js' : ['www/js/*.js', '!www/js/<%= pkg.name %>.min.js', '!www/js/<%= pkg.name %>.js']
           'www/js/<%= pkg.name %>.min.js' : ['www/js/<%= pkg.name %>.js']
         }
-//        src: 'www/js/*.js',
+      },
-//        dest: 'www/js/min/blabla.js'
+      jslibs: {
-//        src: ['www/js/*.js', '!www/js/<%= pkg.name %>.min.js'],
+        cwd: "js_src/libs/",
-//        dest: 'www/js/<%= pkg.name %>.min.js'
+//        src: ['js_src/libs/*.js', '!js_src/libs/*.min.js'],  // source files mask
+        src: ['*.js', '!*.min.js'],  // source files mask
+        dest: 'www/js/libs/',    // destination folder
+        expand: true,    // allow dynamic building
+        flatten: true,   // remove all unnecessary nesting
+        ext: '.min.js'   // replace .js to .min.js
+//        files: {
+//          'www/js/<%= pkg.name %>.min.js' : ['www/js/<%= pkg.name %>.js']
+//        }
       }
     },
     jshint: {
@@ -94,7 +102,12 @@ module.exports = function(grunt) {
     watch: {
       javascript: {
         files: ["js_src/*", '!www/js/<%= pkg.name %>.min.js', '!www/js/<%= pkg.name %>.js'],
-        tasks: ["concat", "uglify"]
+        tasks: ["concat:js", "uglify:js"]
+//        tasks: ["jshint", "concat", "uglify"]
+      },
+      javascriptLibs: {
+        files: ["js_src/libs/*"],
+        tasks: ["uglify:jslibs"]
 //        tasks: ["jshint", "concat", "uglify"]
       },
       styles: {

js_src/buttonbehaviors.js

@@ -48,7 +48,7 @@ function initButtonBehavior() {
 	$("#btnPrevious").css("opacity", "0.3");
 	btnNext.css("opacity", "0.3");
 	$("#btnSave").css("opacity", "0.3");
-	btnInfo.css("opacity", "0.3");
+//	btnInfo.css("opacity", "0.3");
 
 //  btnClear.click(function(e) {
 //    e.preventDefault();
@@ -173,6 +173,7 @@ function initButtonBehavior() {
   btnInfo.mouseup(function(e) {
     e.preventDefault();
     console.log("btnInfo mouse up");
+    helpTours.startTour(helpTours.WELCOMETOUR);
   });
 
   // DEBUG

js_src/main.js

@@ -55,6 +55,7 @@ $(function() {
   initSidebars();
   initButtonBehavior();
   initVerticalShapes();
+  initHelp();
 
 	thermometer.init($("#thermometerCanvas"), $("#thermometerContainer"));
   progressbar.init($("#progressbarCanvas"), $("#progressbarCanvasContainer"));

less/jquery-tourbus.less

@@ -11,7 +11,17 @@
   box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
   border-radius: 4px;
   background: white;
+
+  /*
+    remove top padding/margin on headings
+    because the interior of the leg has padding
+  */
+  h1, h2, h3, h4, h5, h6 {
+    margin-top: 0;
+    padding-top: 0;
+  }
 }
+
 /* Interior of leg, clearfixed */
 .tourbus-leg-inner {
   padding: 20px;
@@ -40,19 +50,7 @@
 	box-shadow: 0 0 3px rgba(0, 0, 0, 0.7);
 	margin-right: 8px;
 }
-/*
+
-  remove top padding/margin on headings
-  because the interior of the leg has padding
-*/
-.tourbus-leg h1,
-.tourbus-leg h2,
-.tourbus-leg h3,
-.tourbus-leg h4,
-.tourbus-leg h5,
-.tourbus-leg h6 {
-  margin-top: 0;
-  padding-top: 0;
-}
 /* Tourbus leg arrow */
 .tourbus-arrow:before,
 .tourbus-arrow:after {

www/js/libs/html5shiv-printshiv.min.js

@@ -0,0 +1 @@
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=x.elements;return"string"==typeof a?a.split(" "):a}function e(a){var b=w[a[u]];return b||(b={},v++,a[u]=v,w[v]=b),b}function f(a,c,d){if(c||(c=b),p)return c.createElement(a);d||(d=e(c));var f;return f=d.cache[a]?d.cache[a].cloneNode():t.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),f.canHaveChildren&&!s.test(a)?d.frag.appendChild(f):f}function g(a,c){if(a||(a=b),p)return a.createDocumentFragment();c=c||e(a);for(var f=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)f.createElement(h[g]);return f}function h(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return x.shivMethods?f(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/\w+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(x,b.frag)}function i(a){a||(a=b);var d=e(a);return!x.shivCSS||o||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),p||h(a,d),a}function j(a){for(var b,c=a.getElementsByTagName("*"),e=c.length,f=RegExp("^(?:"+d().join("|")+")$","i"),g=[];e--;)b=c[e],f.test(b.nodeName)&&g.push(b.applyElement(k(b)));return g}function k(a){for(var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(z+":"+a.nodeName);d--;)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function l(a){for(var b,c=a.split("{"),e=c.length,f=RegExp("(^|[\\s,>+~])("+d().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),g="$1"+z+"\\:$2";e--;)b=c[e]=c[e].split("}"),b[b.length-1]=b[b.length-1].replace(f,g),c[e]=b.join("}");return c.join("{")}function m(a){for(var b=a.length;b--;)a[b].removeNode()}function n(a){function b(){clearTimeout(g._removeSheetTimer),d&&d.removeNode(!0),d=null}var d,f,g=e(a),h=a.namespaces,i=a.parentWindow;return!A||a.printShived?a:("undefined"==typeof h[z]&&h.add(z),i.attachEvent("onbeforeprint",function(){b();for(var e,g,h,i=a.styleSheets,k=[],m=i.length,n=Array(m);m--;)n[m]=i[m];for(;h=n.pop();)if(!h.disabled&&y.test(h.media)){try{e=h.imports,g=e.length}catch(o){g=0}for(m=0;g>m;m++)n.push(e[m]);try{k.push(h.cssText)}catch(o){}}k=l(k.reverse().join("")),f=j(a),d=c(a,k)}),i.attachEvent("onafterprint",function(){m(f),clearTimeout(g._removeSheetTimer),g._removeSheetTimer=setTimeout(b,500)}),a.printShived=!0,a)}var o,p,q="3.6.2",r=a.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,t=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,u="_html5shiv",v=0,w={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",o="hidden"in a,p=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){o=!0,p=!0}}();var x={elements:r.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:q,shivCSS:r.shivCSS!==!1,supportsUnknownElements:p,shivMethods:r.shivMethods!==!1,type:"default",shivDocument:i,createElement:f,createDocumentFragment:g};a.html5=x,i(b);var y=/^$|\b(?:all|print)\b/,z="html5shiv",A=!p&&function(){var c=b.documentElement;return!("undefined"==typeof b.namespaces||"undefined"==typeof b.parentWindow||"undefined"==typeof c.applyElement||"undefined"==typeof c.removeNode||"undefined"==typeof a.attachEvent)}();x.type+=" print",x.shivPrint=n,n(b)}(this,document);

www/js/libs/html5shiv.min.js

@@ -0,0 +1 @@
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=s.elements;return"string"==typeof a?a.split(" "):a}function e(a){var b=r[a[p]];return b||(b={},q++,a[p]=q,r[q]=b),b}function f(a,c,d){if(c||(c=b),k)return c.createElement(a);d||(d=e(c));var f;return f=d.cache[a]?d.cache[a].cloneNode():o.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),f.canHaveChildren&&!n.test(a)?d.frag.appendChild(f):f}function g(a,c){if(a||(a=b),k)return a.createDocumentFragment();c=c||e(a);for(var f=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)f.createElement(h[g]);return f}function h(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return s.shivMethods?f(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/\w+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(s,b.frag)}function i(a){a||(a=b);var d=e(a);return!s.shivCSS||j||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),k||h(a,d),a}var j,k,l="3.6.2",m=a.html5||{},n=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,o=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,p="_html5shiv",q=0,r={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",j="hidden"in a,k=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){j=!0,k=!0}}();var s={elements:m.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:l,shivCSS:m.shivCSS!==!1,supportsUnknownElements:k,shivMethods:m.shivMethods!==!1,type:"default",shivDocument:i,createElement:f,createDocumentFragment:g};a.html5=s,i(b)}(this,document);