From 4467ec7dd70d1e6575113e78ffd4056ab9e08678 Mon Sep 17 00:00:00 2001 From: semu Date: Tue, 6 Mar 2012 21:46:01 +0100 Subject: [PATCH] Updated for gh-pages --- public/scripts/app.main.js | 2 +- public/scripts/app.none.js | 2 +- public/scripts/app.walkLED.js | 4 ++-- public/scripts/example-1.js | 2 +- public/scripts/example-2.js | 2 +- public/scripts/example-3.js | 2 +- public/styles/bootstrap/init.css | 4 ++-- public/styles/bootstrap/variables.less | 4 ++-- public/styles/init.css | 2 +- public/styles/init.less | 2 +- srv.app.js | 2 +- views/home.jade | 4 ++-- views/layout.jade | 10 +++++----- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/public/scripts/app.main.js b/public/scripts/app.main.js index fb6360a..43ea0d1 100755 --- a/public/scripts/app.main.js +++ b/public/scripts/app.main.js @@ -1,4 +1,4 @@ -var p = '/scripts/vendor/'; +var p = 'scripts/vendor/'; require(["jquery", p + "dropdown.js", p + "prettify.js", "./scripts/examples.js"], function($, dd, pf, examples) { $(document).ready(function(e) { prettyPrint(); diff --git a/public/scripts/app.none.js b/public/scripts/app.none.js index b88046b..7adafd3 100755 --- a/public/scripts/app.none.js +++ b/public/scripts/app.none.js @@ -1,4 +1,4 @@ -var p = '/scripts/vendor/'; +var p = 'scripts/vendor/'; require(["jquery", p + "dropdown.js", p + "prettify.js", "./scripts/examples.js"], function($, dd, pf, examples) { $(document).ready(function(e) { prettyPrint(); diff --git a/public/scripts/app.walkLED.js b/public/scripts/app.walkLED.js index a12cf65..2f694b7 100755 --- a/public/scripts/app.walkLED.js +++ b/public/scripts/app.walkLED.js @@ -1,5 +1,5 @@ -var pv = '/scripts/vendor/'; -var pl = '/scripts/libs/'; +var pv = 'scripts/vendor/'; +var pl = 'scripts/libs/'; require(["jquery", pv + "dropdown.js", pv + "prettify.js", pl + 'Noduino.js', pl + 'Noduino.Socket.js', pl + 'Logger.HTML.js'], function($, dd, p, NoduinoObj, Connector, Logger) { var Noduino = null; diff --git a/public/scripts/example-1.js b/public/scripts/example-1.js index 7d4629a..98133d6 100755 --- a/public/scripts/example-1.js +++ b/public/scripts/example-1.js @@ -4,7 +4,7 @@ define(function() { } Example.handle = function() { - require(['/scripts/libs/Noduino.js', '/scripts/libs/Noduino.Socket.js', '/scripts/libs/Logger.js'], function(NoduinoObj, Connector, Logger) { + require(['scripts/libs/Noduino.js', 'scripts/libs/Noduino.Socket.js', 'scripts/libs/Logger.js'], function(NoduinoObj, Connector, Logger) { var Noduino = new NoduinoObj({debug: false, host: 'http://localhost:8090'}, Connector, Logger); Noduino.connect(function(err, board) { $('#e1-exampleConnection .alert').addClass('hide'); diff --git a/public/scripts/example-2.js b/public/scripts/example-2.js index 140307e..793e903 100755 --- a/public/scripts/example-2.js +++ b/public/scripts/example-2.js @@ -6,7 +6,7 @@ define(function() { Example2.handle = function() { var that = this; - require(['/scripts/libs/Noduino.js', '/scripts/libs/Noduino.Socket.js', '/scripts/libs/Logger.js'], function(NoduinoObj, Connector, Logger) { + require(['scripts/libs/Noduino.js', 'scripts/libs/Noduino.Socket.js', 'scripts/libs/Logger.js'], function(NoduinoObj, Connector, Logger) { var Noduino = new NoduinoObj({debug: false, host: 'http://localhost:8090'}, Connector, Logger); Noduino.connect(function(err, board) { $('#e2-exampleConnection .alert').addClass('hide'); diff --git a/public/scripts/example-3.js b/public/scripts/example-3.js index f41fb54..a559e6e 100755 --- a/public/scripts/example-3.js +++ b/public/scripts/example-3.js @@ -5,7 +5,7 @@ define(function() { Example3.handle = function() { - require(['/scripts/libs/Noduino.js', '/scripts/libs/Noduino.Socket.js', '/scripts/libs/Logger.js'], function(NoduinoObj, Connector, Logger) { + require(['scripts/libs/Noduino.js', 'scripts/libs/Noduino.Socket.js', 'scripts/libs/Logger.js'], function(NoduinoObj, Connector, Logger) { var Noduino = new NoduinoObj({debug: false, host: 'http://localhost:8090'}, Connector, Logger); Noduino.connect(function(err, board) { $('#e3-exampleConnection .alert').addClass('hide'); diff --git a/public/styles/bootstrap/init.css b/public/styles/bootstrap/init.css index 76d5c7c..dc602d1 100644 --- a/public/styles/bootstrap/init.css +++ b/public/styles/bootstrap/init.css @@ -220,8 +220,8 @@ table .span9{float:none;width:684px;margin-left:0;} table .span10{float:none;width:764px;margin-left:0;} table .span11{float:none;width:844px;margin-left:0;} table .span12{float:none;width:924px;margin-left:0;} -[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;line-height:14px;vertical-align:text-top;background-image:url("/images/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0;} -.icon-white{background-image:url("/images/glyphicons-halflings-white.png");} +[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;line-height:14px;vertical-align:text-top;background-image:url("../../images/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0;} +.icon-white{background-image:url("../../images/glyphicons-halflings-white.png");} .icon-glass{background-position:0 0;} .icon-music{background-position:-24px 0;} .icon-search{background-position:-48px 0;} diff --git a/public/styles/bootstrap/variables.less b/public/styles/bootstrap/variables.less index c9429b4..d1a6b6c 100644 --- a/public/styles/bootstrap/variables.less +++ b/public/styles/bootstrap/variables.less @@ -55,8 +55,8 @@ @zindexModal: 1050; // Sprite icons path -@iconSpritePath: "/images/glyphicons-halflings.png"; -@iconWhiteSpritePath: "/images/glyphicons-halflings-white.png"; +@iconSpritePath: "../../images/glyphicons-halflings.png"; +@iconWhiteSpritePath: "../../images/glyphicons-halflings-white.png"; // Input placeholder text color @placeholderText: @grayLight; diff --git a/public/styles/init.css b/public/styles/init.css index f353c00..5ac497b 100644 --- a/public/styles/init.css +++ b/public/styles/init.css @@ -79,7 +79,7 @@ form.well{padding:14px;} .the-icons{margin-left:0;list-style:none;} .the-icons i:hover{background-color:rgba(255, 0, 0, 0.25);} .bootstrap-examples .thumbnail{margin-bottom:9px;background-color:#fff;} -@media (max-width:480px){body{padding-top:70px;} h2{margin-top:27px;} h2 small{display:block;line-height:18px;} h3{margin-top:18px;} .jumbotron h1,.jumbotron p{text-align:center;margin-right:0;} .jumbotron h1{font-size:45px;margin-right:0;} .jumbotron p{margin-right:0;margin-left:0;font-size:18px;line-height:24px;} .jumbotron .btn{display:block;font-size:18px;padding:10px 14px;margin:0 auto 10px;} .masthead{padding-top:0;} .quick-links{margin:40px 0 0;} .quick-links .divider{display:none;} .example-sites{margin-left:0;} .example-sites>li{float:none;display:block;max-width:280px;margin:0 auto 18px;text-align:center;} .example-sites .thumbnail>img{max-width:270px;} table code{white-space:normal;word-wrap:break-word;word-break:break-all;} .modal-example .modal{position:relative;top:auto;right:auto;bottom:auto;left:auto;}}@media (max-width:768px){body{padding-top:0;} .jumbotron .btn{margin-bottom:10px;} .subnav{position:static;top:auto;z-index:auto;width:auto;height:auto;background:#fff;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .subnav .nav>li{float:none;} .subnav .nav>li>a{border:0;} .subnav .nav>li+li>a{border-top:1px solid #e5e5e5;} .subnav .nav>li:first-child>a,.subnav .nav>li:first-child>a:hover{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} .large-bird{display:none;} .popover-well .popover-wrapper{margin-left:0;} .show-grid [class*="span"]{margin-bottom:5px;} .footer .pull-right{float:none;} .footer p{margin-bottom:9px;}}@media (min-width:480px) and (max-width:768px){.jumbotron h1{font-size:54px;} .jumbotron p{margin-right:0;margin-left:0;}}@media (min-width:768px) and (max-width:980px){body{padding-top:0;} .jumbotron h1{font-size:72px;}}@media (max-width:980px){.navbar-fixed-top .brand{float:left;margin-left:0;padding-left:10px;padding-right:10px;} .quick-links li{display:inline-block;margin:5px;}}@media (min-width:1210px){.subnav-fixed .nav{width:1168px;}}body{position:relative;padding-top:90px;background-color:white;background-image:url(/images/grid-18px-masked.png);background-repeat:repeat-x;background-position:0 40px;} +@media (max-width:480px){body{padding-top:70px;} h2{margin-top:27px;} h2 small{display:block;line-height:18px;} h3{margin-top:18px;} .jumbotron h1,.jumbotron p{text-align:center;margin-right:0;} .jumbotron h1{font-size:45px;margin-right:0;} .jumbotron p{margin-right:0;margin-left:0;font-size:18px;line-height:24px;} .jumbotron .btn{display:block;font-size:18px;padding:10px 14px;margin:0 auto 10px;} .masthead{padding-top:0;} .quick-links{margin:40px 0 0;} .quick-links .divider{display:none;} .example-sites{margin-left:0;} .example-sites>li{float:none;display:block;max-width:280px;margin:0 auto 18px;text-align:center;} .example-sites .thumbnail>img{max-width:270px;} table code{white-space:normal;word-wrap:break-word;word-break:break-all;} .modal-example .modal{position:relative;top:auto;right:auto;bottom:auto;left:auto;}}@media (max-width:768px){body{padding-top:0;} .jumbotron .btn{margin-bottom:10px;} .subnav{position:static;top:auto;z-index:auto;width:auto;height:auto;background:#fff;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .subnav .nav>li{float:none;} .subnav .nav>li>a{border:0;} .subnav .nav>li+li>a{border-top:1px solid #e5e5e5;} .subnav .nav>li:first-child>a,.subnav .nav>li:first-child>a:hover{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} .large-bird{display:none;} .popover-well .popover-wrapper{margin-left:0;} .show-grid [class*="span"]{margin-bottom:5px;} .footer .pull-right{float:none;} .footer p{margin-bottom:9px;}}@media (min-width:480px) and (max-width:768px){.jumbotron h1{font-size:54px;} .jumbotron p{margin-right:0;margin-left:0;}}@media (min-width:768px) and (max-width:980px){body{padding-top:0;} .jumbotron h1{font-size:72px;}}@media (max-width:980px){.navbar-fixed-top .brand{float:left;margin-left:0;padding-left:10px;padding-right:10px;} .quick-links li{display:inline-block;margin:5px;}}@media (min-width:1210px){.subnav-fixed .nav{width:1168px;}}body{position:relative;padding-top:90px;background-color:white;background-image:url(../images/grid-18px-masked.png);background-repeat:repeat-x;background-position:0 40px;} .jumbotron{position:relative;} .jumbotron h1{margin-bottom:9px;font-size:81px;letter-spacing:-1px;line-height:1;} .jumbotron p{margin-bottom:18px;font-weight:300;} diff --git a/public/styles/init.less b/public/styles/init.less index 3892d53..a66c07c 100755 --- a/public/styles/init.less +++ b/public/styles/init.less @@ -767,7 +767,7 @@ body { position: relative; padding-top: 90px; background-color: white; -background-image: url(/images/grid-18px-masked.png); +background-image: url(../images/grid-18px-masked.png); background-repeat: repeat-x; background-position: 0 40px; } .jumbotron { diff --git a/srv.app.js b/srv.app.js index 340bdee..c8ffb33 100644 --- a/srv.app.js +++ b/srv.app.js @@ -42,7 +42,7 @@ define(['kickstart', 'module', 'path', 'fs'], function (kickstart, module, path, /** * Catch request for serving walkLED example page */ - srv.all('/examples/walkLED.html', function(req, res) { + srv.all('/example-walkLED.html', function(req, res) { res.render('example-walkLED', {jsApp: 'walkLED', active: 'examples', title: 'noduino', 'examples': examples}); }); diff --git a/views/home.jade b/views/home.jade index 49c2572..2b1aa2f 100755 --- a/views/home.jade +++ b/views/home.jade @@ -31,7 +31,7 @@ section#homeContent p a(href="https://github.com/semu/noduino") Download noduino | , install needed packages with npm, fetch git submodules, upload duino's file duino/src/du.ino to your Arduino and you are good to go. An example on how to catch and fire events with an HTML interface is provided as well. Take a look at - a(href="/examples/walkLED.html") LED Walker + a(href="/example-walkLED.html") LED Walker | … .span9 pre.prettyprint.linenums=examples.node @@ -137,7 +137,7 @@ section#homeContent .row .span12 p.exampleLinks - a.btn.btn-success(href="/examples/walkLED.html") + a.btn.btn-success(href="/example-walkLED.html") i.icon-gift.icon-white | View Example .page-header diff --git a/views/layout.jade b/views/layout.jade index 0a1b235..559b5aa 100755 --- a/views/layout.jade +++ b/views/layout.jade @@ -2,10 +2,10 @@ html(lang="en") head title Arduino control nodeuino for JavaScript and Node.js with WebSockets and HTML5 - link(rel="stylesheet", href="/styles/bootstrap/init.css") - link(rel="stylesheet", href="/styles/prettify.css") - link(rel="stylesheet", href="/styles/init.css") - script(data-main="/scripts/app." + jsApp, type="text/javascript", src="/scripts/vendor/require-jquery.js") + link(rel="stylesheet", href="styles/bootstrap/init.css") + link(rel="stylesheet", href="styles/prettify.css") + link(rel="stylesheet", href="styles/init.css") + script(data-main="scripts/app." + jsApp, type="text/javascript", src="scripts/vendor/require-jquery.js") script(type="text/javascript", src="http://localhost:8090/socket.io/socket.io.js") body .navbar.navbar-fixed-top(style="z-index: 4;position:absolute;") @@ -22,7 +22,7 @@ html(lang="en") b.caret ul.dropdown-menu li - a(href="/examples/walkLED.html") Adjustable LED Walker + a(href="/example-walkLED.html") Adjustable LED Walker li a(href="https://github.com/semu/noduino") View on GitHub » div.nav-collapse.pull-right