diff --git a/VERSION b/VERSION
index 3c1f2e2d..088d9c0b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.10.0-trunk+timestamp.2014.08.14.13.38.41
+Version 2.10.0-trunk+timestamp.2014.08.14.16.23.22
diff --git a/applications/welcome/static/css/web2py_bootstrap.css b/applications/welcome/static/css/web2py_bootstrap.css
deleted file mode 100644
index a91465f1..00000000
--- a/applications/welcome/static/css/web2py_bootstrap.css
+++ /dev/null
@@ -1,264 +0,0 @@
-/*=============================================================
- CUSTOM RULES
-==============================================================*/
-
-body{height:auto;} /* to avoid vertical scroll bar */
-
-a{}
-a:visited{}
-a:hover{}
-a:focus{}
-a:active{}
-
-h1{}
-h2{}
-h3{}
-h4{}
-h5{}
-h6{}
-
-div.flash.flash-center{left:25%;right:25%;}
-div.flash.flash-top,div.flash.flash-top:hover{
- position:relative;
- display:block;
- margin:0;
- padding:1em;
- top:0;
- left:0;
- width:100%;
- text-align:center;
- text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);
- color:#865100;
- background:#feea9a;
- border:1px solid;
- border-top:0px;
- border-left:0px;
- border-right:0px;
- border-radius:0;
- opacity:1;
-}
-#header{margin-top:60px;}
-.mastheader h1 {
- margin-bottom:9px;
- font-size:81px;
- font-weight:bold;
- letter-spacing:-1px;
- line-height:1;
- font-size:54px;
-}
-.mastheader small {
- font-size:20px;
- font-weight:300;
-}
-/* auth navbar - primitive style */
-.auth_navbar,.auth_navbar a{color:inherit;}
-.navbar-inner {-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
-.ie-lte7 .auth_navbar,.auth_navbar a{color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */}
-.auth_navbar a{white-space:nowrap;} /* to avoid the nav split on more lines */
-.auth_navbar a:hover{color:white;text-decoration:none;}
-ul#navbar>.auth_navbar{
- display:inline-block;
- padding:5px;
-}
-/* form errors message box customization */
-div.error_wrapper{margin-bottom:9px;}
-div.error_wrapper .error{
- border-radius: 4px;
- -o-border-radius: 4px;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
-}
-/* below rules are only for formstyle = bootstrap
-trying to make errors look like bootstrap ones */
-div.controls .error_wrapper{
- display:inline-block;
- margin-bottom:0;
- vertical-align:middle;
-}
-div.controls .error{
- min-width:5px;
- background:inherit;
- color:#B94A48;
- border:none;
- padding:0;
- margin:0;
- /*display:inline;*/ /* uncommenting this, the animation effect is lost */
-}
-div.controls .help-inline{color:#3A87AD;}
-div.controls .error_wrapper +.help-inline {margin-left:-99999px;}
-div.controls select +.error_wrapper {margin-left:5px;}
-.ie-lte7 div.error{color:#fff;}
-
-/* beautify brand */
-.navbar {margin-bottom:0}
-.navbar-inverse .brand{color:#c6cecc;}
-.navbar-inverse .brand b{display:inline-block;margin-top:-1px;}
-.navbar-inverse .brand b>span{font-size:22px;color:white}
-.navbar-inverse .brand:hover b>span{color:white}
-/* beautify web2py link in navbar */
-span.highlighted{color:#d8d800;}
-.open span.highlighted{color:#ffff00;}
-
-/*=============================================================
- OVERRIDING WEB2PY.CSS RULES
-==============================================================*/
-
-/* reset to default */
-a{white-space:normal;}
-li{margin-bottom:0;}
-textarea,button{display:block;}
-/*reset ul padding */
-ul#navbar{padding:0;}
-/* label aligned to related input */
-td.w2p_fl,td.w2p_fc {padding:0;}
-#web2py_user_form td{vertical-align:middle;}
-
-/*=============================================================
- OVERRIDING BOOTSTRAP.CSS RULES
-==============================================================*/
-
-/* because web2py handles this via js */
-textarea { width:90%}
-.hidden{visibility:visible;}
-/* right folder for bootstrap black images/icons */
-[class^="icon-"],[class*=" icon-"]{
- background-image:url("../images/glyphicons-halflings.png")
-}
-/* right folder for bootstrap white images/icons */
-.icon-white,
-.nav-tabs > .active > a > [class^="icon-"],
-.nav-tabs > .active > a > [class*=" icon-"],
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"] {
- background-image:url("../images/glyphicons-halflings-white.png");
-}
-/* bootstrap has a label as input's wrapper while web2py has a div */
-div>input[type="radio"],div>input[type="checkbox"]{margin:0;}
-/* bootstrap has button instead of input */
-input[type="button"], input[type="submit"]{margin-right:8px;}
-
-/* web2py radio widget adjustment */
-.generic-widget input[type='radio'] {margin:-1px 0 0 0; vertical-align: middle;}
-.generic-widget input[type='radio'] + label {display:inline-block; margin:0 0 0 6px; vertical-align: middle;}
-
-/*=============================================================
-RULES FOR SOLVING CONFLICTS BETWEEN WEB2PY.CSS AND BOOTSTRAP.CSS
-==============================================================*/
-
-/*when formstyle=table3cols*/
-tr#auth_user_remember__row>td.w2p_fw>div{padding-bottom:8px;}
-td.w2p_fw div>label{vertical-align:middle;}
-td.w2p_fc {padding-bottom:5px;}
-/*when formstyle=divs*/
-div#auth_user_remember__row{margin-top:4px;}
-div#auth_user_remember__row>.w2p_fl{display:none;}
-div#auth_user_remember__row>.w2p_fw{min-height:39px;}
-div.w2p_fw,div.w2p_fc{
- display:inline-block;
- vertical-align:middle;
- margin-bottom:0;
-}
-div.w2p_fc{
- padding-left:5px;
- margin-top:-8px;
-}
-/*when formstyle=ul*/
-form>ul{
- list-style:none;
- margin:0;
-}
-li#auth_user_remember__row{margin-top:4px;}
-li#auth_user_remember__row>.w2p_fl{display:none;}
-li#auth_user_remember__row>.w2p_fw{min-height:39px;}
-/*when formstyle=bootstrap*/
-#auth_user_remember__row label.checkbox{display:block;}
-span.inline-help{display:inline-block;}
-input[type="text"].input-xlarge,input[type="password"].input-xlarge{width:270px;}
-/*when recaptcha is used*/
-#recaptcha{min-height:30px;display:inline-block;margin-bottom:0;line-height:30px;vertical-align:middle;}
-td>#recaptcha{margin-bottom:6px;}
-div>#recaptcha{margin-bottom:9px;}
-div.control-group.error{
-width:auto;
-background:transparent;
-border:0;
-color:inherit;
-padding:0;
-background-repeat:repeat;
-}
-
-/*=============================================================
- OTHER RULES
-==============================================================*/
-
-/* Massimo Di Pierro fixed alignment in forms with list:string */
-form table tr{margin-bottom:9px;}
-td.w2p_fw ul{margin-left:0px;}
-
-/* web2py_console in grid and smartgrid */
-.hidden{visibility:visible;}
-.web2py_console input{
- display: inline-block;
- margin-bottom: 0;
- vertical-align: middle;
-}
-.web2py_console input[type="submit"],
-.web2py_console input[type="button"],
-.web2py_console button{
- padding-top:4px;
- padding-bottom:4px;
- margin:3px 0 0 2px;
-}
-.web2py_console a,
-.web2py_console select,
-.web2py_console input
-{
- margin:3px 0 0 2px;
-}
-.web2py_grid form table{width:auto;}
-/* auth_user_remember checkbox extrapadding in IE fix */
-.ie-lte9 input#auth_user_remember.checkbox {padding-left:0;}
-
-div.controls .error {
- width: auto;
-}
-
-/*=============================================================
- MEDIA QUERIES
-==============================================================*/
-
-@media only screen and (max-width:979px){
- body{padding-top:0px;}
- #navbar{/*top:5px;*/}
- div.flash{right:5px;}
- .dropdown-menu ul{visibility:visible;}
-}
-
-@media only screen and (max-width:479px){
- body{
- padding-left:10px;
- padding-right:10px;
- }
- .navbar-fixed-top,.navbar-fixed-bottom {
- margin-left:-10px;
- margin-right:-10px;
- }
- input[type="text"],input[type="password"],select{
- width:95%;
- }
-}
-
-@media (max-width: 767px) {
- .navbar {
- margin-right: -20px;
- margin-left: -20px;
- }
-}
diff --git a/applications/welcome/static/css/web2py_bootstrap_nojs.css b/applications/welcome/static/css/web2py_bootstrap_nojs.css
deleted file mode 100644
index 0ec7312f..00000000
--- a/applications/welcome/static/css/web2py_bootstrap_nojs.css
+++ /dev/null
@@ -1,122 +0,0 @@
-/*=============================================================
- BOOTSTRAP DROPDOWN MENU
-==============================================================*/
-
-.dropdown-menu ul{
- left:100%;
- position:absolute;
- top:0;
- visibility:hidden;
- margin-top:-1px;
-}
-.dropdown-menu li:hover ul{visibility:visible;}
-.navbar .dropdown-menu ul:before{
- border-bottom:7px solid transparent;
- border-left:none;
- border-right:7px solid rgba(0, 0, 0, 0.2);
- border-top:7px solid transparent;
- left:-7px;
- top:5px;
-}
-.nav > li.dropdown > a:after {
- border-left: 4px solid transparent;
- border-right: 4px solid transparent;
- border-top: 4px solid #000000;
- content: "";
- display: inline-block;
- height: 0;
- opacity: 0.7;
- vertical-align: top;
- width: 0;
-
- margin-left: 2px;
- margin-top: 8px;
-
- border-bottom-color: #FFFFFF;
- border-top-color: #FFFFFF;
-}
-.dropdown-menu span{display:inline-block;}
-ul.dropdown-menu li.dropdown > a:after {
- border-left: 4px solid #000;
- border-right: 4px solid transparent;
- border-bottom: 4px solid transparent;
- border-top: 4px solid transparent;
- content: "";
- display: inline-block;
- height: 0;
- opacity: 0.7;
- vertical-align: top;
- width: 0;
-
- margin-left: 8px;
- margin-top: 6px;
-}
-
-ul.nav li.dropdown:hover ul.dropdown-menu {
- display: block;
-}
-
-.open >.dropdown-menu ul{display:block;} /* fix menu issue when BS2.0.4 is applied */
-
-/*=============================================================
- BOOTSTRAP SUBMIT BUTTON
-==============================================================*/
-
-input[type='submit']:not(.btn) {
-display: inline-block;
-padding: 4px 14px;
-margin-bottom: 0;
-font-size: 14px;
-line-height: 20px;
-color: #333;
-text-align: center;
-text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-vertical-align: middle;
-cursor: pointer;
-background-color: whiteSmoke;
-background-image: -webkit-gradient(linear,0 0,0 100%,from(white),to(#E6E6E6));
-background-image: -webkit-linear-gradient(top,white,#E6E6E6);
-background-image: -o-linear-gradient(top,white,#E6E6E6);
-background-image: linear-gradient(to bottom,white,#E6E6E6);
-background-image: -moz-linear-gradient(top,white,#E6E6E6);
-background-repeat: repeat-x;
-border: 1px solid #BBB;
-border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-border-bottom-color: #A2A2A2;
--webkit-border-radius: 4px;
--moz-border-radius: 4px;
-border-radius: 4px;
-filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);
-filter: progid:dximagetransform.microsoft.gradient(enabled=false);
--webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);
--moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-input[type='submit']:not(.btn):hover {
-color: #333;
-text-decoration: none;
-background-color: #E6E6E6;
-background-position: 0 -15px;
--webkit-transition: background-position .1s linear;
--moz-transition: background-position .1s linear;
--o-transition: background-position .1s linear;
-transition: background-position .1s linear;
-}
-
-input[type='submit']:not(.btn).active, input[type='submit']:not(.btn):active {
-background-color: #E6E6E6;
-background-color: #D9D9D9 9;
-background-image: none;
-outline: 0;
--webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
--moz-box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-/*=============================================================
- OTHER
-==============================================================*/
-
-.ie-lte8 .navbar-fixed-top {position:static;}
-
diff --git a/applications/welcome/static/js/dd_belatedpng.js b/applications/welcome/static/js/dd_belatedpng.js
deleted file mode 100644
index fa131fe6..00000000
--- a/applications/welcome/static/js/dd_belatedpng.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
-* DD_belatedPNG: Adds IE6 support: PNG images for CSS background-image and HTML ![]()
.
-* Author: Drew Diller
-* Email: drew.diller@gmail.com
-* URL: http://www.dillerdesign.com/experiment/DD_belatedPNG/
-* Version: 0.0.8a
-* Licensed under the MIT License: http://dillerdesign.com/experiment/DD_belatedPNG/#license
-*
-* Example usage:
-* DD_belatedPNG.fix('.png_bg'); // argument is a CSS selector
-* DD_belatedPNG.fixPng( someNode ); // argument is an HTMLDomElement
-**/
-var DD_belatedPNG={ns:"DD_belatedPNG",imgSize:{},delay:10,nodesFixed:0,createVmlNameSpace:function(){if(document.namespaces&&!document.namespaces[this.ns]){document.namespaces.add(this.ns,"urn:schemas-microsoft-com:vml")}},createVmlStyleSheet:function(){var b,a;b=document.createElement("style");b.setAttribute("media","screen");document.documentElement.firstChild.insertBefore(b,document.documentElement.firstChild.firstChild);if(b.styleSheet){b=b.styleSheet;b.addRule(this.ns+"\\:*","{behavior:url(#default#VML)}");b.addRule(this.ns+"\\:shape","position:absolute;");b.addRule("img."+this.ns+"_sizeFinder","behavior:none; border:none; position:absolute; z-index:-1; top:-10000px; visibility:hidden;");this.screenStyleSheet=b;a=document.createElement("style");a.setAttribute("media","print");document.documentElement.firstChild.insertBefore(a,document.documentElement.firstChild.firstChild);a=a.styleSheet;a.addRule(this.ns+"\\:*","{display: none !important;}");a.addRule("img."+this.ns+"_sizeFinder","{display: none !important;}")}},readPropertyChange:function(){var b,c,a;b=event.srcElement;if(!b.vmlInitiated){return}if(event.propertyName.search("background")!=-1||event.propertyName.search("border")!=-1){DD_belatedPNG.applyVML(b)}if(event.propertyName=="style.display"){c=(b.currentStyle.display=="none")?"none":"block";for(a in b.vml){if(b.vml.hasOwnProperty(a)){b.vml[a].shape.style.display=c}}}if(event.propertyName.search("filter")!=-1){DD_belatedPNG.vmlOpacity(b)}},vmlOpacity:function(b){if(b.currentStyle.filter.search("lpha")!=-1){var a=b.currentStyle.filter;a=parseInt(a.substring(a.lastIndexOf("=")+1,a.lastIndexOf(")")),10)/100;b.vml.color.shape.style.filter=b.currentStyle.filter;b.vml.image.fill.opacity=a}},handlePseudoHover:function(a){setTimeout(function(){DD_belatedPNG.applyVML(a)},1)},fix:function(a){if(this.screenStyleSheet){var c,b;c=a.split(",");for(b=0;bn.H){i.B=n.H}d.vml.image.shape.style.clip="rect("+i.T+"px "+(i.R+a)+"px "+i.B+"px "+(i.L+a)+"px)"}else{d.vml.image.shape.style.clip="rect("+f.T+"px "+f.R+"px "+f.B+"px "+f.L+"px)"}},figurePercentage:function(d,c,f,a){var b,e;e=true;b=(f=="X");switch(a){case"left":case"top":d[f]=0;break;case"center":d[f]=0.5;break;case"right":case"bottom":d[f]=1;break;default:if(a.search("%")!=-1){d[f]=parseInt(a,10)/100}else{e=false}}d[f]=Math.ceil(e?((c[b?"W":"H"]*d[f])-(c[b?"w":"h"]*d[f])):parseInt(a,10));if(d[f]%2===0){d[f]++}return d[f]},fixPng:function(c){c.style.behavior="none";var g,b,f,a,d;if(c.nodeName=="BODY"||c.nodeName=="TD"||c.nodeName=="TR"){return}c.isImg=false;if(c.nodeName=="IMG"){if(c.src.toLowerCase().search(/\.png$/)!=-1){c.isImg=true;c.style.visibility="hidden"}else{return}}else{if(c.currentStyle.backgroundImage.toLowerCase().search(".png")==-1){return}}g=DD_belatedPNG;c.vml={color:{},image:{}};b={shape:{},fill:{}};for(a in c.vml){if(c.vml.hasOwnProperty(a)){for(d in b){if(b.hasOwnProperty(d)){f=g.ns+":"+d;c.vml[a][d]=document.createElement(f)}}c.vml[a].shape.stroked=false;c.vml[a].shape.appendChild(c.vml[a].fill);c.parentNode.insertBefore(c.vml[a].shape,c)}}c.vml.image.shape.fillcolor="none";c.vml.image.fill.type="tile";c.vml.color.fill.on=false;g.attachHandlers(c);g.giveLayout(c);g.giveLayout(c.offsetParent);c.vmlInitiated=true;g.applyVML(c)}};try{document.execCommand("BackgroundImageCache",false,true)}catch(r){}DD_belatedPNG.createVmlNameSpace();DD_belatedPNG.createVmlStyleSheet();
diff --git a/applications/welcome/static/js/modernizr.js b/applications/welcome/static/js/modernizr.js
deleted file mode 100644
index 2a6e0e42..00000000
--- a/applications/welcome/static/js/modernizr.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Modernizr 2.7.1 (Custom Build) | MIT & BSD
- * Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexboxlegacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-shiv-cssclasses-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
- */
-;window.Modernizr=function(a,b,c){function C(a){j.cssText=a}function D(a,b){return C(n.join(a+";")+(b||""))}function E(a,b){return typeof a===b}function F(a,b){return!!~(""+a).indexOf(b)}function G(a,b){for(var d in a){var e=a[d];if(!F(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function H(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:E(f,"function")?f.bind(d||b):f}return!1}function I(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+p.join(d+" ")+d).split(" ");return E(b,"string")||E(b,"undefined")?G(e,b):(e=(a+" "+q.join(d+" ")+d).split(" "),H(e,b,c))}function J(){e.input=function(c){for(var d=0,e=c.length;d',a,""].join(""),l.id=h,(m?l:n).innerHTML+=f,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=g.style.overflow,g.style.overflow="hidden",g.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),g.style.overflow=k),!!i},z=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=E(e[d],"function"),E(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),A={}.hasOwnProperty,B;!E(A,"undefined")&&!E(A.call,"undefined")?B=function(a,b){return A.call(a,b)}:B=function(a,b){return b in a&&E(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=w.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(w.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(w.call(arguments)))};return e}),s.flexbox=function(){return I("flexWrap")},s.flexboxlegacy=function(){return I("boxDirection")},s.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},s.canvastext=function(){return!!e.canvas&&!!E(b.createElement("canvas").getContext("2d").fillText,"function")},s.webgl=function(){return!!a.WebGLRenderingContext},s.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:y(["@media (",n.join("touch-enabled),("),h,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=a.offsetTop===9}),c},s.geolocation=function(){return"geolocation"in navigator},s.postmessage=function(){return!!a.postMessage},s.websqldatabase=function(){return!!a.openDatabase},s.indexedDB=function(){return!!I("indexedDB",a)},s.hashchange=function(){return z("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},s.history=function(){return!!a.history&&!!history.pushState},s.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},s.websockets=function(){return"WebSocket"in a||"MozWebSocket"in a},s.rgba=function(){return C("background-color:rgba(150,255,150,.5)"),F(j.backgroundColor,"rgba")},s.hsla=function(){return C("background-color:hsla(120,40%,100%,.5)"),F(j.backgroundColor,"rgba")||F(j.backgroundColor,"hsla")},s.multiplebgs=function(){return C("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(j.background)},s.backgroundsize=function(){return I("backgroundSize")},s.borderimage=function(){return I("borderImage")},s.borderradius=function(){return I("borderRadius")},s.boxshadow=function(){return I("boxShadow")},s.textshadow=function(){return b.createElement("div").style.textShadow===""},s.opacity=function(){return D("opacity:.55"),/^0.55$/.test(j.opacity)},s.cssanimations=function(){return I("animationName")},s.csscolumns=function(){return I("columnCount")},s.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return C((a+"-webkit- ".split(" ").join(b+a)+n.join(c+a)).slice(0,-a.length)),F(j.backgroundImage,"gradient")},s.cssreflections=function(){return I("boxReflect")},s.csstransforms=function(){return!!I("transform")},s.csstransforms3d=function(){var a=!!I("perspective");return a&&"webkitPerspective"in g.style&&y("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(b,c){a=b.offsetLeft===9&&b.offsetHeight===3}),a},s.csstransitions=function(){return I("transition")},s.fontface=function(){var a;return y('@font-face {font-family:"font";src:url("https://")}',function(c,d){var e=b.getElementById("smodernizr"),f=e.sheet||e.styleSheet,g=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"";a=/src/i.test(g)&&g.indexOf(d.split(" ")[0])===0}),a},s.generatedcontent=function(){var a;return y(["#",h,"{font:0/0 a}#",h,':after{content:"',l,'";visibility:hidden;font:3px/1 a}'].join(""),function(b){a=b.offsetHeight>=3}),a},s.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},s.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},s.localstorage=function(){try{return localStorage.setItem(h,h),localStorage.removeItem(h),!0}catch(a){return!1}},s.sessionstorage=function(){try{return sessionStorage.setItem(h,h),sessionStorage.removeItem(h),!0}catch(a){return!1}},s.webworkers=function(){return!!a.Worker},s.applicationcache=function(){return!!a.applicationCache},s.svg=function(){return!!b.createElementNS&&!!b.createElementNS(r.svg,"svg").createSVGRect},s.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="",(a.firstChild&&a.firstChild.namespaceURI)==r.svg},s.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(m.call(b.createElementNS(r.svg,"animate")))},s.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(m.call(b.createElementNS(r.svg,"clipPath")))};for(var K in s)B(s,K)&&(x=K.toLowerCase(),e[x]=s[K](),v.push((e[x]?"":"no-")+x));return e.input||J(),e.addTest=function(a,b){if(typeof a=="object")for(var d in a)B(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},C(""),i=k=null,function(a,b){function l(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x",d.insertBefore(c.lastChild,d.firstChild)}function m(){var a=s.elements;return typeof a=="string"?a.split(" "):a}function n(a){var b=j[a[h]];return b||(b={},i++,a[h]=i,j[i]=b),b}function o(a,c,d){c||(c=b);if(k)return c.createElement(a);d||(d=n(c));var g;return d.cache[a]?g=d.cache[a].cloneNode():f.test(a)?g=(d.cache[a]=d.createElem(a)).cloneNode():g=d.createElem(a),g.canHaveChildren&&!e.test(a)&&!g.tagUrn?d.frag.appendChild(g):g}function p(a,c){a||(a=b);if(k)return a.createDocumentFragment();c=c||n(a);var d=c.frag.cloneNode(),e=0,f=m(),g=f.length;for(;e",g="hidden"in a,k=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){g=!0,k=!0}})();var s={elements:d.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:c,shivCSS:d.shivCSS!==!1,supportsUnknownElements:k,shivMethods:d.shivMethods!==!1,type:"default",shivDocument:r,createElement:o,createDocumentFragment:p};a.html5=s,r(b)}(this,b),e._version=d,e._prefixes=n,e._domPrefixes=q,e._cssomPrefixes=p,e.hasEvent=z,e.testProp=function(a){return G([a])},e.testAllProps=I,e.testStyles=y,g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+v.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;fli>a').each(function(){
- if(jQuery(this).parent().find('ul').length)
- jQuery(this).attr({'class':'dropdown-toggle','data-toggle':'dropdown'}).append('');
- });
- jQuery('.nav li li').each(function(){
- if(jQuery(this).find('ul').length)
- jQuery(this).addClass('dropdown-submenu');
- });
- function adjust_height_of_collapsed_nav() {
- var cn = jQuery('div.collapse');
- if (cn.get(0)) {
- var cnh = cn.get(0).style.height;
- if (cnh>'0px'){
- cn.css('height','auto');
- }
- }
- }
- function hoverMenu(){
- jQuery('ul.nav a.dropdown-toggle').parent().hover(function(){
- adjust_height_of_collapsed_nav();
- var mi = jQuery(this).addClass('open');
- mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400);
- }, function(){
- var mi = jQuery(this);
- mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')});
- });
- }
- hoverMenu(); // first page load
- jQuery(window).resize(hoverMenu); // on resize event
- jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
-});
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index c12afa6a..da61cc13 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -29,7 +29,6 @@
{{
response.files.insert(0,URL('static','css/web2py.css'))
response.files.insert(1,URL('static','css/bootstrap.min.css'))
- response.files.insert(3,URL('static','css/bootstrap-theme.min.css'))
response.files.insert(4,URL('static','css/web2py-bootstrap3.css'))
}}