new admin

admin2 - experimental
added missing file
2016-03-09 11:55:36 -06:00 · 2016-03-09 11:53:07 -06:00 · 2016-03-09 11:50:48 -06:00 · 2016-03-09 09:44:51 -06:00 · 2016-03-09 09:35:01 -06:00 · 2016-03-09 09:25:52 -06:00
99 changed files with 5617 additions and 5982 deletions
@@ -59,3 +59,4 @@ HOWTO-web2py-devel
 *.sublime-workspace
 .idea/*
 site-packages/
+logs/
@@ -1,8 +1,38 @@
-## 2.13.1
+## trunk
+- new JWT implementation (experimental)
+- new gluon.contrib.redis_scheduler
+- BREAKING: changes to gluon.contrib.redis_cache
+    BEFORE:
+    from gluon.contrib.redis_cache import RedisCache
+    cache.redis = RedisCache('localhost:6379',db=None, debug=True)
+    NOW:
+    from gluon.contrib.redis_utils import RConn
+    from gluon.contrib.redis_cache import RedisCache
+    rconn = RConn()
+    # or RConn(host='localhost', port=6379,
+    # db=0, password=None, socket_timeout=None,
+    # socket_connect_timeout=None, .....)
+    # exactly as a redis.StrictRedis instance
+    cache.redis = RedisCache(redis_conn=rconn, debug=True)
+- BREAKING: changes to gluon.contrib.redis_session
+    BEFORE:
+    from gluon.contrib.redis_session import RedisSession
+    sessiondb = RedisSession('localhost:6379',db=0, session_expiry=False)
+    session.connect(request, response, db = sessiondb)
+    NOW:
+    from gluon.contrib.redis_utils import RConn
+    from gluon.contrib.redis_session import RedisSession
+    rconn = RConn()
+    sessiondb = RedisSession(redis_conn=rconn, session_expiry=False)
+    session.connect(request, response, db = sessiondb)

+
+## 2.13.1-2
+
+- fixed a security issue in request_reset_password
 - added fabfile.py
 - fixed oauth2 renew token, thanks dokime7
- fixed add_membership, del_membership, add_membership IntegrityError (when auth.enable_record_versioning) 
+- fixed add_membership, del_membership, add_membership IntegrityError (when auth.enable_record_versioning)
 - allow passing unicode to template render
 - allow IS_NOT_IN_DB to work with custom primarykey, thanks timmyborg
 - allow HttpOnly cookies
@@ -11,7 +11,7 @@ clean:
 	find ./ -name '*.rej' -exec rm -f {} \; 
 	find ./ -name '#*' -exec rm -f {} \;
 	find ./ -name 'Thumbs.db' -exec rm -f {} \; 
-	find ./gluon/ -name '.*' -exec rm -f {} \;
+	# find ./gluon/ -name '.*' -exec rm -f {} \;
 	find ./gluon/ -name '*class' -exec rm -f {} \; 
 	find ./applications/admin/ -name '.*' -exec rm -f {} \; 
 	find ./applications/examples/ -name '.*' -exec rm -f {} \; 
@@ -32,7 +32,7 @@ update:
 	echo "remember that pymysql was tweaked"
 src:
 	### Use semantic versioning
-	echo 'Version 2.13.1-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.13.4-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
@@ -1 +1 @@
-Version 2.12.3-stable+timestamp.2015.08.18.19.14.07
+Version 2.13.4-stable+timestamp.2016.02.10.15.41.11
@@ -576,7 +576,7 @@ def bg_graph_model():
            meta_graphmodel = dict(group=request.application, color='#ECECEC')

        group = meta_graphmodel['group'].replace(' ', '')
-        if not subgraphs.has_key(group):
+        if group not in subgraphs:
            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
        subgraphs[group]['tables'].append(tablename)

@@ -12,29 +12,24 @@ def button(href, label):
    if is_mobile:
        ret = A_button(SPAN(label), _href=href)
    else:
-        ret = A(SPAN(label), _class='button btn', _href=href)
+        ret = A(SPAN(label), _class='btn rounded', _href=href)
    return ret

 def button_enable(href, app):
    if os.path.exists(os.path.join(apath(app, r=request), 'DISABLED')):
-        label = SPAN(T('Enable'), _style='color:red')
+        text, classes = T("Enable"), "btn rounded red"
    else:
-        label = SPAN(T('Disable'), _style='color:green')
+        text, classes = T("Disable"), "btn rounded gree"
    id = 'enable_' + app
-    return A(label, _class='button btn', _id=id, callback=href, target=id)
+    return A(text, _class=classes, _id=id, callback=href, target=id)

 def sp_button(href, label):
    if request.user_agent().get('is_mobile'):
        ret = A_button(SPAN(label), _href=href)
    else:
-        ret = A(SPAN(label), _class='button special btn btn-inverse', _href=href)
+        ret = A(SPAN(label), _class='btn pink rounded', _href=href)
    return ret

 def helpicon():
    return IMG(_src=URL('static', 'images/help.png'), _alt='help')

-def searchbox(elementid):
-    return SPAN(LABEL(IMG(_id="search_start", _src=URL('static', 'images/search.png'), _alt=T('filter')),
-                    _class='icon', _for=elementid), ' ',
-                INPUT(_id=elementid, _type='text', _size=12, _class="input-medium"),
-            _class="searchbox")
@@ -1,579 +0,0 @@
-/*=============================================================
-                         GENERAL 
-==============================================================*/
-html,body{height:auto;background:transparent;}
-/*=============================================================
-                         CONTROLS 
-==============================================================*/
-label,
-input,
-button,
-select,
-textarea,
-button.btn
-{
-font-size:13px;
-font-weight:normal;
-line-height:18px;
-}
-textarea,
-select
-{
-margin-bottom:9px;
-}
-select,
-/*textarea,*/
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input,
-a.btn-lnk
-{
-height:18px;
-padding:4px;
-font-size:13px;
-line-height:18px;
-}
-.design h3,
-.plugin h3
-{
-background-position:0 2px;
-}
-
-select,
-input[type="file"]
-{
-height:28px;
-line-height:28px;
-}
-input[type="submit"],
-input[type="button"]
-{
-font-size:13px;
-height:28px;
-line-height:18px;
-padding:4px 10px;
-}
-input[type="radio"],
-input[type="checkbox"]
-{
-margin-top:2px;
-}
-.button.btn
-{
-line-height:1.25em;
-font-size:inherit;
-border:none;
-text-shadow:none;
-margin-bottom:0px;
-webkit-border-radius:0px;
-   -moz-border-radius:0px;
-        border-radius:0px;
-webkit-box-shadow:none;
-   -moz-box-shadow:none;
-        box-shadow:none);
-}
-.button.btn:hover
-{
-background-color:transparent;
-webkit-transition: background-position 0s linear;
-   -moz-transition: background-position 0s linear;
-     -o-transition: background-position 0s linear;
-        transition: background-position 0s linear;
-}
-form label
-{
-font-weight:bold;
-}
-.help
-{
-border-color:transparent;
-}
-/* tree menu */
-.folder
-{
-border:none;
-}
-.folder>i
-{
-display:none;
-}
-.celled
-{
-padding-top: 2px;
-}
-.celled-one
-{
-padding-top: 1px;
-}
-
-.test h3
-{
-border:0;
-padding-left:18px;
-}
-/*=============================================================
-                      FLASH MESSAGEBOX 
-==============================================================*/
-.flash
-{
-position:fixed;
-width:50%;
-top:49px;
-left:25%;
-right:25%;
-cursor:default;
-text-align:center;
-padding:8px 35px 8px 14px;
-z-index:5620;
-}
-.flash>.close
-{
-color:inherit;
-opacity:0.7;
-}
-.flash>.close:hover
-{
-opacity:0.9;
-}
-/*=============================================================
-                         NAVBAR 
-==============================================================*/
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner
-{
-/* in place of shadow image */
-webkit-box-shadow:0px 10px 20px rgba(195,195,195,1.0);
-moz-box-shadow:   0px 10px 20px rgba(195,195,195,1.0);
-box-shadow:        0px 10px 20px rgba(195,195,195,1.0);
-//zoom:1; /* IE6-9 */
-filter:progid:DXImageTransform.Microsoft.DropShadow(OffX=0, OffY=10, Color=#000000); /* IE6-9 */
-padding:0;
-}
-.navbar-inverse .navbar-inner
-{
-min-height:33px; /* required - override */
-height:33px;
-filter:progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
-background:#292929 url(../images/header_bg.png) repeat-x;
-border:none;
-}
-#header
-{
-background:transparent;
-}
-#header.navbar
-{
-overflow:visible;
-}
-.navbar-inverse .nav > li > a
-{
-padding:0;
-line-height:1.25;
-text-shadow:none;
-}
-.navbar .btn-navbar
-{
-padding:4px;
-margin:5px 5px 0 5px;
-}
-#menu{margin-right:-7px;}
-/*=============================================================
-                         FOOTER 
-==============================================================*/
-#footer
-{
-padding-bottom:0;
-}
-/*=============================================================
-                         MAIN 
-==============================================================*/
-#main
-{
-position:static;
-padding-top:0;
-padding-bottom:0;
-}
-/*=============================================================
-                        SIDEBAR 
-==============================================================*/
-.sidebar_inner
-{
-background:transparent;
-padding:0;
-min-width:auto;
-}
-.sidebar .box {
-border-top:1px solid #EEE;
-}
-/*=============================================================
-                       WIZARD 
-==============================================================*/
-.step div.help li
-{
-line-height:inherit;
-}
-.ms-container .ms-selectable li.ms-elem-selectable,
-.ms-container .ms-selection li.ms-elem-selected
-{
-font-size:13px;
-}
-.input-append a.btn
-{
-padding:4px;
-height:18px;
-font-size:13px;
-line-height:18px;
-}
-/*=============================================================
-                       ERRORS TABLE 
-==============================================================*/
-.errors .table th
-{
-filter:progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
-}
-
-.tablebar span.help
-{
-font-weight:normal;
-line-height:1.25em;
-text-shadow:none;
-width:auto;
-}
-/*=============================================================
-                      TOOLTIP
-==============================================================*/
-.tooltip.in
-{
-opacity:1;
-filter:alpha(opacity=100);
-}
-.tooltip-inner
-{
-opacity:1;
-text-align:left;
-background:#9fb364;
-color:#eef1d9;
-border:1px solid #eef1d9;
-font-style:italic;
-padding:0.3em;
-moz-border-radius:0.5em;
-border-radius:0.5em;
-font-size:13px;
-text-transform:none;
-}
-.tooltip.right .tooltip-arrow,
-.tooltip.left .tooltip-arrow
-{
-border-color:transparent;
-}
-
-/*=============================================================
-                        THE GRID 
-==============================================================*/
-.w2p_grid_bottom_bar .w2p_export_menu
-{
-line-height:18px;
-margin-left:0;
-}
-.w2p_export_menu .dropdown-toggle
-{
-cursor:pointer;
-margin:0;
-padding:0;
-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);
-}
-.w2p_export_menu ul 
-{
-margin-top:2px;
-display:none;
-}
-.w2p_export_menu li
-{ 
-display:list-item;
-margin:0;
-}
-div.web2py_grid 
-{
-font-size:13px;
-line-height:18px;
-}
-.web2py_grid a.btn
-{
-font-size:13px;
-line-height:18px;
-padding:4px 10px;
-margin-left:0;
-margin-right:4px;
-
-background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-}
-.web2py_grid .input-append .btn
-{
-padding:4px 10px;
-margin-right:0;
-font-family:inherit;
-color:#333;
-text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);
-border:1px solid #c5c5c5;
-}
-.web2py_grid select:focus
-{
-border-color:rgba(232,149,60,0.8);
-outline:0;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(232, 149, 60, 0.6);
-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(232,149,60,0.6);
-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(232, 149, 60, 0.6);
-}
-.web2py_console input[type="button"],
-.web2py_grid .row_buttons a.btn
-{
-color:#333;
-line-height:18px;
-padding:4px 10px;
-text-shadow:rgba(255, 255, 255, 0.74902) 0px 1px 1px;
-border-color:rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
-webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-        border-radius: 4px;
-}
-.web2py_console input[type="button"]:hover,
-.web2py_grid .row_buttons a.btn:hover
-{
-color:#333;
-border-color:rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
-background:#E6E6E6;
-background-position: 0 -15px !important;
-webkit-transition: background-position .1s linear;
-moz-transition: background-position .1s linear;
-o-transition: background-position .1s linear;
-transition: background-position .1s linear;
-}
-.web2py_table 
-{
-border:none;
-}
-.web2py_table table
-{
-/*table-layout:fixed;*/
-margin-bottom:4px;
-}
-.web2py_table table td
-{
-/*word-wrap:break-word;*/ /*uncomment when "table-layout:fixed" is applied */
-}
-
-.web2py_grid thead th 
-{
-background-color:transparent;
-padding:4px 5px;
-line-height:18px;
-vertical-align:bottom;
-border-right:0;
-border-bottom:0;
-word-wrap:break-word;
-}
-.web2py_grid .btn-group > .dropdown-menu
-{
-font-size:13px;
-}
-.web2py_grid .dropdown-menu li > a:hover,
-.web2py_grid .dropdown-menu li > a:focus 
-{
-filter:progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
-background-image:none;
-background-color:#E8953C;
-}
-.pagination
-{
-margin:0;
-height:30px;
-}
-.pagination ul > li > a
-{
-line-height:28px;
-}
-
-#w2p_grid_addbtn:focus,
-#w2p_search-form :focus,
-.btn:focus
-{
-outline:none;
-}
-.web2py_console input[type="button"]:focus,
-.web2py_grid .row_buttons a.btn:focus
- {
-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-div.web2py_counter.span6
-{
-min-height:20px;
-}
-.web2py_paginator 
-{
-border:0;
-margin:0;
-padding:0;
-background-color:transparent;
-}
-.web2py_paginator ul li a
-{
-margin-right:0;
-padding:0 14px;
-border:1px solid #DDD;
-border-left-width:0;
-color:#E8953C;
-}
-.web2py_paginator ul li a:hover
-{
-background: whiteSmoke;
-border: 1px solid #DDD;
-border-left-width:0;
-color:#e2821b;
-}
-.web2py_paginator ul li:first-child a,
-.web2py_paginator ul li:first-child a:hover
-{
-border-left-width:1px;
-}
-.web2py_paginator .current
-{
-font-weight:normal;
-}
-.web2py_paginator ul li.current a:hover
-{
-color:#999;
-}
-
-
-
-
-
-.editor-bar-column a[name="save"]
-{
-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;
-padding:2px 6px;
-font-size:11px;
-line-height:17px;
-margin:0;
-}
-.editor-bar-column a[name="save"]:hover
-{
-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;
-}
-.keybindings
-{
-padding:0 18px 10px;
-} 
-.keybindings li 
-{
-margin-bottom:0;
-}
-
-/*-----  translate page  ---*/
-
-.languageform input
-{
-margin-bottom:0;
-}
-.languageform div
-{
-margin-bottom:9px;
-}
-.languageform input.untranslated
-{
-background-color:#FC0;
-}
-
-.step #wizard_nav .first-box
-{
-padding-top:0;
-}
-
-/*=============================================================
-                         MEDIA QUERIES 
-==============================================================*/
-@media (max-width: 979px)
-{
-/*-----------------------------------
-                  Navbar
-------------------------------------*/
-	#header .navbar-inner
-	{
-	padding:0;
-	}
-	/*collapsed menu*/
-	.navbar .nav-collapse .nav
-	{
-	background:#222;
-	padding:8px 2px 8px 8px;
-	-webkit-border-bottom-right-radius:8px;
-	-webkit-border-bottom-left-radius:8px;
-	-moz-border-radius-bottomright:8px;
-	-moz-border-radius-bottomleft:8px;
-	border-bottom-right-radius:8px;
-	border-bottom-left-radius:8px;
-	}
-	#menu
-	{
-	margin-right:0;
-	}
-	#menu li
-	{
-	float:none;
-	}
-	#menu a.button,
-	#menu a.button span
-	{
-	background-image:url(../images/menu_responsive.png);
-	}
-	#menu a.button
-	{
-	padding:0 1em 0 0;
-	}
-}
-@media(max-width:632px)
-{
-/*-----------------------------------
-                  footer
-------------------------------------*/
-	#footer
-	{
-	height:auto;
-	}
-
-	#footer select
-	{
-	margin-top:8px;
-	}
-}
@@ -1,489 +0,0 @@
-
-/*=============================================================
- GENERAL
-==============================================================*/
- body { /*remember to account for the hidden area underneath
-fixed navbar by adding at least 40px padding to the <body>.
-Be sure to add this after the core Bootstrap CSS
-and before the optional responsive CSS.
-An alternative solution is to set top-margin to div#main padding-top:60px; comment this for alternative solution*/ height:auto; /*uncomment this for alternative solution*/ }
-
-/*=============================================================
- BOOTSTRAP ICONS FOLDER FIX
-==============================================================*/
- [class^="icon-"], [class*=" icon-"] { /* right folder for bootstrap black images/icons*/ background-image:url("../images/glyphicons-halflings.png") }
-
-.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-"] { /* right folder for bootstrap white images/icons*/ background-image:url("../images/glyphicons-halflings-white.png"); }
-
-/*=============================================================
- INPUT BORDER HIGHLIGHT WHEN INPUT IS FOCUSED
-==============================================================*/
- textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="date"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="color"]:focus, input[type="file"]:focus, select:focus, .uneditable-input:focus { /* outline color*/ border-color:rgba(232, 149, 60, 0.8); outline:0; /*outline:thin dotted \9;*/ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(232, 149, 60, 0.6); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(232, 149, 60, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(232, 149, 60, 0.6); }
-
-.web2py_grid .dropdown-menu li > a:hover, .web2py_grid .dropdown-menu li > a:focus { filter:progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9*/ background-image:none; background-color:#E8953C; }
-
-/*=============================================================
- COLOR OF LINKS
-==============================================================*/
- a, a:hover { color:#E8953C; text-decoration:none; }
-
-a:hover { color:#e2821b; }
-
-/*=============================================================
- CONTROLS and CONTAINERS
-==============================================================*/
- .row-buttons .btn { margin-bottom:7px; }
-
-.sidebar .box { clear:right; margin-top:2em; border-top:1px solid #d1d1d1; padding:0 1em; }
-
-.pwdchange>.button { margin-bottom:10px; }
-
-input[type="file"] { margin-bottom:9px; }
-
-.form-inline input[type="file"] { margin-bottom:0px; }
-
-input + .help-block { margin-top:-10px; margin-bottom:4px; }
-
-#confirm_form input.btn, .generatedbyw2p input { margin-right:4px; }
-
-a[rel='tooltip'] span, div[rel='tooltip'] span { display:none; margin-left:-9999px; }
-
-/*in-page browsing*/
- [rel="pagebookmark"] { position:relative; }
-
-[rel="pagebookmark"]>.component { cursor:pointer; }
-
-[rel="pagebookmark"]>.hashstick { position:absolute; top:-54px; left:-9999px; visibility:visible; }
-
-/* following 2 rules set the style of a small button for going to top of page*/
- .tophashlink.btn { padding:2px 3px; visibility:hidden; }
-
-.hashstick:target+.tophashlink.btn { visibility:visible; }
-
-ul.act_edit { margin-top:4px; margin-left:20px; }
-
-ul.act_edit .btn { margin-top:4px; margin-bottom:4px; }
-
-ul.act_edit .file>a { white-space:pre; }
-
-.right-full { text-align:right; }
-
-.searchbox, .searchbox label, .searchbox input { display:inline-block; }
-
-.buttons-row .btn { margin-bottom:9px; }
-
-.li-controls { display:inline-block; width:180px; vertical-align:middle; }
-
-.celled { display:inline-block; padding: 0 0 0 4px; vertical-align:top; margin-top:4px; width:700px; }
-
-.folder { list-style-type:none; #border-left: 1px dotted #AAA; }
-
-.folder li { list-style-type:none; }
-
-.folder>i { display:inline-block; width:5px; height:5px; border:1px solid; background-color:#FAA732; margin-left:-4px; margin-top:-2px; border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-radius:1px; }
-
-.folder>i+a { padding-left:0.5em; }
-
-.folder ul { margin-top:0.5em; margin-bottom:0.5em; }
-
-.controls-inline .btn { margin-right:5px; }
-
-div.web2py_counter.span6 { min-height:24px; text-align:right; }
-
-.pagination { margin:0; }
-
-.table { margin-bottom:10px; }
-
-.row_buttons .btn { margin-right:4px; }
-
-.editor-bar-column { display:inline-block; vertical-align:top; margin-right:4px; }
-
-.editor-bar-column .input-long { width:270px; }
-
-.editor-bar-column .input-normal { width:206px; }
-
-.keybindings li { margin-bottom:0.5em; }
-
-.keybindings span { padding:0.3em; border:1px solid transparent; vertical-align:middle; }
-
-.teletype-text { font-family:monospace; font-weight:bold; font-style:normal; border-color:#999; background:#333; color:#DDD; -moz-border-radius:0.3em; border-radius:0.3em; }
-
-.edit_language .tab_row div { display:inline-block; vertical-align:top; margin-right:4px; }
-
-.edit_language .fake-input { height:18px; padding:4px; font-size:13px; line-height:18px; overflow:hidden; white-space:nowrap; display:inline-block; margin-bottom:9px; }
-
-.test h3 { padding-left:9px; margin:0; font-size:16px; line-height:1; border-left:9px solid transparent; }
-
-.test h3.passed { border-color:#009900; }
-
-.test h3.failed { border-color:#CC0000; }
-
-.test h3.nodoctests { border-color:#CCCC99; }
-
-.test .test_report { width:100%; overflow:auto; }
-
-.test_report pre { white-space:pre; }
-
-.test div[id^="output_"]>h2 { font-size:18px; line-height:1; color:grey; }
-
-div.center { text-align:center; }
-
-.delete h2 { word-wrap:break-word; }
-
-/*=============================================================
- SHELL
-==============================================================*/
- .shell .output-wrapper { width:100%; height:30em; border:1px solid #333; }
-
-.shell .prompt-wrapper { float:left; width:100%; overflow:hidden; height:auto; border:1px solid #333; }
-
-.shell .prompt-container { margin-left:2.5em; }
-
-.shell #caret { width:2.5em; float:left; margin-left:-100%; }
-
-.shell #shellwrapper { background:white; color:#E8953C; width:100%; margin:1em 0; border:0; }
-
-.shell #output, .shell .prompt { color:#E8953C; background:white; resize:none; border:none; width:100%; height:100%; cursor:default; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; }
-
-.shell #output:focus, .shell .prompt:focus { border-color:transparent; outline:0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
-
-.shell #output pre { color: #E8953C; }
-
-.shell #autoscroll { cursor:pointer; float:right; }
-
-.shell .prompt, .shell #output, .shell #caret { font-size: 11pt; padding: 6px; padding-right: 0em; }
-
-.shell #caret { padding-top:9px; }
-
-.shell .prompt, .shell #output, .shell pre, .shell #caret { font-family: monospace; }
-
-.shell a[rel="tooltip"] { margin-left:8px; }
-
-/*=============================================================
- PEEK
-==============================================================*/
- .peek .code-wrapper { width:100%; overflow:auto; white-space:pre; }
-
-.peek table td pre { word-break:normal; white-space:pre; }
-
-/*=============================================================
- FOOTER
-==============================================================*/
- #footer { border-top:1px solid; text-align:center; padding:1em 0; }
-
-#footer span, #footer select { display:inline-block; margin-bottom:0; vertical-align:middle; }
-
-#footer select { width:auto; }
-
-/*=============================================================
- MAIN
-==============================================================*/
- #main { margin-top:60px; /*uncomment this for alternative solution to hidden area underneath fixed navbar issue*/ margin-bottom:60px; }
-
-/*=============================================================
- WIZARD
-==============================================================*/
- #wizard_nav .box { border-bottom:1px dotted; }
-
-#wizard_nav li { margin-left:1em; margin-top:0.5em; }
-
-.step textarea { width:auto; }
-
-select[name='layout_theme'] { vertical-align:top; }
-
-img#preview { margin-bottom:9px; }
-
-/* multiselect customization*/
- .ms-container { margin-bottom:5px; }
-
-.ms-selectable, .step .ms-selection { text-align:center; }
-
-.ms-list { text-align:left; background:white; }
-
-.ms-container li.ms-elem-selectable:not(.disabled).ms-hover, .ms-container .ms-selection li:not(.disabled).ms-hover { background-color:#E8953C; }
-
-.ms-container .ms-selectable { margin-right:25px; }
-
-.ms-container .ms-selectable, .ms-container .ms-selection { background:transparent; }
-
-.ms-container .ms-list.ms-focus { border-color:rgba(232, 149, 60, 0.8); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(232, 149, 60, 0.6); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(232, 149, 60, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(232, 149, 60, 0.6); }
-
-/* grow_input*/
- ul[id$="_grow_input"] { margin-left:0; }
-
-/* generate_form*/
- #generate_form .control-group { margin-bottom:0; }
-
-#generate_form .control-label { text-align:left; }
-
-#generate_form .controls { padding-left:18px; margin-left:0; }
-
-#generate_form .control-label.empty { width:142px; }
-
-.step [rel="pagebookmark"]>.hashstick { display:none; }
-
-/*generated page*/
- .generated iframe { border:1px inset #e3e3e3; }
-
-/*=============================================================
- ERRORS TABLE / TICKET PAGE
-==============================================================*/
- .tablebar { margin:7px 0 7px 0; }
-
-.tablebar input { margin-right:27px; }
-
-.tablebar span { vertical-align:bottom; }
-
-.table th { background: #e9e9e9; background: -moz-linear-gradient(top, #FAFAFA 0%, #E9E9E9 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #FAFAFA), color-stop(100%, #E9E9E9)); background: -webkit-linear-gradient(top, #FAFAFA 0%, #E9E9E9 100%); background: -o-linear-gradient(top, #FAFAFA 0%, #E9E9E9 100%); background: -ms-linear-gradient(top, #FAFAFA 0%, #E9E9E9 100%); background: linear-gradient(top, #FAFAFA 0%, #E9E9E9 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9'); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9')"; /*font-size:10px; color:#444; text-transform:uppercase;*/ }
-
-td.cbcentered, th.cbcentered { text-align:center; }
-
-td.cbcentered>input, th.cbcentered>input { margin-top:-1px; }
-
-.traceback div { }
-
-.ticket_code>table td:first-child { border-left:0; }
-
-#trck_errors table td pre { word-break:normal; white-space:pre; }
-
-.inspect pre, .errorsource pre { word-break:normal; white-space:pre; }
-
-.ticket_code { background-color:lightyellow; }
-
-.ticket_code table, .ticket_code td { border-width:0px; border-collapse:collapse; width:100%; }
-
-.ticket_code tbody tr:hover td { background-color:transparent; }
-
-/*=============================================================
- FLOT GRAPHS
-==============================================================*/
- .about #placeholder { width:auto; max-width:600px; height:300px; position:relative; margin:0 auto; /* for centering*/ }
-
-/*=============================================================
- THE GRID
-==============================================================*/
- #w2p_query_panel { min-width:20px; min-height:20px; padding:10px; margin-top:1em; background-color:#f5f5f5; border: 1px solid #e3e3e3; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); }
-
-#w2p_query_panel select, #w2p_query_panel input { margin-bottom:0; margin-right:4px; }
-
-.web2py_grid .hidden { visibility:visible; }
-
-.qry_pnl_btns { display:inline-block; }
-
-#w2p_grid_addbtn, #w2p_search-form { margin-top:9px; margin-bottom:9px; }
-
-#w2p_search-form { margin-bottom:0; }
-
-#w2p_search-form form { margin-bottom:0; }
-
-/*----- translate page ---*/
- .languageform input { margin-bottom:0; }
-
-.languageform input.untranslated { background-color:#FC0; }
-
-/*=============================================================
-MASKED UPLOAD INPUT (NO BOOTSTRAP RELATED)
-==============================================================*/
-#appupdate_file.masked {
-margin: 0;
-opacity: 0;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; /* IE 8 */
-filter: alpha(opacity=0); /* IE 7 */
-font-size: 100px;
-position: absolute;
-top: 0;
-right: 0;
-z-index: 410;
-}
-
-#fileselect {
-padding: 4px 6px;
-border: 1px solid #ccc;
-border-radius: 4px;
-color: #555;
-cursor: default;
-position: relative;
-z-index: 400;
-font-size: 14px;
-background-color: #fff;
-margin-bottom: 10px;
-overflow: hidden;
-}
-
-#fileselect span {
-position: absolute;
-left: 6px;
-top: 4px;
-}
-
-.uploadbtn {
-position: absolute;
-top: 3px;
-right: 3px;
-}
-
-.txtPlaceholder {
-font-style: italic;
-color: #ccc;
-}
-
-/*=============================================================
-EDIT PAGE SLIDING FILES MENU
-==============================================================*/
-@media (max-width: 979px) {
-    body.edit div#header {position:relative; z-index: 1030 !important;}
-}
-
-#editor_area, #edit_placeholder {
-    margin: 0;
-    padding: 0;
-}
-
-#editor_area {
-    position: relative;
-    box-sizing: border-box;
-}
-
-#files {
-    width: auto;
-    height: 100%;
-    margin: 0;
-    padding: 0;
-    position: fixed;
-    top: 0px;
-    left: 0px;
-    z-index: 1031;
-    border-right: 3px solid #000;
-    /* animation (it doesn't work in IE<10) */
-    -moz-transition: all 0.4s;
-    -webkit-transition: all 0.4s;
-    -o-transition: all 0.4s;
-    transition: all 0.4s;
-}
-
-#files:hover, #files:focus {
-    left: 0px !important;
-}
-
-#files, .files-toggle {
-    background: #1b1b1b;
-    opacity: 0.98;
-}
-
-.files-toggle {
-    width: 18px;
-    height: 86px;
-    border-radius: 0px 4px 4px 0px;
-    color: #999;
-    position: absolute;
-    top: 60px;
-    right: -18px;
-    cursor: default;
-}
-
-.arrow {
-    display: block;
-    position: absolute;
-    top: 8px;
-    width: 18px;
-    height: 70px;
-    background: url(../images/files_toggle.png) no-repeat;
-}
-
-.files-menu {
-    height: 100%;
-    overflow: auto;
-}
-
-#filelist {
-    position: relative;
-    top: 60px;
-    padding-bottom: 60px;
-}
-
-#filelist li {
-    padding-right: 8px;
-    width: 100%;
-}
-
-#filelist li>a {
-    text-shadow: none;
-}
-
-/*=============================================================
- MEDIA QUERIES
-==============================================================*/
- @media (max-width: 800px) { .step [rel="pagebookmark"]>.hashstick { /*top:-54px;*/ display:block; }
-
- }
-
-@media (max-width: 767px) { [rel="pagebookmark"]>.hashstick { top:0; }
-
-/*-----------------------------------
- main
-------------------------------------*/
- #main { margin-top:0; }
-
-/*-----------------------------------
- footer
-------------------------------------*/
- #footer { margin-left: -20px; margin-right: -20px; padding-left: 20px; padding-right: 20px; }
-
-/*-----------------------------------
- errors page
-------------------------------------*/
- #trck_errors { table-layout:fixed; }
-
-#trck_errors .column1 { width:20px; }
-
-#trck_errors .column2 { width:45px; }
-
-#trck_errors .column3 { width:150px; }
-
-#trck_errors .columnN { width:55px; }
-
-#trck_errors .columnN1 { width:138px; }
-
-.ticket_code, .inspect.resp1, .inspect.controls pre, .errorsource { width:100%; overflow:auto; }
-
-.ticket_code>table { width:100%; }
-
-.celled { width:320px; }
-
- }
-
-@media (max-width: 480px) { .qry_pnl_btns { display:block; margin-top:4px; }
-
-/*-----------------------------------
- wizard
-------------------------------------*/
- #generate_form .control-label { float:left; width:160px; padding-top:5px; }
-
-.inspect>code { display:block; white-space:normal; }
-
-.li-controls { }
-
-.celled { width:165px; }
-
- }
-
-/*-----------------------------------
-miscellaneous
-------------------------------------*/
-h4.editableapp, h4.currentapp { padding: 5px 0 5px 54px; display: inline; }
-
-h4.editableapp { background: #fff url(../images/folder.png) no-repeat; }
-
-h4.currentapp { background: #fff url(../images/folder_locked.png) no-repeat; }
-
-.flash { position:fixed; width:50%; top:49px; left:25%; right:25%; cursor:default; text-align:center; z-index:5620; }
-span#closeflash {position:absolute; top:1px; right:-1px; font-size:150%; border:1px solid black; border-color: transparent transparent #fbeed5 #fbeed5; border-radius: 0 0 0 4px; width:22px; }
-span#closeflash:hover {font-weight:bold; cursor:pointer; }
-
-table.twitter{ background-color: transparent; }
-table.twitter tr td {vertical-align: top; padding: 5px; }
-table.twitter tr { border-bottom: 1px solid #a0a0a0; }
-
-div.error_wrapper {margin-top:-10px; margin-bottom:8px; padding-left:2px; color:#d62e2b; }
-
-.twitter-timeline >iframe{padding: 1em 0;}
@@ -1,7 +1,11 @@
-.calendar{z-index:99;position:relative;display:none;background:#fff;border:2px solid #000;font-size:11px;color:#000;cursor:default;font-family:Arial,Helvetica,sans-serif;
-border-radius: 10px;
-    -moz-border-radius: 10px;
-    -webkit-border-radius: 10px;
-}.calendar table{margin:0px;font-size:11px;color:#000;cursor:default;font-family:tahoma,verdana,sans-serif;}.calendar .button{text-align:center;padding:1px;color:#fff;background:#000;}.calendar .nav{background:#000;color:#fff}.calendar thead .title{font-weight:bold;padding:1px;background:#000;color:#fff;text-align:center;}.calendar thead .name{padding:2px;text-align:center;background:#bbb;}.calendar thead .weekend{color:#f00;}.calendar thead .hilite {background-color:#666;}.calendar thead .active{padding:2px 0 0 2px;background-color:#c4c0b8;}.calendar tbody .day{width:2em;text-align:right;padding:2px 4px 2px 2px;}.calendar tbody .day.othermonth{color:#aaa;}.calendar tbody .day.othermonth.oweekend{color:#faa;}.calendar table .wn{padding:2px 3px 2px 2px;background:#bbb;}.calendar tbody .rowhilite td{background:#ddd;}.calendar tbody td.hilite{background:#bbb;}.calendar tbody td.active{background:#bbb;}.calendar tbody td.selected{font-weight:bold;background:#ddd;}.calendar tbody td.weekend{color:#f00;}.calendar tbody td.today{font-weight:bold;color:#00f;}.calendar tbody .disabled{color:#999;}.calendar tbody .emptycell{visibility:hidden;}.calendar tbody .emptyrow{display:none;}.calendar tfoot .ttip{background:#bbb;padding:1px;background:#000;color:#fff;text-align:center;}.calendar tfoot .hilite{background:#ddd;}.calendar tfoot .active{}.calendar .combo{position:absolute;display:none;width:4em;top:0;left:0;cursor:default;background:#e4e0d8;padding:1px;z-index:100;}.calendar .combo .label,.calendar .combo .label-IEfix{text-align:center;padding:1px;}.calendar .combo .label-IEfix{width:4em;}.calendar .combo .active{background:#c4c0b8;}.calendar .combo .hilite{background:#048;color:#fea;}.calendar td.time{padding:1px 0;text-align:center;background-color:#bbb;}.calendar td.time .hour,.calendar td.time .minute,.calendar td.time .ampm{padding:0 3px 0 4px;font-weight:bold;}.calendar td.time .ampm{text-align:center;}.calendar td.time .colon{padding:0 2px 0 3px;font-weight:bold;}.calendar td.time span.hilite{}.calendar td.time span.active{border-color:#f00;background-color:#000;color:#0f0;}.hour,.minute{font-size:2em;}
+.calendar {z-index:2000;position:relative;margin-top:140px;display:none;background-color:white;border:1px solid #000;color:#000;cursor:default;box-shadow:0 0 10px #666}.calendar * {text-align: center;font-size:10px!important}
+.calendar table {border-collapse:collapse}
+.calendar tbody tr:hover {background-color:#fbf6d9}
+.calendar td, th {padding:5px; vertical-align:top; text-align:left; border:0}
+.calendar thead tr {background-color:#f1f1f1}
+.calendar tbody tr {border-bottom:2px solid #f1f1f1}
+.calendar th {font-weight:string; padding:5px; vertical-align:bottom; text-align:left}
+.calendar thead th {vertical-align:bottom}
+.calendar tbody th {vertical-align:top}

-#CP_hourcont{z-index:99;padding:0;position:absolute;border:1px dashed #666;background-color:#eee;display:none;}#CP_minutecont{z-index:99;background-color:#ddd;padding:1px;position:absolute;width:45px;display:none;}.floatleft{float:left;}.CP_hour{z-index:99;padding:1px;font-family:Arial,Helvetica,sans-serif;font-size:9px;white-space:nowrap;cursor:pointer;width:35px;}.CP_minute{z-index:99;padding:1px;font-family:Arial,Helvetica,sans-serif;font-size:9px;white-space:nowrap;cursor:pointer;width:auto;}.CP_over{background-color:#fff;z-index:99}
+#CP_hourcont{z-index:2000;padding:0;position:absolute;border:1px dashed #666;background-color:#eee;display:none;}#CP_minutecont{z-index:2000;background-color:#ddd;padding:1px;position:absolute;width:45px;display:none;}.floatleft{float:left;}.CP_hour{z-index:2000;padding:1px;font-family:Arial,Helvetica,sans-serif;font-size:9px;white-space:nowrap;cursor:pointer;width:35px;}.CP_minute{z-index:2000;padding:1px;font-family:Arial,Helvetica,sans-serif;font-size:9px;white-space:nowrap;cursor:pointer;width:auto;}.CP_over{background-color:#fff;z-index:2000}
@@ -0,0 +1,361 @@
+/************
+  Created by Massimo Di Pierro
+  Stupid.css is what the names says, take it with a grain of salt
+  License: BSD
+************/
+
+/*** basic styles ***/
+* {border:0; margin:0; padding:0; font-familiy:Helvetica}
+html, body {max-width: 100vw !important;overflow-x: hidden !important}
+body {font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif}
+p, li {margin-bottom:0.5em}
+p {text-align:justify}
+label, strong {font-weight:bold}
+ul {list-style-type:none; padding-left:20px}
+a {text-decoration:none; color:#26a69a; white-space:nowrap}
+a:hover {cursor:pointer}
+h1,h2,h3,h4,h5,h6{font-weight:strong; text-transform:uppercase}
+h1{font-size:4em; margin:1.0em 0 0.25em 0}
+h2{font-size:2.4em; margin:0.9em 0 0.25em 0}
+h3{font-size:1.8em; margin:0.8em 0 0.25em 0}
+h4{font-size:1.6em; margin:0.7em 0 0.25em 0}
+h5{font-size:1.4em; margin:0.6em 0 0.25em 0}
+h6{font-size:1.2em; margin:0.5em 0 0.25em 0}
+table {border-collapse:collapse}
+tbody tr:hover {background-color:#fbf6d9}
+td, th {padding:5px; vertical-align:top; text-align:left; border:0}
+thead tr {background-color:#f1f1f1}
+tbody tr {border-bottom:2px solid #f1f1f1}
+th {font-weight:string; padding:5px; vertical-align:bottom; text-align:left}
+thead th {vertical-align:bottom}
+tbody th {vertical-align:top}
+header, footer {with:100%}
+
+@media (max-width:599px) {
+  h1{font-size:2em}
+  h2{font-size:1.8em}
+  h3{font-size:1.6em}
+  h4{font-size:1.4em}
+  h5{font-size:1.2em}
+  h6{font-size:1.0em}
+}
+
+/*** buttons ***/
+.btn, button, [type=button], [type=submit] {padding:0.5em 1em !important; margin:0 0.5em 0.5em 0; line-height:2.4em; background-color:#26a69a; color:white}
+.btn:hover, button:hover, [type=button]:hover, [type=submit]:hover {box-shadow:0 0 10px #666; text-decoration:none; cursor:pointer}
+.btn.small, table .btn {padding:0.25em 0.5em !important; font-size:0.8em; line-height:1.5em}
+.btn.large {padding:1em 2em !important; font-size:1.2em; line-height:4em}
+.btn.oval {border-radius:50%}
+
+/*** helpers ***/
+.rounded {-moz-border-radius:5px; border-radius:5px}
+.padded {padding:10px 20px !important; -webkit-box-sizing:border-box; -moz-box-sizing:border-box; box-sizing:border-box}
+.center {text-align:center !important; margin-left:auto; margin-right:auto}
+.center>div {text-align:left}
+.right {right:0; text-align:right}
+.middle div {vertical-align:middle !important}
+.bottom div {vertical-align:bottom !important}
+.xscroll {overflow-x:scroll; width:100%}
+.yscroll {overflow-y:scroll; width:100%}
+.nowrap {white-space:nowrap; overflow-x:hidden}
+.fill {width:100%}
+.lifted {box-shadow:5px 5px 10px #666}
+.relative {position:relative}
+.relative>div {position:absolute}
+.spaced {margin-bottom:20px; margin-top:20px}
+.hidden {display:none}
+
+/*** forms ***/
+input:not([type]), input:not([type=checkbox]):not([type=radio]):not([type=submit]), [type=file]:before {outline:none; padding:0.5em 1em; margin:0.5px; border-bottom:1px solid #ddd; width:100%}
+textarea {width:100%; border:1px solid #ddd; padding:4px 8px; outline:none; outline:none}
+select {-webkit-appearance:none; outline:none; padding:0.5em 1em; border-radius:0; margin:0.5px; border-bottom:1px solid #ddd}
+input, textarea, select, button {font-size:12px}
+input:not([type]), input:not([type=checkbox]):not([type=radio]):not([type=submit]):hover, select:hover, textarea:hover {background-color:#fbf6d9; transition:background-color 1s ease}
+
+/*** grid ***/
+.container {margin-right:-20px}
+.container>.quarter, .container>.half, .container>.third, .container>.twothirds, .container>.threequarters, .container>.fill{display:inline-block; padding:5px 20px 5px 0; -webkit-box-sizing:border-box; -moz-box-sizing:border-box; box-sizing:border-box; vertical-align:top}
+.container>.fill {width:100%; margin-right:-20px}
+.container img, .container video {max-width:100%}
+@media (min-width:800px) {
+  .max900 {max-width:900px; margin-left:auto; margin-right:auto}
+  .quarter {width:25%; margin-right:-5px}
+  .half {width:50%; margin-right:-10px}
+  .third {width:33.33%; margin-right:-6.66px}
+  .twothirds {width:66.66%; margin-right:-13.33px}
+  .threequarters {width:75%; margin-right:-15px}
+}
+@media (min-width:600px) and (max-width:799px) {
+  .quarter.compressible {width:25%; margin-right:-5px}
+  .half.compressible {width:50%; margin-right:-10px}
+  .threequarters.compressible {width:75%; margin-right:-15px}
+  .quarter:not(.compressible), .half:not(.compressible), .threequarters:not(.compressible) {width:100%; margin-right:-20px}
+  .third {width:33.33%; margin-right:-6.66px}
+  .twothirds {width:66.66%; margin-right:-13.33px}
+  label.quarter:not(.compressible).right, label.half:not(.compressible).right, label.threequarters:not(.compressible).right   {float:left; text-align:left}
+}
+@media (max-width:599px) {  
+  .quarter:not(.compressible), .half:not(.compressible), .third:not(.compressible), .twothirds:not(.compressible), .threequarters:not(.compressible) {width:100%;}
+  label.quarter:not(.compressible).right, label.half:not(.compressible).right, label.threequarters:not(.compressible).right,
+  label.third:not(.compressible).right, label.twothirds:not(.compressible).right   {float:left; text-align:left}
+  .quarter.compressible {width:25%; margin-right:-5px}
+  .half.compressible {width:50%; margin-right:-10px}
+  .third.compressible {width:33.33%; margin-right:-6.66px}
+  .twothirds.compressible {width:66.66%; margin-right:-13.33px}
+  .threequarters.compressible {width:75%; margin-right:-15px}
+}
+
+/*** progress bar from http://codepen.io/holdencreative/details/pvxGxy  ***/
+.progress {
+  margin-left:-15px;
+  margin-right:-15px;
+  position:relative;
+  height:8px;
+  display:block;
+  width:120%;
+  background-color:#acece6;
+  border-radius:0 !important;
+  background-clip:padding-box;
+  overflow:hidden;
+}
+.progress .determinate {
+  position:absolute;
+  background-color:inherit;
+  top:0;
+  bottom:0;
+  background-color:#26a69a;
+  transition:width .3s linear;
+}
+.progress .indeterminate {
+  background-color:#26a69a;
+}
+.progress .indeterminate:before {
+  content:'';
+  position:absolute;
+  background-color:inherit;
+  top:0;
+  left:0;
+  bottom:0;
+  will-change:left, right;
+  animation:indeterminate 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite;
+}
+.progress .indeterminate:after {
+  content:'';
+  position:absolute;
+  background-color:inherit;
+  top:0;
+  left:0;
+  bottom:0;
+  will-change:left, right;
+  animation:indeterminate-short 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) infinite;
+  animation-delay:1.15s;
+}
+@-webkit-keyframes indeterminate {
+  0% {left:-35%; right:100%}
+  60% {left:100%; right:-90%}
+  100% {left:100%; right:-90%}
+}
+@-moz-keyframes indeterminate {
+  0% {left:-35%; right:100%}
+  60% {left:100%; right:-90%}
+  100% {left:100%; right:-90%}
+}
+@keyframes indeterminate {
+  0% {left:-35%; right:100%}
+  60% {left:100%; right:-90%}
+  100% {left:100%; right:-90%}
+}
+@-webkit-keyframes indeterminate-short {
+  0% {left:-200%; right:100%}
+  60% {left:107%; right:-8%}
+  100% {left:107%; right:-8%}
+}
+@-moz-keyframes indeterminate-short {
+  0% {left:-200%; right:100%}
+  60% {left:107%; right:-8%}
+  100% {left:107%; right:-8%}
+}
+@keyframes indeterminate-short {
+  0% {left:-200%; right:100%}
+  60% {left:107%; right:-8%}
+  100% {left:107%; right:-8%}
+}
+
+/**** dropdown menu from http://codepen.io/philhoyt/pen/ujHzd ***/
+.menu {list-style:none; position:relative; margin:0; padding:0}
+.menu.right {float:right}
+.menu a {padding:0 15px; text-decoration:none;text-align:left;font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; text-align:left}
+.menu li {position:relative; float:left; margin:0; padding:0}
+.menu ul {background:white; border:1px solid #e1e1e1; visibility:hidden; opacity:0;  position:absolute; top:110%; padding:0; z-index:1000; transition:all 0.2s ease-out; list-style-type:none; box-shadow:5px 5px 10px #666}
+.menu ul a {padding:10px 15px; color:#333; font-weight:700; font-size:12px; line-height:16px; display: block}
+.menu ul li {float:none; width:200px}
+.menu ul ul {top:0; left:80%; z-index:2000}
+.menu li:hover > ul {visibility:visible; opacity:1}
+.menu>li>ul>li:first-child:before{content:''; position:absolute; width:1px; height:1px; border:10px solid transparent; left:50px; top:-20px; margin-left:-10px; border-bottom-color:white}
+.menu.dark ul {background:black; border:1px solid black}
+.menu.dark ul a {color:white}
+.menu.dark>li>ul>li:first-child:before{border-bottom-color:black}
+
+@media (max-width:599px) {
+  header .menu li, header .menu ul {width: 100%}  
+  header .menu.right {float:left; text-align:left}
+  header .menu ul ul {top:2.5em; left:-1px; z-index:2000}
+}
+
+@media (min-width:600px) {
+  .ham {display:none!important}
+  .burger.accordion * {max-height:1000px; overflow:visible}
+}
+
+/*** pulsating ring from https://jsfiddle.net/mandynicole/7xrKP/ *******/
+.pulse:after {
+    content:"";
+    border:3px solid #00e6ac;
+    -webkit-border-radius:30px;
+    height:40px;
+    width:40px;
+    position:absolute;
+    margin-left:-20px;
+    margin-top:-20px;
+    -webkit-animation:pulsate 1s ease-out;
+    -webkit-animation-iteration-count:infinite;
+    opacity:0.0
+}
+@-webkit-keyframes pulsate {
+    0% {-webkit-transform:scale(0.1, 0.1); opacity:0.0}
+    50% {opacity:1.0}
+    100% {-webkit-transform:scale(1.2, 1.2); opacity:0.0}
+}
+
+/**** underline effect ***/
+a:not(.btn):not(.noeffect) {position:relative}
+a:not(.btn):not(.noeffect):hover {color:#26a69a}
+a:not(.btn):not(.noeffect):hover:after {width:100%}
+a:not(.btn):not(.noeffect):after {
+  display:block;
+  position:absolute;
+  left:0;
+  bottom:-1px;
+  width:0;
+  height:2px;
+  background-color:#26a69a;
+  content:"";
+  transition:width 0.2s;
+}
+
+/**** modal ***/
+.modal {
+  position:fixed;
+  z-index:9999;
+  top:0;
+  bottom:0;
+  left:0;
+  right:0;
+  background-color:rgba(0,0,0,0.8);
+  padding-top:20vh;
+  transition:opacity 500ms;
+  visibility:hidden;
+  opacity:0;
+}
+.modal:target {visibility:visible; opacity:1}
+.modal div {margin-left:auto; margin-right:auto}
+.modal .close:not(.btn) {position:absolute; top:10px; right:10px; font-size:20px}
+.modal .close {transition:all 200ms}
+
+/*** tooltips from http://codepen.io/trezy/pen/Khnzy ***/
+[data-tooltip] {position:relative}
+[data-tooltip]:hover:after,[data-tooltip]:hover:before {display:block}
+[data-tooltip]:before, [data-tooltip]:after {display:none; position:absolute; top:0}
+[data-tooltip]:hover:before {
+  border-bottom:.6em solid black;
+  border-bottom:.6em solid black;
+  border-left:7px solid transparent;
+  border-right:7px solid transparent;
+  content:"";
+  left:5px;
+  margin-top:1em;
+}
+[data-tooltip]:hover:after {
+  background-color:rgba(0,0,0,0.8) !important;
+  border:4px solid rgba(0,0,0,0.8) !important;
+  border-radius:7px !important; 
+  color:white !important;
+  content:attr(data-tooltip);
+  text-transform:none;
+  font-size: 11px;
+  left:0 !important;
+  margin-top:1.5em;
+  padding:5px 15px;
+  white-space:pre-wrap;
+  width:100px;
+}
+
+/*** accordion ***/
+.accordion>input ~ label:before {content:"▲ "; color:#ddd}
+.accordion>input:checked ~ label:before {content:"▼ "; color:#ddd}
+.accordion>input {display:none}
+.accordion>input:checked ~ *:not(label) {
+  max-height: 1000px !important;
+  overflow:visible !important;
+  -webkit-transition: max-height .3s ease-in;
+  transition: max-height .3s ease-in;
+}
+.accordion>*:not(label) {
+  max-height: 0;
+  overflow: hidden;
+  margin: 0;
+  padding: 0;
+  -webkit-transition: max-height .3s ease-out;
+  transition: max-height .3s ease-out;
+}
+
+
+/*** cards from http://codepen.io/edeesims/pen/iGDzk ***/
+.card {perspective: 500px; max-width:100%}
+.card>div {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  box-shadow: 0 0 15px rgba(0,0,0,0.1);
+  transition: transform 1s;
+  transform-style: preserve-3d;
+}
+.card:hover>div {
+  transform: rotateY( 180deg ) ;
+  transition: transform 0.5s;
+}
+.card>div>div {
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  backface-visibility: hidden;
+}
+.card>div>div:nth-child(2) {
+  transform: rotateY( 180deg );
+}
+
+/*** colors from http://clrs.cc/ ***/
+.navy{background-color:#001f3f!important;color:white}.blue{background-color:#0074d9!important;color:white}.aqua{background-color:#7fdbff!important;color:black}.teal{background-color:#39cccc!important;color:white}.olive{background-color:#3d9970!important;color:white}.green{background-color:#2ecc40!important;color:white}.aquamarine{background-color:#26a69a!important;color:white}.lime{background-color:#01ff70!important;color:black}.yellow{background-color:#ffdc00!important;color:black}.orange{background-color:#ff851b!important;color:white}.red{background-color:#cc1f00!important;color:white}.fuchsia{background-color:#f012be!important;color:white}.pink{background-color:#ee6e73!important;color:white}.purple{background-color:#b10dc9!important;color:white}.maroon{background-color:#85144b!important;color:white}.white{background-color:#fff!important;color:black;-webkit-box-shadow:inset 0px 0px 0px 1px #ddd;-moz-box-shadow:inset 0px 0px 0px 1px #ddd;box-shadow:inset 0px 0px 0px 1px #ddd}.gray{background-color:#aaa!important;color:white}.silver{background-color:#f1f1f1!important;color:black}.black{background-color:#000!important;color:white}.glass{background:rgba(255,255,255,0.5)!important;color:black}
+
+/**** tags ****/
+.tags > span, .tags > span.off:hover {
+  height: 30px;
+  padding: 4px 9px;
+  text-decoration: none;
+  margin: 0 5px 30px 0 !important;
+  white-space: nowrap;
+  color: white;
+  background-color: #26a69a;
+  border-radius: 5px;
+  line-height: 32px;
+}
+.tags.dismissible > span:not(.off):hover {
+  background-color: #ccc !important;
+}
+.tags.dismissible > span:not(.off):after {
+  content: " \f00d";
+  font-family: FontAwesome;
+}
+.tags > span.off {
+  background-color: #ccc;
+}
@@ -1,84 +1,17 @@
-/** these MUST stay **/
-a {text-decoration:none; white-space:nowrap}
-a:hover {text-decoration:underline}
-a.button {text-decoration:none}
-h1,h2,h3,h4,h5,h6 {margin:0.5em 0 0.25em 0; display:block;
-  font-family:Helvetica}
-h1 {font-size:4.00em}
-h2 {font-size:3.00em}
-h3 {font-size:2.00em}
-h4 {font-size:1.50em}
-h5 {font-size:1.25em}
-h6 {font-size:1.12em}
-th,label {font-weight:bold; white-space:nowrap;}
-td,th {text-align:left; padding:2px 5px 2px 5px}
-th {vertical-align:middle; border-right:1px solid white}
-td {vertical-align:top}
-form table tr td label {text-align:left}
-p,table,ol,ul {padding:0; margin: 0.75em 0}
-p {text-align:justify}
-ol, ul {list-style-position:outside; margin-left:2em}
-li {margin-bottom:0.5em}
-span,input,select,textarea,button,label,a {display:inline}
-img {border:0}
-blockquote,blockquote p,p blockquote {
-  font-style:italic; margin:0.5em 30px 0.5em 30px; font-size:0.9em}
-i,em {font-style:italic}
-strong {font-weight:bold}
-small {font-size:0.8em}
-code {font-family:Courier}
-textarea {width:100%}
-video {width:400px}
-audio {width:200px}
-[type="text"], [type="password"], select {
-  margin-right: 5px; width: 300px;
-}
-.hidden {display:none;visibility:visible}
+header a {color: white; font-size:1.1em}
+main {min-height: 70vh}
+.form-group {padding-bottom: 10px !important;}
+.w2p_hidden {display:none;visibility:visible}
 .right {float:right; text-align:right}
 .left {float:left; text-align:left}
 .center {width:100%; text-align:center; vertical-align:middle}
-/** end **/
-
-/* Sticky footer begin */
-
-.main {
-  padding:20px 0 50px 0;
-}
-
-.footer,.push {
-  height:6em;
-  padding:1em 0;
-  clear:both;
-}
-
-.footer-content {position:relative; bottom:-4em; width:100%}
-
-.auth_navbar {
-    white-space:nowrap;
-}
-
-/* Sticky footer end */
-
-.footer {
-    border-top:1px #DEDEDE solid;
-}
-.header {
-	/* background:<fill here for header image>; */
-}
-
-
-fieldset {padding:16px; border-top:1px #DEDEDE solid}
-fieldset legend {text-transform:uppercase; font-weight:bold; padding:4px 16px 4px 16px; background:#f1f1f1}
-
-/* fix ie problem with menu */
-
 td.w2p_fw {padding-bottom:1px}
 td.w2p_fl,td.w2p_fw,td.w2p_fc {vertical-align:top}
 td.w2p_fl {text-align:left}
 td.w2p_fl, td.w2p_fw {padding-right:7px}
 td.w2p_fl,td.w2p_fc {padding-top:4px}
-div.w2p_export_menu {margin:5px 0}
-div.w2p_export_menu a, div.w2p_wiki_tags a, div.w2p_cloud a {margin-left:5px; padding:2px 5px; background-color:#f1f1f1; border-radius:5px; -moz-border-radius:5px; -webkit-border-radius:5px;}
+div.w2p_export_menu {white-space: wrap; margin:5px 0}
+div.w2p_export_menu a, div.w2p_wiki_tags a, div.w2p_cloud a {margin-left:5px; padding:2px 5px; background-color:#f1f1f1; border-radius:5px; -moz-border-radius:5px; -webkit-border-radius:5px; font-size:0.7em; color: black}

 /* tr#submit_record__row {border-top:1px solid #E5E5E5} */
 #submit_record__row td {padding-top:.5em}
@@ -88,54 +21,30 @@ div.w2p_export_menu a, div.w2p_wiki_tags a, div.w2p_cloud a {margin-left:5px; pa
 #web2py_user_form td {vertical-align:top}

 /*********** web2py specific ***********/
-div.flash {
+div.w2p_flash {
    font-weight:bold;
    display:none;
-    position:fixed;
-    padding:10px;
-    top:48px;
-    right:250px;
-    min-width:280px;
+    padding:20px 20px 20px 50px;
+    width:100%;    
    opacity:0.95;
-    margin:0px 0px 10px 10px;
    vertical-align:middle;
    cursor:pointer;
-    color:#fff;
-    background-color:#000;
-    border:2px solid #fff;
-    border-radius:8px;
-    -o-border-radius: 8px;
-    -moz-border-radius:8px;
-    -webkit-border-radius:8px;
-    background-image: -webkit-linear-gradient(top,#222,#000);
-    background-image: -o-linear-gradient(top,#222,#000);
-    background-image: -moz-linear-gradient(90deg, #222, #000);
-    background-image: linear-gradient(top,#222,#000);
-    background-repeat: repeat-x;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    -webkit-font-smoothing: antialiased;
+    color:#000;
+    background-color:#ffdc00;
    z-index:2000;
 }

-div.flash #closeflash{color:inherit; float:right; margin-left:15px;}
+div.w2p_flash:before{content:"×";float:right; margin-right:100px; color:black;}
 .ie-lte7  div.flash #closeflash
 {color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;}

-div.flash:hover { opacity:0.25; }
+div.w2p_flash:hover { opacity:0.80; }

 div.error_wrapper {display:block}
 div.error {
-    width: 298px;
-    background:red;
-    border: 2px solid #d00;
-    color:white;
+    color:red;
    padding:5px;
    display:inline-block;
-    background-image: -webkit-linear-gradient(left,#f00,#fdd);
-    background-image: -o-linear-gradient(left,#f00,#fdd);
-    background-image: -moz-linear-gradient(0deg, #f00, #fdd);
-    background-image: linear-gradient(left,#f00,#fdd);
-    background-repeat: repeat-y;
 }

 .topbar {
@@ -190,34 +99,8 @@ div.error {
 */
 /* .web2py_table {border:1px solid #ccc} */
 .web2py_paginator {}
-.web2py_grid {width:100%}
 .web2py_grid table {width:100%}
-.web2py_grid tbody td {padding:2px 5px 2px 5px; vertical-align: middle;}
-.web2py_grid .web2py_form td {vertical-align: top;}
-
-.web2py_grid thead th,.web2py_grid tfoot td {
-    background-color:#EAEAEA;
-    padding:10px 5px 10px 5px;
-}
-
-.web2py_grid tr.odd {background-color:#F9F9F9}
-.web2py_grid tr:hover {background-color:#F5F5F5}
-
-/*
-.web2py_breadcrumbs a {
-    line-height:20px; margin-right:5px; display:inline-block;
-    padding:3px 5px 3px 5px;
-    font-family:'lucida grande',tahoma,verdana,arial,sans-serif;
-    color:#3C3C3D;
-    text-shadow:1px 1px 0 #FFFFFF;
-    white-space:nowrap; overflow:visible; cursor:pointer;
-    background:#ECECEC;
-    border:1px solid #CACACA;
-    -webkit-border-radius:2px; -moz-border-radius:2px;
-    -webkit-background-clip:padding-box; border-radius:2px;
-    outline:none; position:relative; zoom:1; *display:inline;
-}
-*/
+.web2py_grid td {color: black;}

 .web2py_console form {
    width: 100%;
@@ -302,11 +185,6 @@ li.w2p_grid_breadcrumb_elem {
 .web2py_console input, .web2py_console select,
 .web2py_console a { margin: 2px; }

-.web2py_htmltable {
-   width: 100%;
-   overflow-x: auto;
-   -ms-overflow-x:scroll;
-}

 #wiki_page_body {
   width: 600px;
@@ -317,6 +195,10 @@ li.w2p_grid_breadcrumb_elem {
 /* fix some IE problems */

 .ie-lte7 .topbar .container {z-index:2}
-.ie-lte8 div.flash{ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#222222', endColorstr='#000000', GradientType=0 ); }
-.ie-lte8 div.flash:hover {filter:alpha(opacity=25);}
+.ie-lte8 div.w2p_flash{ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#222222', endColorstr='#000000', GradientType=0 ); }
+.ie-lte8 div.w2p_flash:hover {filter:alpha(opacity=25);}
 .ie9 #w2p_query_panel {padding-bottom:2px}
+
+.web2py_console .form-control {width: 20%; display: inline;}
+.web2py_console #w2p_keywords {width: 50%;}
+.web2py_search_actions a, .web2py_console input[type=submit], .web2py_console input[type=button], .web2py_console button { padding: 6px 12px; }
@@ -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;
-    }
-}
@@ -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;}
-
@@ -77,10 +77,10 @@ function doClickSave() {
      t.attr('disabled', '');
 	  var flash = xhr.getResponseHeader('web2py-component-flash');
      if(flash) {
-        $('.flash').html(decodeURIComponent(flash))
+        $('.w2p_flash').html(decodeURIComponent(flash))
          .append('<a href="#" class="close">&times;</a>')
          .slideDown();
-      } else $('.flash').hide();
+      } else $('.w2p_flash').hide();
      try {
        if(json.error) {
          window.location.href = json.redirect;
@@ -158,10 +158,10 @@ function doToggleBreakpoint(filename, url, sel) {
      // show flash message (if any)
      var flash = xhr.getResponseHeader('web2py-component-flash');
      if(flash) {
-        $('.flash').html(decodeURIComponent(flash))
+        $('.w2p_flash').html(decodeURIComponent(flash))
          .append('<a href="#" class="close">&times;</a>')
          .slideDown();
-      } else $('.flash').hide();
+      } else $('.w2p_flash').hide();
      try {
        if(json.error) {
          window.location.href = json.redirect;
@@ -1,33 +0,0 @@
-// this code improves bootstrap menus and adds dropdown support
-jQuery(function(){
-  jQuery('.nav>li>a').each(function(){
-    if(jQuery(this).parent().find('ul').length)
-      jQuery(this).attr({'class':'dropdown-toggle','data-toggle':'dropdown'}).append('<b class="caret"></b>');
-  });
-  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');});
-});
@@ -155,8 +155,8 @@
      {{=T.M("Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.",
              dict(hours=total['oldest'][0], min=total['oldest'][1], sec=total['oldest'][2]))}}
    </p>
-    {{=BUTTON(T('Cache Keys'), _onclick='jQuery("#all_keys").toggle().toggleClass( "hidden" );')}}
-    <div class="hidden" id="all_keys">
+    {{=BUTTON(T('Cache Keys'), _onclick='jQuery("#all_keys").toggle().toggleClass( "w2p_hidden" );')}}
+    <div class="w2p_hidden" id="all_keys">
      {{=total['keys']}}
    </div>
    <br />
@@ -183,8 +183,8 @@
      {{=T.M("RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.",
              dict(hours=ram['oldest'][0], min=ram['oldest'][1], sec=ram['oldest'][2]))}}
    </p>
-    {{=BUTTON(T('RAM Cache Keys'), _onclick='jQuery("#ram_keys").toggle().toggleClass( "hidden" );')}}
-    <div class="hidden" id="ram_keys">
+    {{=BUTTON(T('RAM Cache Keys'), _onclick='jQuery("#ram_keys").toggle().toggleClass( "w2p_hidden" );')}}
+    <div class="w2p_hidden" id="ram_keys">
      {{=ram['keys']}}
    </div>
    <br />
@@ -212,8 +212,8 @@
      {{=T.M("DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.",
                dict(hours=disk['oldest'][0], min=disk['oldest'][1], sec=disk['oldest'][2]))}}
      </p>
-      {{=BUTTON(T('Disk Cache Keys'), _onclick='jQuery("#disk_keys").toggle().toggleClass( "hidden" );')}}
-      <div class="hidden" id="disk_keys">
+      {{=BUTTON(T('Disk Cache Keys'), _onclick='jQuery("#disk_keys").toggle().toggleClass( "w2p_hidden" );')}}
+      <div class="w2p_hidden" id="disk_keys">
      {{=disk['keys']}}
      </div>
      <br />
@@ -249,8 +249,8 @@
          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['png'])}}">png</a></li>
          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['svg'])}}">svg</a></li>
          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['pdf'])}}">pdf</a></li>
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['ps'])}}">ps</a></li>          
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['dot'])}}">dot</a></li>                                   
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['ps'])}}">ps</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['dot'])}}">dot</a></li>
      </ul>
    </div>
    <br />
@@ -1,5 +1,4 @@
 {{extend 'layout.html'}}
-{{block sectionclass}}about{{end}}
 <!-- begin "about" block -->
 <h2>{{=T("About application")}} "{{=app}}"</h2>
 <h3>{{=T("About")}} {{=app}}</h3>
@@ -23,4 +22,4 @@ jQuery(document).ready(function() {
 	jQuery.plot(jQuery("#placeholder"), [ {{=progress}} ]);
 })
 </script>
-<!-- end "about" block -->
+<!-- end "about" block -->
@@ -9,19 +9,16 @@ def peekfile(path,file,vars={},title=None):
    return A(file.replace('\\\\','/'),_title=title,_href=URL('peek', args=args, vars=vars))
 def editfile(path,file,vars={}):
    args=(path,file) if 'app' in vars else (app,path,file)
-    return A(SPAN(T('Edit')),_class='button editbutton btn btn-mini',_href=URL('edit', args=args, vars=vars))
+    return A(T('Edit'),_class='btn small rounded black',_href=URL('edit', args=args, vars=vars))
 def testfile(path,file):
-    return A(TAG[''](IMG(_src=URL('static', 'images/test_icon.png'), _alt=T('test')), 
-                        SPAN(T("Run tests in this file (to run all files, you may also use the button labelled 'test')"))), 
-                        _class='icon test',
-                        _href=URL('test', args=(app, file)),
-                        _rel="tooltip",
-                        **{'_data-placement':'right',
-                            '_data-original-title':T("Run tests in this file (to run all files, you may also use the button labelled 'test')")})
+    return A(I(_class="fa fa-cog"),**{
+         '_class':'btn small rounded black',
+         '_data-tooltip':T("Run tests in this file (to run all files, you may also use the but\
+ton labelled 'test')")})
 def editlanguagefile(path,file,vars={}):
-    return A(SPAN(T('Edit')),_class='button editbutton btn btn-mini',_href=URL('edit_language', args=(app, path, file), vars=vars))
+    return A(T('Edit'),_class='button editbutton btn rounded small',_href=URL('edit_language', args=(app, path, file), vars=vars))
 def editpluralsfile(path,file,vars={}):
-    return A(SPAN(T('Edit')),_class='button editbutton btn btn-mini',_href=URL('edit_plurals', args=(app, path, file), vars=vars))
+    return A(T('Edit'),_class='button editbutton btn rounded small',_href=URL('edit_plurals', args=(app, path, file), vars=vars))
 def file_upload_form(location, anchor=None):
    form=FORM(
            LABEL(T("upload file:")),
@@ -59,13 +56,8 @@ def upload_plugin_form(app, anchor=None):
    return form
 def deletefile(arglist, vars={}):
    vars.update({'sender':request.function+'/'+app})
-    return A(TAG[''](IMG(_src=URL('static', 'images/delete_icon.png')), 
-                        SPAN(T('Delete this file (you will be asked to confirm deletion)'))),
-                        _href=URL('delete',args=arglist,vars=vars),
-                        _class='icon delete',
-                        _rel="tooltip",
-                        **{'_data-placement':'right',
-                            '_data-original-title':T('Delete this file (you will be asked to confirm deletion)')})
+    return A(I(_class='fa fa-trash'),_class="red rounded small btn",
+            _href=URL('delete',args=arglist,vars=vars))
 }}

 {{block sectionclass}}design{{end}}
@@ -74,64 +66,66 @@ def deletefile(arglist, vars={}):
 <h2>{{=T("Edit application")}} "{{=A(app,_href=URL(app,'default','index'),_target="_blank")}}"</h2>

 <!-- COLLAPSE/JUMP-TO BUTTONS -->
-<div class="right-full controls">
-    <p class="buttons-row">
-    {{=searchbox('search')}}
-    <a class="button special btn btn-inverse" href="#" onclick="jQuery('h3>span').click();return false"><span>{{=T("collapse/expand all")}}</span></a>
-    <span class="buttongroup">
-    {{=button('#models', T("models"))}}
-    {{=button('#controllers', T("controllers"))}}
-    {{=button('#views', T("views"))}}
-    {{=button('#languages', T("languages"))}}
-    {{=button('#static', T("static"))}}
-    {{=button('#modules', T("modules"))}}
-    {{=button('#private', T("private files"))}}
-    {{=button('#plugins', T("plugins"))}}
-    </span>
-    </p>
+<div class="container">
+  <div class="fill">
+    <input placeholder="filter" id="search" style="left:100px"/>
+  </div>
+  <div class="fill">
+    <div class="padded">
+      <a class="btn rounded small black" href="#" onclick="jQuery('.accordion>[type=checkbox]').click();return false">{{=T("collapse/expand all")}}</a>
+      <a href="#models" class="btn small rounded orange">{{=T("models")}}</a>
+      <a href="#controllers" class="btn small rounded orange">{{=T("controllers")}}</a>
+      <a href="#views" class="btn small rounded orange">{{=T("views")}}</a>
+      <a href="#models" class="btn small rounded orange">{{=T("languages")}}</a>
+      <a href="#static" class="btn small rounded orange">{{=T("static")}}</a>
+      <a href="#models" class="btn small rounded orange">{{=T("modules")}}</a>
+      <a href="#private" class="btn small rounded orange">{{=T("private files")}}</a>
+      <a href="#plugins" class="btn small rounded orange">{{=T("plugins")}}</a>
+    </div>
+  </div>
 </div>

 <!-- MODELS -->
-<h3 id="_models" rel="pagebookmark">
-    <span class="component" onclick="collapse('models_inner');">{{=T("Models")}}</span>
-    <a href="#models" rel="tooltip" data-placement="right" data-original-title="{{=T('The data representation, define database tables and sets')}}">
-    {{=helpicon()}}
-    <span>{{=T("The data representation, define database tables and sets")}}</span>
-    </a><span id="models" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
-</h3>
-<div id="models_inner" class="component_contents">
+<h5 id="_models">
+  <label class="component" for="models_inner" data-tooltip="{{=T('The data representation, define database tables and sets')}}">{{=T("Models")}}</label>  
+</h5>
+<div class="accordion">
+  <input type="checkbox" id="models_inner" checked>
+  <div>
+    <a href="#" class="right btn rounded small yellow">top</a>
    {{if not models:}}<p><strong>{{=T("There are no models")}}</strong></p>{{else:}}
    <div class="controls comptools">
-        {{=button(URL(a=app,c='appadmin',f='index'), T('database administration'))}}
-        {{if os.access(os.path.join(request.folder,'..',app,'databases','sql.log'),os.R_OK):}}
-            {{=button(URL('peek/%s/databases/sql.log'%app), 'sql.log')}}
-        {{pass}}
-                {{=button(URL(a=app, c='appadmin',f='graph_model'), T('graph model'))}}
+      {{=button(URL(a=app,c='appadmin',f='index'), T('database administration'))}}
+      {{if os.access(os.path.join(request.folder,'..',app,'databases','sql.log'),os.R_OK):}}
+      {{=button(URL('peek/%s/databases/sql.log'%app), 'sql.log')}}
+      {{pass}}
+      {{=button(URL(a=app, c='appadmin',f='graph_model'), T('graph model'))}}
    </div>
    <ul class="unstyled act_edit">
-        {{for m in models:}}
-            {{id="models__"+m.replace('.','__')}}
-        <li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
-            <span class="filetools controls">
-                {{=editfile('models',m, dict(id=id))}}
-                {{=deletefile([app, 'models', m], dict(id=id, id2='models'))}}
-            </span>
-            <span class="file">
-                {{=peekfile('models',m, dict(id=id))}}
-            </span>
-            <span class="extras">
-                {{if len(defines[m]):}}{{=T("defines tables")}} {{pass}}{{=XML(', '.join([B(table).xml() for table in defines[m]]))}}
-            </span>
-        </li>
-        {{pass}}
+      {{for m in models:}}
+      {{id="models__"+m.replace('.','__')}}
+      <li id="{{='_'+id}}"><span id="{{=id}}" class="hashstick">&nbsp;</span>
+        <span class="filetools controls">
+          {{=editfile('models',m, dict(id=id))}}
+          {{=deletefile([app, 'models', m], dict(id=id, id2='models'))}}
+        </span>
+        <span class="file">
+          {{=peekfile('models',m, dict(id=id))}}
+        </span>
+        <span class="extras">
+          {{if len(defines[m]):}}{{=T("defines tables")}} {{pass}}{{=XML(', '.join([B(table).xml() for table in defines[m]]))}}
+        </span>
+      </li>
+      {{pass}}
    </ul>
    {{pass}}
-    <div class="controls formfield">
-      <button onclick="jQuery('#form1').slideToggle()" class="btn btn-mini">{{=T('Create')}}</button>
+    <div class="silver rounded padded">
+      <button onclick="jQuery('#form1').slideToggle()" class="btn rounded small">{{=T('Create')}}</button>
      <div id="form1" class="row-fluid" style="display:none">
        <div class="span3">{{=file_create_form('%s/models/' % app, 'models')}}</div>
      </div>
    </div>
+  </div>
 </div>

 <!-- FIND CONTROLLER FUNCTIONS -->
@@ -141,163 +135,162 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
 }}

 <!-- CONTROLLERS -->
-<h3 id="_controllers" rel="pagebookmark">
-    <span class="component" onclick="collapse('controllers_inner');">{{=T("Controllers")}}</span>
-    <a href="#controllers" rel="tooltip" data-placement="right" data-original-title="{{=T('The application logic, each URL path is mapped in one exposed function in the controller')}}">
-    {{=helpicon()}}
-    <span>{{=T("The application logic, each URL path is mapped in one exposed function in the controller")}}</span>
-    </a><span id="controllers" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
-</h3>
-<div id="controllers_inner" class="component_contents">
+<h5 id="_controllers">
+  <label class="component" for="controllers_inner" data-tooltip="{{=T('The application logic, each URL path is mapped in one exposed function in the controller')}}">{{=T("Controllers")}}</label>  
+</h5>
+<div class="accordion">
+  <input type="checkbox" id="controllers_inner" checked>
+  <div>
+    <a href="#" class="right btn rounded small yellow">top</a>
    {{if not controllers:}}<p><strong>{{=T("There are no controllers")}}</strong></p>{{else:}}
    <div class="controls comptools">
-        {{=button(URL(r=request,c='shell',f='index',args=app), T("shell"))}}
-        {{=button(URL('test',args=app), T("test"))}}
-        {{=button(URL('edit',args=[app,'cron','crontab']), T("crontab"))}}
+      {{=button(URL(r=request,c='shell',f='index',args=app), T("shell"))}}
+      {{=button(URL('test',args=app), T("test"))}}
+      {{=button(URL('edit',args=[app,'cron','crontab']), T("crontab"))}}
    </div>
    <ul class="unstyled act_edit">
-        {{for c in controllers:}}
-        {{id="controllers__"+c.replace('.','__')}}
-        <li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
+      {{for c in controllers:}}
+      {{id="controllers__"+c.replace('.','__')}}
+      <li id="{{='_'+id}}"><span id="{{=id}}" class="hashstick">&nbsp;</span>
        <span class="filetools controls">
-        {{=editfile('controllers',c, dict(id=id))}}
-        {{=deletefile([app, 'controllers', c], dict(id=id, id2='controllers'))}}
-        {{=testfile('controllers',c)}}
+          {{=editfile('controllers',c, dict(id=id))}}
+          {{=deletefile([app, 'controllers', c], dict(id=id, id2='controllers'))}}
+          {{=testfile('controllers',c)}}
        </span>
        <span class="file">
-        {{=peekfile('controllers',c, dict(id=id))}}
+          {{=peekfile('controllers',c, dict(id=id))}}
        </span>
        <span class="extras celled">
-            {{if functions[c]:}}{{=T("exposes")}}{{pass}} {{=XML(', '.join([A(f,_href=URL(a=app,c=c[:-3],f=f)).xml() for f in functions[c]]))}}
+          {{if functions[c]:}}{{=T("exposes")}}{{pass}} {{=XML(', '.join([A(f,_href=URL(a=app,c=c[:-3],f=f)).xml() for f in functions[c]]))}}
        </span>
-        </li>
-        {{pass}}
+      </li>
+      {{pass}}
    </ul>
    {{pass}}
-    <div class="controls formfield">
-      <button onclick="jQuery('#form2').slideToggle()" class="btn btn-mini">{{=T('Create')}}</button>
+    <div class="silver rounded padded">
+      <button onclick="jQuery('#form2').slideToggle()" class="btn rounded small">{{=T('Create')}}</button>
      <div id="form2" class="row-fluid" style="display:none">
        <div class="span3">{{=file_create_form('%s/controllers/' % app, 'controllers')}}</div>
      </div>
    </div>
+  </div>
 </div>

 <!-- VIEWS -->
-<h3 id="_views" rel="pagebookmark">
-    <span class="component" onclick="collapse('views_inner');">{{=T("Views")}}</span>
-    <a href="#views" rel="tooltip" data-placement="right" data-original-title="{{=T('The presentations layer, views are also known as templates')}}">
-    {{=helpicon()}}
-    <span>{{=T("The presentations layer, views are also known as templates")}}</span>
-    </a><span id="views" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
-</h3>
-<div id="views_inner" class="component_contents">
-  {{if not views:}}<p><strong>{{=T("There are no views")}}</strong></p>{{else:}}
+<h5 id="_views">
+  <label class="component" for="views_inner" data-tooltip="{{=T('The presentations layer, views are also known as templates')}}">{{=T("Views")}}</label>  
+</h5>
+<div class="accordion">
+  <input type="checkbox" id="views_inner" checked>
+  <div>
+    <a href="#" class="right btn rounded small yellow">top</a>
+    {{if not views:}}<p><strong>{{=T("There are no views")}}</strong></p>{{else:}}
    <div class="controls comptools">
-        {{=button(LAYOUTS_APP, T("Download layouts from repository"))}}
+      {{=button(LAYOUTS_APP, T("Download layouts from repository"))}}
    </div>
    <ul class="unstyled act_edit">
-        {{for c in views:}}
-            {{id="views__"+c.replace('/','__').replace('.','__')}}
-        <li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
-            <span class="filetools controls">
-                {{=editfile('views',c, dict(id=id))}}
-                {{=deletefile([app, 'views', c], dict(id=id, id2='views'))}}
-            </span>
-            <span class="file">
-                {{=peekfile('views',c, dict(id=id))}}
-            </span>
-            <span class="extras celled celled-one">
-                {{if extend.has_key(c):}}{{=T("extends")}} <b>{{=extend[c]}}</b> {{pass}}
-                {{if include[c]:}}{{=T("includes")}} {{pass}}{{=XML(', '.join([B(f).xml() for f in include[c]]))}}
-            </span>
-        </li>
-        {{pass}}
+      {{for c in views:}}
+      {{id="views__"+c.replace('/','__').replace('.','__')}}
+      <li id="{{='_'+id}}"><span id="{{=id}}" class="hashstick">&nbsp;</span>
+        <span class="filetools controls">
+          {{=editfile('views',c, dict(id=id))}}
+          {{=deletefile([app, 'views', c], dict(id=id, id2='views'))}}
+        </span>
+        <span class="file">
+          {{=peekfile('views',c, dict(id=id))}}
+        </span>
+        <span class="extras celled celled-one">
+        {{if c in extend:}}{{=T("extends")}} <b>{{=extend[c]}}</b> {{pass}}
+        {{if include[c]:}}{{=T("includes")}} {{pass}}{{=XML(', '.join([B(f).xml() for f in include[c]]))}}
+        </span>
+      </li>
+      {{pass}}
    </ul>
-    {{pass}}
-    <div class="controls formfield">
-      <button onclick="jQuery('#form3').slideToggle()" class="btn btn-mini">{{=T('Create')}}</button>
+  {{pass}}
+    <div class="silver rounded padded">
+      <button onclick="jQuery('#form3').slideToggle()" class="btn rounded small">{{=T('Create')}}</button>
      <div id="form3" class="row-fluid" style="display:none">
        <div class="span3">{{=file_create_form('%s/views/' % app, 'views')}}</div>
      </div>
    </div>
+  </div>
 </div>

 <!-- LANGUAGES -->
-<h3 id="_languages" rel="pagebookmark">
-    <span class="component" onclick="collapse('languages_inner');">{{=T("Languages")}}</span>
-    <a href="#languages" rel="tooltip" data-placement="right" data-original-title="{{=T('Translation strings for the application')}}">
-    {{=helpicon()}}
-    <span>{{=T("Translation strings for the application")}}</span>
-    </a><span id="languages" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
-</h3>
-<div id="languages_inner" class="component_contents">
+<h5 id="_languages">
+  <label class="component" for="languages_inner" data-tooltip="{{=T('Translation strings for the application')}}">{{=T("Languages")}}</label>  
+</h5>
+<div class="accordion">
+  <input type="checkbox" id="languages_inner" checked>
+  <div>
+    <a href="#" class="right btn rounded small yellow">top</a>
    {{if not languages:}}<p><strong>{{=T("There are no translators, only default language is supported")}}</strong></p>{{else:}}
    <div class="controls comptools">
-        {{=button(URL('update_languages/'+app), T('update all languages'))}}
+      {{=button(URL('update_languages/'+app), T('update all languages'))}}
    </div>
    <ul class="unstyled act_edit">
-        {{for lang in sorted(languages):
-            file = lang+'.py'
-            id = "languages__"+file.replace('.','__')}}
-        <li id="{{='_'+id}}" rel="pagebookmark" class="li-row"><span id="{{=id}}" class="hashstick">&nbsp;</span>
-            <span class="li-controls">
-                <span class="filetools controls">
-                 {{=editlanguagefile('languages',file)}}
-                 {{=deletefile([app, 'languages', file], dict(id=id, id2='languages'))}}
-                </span>
-                <span class="">
-                  {{=peekfile('languages',file, dict(id=id))}}
-                </span>
-            </span> <!-- /li-row -->
-            <span class="extras celled">
-                (
-                {{=T("Plural-Forms:")}}
-                {{p=languages[lang][3:7]}}
-                {{if p[2] == 'default':}}
-                   <span class='error text-error'>{{=T("rules are not defined")}}</span> {{=T.M("(file **gluon/contrib/plural_rules/%s.py** is not found)",lang[:2])}}
-                {{else:}}
-                 {{if p[3] == 1:}}
-                   {{=B(T("are not used"))}}
-                 {{else:}}
-                   {{pfile=p[0]}}
-                    {{if p[1]!=0:}}<span style="display:inline-block;margin-top:-10px;">
-                     <span class="filetools controls">
-                       {{=editpluralsfile('languages',pfile,dict(nplurals=p[3]))}}
-                     </span>
-                     <span class="file">
-                        {{=peekfile('languages',pfile,dict(id=id))}}
-                     </span></span>
-                   {{else:}}
-                      <b>{{=T("are not used yet")}}</b>
-                    {{pass}}
-                  {{pass}}
-                {{pass}}
-                )
-            </span>
-        </li>
+      {{for lang in sorted(languages):
+      file = lang+'.py'
+      id = "languages__"+file.replace('.','__')}}
+      <li id="{{='_'+id}}" class="li-row"><span id="{{=id}}" class="hashstick">&nbsp;</span>
+        <span class="li-controls">
+          <span class="filetools controls">
+            {{=editlanguagefile('languages',file)}}
+            {{=deletefile([app, 'languages', file], dict(id=id, id2='languages'))}}
+        </span>
+          <span class="">
+            {{=peekfile('languages',file, dict(id=id))}}
+          </span>
+        </span> <!-- /li-row -->
+        <span class="extras celled">
+        (
+        {{=T("Plural-Forms:")}}
+        {{p=languages[lang][3:7]}}
+        {{if p[2] == 'default':}}
+        <span class='error text-error'>{{=T("rules are not defined")}}</span> {{=T.M("(file **gluon/contrib/plural_rules/%s.py** is not found)",lang[:2])}}
+        {{else:}}
+        {{if p[3] == 1:}}
+        {{=B(T("are not used"))}}
+        {{else:}}
+        {{pfile=p[0]}}
+        {{if p[1]!=0:}}<span style="display:inline-block;margin-top:-10px;">
+          <span class="filetools controls">
+            {{=editpluralsfile('languages',pfile,dict(nplurals=p[3]))}}
+          </span>
+          <span class="file">
+            {{=peekfile('languages',pfile,dict(id=id))}}
+        </span></span>
+        {{else:}}
+        <b>{{=T("are not used yet")}}</b>
        {{pass}}
+        {{pass}}
+        {{pass}}
+        )
+      </span>
+      </li>
+      {{pass}}
    </ul>
-    {{pass}}
-    <div class="controls formfield">
-      <button onclick="jQuery('#form4').slideToggle()" class="btn btn-mini">{{=T('Create')}}</button>
+  {{pass}}
+    <div class="silver rounded padded">
+      <button onclick="jQuery('#form4').slideToggle()" class="btn rounded small">{{=T('Create')}}</button>
      <div id="form4" class="row-fluid" style="display:none">
        <div class="span3">{{=file_create_form('%s/languages/' % app, 'languages', T('(something like "it-it")'))}}</div>
-      </div>
    </div>
+    </div>
+  </div>
 </div>

 <!-- STATIC -->
-<h3 id="_static" rel="pagebookmark">
-    <span class="component" onclick="collapse('static_inner');">{{=T("Static")}}</span>
-    <a href="#static" rel="tooltip" data-placement="right" data-original-title="{{=T('These files are served without processing, your images go here')}}">
-    {{=helpicon()}}
-    <span>{{=T("These files are served without processing, your images go here")}}</span>
-    </a><span id="static" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
-</h3>
-<div id="static_inner" class="component_contents">
+<h5 id="_static">
+  <label class="component" for="static_inner" data-tooltip="{{=T('These files are served without processing, your images go here')}}">{{=T("Static")}}</label>  
+</h5>
+<div class="accordion">
+  <input type="checkbox" id="static_inner" checked>
+  <div>
+    <a href="#" class="right btn rounded small yellow">top</a>
    {{if not statics:}}<p><strong>{{=T("There are no static files")}}</strong></p>{{else:}}
    <ul class="unstyled act_edit">
-    {{
+      {{
        path=[]
        for file in statics+['']:
            items=file.split('/')
@@ -308,88 +301,89 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
                    path.append(file_path[len(path)])
                    thispath = regex_space.sub('-', 'static__'+'__'.join(path))
    }}
-        <li class="folder"><i>&nbsp;</i>
-            <a href="javascript:collapse('{{=thispath}}');" class="file">{{=path[-1]}}/</a>
-            <ul id="{{=thispath}}" style="display: none;" class="sublist">{{
-                else:
-                    path = path[:-1]
-        }}
-        </ul></li>
+      <li class="folder"><i>&nbsp;</i>
+        <a href="javascript:collapse('{{=thispath}}');" class="file">{{=path[-1]}}/</a>
+        <ul id="{{=thispath}}" style="display: none;" class="sublist">{{
+          else:
+          path = path[:-1]
+          }}
+        </ul>
+      </li>
    {{
                pass
            pass
        if filename:
    }}
-        <li>
-            <span class="filetools controls">
-                {{=editfile('static',file, dict(id="static"))}} {{=deletefile([app,'static',file], dict(id="static",id2="static"))}}
-            </span>
-            <span class="file">
-                <a href="{{=URL(a=app,c='static',f=file)}}">{{=filename}}</a>
-            </span>
-        </li>{{
-        pass
-    pass
-    }}
+      <li>
+        <span class="filetools controls">
+          {{=editfile('static',file, dict(id="static"))}} {{=deletefile([app,'static',file], dict(id="static",id2="static"))}}
+        </span>
+        <span class="file">
+          <a href="{{=URL(a=app,c='static',f=file)}}">{{=filename}}</a>
+        </span>
+    </li>{{
+      pass
+      pass
+      }}
    </ul>
    {{pass}}
-    <div class="controls formfield">
-      <button onclick="jQuery('#form5').slideToggle()" class="btn btn-mini">{{=T('Create/Upload')}}</button>
+    <div class="silver rounded padded">
+      <button onclick="jQuery('#form5').slideToggle()" class="btn rounded small">{{=T('Create/Upload')}}</button>
      <div id="form5" class="row-fluid" style="display:none">
        <div class="span3">{{=file_create_form('%s/static/' % app, 'static')}}<em>{{=T('or alternatively')}}</em></div>
        <div class="span3">{{=file_upload_form('%s/static/' % app, 'static')}}</div>
      </div>
    </div>
+  </div>
 </div>

 <!-- MODULES -->
-<h3 id="_modules" rel="pagebookmark">
-    <span class="component" onclick="collapse('modules_inner');">{{=T("Modules")}}</span>
-    <a href="#modules" rel="tooltip" data-placement="right" data-original-title="{{=T('Additional code for your application')}}">
-    {{=helpicon()}}
-    <span>{{=T("Additional code for your application")}}</span>
-    </a><span id="modules" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
-</h3>
-<div id="modules_inner" class="component_contents">
+<h5 id="_modules">
+  <label class="component" for="modules_inner" data-tooltip="{{=T('Additional code for your application')}}">{{=T("Modules")}}</label>  
+</h5>
+<div class="accordion">
+  <input type="checkbox" id="modules_inner" checked>
+  <div>
+    <a href="#" class="right btn rounded small yellow">top</a>
    {{if not modules:}}<p><strong>{{=T("There are no modules")}}</strong></p>{{else:}}
    <ul class="unstyled act_edit">
-        {{for m in modules:}}
-            {{id="modules__"+m.replace('/','__').replace('.','__')}}
-        <li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
-            <span class="filetols controls">
-                {{=editfile('modules',m,dict(id=id))}}
-                {{if m!='__init__.py':}}
-                    {{=deletefile([app, 'modules', m], dict(id=id, id2='modules'))}}
-                {{pass}}
-            </span>
-            <span class="file">
-                {{=peekfile('modules',m, dict(id=id))}}
-            </span>
-        </li>
-        {{pass}}
+      {{for m in modules:}}
+      {{id="modules__"+m.replace('/','__').replace('.','__')}}
+      <li id="{{='_'+id}}"><span id="{{=id}}" class="hashstick">&nbsp;</span>
+        <span>
+          {{=editfile('modules',m,dict(id=id))}}
+          {{if m!='__init__.py':}}
+          {{=deletefile([app, 'modules', m], dict(id=id, id2='modules'))}}
+          {{pass}}
+        </span>
+        <span class="file">
+          {{=peekfile('modules',m, dict(id=id))}}
+        </span>
+      </li>
+      {{pass}}
    </ul>
    {{pass}}
-    <div class="controls formfield">
-      <button onclick="jQuery('#form6').slideToggle()" class="btn btn-mini">{{=T('Create/Upload')}}</button>
+    <div class="silver rounded padded">
+      <button onclick="jQuery('#form6').slideToggle()" class="btn rounded small">{{=T('Create/Upload')}}</button>
      <div id="form6" class="row-fluid" style="display:none">
        <div class="span3">{{=file_create_form('%s/modules/' % app, 'modules')}}<em>{{=T('or alternatively')}}</em></div>
        <div class="span3">{{=file_upload_form('%s/modules/' % app, 'modules')}}</div>
      </div>
    </div>
+  </div>
 </div>

 <!-- PRIVATE -->
-<h3 id="_private" rel="pagebookmark">
-    <span class="component" onclick="collapse('private_inner');">{{=T("Private files")}}</span>
-    <a href="#private" rel="tooltip" data-placement="right" data-original-title="{{=T('These files are not served, they are only available from within your app')}}">
-    {{=helpicon()}}
-    <span>{{=T("These files are not served, they are only available from within your app")}}</span>
-    </a><span id="private" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
-</h3>
-<div id="private_inner" class="component_contents">
+<h5 id="_private">
+  <label class="component" for="private_inner" data-tooltip="{{=T('These files are not served, they are only available from within your app')}}">{{=T("Private files")}}</label>  
+</h5>
+<div class="accordion">
+  <input type="checkbox" id="private_inner" checked>
+  <div>
+    <a href="#" class="right btn rounded small yellow">top</a>
    {{if not privates:}}<p><strong>{{=T("There are no private files")}}</strong></p>{{else:}}
    <ul class="unstyled act_edit">
-        {{
+    {{
        path=[]
        for file in privates+['']:
            items=file.split('/')
@@ -400,72 +394,74 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
                    path.append(file_path[len(path)])
                    thispath='private__'+'__'.join(path)
        }}
-        <li class="folder">
-            <a href="javascript:collapse('{{=thispath}}');" class="file">{{=path[-1]}}/</a>
-            <ul id="{{=thispath}}" style="display: none;" class="sublist">{{
-                else:
-                    path = path[:-1]
-            }}
-            </ul>
-        </li>
-        {{
+    <li class="folder">
+      <a href="javascript:collapse('{{=thispath}}');" class="file">{{=path[-1]}}/</a>
+      <ul id="{{=thispath}}" style="display: none;" class="sublist">{{
+        else:
+        path = path[:-1]
+        }}
+      </ul>
+    </li>
+    {{
                pass
            pass
            if filename:
-        }}
-        <li>
-            <span class="filetools controls">
-                {{=editfile('private',file, dict(id="private"))}} {{=deletefile([app,'private',file], dict(id="private",id2="private"))}}
-            </span>
-            <span class="file">
-                {{=peekfile('private',file, dict(id="private"))}}
-            </span>
-        </li>{{
-            pass
-        pass
-        }}
+    }}
+    <li>
+      <span class="filetools controls">
+        {{=editfile('private',file, dict(id="private"))}} {{=deletefile([app,'private',file], dict(id="private",id2="private"))}}
+      </span>
+      <span class="file">
+        {{=peekfile('private',file, dict(id="private"))}}
+      </span>
+    </li>{{
+    pass
+    pass
+    }}
    {{pass}}
    </ul>
-    <div class="controls formfield">
-      <button onclick="jQuery('#form7').slideToggle()" class="btn btn-mini">{{=T('Create/Upload')}}</button>
+    <div class="silver rounded padded">
+      <button onclick="jQuery('#form7').slideToggle()" class="btn rounded small">{{=T('Create/Upload')}}</button>
      <div id="form7" class="row-fluid" style="display:none">
        <div class="span3">{{=file_create_form('%s/private/' % app, 'private')}}<em>{{=T('or alternatively')}}</em></div>
        <div class="span3">{{=file_upload_form('%s/private/' % app, 'private')}}</div>
      </div>
    </div>
+  </div>
 </div>

 <!-- PLUGINS -->
-<h3 id="_plugins" rel="pagebookmark">
-    <span class="component" onclick="collapse('plugins_inner');">{{=T("Plugins")}}</span>
-    <a href="#plugins" rel="tooltip" data-placement="right" data-original-title="{{=T('To create a plugin, name a file/folder plugin_[name]')}}">
-    {{=helpicon()}}
-    <span>{{=T("To create a plugin, name a file/folder plugin_[name]")}}</span>
-    </a><span id="plugins" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
-</h3>
-<div id="plugins_inner" class="component_contents">
+<h5 id="_plugins">
+  <label class="component" for="plugins_inner" data-tooltip="{{=T('To create a plugin, name a file/folder plugin_[name]')}}">{{=T("Plugins files")}}</label>
+</h5>
+<div class="accordion">
+  <input type="checkbox" id="plugins_inner" checked>
+  <div>
+    <a href="#" class="right btn rounded small yellow">top</a>
    {{if plugins:}}
    <ul class="unstyled act_edit">
-        {{for plugin in plugins:}}
-            {{id="plugins__"+plugin.replace('/','__').replace('.','__')}}
-        <li id="{{=id}}">
-            {{=A('plugin_%s' % plugin, _class='file', _href=URL('plugin', args=[app, plugin], vars=dict(id=id, id2='plugins')))}}
-        </li>
-        {{pass}}
+      {{for plugin in plugins:}}
+      {{id="plugins__"+plugin.replace('/','__').replace('.','__')}}
+      <li id="{{=id}}">
+        {{=A('plugin_%s' % plugin, _class='file', _href=URL('plugin', args=[app, plugin], vars=dict(id=id, id2='plugins')))}}
+      </li>
+      {{pass}}
    </ul>
    {{else:}}
    <p><strong>{{=T('There are no plugins')}}</strong></p>
    {{pass}}
    <div class="controls comptools">
-        {{=button(URL(c="default", f="plugins", args=[app,]), T('Download plugins from repository'))}}
+      {{=button(URL(c="default", f="plugins", args=[app,]), T('Download plugins from repository'))}}
    </div>
-    <div class="controls formfield">
-      <button onclick="jQuery('#form8').slideToggle()" class="btn btn-mini">{{=T('Upload')}}</button>
+    <div class="silver rounded padded">
+      <button onclick="jQuery('#form8').slideToggle()" class="btn rounded small">{{=T('Upload')}}</button>
      <div id="form8" class="row-fluid" style="display:none">
        <div class="row-fluid">
          <div class="span3">{{=upload_plugin_form(app, 'plugins')}}</div>
        </div>
      </div>
+    </div>
+  </div>
 </div>

 <script>
@@ -477,11 +473,11 @@ function filter_files() {
          message=data['message'];
          for(var i=0; i<files.length; i++)
            jQuery('li#_'+files[i].replace(/\//g,'__').replace('.','__')).slideDown();
-          jQuery('.flash').html(message).slideDown();
+          jQuery('.w2p_flash').html(message).slideDown();
          });
      } else {
          jQuery('.component_contents li, .formfield, .comptools').slideDown();
-          jQuery('.flash').html('').hide();
+          jQuery('.w2p_flash').html('').hide();
      }
 }
 jQuery(document).ready(function(){
@@ -490,6 +486,7 @@ jQuery(document).ready(function(){
      if(code==13) filter_files();
   });
   jQuery('#search_start').click(function(e){ filter_files(); });
-});
-</script>
+                                       });
+                                       </script>
 <!-- end "design" block -->
+    
@@ -32,7 +32,7 @@ def file_create_form(location, anchor=None, helptext=""):
 <!-- begin "edit" block -->
 {{
  def shortcut(combo, description):
-    return XML('<li class="span5"><span class="teletype-text">%s</span><span>%s</span></li>' % (combo, description))
+    return XML('<li><span class="teletype-text">%s</span><span>%s</span></li>' % (combo, description))
  def listfiles(app, dir, regexp='.*\.py$'):
      files = sorted(
         listdir(apath('%(app)s/%(dir)s/' % {'app':app, 'dir':dir}, r=request), regexp))
@@ -1,23 +1,22 @@
 {{extend 'layout.html'}}
-{{block sectionclass}}login{{end}}
 <!-- begin "index" block -->
 <h2>web2py&trade; {{=T('Web Framework')}}</h2>
-<h3>{{=T('Login to the Administrative Interface')}}</h3>
-<div class="form row-fluid">
+<div class="twothirds padded lifted">
 {{if request.is_https or request.is_local:}}
-	<form action="{{=URL(r=request)}}" method="post" class="span4 well">
-		<label for="password">{{=T('Administrator Password:')}}</label>
-		<input type="password" name="password" id="password"/>
-		<input type="hidden" name="send" value="{{=send}}"/>
-		<div class="controls"><button type="submit" name="login" class="btn">{{=T('Login')}}</button></div>
-	</form>
+<form action="{{=URL(r=request)}}" method="post" class="span4 well">
+  <h5>{{=T('Login to the Administrative Interface')}}</h5>
+  <label class="spaced" for="password">{{=T('Administrator Password:')}}</label>
+  <input class="spaced" type="password" name="password" id="password"/>
+  <input class="spaced" type="hidden" name="send" value="{{=send}}"/>
+  <button class="spaced" type="submit" name="login">{{=T('Login')}}</button>
+</form>
 {{else:}}
 <p class="help span7 alert alert-block alert-warning">{{=T('ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.')}}</p>
 {{pass}}
 </div>
 <script type="text/javascript">
-	jQuery(document).ready(function(){
-		jQuery("#password").focus();
-	});
+  jQuery(document).ready(function(){
+    jQuery("#password").focus();
+  });
 </script>
-<!-- end "index" block -->
+<!-- end "index" block -->
@@ -144,7 +144,7 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
 				{{=peekfile('views',c)}}
 			</span>
 			<span class="extras celled">
-				{{if extend.has_key(c):}}{{=T("extends")}} <b>{{=extend[c]}}</b> {{pass}}
+				{{if c in extend:}}{{=T("extends")}} <b>{{=extend[c]}}</b> {{pass}}
 				{{if include[c]:}}{{=T("includes")}} {{pass}}{{=XML(', '.join([B(f).xml() for f in include[c]]))}}
 			</span>
 		</li>
@@ -1,19 +1,19 @@
 {{extend 'layout.html'}}
 {{import os, glob}}
-{{block sectionclass}}site{{end}}
 <!-- begin "site" block -->
-<div class="row-fluid">
-  <div class="applist f60 span7">
-    <div class="applist_inner">
+<div class="container">
+  <div class="twothirds">
+    <div class="padded">
      <h2>{{=T("Installed applications")}}</h2>
-      <table width="100%" class="table">
-    {{for a in apps:}}
-    <tr>{{buttons = []}}
-      <td>
+      <table>
+        <tbody>
+          {{for a in apps:}}
+          <tr>{{buttons = []}}
+            <td>
          {{if a==request.application:}}
-            <h4 class="currentapp">{{=a}} ({{=T('currently running')}})</h4>
+          <a class="btn rounded gray">{{=a}} ({{=T('currently running')}})</a>
          {{else:}}
-            <h4 class="editableapp">{{=A(a,_href=URL(a,'default','index'))}}</h4>
+          <a class="btn rounded orange" href="{{=URL(a,'default','index')}}">{{=a}}</a>
            {{if MULTI_USER_MODE and db.app(name=a):}}(created by {{="%(first_name)s %(last_name)s" % db.auth_user[db.app(name=a).owner]}}){{pass}}
        {{if not os.path.exists('applications/%s/compiled' % a):}}
          {{buttons.append((URL('design',args=a), T("Edit")))}}
@@ -43,28 +43,30 @@
          {{if a!=request.application:}}
        {{buttons.append((URL('uninstall',args=a), T("Uninstall")))}}
          {{pass}}
-      </td>
-      <td>
-        <div class="btn-group">
-          <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-        {{=T('Manage')}}
-        <span class="caret"></span>
-          </a>
-          <ul class="dropdown-menu">
-        {{for link,name in buttons:}}
-        {{=LI(A(name,_href=link))}}
+          </td>
+          <td>
+            <ul class="menu">
+              <li>
+                <a class="btn white rounded">{{=T('Manage')}}</a>
+                <ul>
+                  {{for link,name in buttons:}}
+                  {{=LI(A(name,_href=link))}}
+                  {{pass}}
+                </ul>
+              </li>
+            </ul> 
+          </td>
+            <td>
+              {{=button_enable(URL('enable',args=a), a) if a!='admin' else ''}}
+            </td>
+        </tr>
        {{pass}}
-          </ul>
-        </div>
-        {{=button_enable(URL('enable',args=a), a) if a!='admin' else ''}}
-      </td>
-    </tr>
-    {{pass}}
+        </tbody>
      </table>
    </div>
  </div> <!-- /applist -->
-  <div class="sidebar fl60 span5">
-    <div class="sidebar_inner controls well well-small">
+  <div class="third black">
+    <div class="padded">
      <!-- CHANGE ADMIN PWD -->
      <div class="pwdchange pull-right">
    {{if MULTI_USER_MODE:}}
@@ -77,77 +79,77 @@
      {{if is_manager():}}
      <!-- VERSION -->
      <div class="box">
-    <h4>{{=T("Version")}}</h4>
-    <p>
-      <tt>{{=myversion}}</tt><br/>
-      {{running_on = T("Running on %s", request.env.server_software or 'Unknown')}}
-      ({{="%s, Python %s" % (running_on, myplatform)}})
-    </p>
-    <p id="check_version" class="row-buttons">
-      {{if session.check_version:}}
-        {{=T('Checking for upgrades...')}}
-        <script>ajax('{{=URL('check_version')}}',[],'check_version');</script>
-        {{session.check_version=False}}
-      {{else:}}
-        {{=button("javascript:ajax('"+URL('check_version')+"',[],'check_version')", T('Check for upgrades'))}}
-      {{pass}}
-    </p>
-    {{if session.is_mobile=='auto':}}
-      <p>{{=A(T('Try the mobile interface'),_href=URL('plugin_jqmobile','about'))}}</p>
-    {{pass}}
+        <h6>{{=T("Version")}}</h6>
+        <p>
+          <tt>{{=myversion}}</tt><br/>
+          {{running_on = T("Running on %s", request.env.server_software or 'Unknown')}}
+          ({{="%s, Python %s" % (running_on, myplatform)}})
+        </p>
+        <p id="check_version" class="row-buttons">
+          {{if session.check_version:}}
+          {{=T('Checking for upgrades...')}}
+          <script>ajax('{{=URL('check_version')}}',[],'check_version');</script>
+          {{session.check_version=False}}
+          {{else:}}
+          {{=button("javascript:ajax('"+URL('check_version')+"',[],'check_version')", T('Check for upgrades'))}}
+          {{pass}}
+        </p>
+        {{if session.is_mobile=='auto':}}
+        <p>{{=A(T('Try the mobile interface'),_href=URL('plugin_jqmobile','about'))}}</p>
+        {{pass}}
      </div> <!-- /VERSION -->
      {{pass}}
      {{if MULTI_USER_MODE and is_manager():}}
      <!-- MULTI_USER_INTERFACE -->
      <div class="box">
-    <h4>{{=T("Multi User Mode")}}</h4>
-    <p class="row-buttons">
-      {{=button(URL('bulk_register'),T('Bulk Register'))}}
-      {{=button(URL('manage_students',vars={'order':'auth_user.id'}),T('Manage Students'))}}
-    </p>
+        <h6>{{=T("Multi User Mode")}}</h6>
+        <p class="row-buttons">
+          {{=button(URL('bulk_register'),T('Bulk Register'))}}
+          {{=button(URL('manage_students',vars={'order':'auth_user.id'}),T('Manage Students'))}}
+        </p>
      </div> <!-- /MULTI_USER_INTERFACE -->
      {{pass}}
      <!-- SCAFFOLD APP -->
      <div class="box">
-    <h4>{{=T("New simple application")}}</h4>
-    {{=form_create.custom.begin}}
-    {{=LABEL(T("Application name:"))}}
-    {{=form_create.custom.widget.name}}
-    <div class="controls"><button type="submit" class="btn">{{=T('Create')}}</button></div>
-    {{=form_create.custom.end}}
+        <h6>{{=T("New simple application")}}</h6>
+        {{=form_create.custom.begin}}
+        {{=LABEL(T("Application name:"))}}
+        {{=form_create.custom.widget.name}}
+        <div class="controls"><button type="submit" class="btn">{{=T('Create')}}</button></div>
+        {{=form_create.custom.end}}
      </div> <!-- /SCAFFOLD APP -->
      <!-- UPLOAD PACKAGE -->
      <div class="box">
-    <h4>{{=T("Upload and install packed application")}}</h4>
-    {{=form_update.custom.begin}}
-    <label for="appupdate_name">{{=T("Application name:")}}</label>
-    {{=form_update.custom.widget.name}}
-    <label for="appupdate_file">{{=T("Upload a package:")}}</label>
-    {{=form_update.custom.widget.file}}
-    <label for="appupdate_url">{{=T("Or Get from URL:")}}</label>
-    {{=form_update.custom.widget.url}}<small class="help-block">({{=T('can be a git repo')}})</small>
-    <div class="controls">
-      <label class="checkbox">
-        {{=form_update.custom.widget.overwrite}} {{=T("Overwrite installed app")}}
-      </label>
-      <button type="submit" class='btn'>{{=T('Install')}}</button>
-    </div>
-    {{=form_update.custom.end}}
+        <h6>{{=T("Upload and install packed application")}}</h6>
+        {{=form_update.custom.begin}}
+        <label for="appupdate_name">{{=T("Application name:")}}</label>
+        {{=form_update.custom.widget.name}}
+        <label for="appupdate_file">{{=T("Upload a package:")}}</label>
+        {{=form_update.custom.widget.file}}
+        <label for="appupdate_url">{{=T("Or Get from URL:")}}</label>
+        {{=form_update.custom.widget.url}}<small class="help-block">({{=T('can be a git repo')}})</small>
+        <div class="controls">
+          <label class="checkbox">
+            {{=form_update.custom.widget.overwrite}} {{=T("Overwrite installed app")}}
+          </label>
+          <button type="submit" class='btn'>{{=T('Install')}}</button>
+        </div>
+        {{=form_update.custom.end}}
      </div> <!-- /UPLOAD PACKAGE -->
      <!-- DEPLOY ON GAE -->
      <div class="box">
-    <h4>{{=T("Deploy")}}</h4>
-    <p class="row-buttons">
-      {{=button(URL('gae','deploy'), T('Deploy on Google App Engine'))}}
-      {{=button(URL('openshift','deploy'),T('Deploy to OpenShift'))}}
-      {{=button(URL('pythonanywhere','deploy'), T('Deploy to PythonAnywhere'))}}
-    </p>
+        <h6>{{=T("Deploy")}}</h6>
+        <p class="row-buttons">
+          {{=button(URL('gae','deploy'), T('Deploy on Google App Engine'))}}
+          {{=button(URL('openshift','deploy'),T('Deploy to OpenShift'))}}
+          {{=button(URL('pythonanywhere','deploy'), T('Deploy to PythonAnywhere'))}}
+        </p>
      </div> <!-- /DEPLOY ON GAE -->
      <!-- APP WIZARD -->
      <div class="box">
-    <h4>{{=T("New application wizard")}}</h4>
-    <p>{{=button(URL('wizard','index'), T('Start wizard'))}}<br/>
-      {{=T("(requires internet access, experimental)")}}</p>
+        <h6>{{=T("New application wizard")}}</h6>
+        <p>{{=button(URL('wizard','index'), T('Start wizard'))}}<br/>
+          {{=T("(requires internet access, experimental)")}}</p>
      </div> <!-- /APP WIZARD -->
      <!-- TWITTER TIMELINE -->
      <div class="box twitter-timeline">
@@ -1,114 +1,69 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <meta http-equiv="P3P" content="CP=\"IDC DSP COR CURa ADMa OUR IND PHY ONL COM STA\"" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>{{=response.title or URL()}}</title>
-        {{
-        response.files.append(URL('static','css/bootstrap.min.css'))
-        response.files.append(URL('static','css/bootstrap_essentials.css'))
-        response.files.append(URL('static','css/bootstrap-responsive.min.css'))
-        }}
-        {{include 'web2py_ajax.html'}}
-    </head>
-
-    <body class="{{=T('direction: ltr') == 'direction: rtl' and 'RTLbody' or ''}} {{block sectionclass}}home{{end}}">
-
-        <!-- NAVBAR
-        ============== -->
-        <div id="header" class="navbar navbar-inverse navbar-fixed-top">
-            <div class="navbar-inner">
-                <div class="container-fluid">
-                    <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </button>
-                    <div id="start" class="brand_wrapper">
-                        <a href="{{=URL('default', 'index')}}" class="button brand" ><span>web2py&trade; {{=T('administrative interface')}}</span></a>
-                    </div>
-                    <div class="nav-collapse">
-                        {{if response.menu is not None:}}
-                        <ul id="menu" class="nav pull-right">
-                            {{for _name,_active,_link in response.menu:}}
-                            <li>{{=A(SPAN(_name), _href=_link, _class=_active and 'button select' or 'button')}}</li>
-                            {{pass}}
-                        </ul>
-                        {{pass}}
-                    </div><!--/.nav-collapse -->
-                </div><!-- /container-fluid -->
-            </div><!-- /navbar-inner -->
-        </div><!-- /#header -->
-
-        <!-- MAIN
-        =========== -->
-            <div id="{{=globals().get('main_id', 'main')}}" class="container-fluid">
-                <div id="main_inner" class="row-fluid">
-                    <div class="span12">
-                        <div class="flash alert">{{=response.flash or ''}}</div>
-                        {{include}}
-                    </div><!-- /main span12 -->
-                </div><!-- /main row-fluid -->
-            </div><!-- /#main -->
-
-        <!-- FOOTER
-        ============== -->
-        {{block footer}}
-        <footer id="footer" class="fixed">
-            <p><span>{{=T('Powered by')}} {{=A('web2py', _href='http://www.web2py.com')}}&trade; {{=T('created by')}} Massimo Di Pierro &copy;2007-{{=request.now.year}}
-                {{if hasattr(T,'get_possible_languages_info'):}}
-                - {{=T('Admin language')}}</span>
-                <select name="adminlanguage" onchange="var date = new Date();cookieDate=date.setTime(date.getTime()+(100*24*60*60*1000));document.cookie='adminLanguage='+this.options[this.selectedIndex].id+'; expires='+cookieDate+'; path=/';window.location.reload()">
-                    {{for langinfo in sorted([(code,info[1]) for code,info in T.get_possible_languages_info().iteritems() if code != 'default']):}}
-                    <option {{=T.accepted_language==langinfo[0] and 'selected' or ''}} {{='id='+langinfo[0]}} >{{=langinfo[1]}}</option>
-                    {{pass}}
-                </select>
-                {{else:}}
-                </span>{{pass}}
-            </p>
-        </footer><!-- /#footer -->
-        {{end}}
-
-        <!-- BS JAVASCRIPT
-        ====================== -->
-        <script src="{{=URL('static','js/bootstrap.min.js')}}"></script>
-        <script type="text/javascript">
-            jQuery(document).ready(function(){
-                jQuery("[rel=tooltip]").tooltip();
-                jQuery(":input").attr("autocomplete","off");
-            });
-        </script>
-        <script>
-            // ====================
-            // upload input mask
-            // ====================
-
-            function FileSelectHandler(e) {
-                e.stopPropagation();
-                var filename = e.target.value.split(/\\|\//).pop();
-                jQuery('#fileselect>span').removeClass('txtPlaceholder').text(filename)
-            }
-
-            jQuery(document).ready(function(){
-                var iupload = jQuery('#appupdate_file');
-                var ow = 300, oh = 20;
-                var iplaceholder = jQuery('<span class="txtPlaceholder">{{=T("no package selected")}}</span>'),
-                    iuploadbtn = jQuery('<button class="btn btn-inverse btn-mini uploadbtn"><i class="icon-white icon-circle-arrow-up"></i></button>');
-                iupload
-                    .addClass('masked')
-                    .wrap('<div id="fileselect" style="width:'+ow+'px;height:'+oh+'px"></div>')
-                    .on('change', function(event){FileSelectHandler(event)});
-                jQuery('#fileselect').append(iplaceholder, iuploadbtn);
-            });
-        </script>
-
-        {{if request.function in ('index','site'):}}
-        <a style="position:fixed;bottom:0;left:0;z-index:1000" href="https://groups.google.com/forum/?fromgroups#!forum/web2py" target="_blank">
-            <!-- http://webchat.freenode.net/?channels=web2py" //-->
-            <img src="{{=URL('static','images/questions.png')}}" />
-        </a>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <link href="{{=URL('static','css/stupid.css')}}" rel="stylesheet" type="text/css"/>
+    <link href="{{=URL('static','css/calendar.css')}}" rel="stylesheet" type="text/css"/>
+    <link href="{{=URL('static','css/web2py.css')}}" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
+    <style>
+      th, td {color: black}
+      tbody tr:hover {background-color:transparent}
+      tbody tr {border-bottom: none}
+      p {text-align: left}
+      pre {background-color: black!important;border-radius:5px; color:white; padding:10px}
+      a.btn.btn180 {padding:20px; font-size:1.2em; width:200px!important}
+      [type=submit], [type=button] {border-radius:5px!important;padding:5px 10px;margin-top:10px}
+    </style>
+    {{
+    left_sidebar_enabled = globals().get('left_sidebar_enabled', False)
+    right_sidebar_enabled = globals().get('right_sidebar_enabled', False)
+    middle_column = {0: 'fill', 1: 'threequarters', 2: 'half'}[
+    (left_sidebar_enabled and 1 or 0)+(right_sidebar_enabled and 1 or 0)]
+    }}
+    {{include "web2py_ajax.html"}}
+  </head>
+  <body class="black">   
+    <header class="black padded">      
+      <div class="container middle max900">
+        <div class="fill middle">                    
+          <label class="ham padded fa fa-bars" for="menu"></label>
+          <div class="burger accordion">
+            <input type="checkbox" id="menu"/>
+            {{=MENU(response.menu,_class='menu')}}
+          </div>
+        </div>
+      </div>
+    </header>
+    {{if response.flash:}}
+    <div class="w2p_flash">
+      {{=response.flash}}
+    </div>
+    {{pass}}
+    <main class="white">
+      <div class="hidden">{{block sectionclass}}design{{end}}</div>
+      <div class="container max900">
+        {{if left_sidebar_enabled:}}
+        <div class="quarter padded">{{block left_sidebar}}{{end}}</div>
        {{pass}}
-    </body>
+        <div class="{{=middle_column}} padded">{{include}}</div>
+        {{if right_sidebar_enabled:}}
+        <div class="quarter padded">{{block right_sidebar}}{{end}}</div>
+        {{pass}}
+      </div>
+    </main>
+    <footer class="black">
+      <div class="container padded max900">
+        <div class="fill">
+          Copyright @ 2016 - Powered by Web2py
+        </div>
+      </div>
+    </footer>
+  </body>  
+  <script>
+    // prevent android horizontal scrolling
+    window.addEventListener("scroll", function(){window.scroll(0, window.pageYOffset);}, false);
+  </script>
 </html>
@@ -576,7 +576,7 @@ def bg_graph_model():
            meta_graphmodel = dict(group=request.application, color='#ECECEC')

        group = meta_graphmodel['group'].replace(' ', '')
-        if not subgraphs.has_key(group):
+        if group not in subgraphs:
            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
        subgraphs[group]['tables'].append(tablename)

@@ -26,7 +26,7 @@ def what():
    return response.render(images=images)


-@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
+#@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
 def download():
    return response.render()

@@ -24,6 +24,10 @@ French speakers group

 ``web2py-fr``:groupdates

+## Italian Group
+
+- [[https://groups.google.com/forum/?fromgroups#!forum/web2py-it https://groups.google.com/forum/?fromgroups#!forum/web2py-it popup]]
+
 ## Japanese Group

 Japanese speakers group
@@ -1,7 +1,11 @@
-.calendar{z-index:99;position:relative;display:none;background:#fff;border:2px solid #000;font-size:11px;color:#000;cursor:default;font-family:Arial,Helvetica,sans-serif;
-border-radius: 10px;
-    -moz-border-radius: 10px;
-    -webkit-border-radius: 10px;
-}.calendar table{margin:0px;font-size:11px;color:#000;cursor:default;font-family:tahoma,verdana,sans-serif;}.calendar .button{text-align:center;padding:1px;color:#fff;background:#000;}.calendar .nav{background:#000;color:#fff}.calendar thead .title{font-weight:bold;padding:1px;background:#000;color:#fff;text-align:center;}.calendar thead .name{padding:2px;text-align:center;background:#bbb;}.calendar thead .weekend{color:#f00;}.calendar thead .hilite {background-color:#666;}.calendar thead .active{padding:2px 0 0 2px;background-color:#c4c0b8;}.calendar tbody .day{width:2em;text-align:right;padding:2px 4px 2px 2px;}.calendar tbody .day.othermonth{color:#aaa;}.calendar tbody .day.othermonth.oweekend{color:#faa;}.calendar table .wn{padding:2px 3px 2px 2px;background:#bbb;}.calendar tbody .rowhilite td{background:#ddd;}.calendar tbody td.hilite{background:#bbb;}.calendar tbody td.active{background:#bbb;}.calendar tbody td.selected{font-weight:bold;background:#ddd;}.calendar tbody td.weekend{color:#f00;}.calendar tbody td.today{font-weight:bold;color:#00f;}.calendar tbody .disabled{color:#999;}.calendar tbody .emptycell{visibility:hidden;}.calendar tbody .emptyrow{display:none;}.calendar tfoot .ttip{background:#bbb;padding:1px;background:#000;color:#fff;text-align:center;}.calendar tfoot .hilite{background:#ddd;}.calendar tfoot .active{}.calendar .combo{position:absolute;display:none;width:4em;top:0;left:0;cursor:default;background:#e4e0d8;padding:1px;z-index:100;}.calendar .combo .label,.calendar .combo .label-IEfix{text-align:center;padding:1px;}.calendar .combo .label-IEfix{width:4em;}.calendar .combo .active{background:#c4c0b8;}.calendar .combo .hilite{background:#048;color:#fea;}.calendar td.time{padding:1px 0;text-align:center;background-color:#bbb;}.calendar td.time .hour,.calendar td.time .minute,.calendar td.time .ampm{padding:0 3px 0 4px;font-weight:bold;}.calendar td.time .ampm{text-align:center;}.calendar td.time .colon{padding:0 2px 0 3px;font-weight:bold;}.calendar td.time span.hilite{}.calendar td.time span.active{border-color:#f00;background-color:#000;color:#0f0;}.hour,.minute{font-size:2em;}
+.calendar {z-index:2000;position:relative;margin-top:140px;display:none;background-color:white;border:1px solid #000;color:#000;cursor:default;box-shadow:0 0 10px #666}.calendar * {text-align: center;font-size:10px!important}
+.calendar table {border-collapse:collapse}
+.calendar tbody tr:hover {background-color:#fbf6d9}
+.calendar td, th {padding:5px; vertical-align:top; text-align:left; border:0}
+.calendar thead tr {background-color:#f1f1f1}
+.calendar tbody tr {border-bottom:2px solid #f1f1f1}
+.calendar th {font-weight:string; padding:5px; vertical-align:bottom; text-align:left}
+.calendar thead th {vertical-align:bottom}
+.calendar tbody th {vertical-align:top}

-#CP_hourcont{z-index:99;padding:0;position:absolute;border:1px dashed #666;background-color:#eee;display:none;}#CP_minutecont{z-index:99;background-color:#ddd;padding:1px;position:absolute;width:45px;display:none;}.floatleft{float:left;}.CP_hour{z-index:99;padding:1px;font-family:Arial,Helvetica,sans-serif;font-size:9px;white-space:nowrap;cursor:pointer;width:35px;}.CP_minute{z-index:99;padding:1px;font-family:Arial,Helvetica,sans-serif;font-size:9px;white-space:nowrap;cursor:pointer;width:auto;}.CP_over{background-color:#fff;z-index:99}
+#CP_hourcont{z-index:2000;padding:0;position:absolute;border:1px dashed #666;background-color:#eee;display:none;}#CP_minutecont{z-index:2000;background-color:#ddd;padding:1px;position:absolute;width:45px;display:none;}.floatleft{float:left;}.CP_hour{z-index:2000;padding:1px;font-family:Arial,Helvetica,sans-serif;font-size:9px;white-space:nowrap;cursor:pointer;width:35px;}.CP_minute{z-index:2000;padding:1px;font-family:Arial,Helvetica,sans-serif;font-size:9px;white-space:nowrap;cursor:pointer;width:auto;}.CP_over{background-color:#fff;z-index:2000}
@@ -0,0 +1,359 @@
+/************
+  Created by Massimo Di Pierro
+  Stupid.css is what the names says, take it with a grain of salt
+  License: BSD
+************/
+
+/*** basic styles ***/
+* {border:0; margin:0; padding:0; font-familiy:Helvetica}
+html, body {max-width: 100vw !important;overflow-x: hidden !important}
+body {font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif}
+p, li {margin-bottom:0.5em}
+p {text-align:justify}
+label, strong {font-weight:bold}
+ul {list-style-type:none; padding-left:20px}
+a {text-decoration:none; color:#26a69a; white-space:nowrap}
+a:hover {cursor:pointer}
+h1,h2,h3,h4,h5,h6{font-weight:strong; text-transform:uppercase}
+h1{font-size:4em; margin:1.0em 0 0.25em 0}
+h2{font-size:2.4em; margin:0.9em 0 0.25em 0}
+h3{font-size:1.8em; margin:0.8em 0 0.25em 0}
+h4{font-size:1.6em; margin:0.7em 0 0.25em 0}
+h5{font-size:1.4em; margin:0.6em 0 0.25em 0}
+h6{font-size:1.2em; margin:0.5em 0 0.25em 0}
+table {border-collapse:collapse}
+tbody tr:hover {background-color:#fbf6d9}
+td, th {padding:5px; vertical-align:top; text-align:left; border:0}
+thead tr {background-color:#f1f1f1}
+tbody tr {border-bottom:2px solid #f1f1f1}
+th {font-weight:string; padding:5px; vertical-align:bottom; text-align:left}
+thead th {vertical-align:bottom}
+tbody th {vertical-align:top}
+header, footer {with:100%}
+
+@media (max-width:599px) {
+  h1{font-size:2em}
+  h2{font-size:1.8em}
+  h3{font-size:1.6em}
+  h4{font-size:1.4em}
+  h5{font-size:1.2em}
+  h6{font-size:1.0em}
+}
+
+/*** buttons ***/
+.btn, button, [type=button], [type=submit] {padding:0.5em 1em !important; margin:0 0.5em 0.5em 0; line-height:2.4em; background-color:#26a69a; color:white}
+.btn:hover, button:hover, [type=button]:hover, [type=submit]:hover {box-shadow:0 0 10px #666; text-decoration:none; cursor:pointer}
+.btn.small, table .btn {padding:0.25em 0.5em !important; font-size:0.8em; line-height:1.5em}
+.btn.large {padding:1em 2em !important; font-size:1.2em; line-height:4em}
+.btn.oval {border-radius:50%}
+
+/*** helpers ***/
+.rounded {-moz-border-radius:5px; border-radius:5px}
+.padded {padding:10px 20px !important; -webkit-box-sizing:border-box; -moz-box-sizing:border-box; box-sizing:border-box}
+.center {text-align:center !important; margin-left:auto; margin-right:auto}
+.center>div {text-align:left}
+.right {right:0; text-align:right}
+.middle div {vertical-align:middle !important}
+.bottom div {vertical-align:bottom !important}
+.xscroll {overflow-x:scroll; width:100%}
+.yscroll {overflow-y:scroll; width:100%}
+.nowrap {white-space:nowrap; overflow-x:hidden}
+.fill {width:100%}
+.lifted {box-shadow:5px 5px 10px #666}
+.relative {position:relative}
+.relative>div {position:absolute}
+.spaced {margin-bottom:20px; margin-top:20px}
+.hidden {display:none}
+
+/*** forms ***/
+input:not([type]), input:not([type=checkbox]):not([type=radio]):not([type=submit]), [type=file]:before {outline:none; padding:0.5em 1em; margin:0.5px; border-bottom:1px solid #ddd; width:100%}
+textarea {width:100%; border:1px solid #ddd; padding:4px 8px; outline:none; outline:none}
+select {-webkit-appearance:none; outline:none; padding:0.5em 1em; border-radius:0; margin:0.5px; border-bottom:1px solid #ddd}
+input, textarea, select, button {font-size:12px}
+input:not([type]), input:not([type=checkbox]):not([type=radio]):not([type=submit]):hover, select:hover, textarea:hover {background-color:#fbf6d9; transition:background-color 1s ease}
+
+/*** grid ***/
+.container {margin-right:-20px}
+.container>.quarter, .container>.half, .container>.third, .container>.twothirds, .container>.threequarters, .container>.fill{display:inline-block; padding:5px 20px 5px 0; -webkit-box-sizing:border-box; -moz-box-sizing:border-box; box-sizing:border-box; vertical-align:top}
+.container>.fill {width:100%; margin-right:-20px}
+.container img, .container video {max-width:100%}
+@media (min-width:800px) {
+  .max900 {max-width:900px; margin-left:auto; margin-right:auto}
+  .quarter {width:25%; margin-right:-5px}
+  .half {width:50%; margin-right:-10px}
+  .third {width:33.33%; margin-right:-6.66px}
+  .twothirds {width:66.66%; margin-right:-13.33px}
+  .threequarters {width:75%; margin-right:-15px}
+}
+@media (min-width:600px) and (max-width:799px) {
+  .quarter.compressible {width:25%; margin-right:-5px}
+  .half.compressible {width:50%; margin-right:-10px}
+  .threequarters.compressible {width:75%; margin-right:-15px}
+  .quarter:not(.compressible), .half:not(.compressible), .threequarters:not(.compressible) {width:100%; margin-right:-20px}
+  .third {width:33.33%; margin-right:-6.66px}
+  .twothirds {width:66.66%; margin-right:-13.33px}
+  label.quarter:not(.compressible).right, label.half:not(.compressible).right, label.threequarters:not(.compressible).right   {float:left; text-align:left}
+}
+@media (max-width:599px) {  
+  .quarter:not(.compressible), .half:not(.compressible), .third:not(.compressible), .twothirds:not(.compressible), .threequarters:not(.compressible) {width:100%;}
+  label.quarter:not(.compressible).right, label.half:not(.compressible).right, label.threequarters:not(.compressible).right,
+  label.third:not(.compressible).right, label.twothirds:not(.compressible).right   {float:left; text-align:left}
+  .quarter.compressible {width:25%; margin-right:-5px}
+  .half.compressible {width:50%; margin-right:-10px}
+  .third.compressible {width:33.33%; margin-right:-6.66px}
+  .twothirds.compressible {width:66.66%; margin-right:-13.33px}
+  .threequarters.compressible {width:75%; margin-right:-15px}
+}
+
+/*** progress bar from http://codepen.io/holdencreative/details/pvxGxy  ***/
+.progress {
+  margin-left:-15px;
+  margin-right:-15px;
+  position:relative;
+  height:8px;
+  display:block;
+  width:120%;
+  background-color:#acece6;
+  border-radius:0 !important;
+  background-clip:padding-box;
+  overflow:hidden;
+}
+.progress .determinate {
+  position:absolute;
+  background-color:inherit;
+  top:0;
+  bottom:0;
+  background-color:#26a69a;
+  transition:width .3s linear;
+}
+.progress .indeterminate {
+  background-color:#26a69a;
+}
+.progress .indeterminate:before {
+  content:'';
+  position:absolute;
+  background-color:inherit;
+  top:0;
+  left:0;
+  bottom:0;
+  will-change:left, right;
+  animation:indeterminate 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite;
+}
+.progress .indeterminate:after {
+  content:'';
+  position:absolute;
+  background-color:inherit;
+  top:0;
+  left:0;
+  bottom:0;
+  will-change:left, right;
+  animation:indeterminate-short 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) infinite;
+  animation-delay:1.15s;
+}
+@-webkit-keyframes indeterminate {
+  0% {left:-35%; right:100%}
+  60% {left:100%; right:-90%}
+  100% {left:100%; right:-90%}
+}
+@-moz-keyframes indeterminate {
+  0% {left:-35%; right:100%}
+  60% {left:100%; right:-90%}
+  100% {left:100%; right:-90%}
+}
+@keyframes indeterminate {
+  0% {left:-35%; right:100%}
+  60% {left:100%; right:-90%}
+  100% {left:100%; right:-90%}
+}
+@-webkit-keyframes indeterminate-short {
+  0% {left:-200%; right:100%}
+  60% {left:107%; right:-8%}
+  100% {left:107%; right:-8%}
+}
+@-moz-keyframes indeterminate-short {
+  0% {left:-200%; right:100%}
+  60% {left:107%; right:-8%}
+  100% {left:107%; right:-8%}
+}
+@keyframes indeterminate-short {
+  0% {left:-200%; right:100%}
+  60% {left:107%; right:-8%}
+  100% {left:107%; right:-8%}
+}
+
+/**** dropdown menu from http://codepen.io/philhoyt/pen/ujHzd ***/
+.menu {list-style:none; position:relative; margin:0; padding:0}
+.menu.right {float:right}
+.menu a {padding:0 15px; text-decoration:none;text-align:left;font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; text-align:left}
+.menu li {position:relative; float:left; margin:0; padding:0}
+.menu ul {background:white; border:1px solid #e1e1e1; visibility:hidden; opacity:0;  position:absolute; top:110%; padding:0; z-index:1000; transition:all 0.2s ease-out; list-style-type:none; box-shadow:5px 5px 10px #666}
+.menu ul a {padding:10px 15px; color:#333; font-weight:700; font-size:12px; line-height:16px; display: block}
+.menu ul li {float:none; width:200px}
+.menu ul ul {top:0; left:80%; z-index:2000}
+.menu li:hover > ul {visibility:visible; opacity:1}
+.menu>li>ul>li:first-child:before{content:''; position:absolute; width:1px; height:1px; border:10px solid transparent; left:50px; top:-20px; margin-left:-10px; border-bottom-color:white}
+.menu.dark ul {background:black; border:1px solid black}
+.menu.dark ul a {color:white}
+.menu.dark>li>ul>li:first-child:before{border-bottom-color:black}
+
+@media (max-width:599px) {
+  header .menu li, header .menu ul {width: 100%}  
+  header .menu.right {float:left; text-align:left}
+  header .menu ul ul {top:2.5em; left:-1px; z-index:2000}
+}
+
+@media (min-width:600px) {
+  .ham {display:none!important}
+  .burger.accordion * {max-height:1000px; overflow:visible}
+}
+
+/*** pulsating ring from https://jsfiddle.net/mandynicole/7xrKP/ *******/
+.pulse:after {
+    content:"";
+    border:3px solid #00e6ac;
+    -webkit-border-radius:30px;
+    height:40px;
+    width:40px;
+    position:absolute;
+    margin-left:-20px;
+    margin-top:-20px;
+    -webkit-animation:pulsate 1s ease-out;
+    -webkit-animation-iteration-count:infinite;
+    opacity:0.0
+}
+@-webkit-keyframes pulsate {
+    0% {-webkit-transform:scale(0.1, 0.1); opacity:0.0}
+    50% {opacity:1.0}
+    100% {-webkit-transform:scale(1.2, 1.2); opacity:0.0}
+}
+
+/**** underline effect ***/
+a:not(.btn):not(.noeffect) {position:relative}
+a:not(.btn):not(.noeffect):hover {color:#26a69a}
+a:not(.btn):not(.noeffect):hover:after {width:100%}
+a:not(.btn):not(.noeffect):after {
+  display:block;
+  position:absolute;
+  left:0;
+  bottom:-1px;
+  width:0;
+  height:2px;
+  background-color:#26a69a;
+  content:"";
+  transition:width 0.2s;
+}
+
+/**** modal ***/
+.modal {
+  position:fixed;
+  z-index:9999;
+  top:0;
+  bottom:0;
+  left:0;
+  right:0;
+  background-color:rgba(0,0,0,0.8);
+  padding-top:20vh;
+  transition:opacity 500ms;
+  visibility:hidden;
+  opacity:0;
+}
+.modal:target {visibility:visible; opacity:1}
+.modal div {margin-left:auto; margin-right:auto}
+.modal .close:not(.btn) {position:absolute; top:10px; right:10px; font-size:20px}
+.modal .close {transition:all 200ms}
+
+/*** tooltips from http://codepen.io/trezy/pen/Khnzy ***/
+[data-tooltip] {position:relative}
+[data-tooltip]:hover:after,[data-tooltip]:hover:before {display:block}
+[data-tooltip]:before, [data-tooltip]:after {display:none; position:absolute; top:0}
+[data-tooltip]:before {
+  border-bottom:.6em solid black;
+  border-bottom:.6em solid black;
+  border-left:7px solid transparent;
+  border-right:7px solid transparent;
+  content:"";
+  left:20px;
+  margin-top:1em;
+}
+[data-tooltip]:after {
+  background-color:rgba(0,0,0,0.8);
+  border:4px solid rgba(0,0,0,0.8);
+  border-radius:7px;
+  color:white;
+  content:attr(data-tooltip);
+  left:0;
+  margin-top:1.5em;
+  padding:5px 15px;
+  white-space:pre-wrap;
+  width:100px;
+}
+
+/*** accordion ***/
+.accordion>input ~ label:before {content:"▲ "; color:#ddd}
+.accordion>input:checked ~ label:before {content:"▼ "; color:#ddd}
+.accordion>input {display:none}
+.accordion>input:checked ~ *:not(label) {
+  max-height: 1000px !important;
+  overflow:visible !important;
+  -webkit-transition: max-height .3s ease-in;
+  transition: max-height .3s ease-in;
+}
+.accordion>*:not(label) {
+  max-height: 0;
+  overflow: hidden;
+  margin: 0;
+  padding: 0;
+  -webkit-transition: max-height .3s ease-out;
+  transition: max-height .3s ease-out;
+}
+
+
+/*** cards from http://codepen.io/edeesims/pen/iGDzk ***/
+.card {perspective: 500px; max-width:100%}
+.card>div {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  box-shadow: 0 0 15px rgba(0,0,0,0.1);
+  transition: transform 1s;
+  transform-style: preserve-3d;
+}
+.card:hover>div {
+  transform: rotateY( 180deg ) ;
+  transition: transform 0.5s;
+}
+.card>div>div {
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  backface-visibility: hidden;
+}
+.card>div>div:nth-child(2) {
+  transform: rotateY( 180deg );
+}
+
+/*** colors from http://clrs.cc/ ***/
+.navy{background-color:#001f3f!important;color:white}.blue{background-color:#0074d9!important;color:white}.aqua{background-color:#7fdbff!important;color:black}.teal{background-color:#39cccc!important;color:white}.olive{background-color:#3d9970!important;color:white}.green{background-color:#2ecc40!important;color:white}.aquamarine{background-color:#26a69a!important;color:white}.lime{background-color:#01ff70!important;color:black}.yellow{background-color:#ffdc00!important;color:black}.orange{background-color:#ff851b!important;color:white}.red{background-color:#cc1f00!important;color:white}.fuchsia{background-color:#f012be!important;color:white}.pink{background-color:#ee6e73!important;color:white}.purple{background-color:#b10dc9!important;color:white}.maroon{background-color:#85144b!important;color:white}.white{background-color:#fff!important;color:black;-webkit-box-shadow:inset 0px 0px 0px 1px #ddd;-moz-box-shadow:inset 0px 0px 0px 1px #ddd;box-shadow:inset 0px 0px 0px 1px #ddd}.gray{background-color:#aaa!important;color:white}.silver{background-color:#f1f1f1!important;color:black}.black{background-color:#000!important;color:white}.glass{background:rgba(255,255,255,0.5)!important;color:black}
+
+/**** tags ****/
+.tags > span, .tags > span.off:hover {
+  height: 30px;
+  padding: 4px 9px;
+  text-decoration: none;
+  margin: 0 5px 30px 0 !important;
+  white-space: nowrap;
+  color: white;
+  background-color: #26a69a;
+  border-radius: 5px;
+  line-height: 32px;
+}
+.tags.dismissible > span:not(.off):hover {
+  background-color: #ccc !important;
+}
+.tags.dismissible > span:not(.off):after {
+  content: " \f00d";
+  font-family: FontAwesome;
+}
+.tags > span.off {
+  background-color: #ccc;
+}
@@ -1,84 +1,17 @@
-/** these MUST stay **/
-a {text-decoration:none; white-space:nowrap}
-a:hover {text-decoration:underline}
-a.button {text-decoration:none}
-h1,h2,h3,h4,h5,h6 {margin:0.5em 0 0.25em 0; display:block;
-  font-family:Helvetica}
-h1 {font-size:4.00em}
-h2 {font-size:3.00em}
-h3 {font-size:2.00em}
-h4 {font-size:1.50em}
-h5 {font-size:1.25em}
-h6 {font-size:1.12em}
-th,label {font-weight:bold; white-space:nowrap;}
-td,th {text-align:left; padding:2px 5px 2px 5px}
-th {vertical-align:middle; border-right:1px solid white}
-td {vertical-align:top}
-form table tr td label {text-align:left}
-p,table,ol,ul {padding:0; margin: 0.75em 0}
-p {text-align:justify}
-ol, ul {list-style-position:outside; margin-left:2em}
-li {margin-bottom:0.5em}
-span,input,select,textarea,button,label,a {display:inline}
-img {border:0}
-blockquote,blockquote p,p blockquote {
-  font-style:italic; margin:0.5em 30px 0.5em 30px; font-size:0.9em}
-i,em {font-style:italic}
-strong {font-weight:bold}
-small {font-size:0.8em}
-code {font-family:Courier}
-textarea {width:100%}
-video {width:400px}
-audio {width:200px}
-[type="text"], [type="password"], select {
-  margin-right: 5px; width: 300px;
-}
-.hidden {display:none;visibility:visible}
+header a {color: white; font-size:1.1em}
+main {min-height: 70vh}
+.form-group {padding-bottom: 10px !important;}
+.w2p_hidden {display:none;visibility:visible}
 .right {float:right; text-align:right}
 .left {float:left; text-align:left}
 .center {width:100%; text-align:center; vertical-align:middle}
-/** end **/
-
-/* Sticky footer begin */
-
-.main {
-  padding:20px 0 50px 0;
-}
-
-.footer,.push {
-  height:6em;
-  padding:1em 0;
-  clear:both;
-}
-
-.footer-content {position:relative; bottom:-4em; width:100%}
-
-.auth_navbar {
-    white-space:nowrap;
-}
-
-/* Sticky footer end */
-
-.footer {
-    border-top:1px #DEDEDE solid;
-}
-.header {
-	/* background:<fill here for header image>; */
-}
-
-
-fieldset {padding:16px; border-top:1px #DEDEDE solid}
-fieldset legend {text-transform:uppercase; font-weight:bold; padding:4px 16px 4px 16px; background:#f1f1f1}
-
-/* fix ie problem with menu */
-
 td.w2p_fw {padding-bottom:1px}
 td.w2p_fl,td.w2p_fw,td.w2p_fc {vertical-align:top}
 td.w2p_fl {text-align:left}
 td.w2p_fl, td.w2p_fw {padding-right:7px}
 td.w2p_fl,td.w2p_fc {padding-top:4px}
-div.w2p_export_menu {margin:5px 0}
-div.w2p_export_menu a, div.w2p_wiki_tags a, div.w2p_cloud a {margin-left:5px; padding:2px 5px; background-color:#f1f1f1; border-radius:5px; -moz-border-radius:5px; -webkit-border-radius:5px;}
+div.w2p_export_menu {white-space: wrap; margin:5px 0}
+div.w2p_export_menu a, div.w2p_wiki_tags a, div.w2p_cloud a {margin-left:5px; padding:2px 5px; background-color:#f1f1f1; border-radius:5px; -moz-border-radius:5px; -webkit-border-radius:5px; font-size:0.7em; color: black}

 /* tr#submit_record__row {border-top:1px solid #E5E5E5} */
 #submit_record__row td {padding-top:.5em}
@@ -88,54 +21,30 @@ div.w2p_export_menu a, div.w2p_wiki_tags a, div.w2p_cloud a {margin-left:5px; pa
 #web2py_user_form td {vertical-align:top}

 /*********** web2py specific ***********/
-div.flash {
+div.w2p_flash {
    font-weight:bold;
    display:none;
-    position:fixed;
-    padding:10px;
-    top:48px;
-    right:250px;
-    min-width:280px;
+    padding:20px 20px 20px 50px;
+    width:100%;    
    opacity:0.95;
-    margin:0px 0px 10px 10px;
    vertical-align:middle;
    cursor:pointer;
-    color:#fff;
-    background-color:#000;
-    border:2px solid #fff;
-    border-radius:8px;
-    -o-border-radius: 8px;
-    -moz-border-radius:8px;
-    -webkit-border-radius:8px;
-    background-image: -webkit-linear-gradient(top,#222,#000);
-    background-image: -o-linear-gradient(top,#222,#000);
-    background-image: -moz-linear-gradient(90deg, #222, #000);
-    background-image: linear-gradient(top,#222,#000);
-    background-repeat: repeat-x;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    -webkit-font-smoothing: antialiased;
+    color:#000;
+    background-color:#ffdc00;
    z-index:2000;
 }

-div.flash #closeflash{color:inherit; float:right; margin-left:15px;}
+div.w2p_flash:before{content:"×";float:right; margin-right:100px; color:black;}
 .ie-lte7  div.flash #closeflash
 {color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;}

-div.flash:hover { opacity:0.25; }
+div.w2p_flash:hover { opacity:0.80; }

 div.error_wrapper {display:block}
 div.error {
-    width: 298px;
-    background:red;
-    border: 2px solid #d00;
-    color:white;
+    color:red;
    padding:5px;
    display:inline-block;
-    background-image: -webkit-linear-gradient(left,#f00,#fdd);
-    background-image: -o-linear-gradient(left,#f00,#fdd);
-    background-image: -moz-linear-gradient(0deg, #f00, #fdd);
-    background-image: linear-gradient(left,#f00,#fdd);
-    background-repeat: repeat-y;
 }

 .topbar {
@@ -190,34 +99,8 @@ div.error {
 */
 /* .web2py_table {border:1px solid #ccc} */
 .web2py_paginator {}
-.web2py_grid {width:100%}
 .web2py_grid table {width:100%}
-.web2py_grid tbody td {padding:2px 5px 2px 5px; vertical-align: middle;}
-.web2py_grid .web2py_form td {vertical-align: top;}
-
-.web2py_grid thead th,.web2py_grid tfoot td {
-    background-color:#EAEAEA;
-    padding:10px 5px 10px 5px;
-}
-
-.web2py_grid tr.odd {background-color:#F9F9F9}
-.web2py_grid tr:hover {background-color:#F5F5F5}
-
-/*
-.web2py_breadcrumbs a {
-    line-height:20px; margin-right:5px; display:inline-block;
-    padding:3px 5px 3px 5px;
-    font-family:'lucida grande',tahoma,verdana,arial,sans-serif;
-    color:#3C3C3D;
-    text-shadow:1px 1px 0 #FFFFFF;
-    white-space:nowrap; overflow:visible; cursor:pointer;
-    background:#ECECEC;
-    border:1px solid #CACACA;
-    -webkit-border-radius:2px; -moz-border-radius:2px;
-    -webkit-background-clip:padding-box; border-radius:2px;
-    outline:none; position:relative; zoom:1; *display:inline;
-}
-*/
+.web2py_grid td {color: black;}

 .web2py_console form {
    width: 100%;
@@ -302,11 +185,6 @@ li.w2p_grid_breadcrumb_elem {
 .web2py_console input, .web2py_console select,
 .web2py_console a { margin: 2px; }

-.web2py_htmltable {
-   width: 100%;
-   overflow-x: auto;
-   -ms-overflow-x:scroll;
-}

 #wiki_page_body {
   width: 600px;
@@ -317,13 +195,10 @@ li.w2p_grid_breadcrumb_elem {
 /* fix some IE problems */

 .ie-lte7 .topbar .container {z-index:2}
-.ie-lte8 div.flash{ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#222222', endColorstr='#000000', GradientType=0 ); }
-.ie-lte8 div.flash:hover {filter:alpha(opacity=25);}
+.ie-lte8 div.w2p_flash{ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#222222', endColorstr='#000000', GradientType=0 ); }
+.ie-lte8 div.w2p_flash:hover {filter:alpha(opacity=25);}
 .ie9 #w2p_query_panel {padding-bottom:2px}
-.control-label.readonly{
-   padding-top:0px !important;
-   padding-right:0px !important;
-}
-
-

+.web2py_console .form-control {width: 20%; display: inline;}
+.web2py_console #w2p_keywords {width: 50%;}
+.web2py_search_actions a, .web2py_console input[type=submit], .web2py_console input[type=button], .web2py_console button { padding: 6px 12px; }
@@ -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;
-    }
-}
@@ -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;}
-
@@ -1,33 +0,0 @@
-// this code improves bootstrap menus and adds dropdown support
-jQuery(function(){
-  jQuery('.nav>li>a').each(function(){
-    if(jQuery(this).parent().find('ul').length)
-      jQuery(this).attr({'class':'dropdown-toggle','data-toggle':'dropdown'}).append('<b class="caret"></b>');
-  });
-  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');});
-});
@@ -155,8 +155,8 @@
      {{=T.M("Cache contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.",
              dict(hours=total['oldest'][0], min=total['oldest'][1], sec=total['oldest'][2]))}}
    </p>
-    {{=BUTTON(T('Cache Keys'), _onclick='jQuery("#all_keys").toggle().toggleClass( "hidden" );')}}
-    <div class="hidden" id="all_keys">
+    {{=BUTTON(T('Cache Keys'), _onclick='jQuery("#all_keys").toggle().toggleClass( "w2p_hidden" );')}}
+    <div class="w2p_hidden" id="all_keys">
      {{=total['keys']}}
    </div>
    <br />
@@ -183,8 +183,8 @@
      {{=T.M("RAM contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.",
              dict(hours=ram['oldest'][0], min=ram['oldest'][1], sec=ram['oldest'][2]))}}
    </p>
-    {{=BUTTON(T('RAM Cache Keys'), _onclick='jQuery("#ram_keys").toggle().toggleClass( "hidden" );')}}
-    <div class="hidden" id="ram_keys">
+    {{=BUTTON(T('RAM Cache Keys'), _onclick='jQuery("#ram_keys").toggle().toggleClass( "w2p_hidden" );')}}
+    <div class="w2p_hidden" id="ram_keys">
      {{=ram['keys']}}
    </div>
    <br />
@@ -212,8 +212,8 @@
      {{=T.M("DISK contains items up to **%(hours)02d** %%{hour(hours)} **%(min)02d** %%{minute(min)} **%(sec)02d** %%{second(sec)} old.",
                dict(hours=disk['oldest'][0], min=disk['oldest'][1], sec=disk['oldest'][2]))}}
      </p>
-      {{=BUTTON(T('Disk Cache Keys'), _onclick='jQuery("#disk_keys").toggle().toggleClass( "hidden" );')}}
-      <div class="hidden" id="disk_keys">
+      {{=BUTTON(T('Disk Cache Keys'), _onclick='jQuery("#disk_keys").toggle().toggleClass( "w2p_hidden" );')}}
+      <div class="w2p_hidden" id="disk_keys">
      {{=disk['keys']}}
      </div>
      <br />
@@ -249,8 +249,8 @@
          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['png'])}}">png</a></li>
          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['svg'])}}">svg</a></li>
          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['pdf'])}}">pdf</a></li>
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['ps'])}}">ps</a></li>          
-          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['dot'])}}">dot</a></li>                                   
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['ps'])}}">ps</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['dot'])}}">dot</a></li>
      </ul>
    </div>
    <br />
@@ -1,14 +1,14 @@
 {{extend 'layout.html'}}

-<iframe src="//player.vimeo.com/hubnut/album/3016728?color=ff6600&amp;background=ffffff&amp;slideshow=1&amp;video_title=1&amp;video_byline=1" width="400" height="300" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
+<center>
+  <iframe src="//player.vimeo.com/hubnut/album/3016728?color=ff6600&amp;background=ffffff&amp;slideshow=1&amp;video_title=1&amp;video_byline=1" width="400" height="300" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
+</center>

-<div class="contentleft">
-    <div >
-        {{=get_content('main')}}
-    </div>
-         {{=get_content('official')}}
-         {{=get_content('community')}}
-         {{=get_content('more')}}
+<div>
+  {{=get_content('main')}}
+  {{=get_content('official')}}
+  {{=get_content('community')}}
+  {{=get_content('more')}}
 </div>


@@ -5,33 +5,59 @@

 <h2>web2py<sup style="font-size:0.5em;">TM</sup> Download</h2>

-<center style="padding:20px">
-  <table class="downloads">
-    <tr>
-      <th>For Normal Users</th>
-      <th>For Testers</th>
-      <th>For Developers</th>
-    </tr>
-    <tr>
-      <td><a class="btn btn-180 btn-success" href="http://www.web2py.com/examples/static/web2py_win.zip">For Windows</a></td>
-      <td><a class="btn btn-180 btn-warning" href="http://www.web2py.com/examples/static/nightly/web2py_win.zip">For Windows</a></td>
-      <td><a class="btn btn-180 btn-danger" href="http://github.com/web2py/web2py/">Git Repository</a></td>
-    </tr>
-    <tr>
-      <td><a class="btn btn-180 btn-success" href="http://www.web2py.com/examples/static/web2py_osx.zip">For Mac</a></td>
-      <td><a class="btn btn-180 btn-warning" href="http://www.web2py.com/examples/static/nightly/web2py_osx.zip">For Mac</a></td>
-      <td></td>
-    </tr>
-    <tr>
-      <td><a class="btn btn-180 btn-success" href="http://www.web2py.com/examples/static/web2py_src.zip">Source Code</a></td>
-      <td><a class="btn btn-180 btn-warning" href="http://www.web2py.com/examples/static/nightly/web2py_src.zip">Source Code</a></td>
-      <td><a class="btn btn-180 btn-danger" href="http://web2py.readthedocs.org/en/latest/">Source code docs</a></td>
-    </tr>
-    <tr>
-      <td><a class="btn btn-180 btn-success" href="https://dl.dropbox.com/u/18065445/web2py/web2py_manual_5th.pdf">Manual</a></td>
-      <td><a class="btn btn-180" href="https://github.com/web2py/web2py/releases">Change Log</a></td>
-      <td><a class="btn btn-180" href="https://github.com/web2py/web2py/issues">Report a Bug</a></td>
-    </tr>
+<center class="spaced">
+  <table class="twothirds">
+    <thead>
+      <tr>
+        <th>For Normal Users</th>
+        <th>For Testers</th>
+        <th>For Developers</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>
+          <a class="btn btn180 rounded red" href="http://www.web2py.com/examples/static/web2py_win.zip">For Windows</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded yellow" href="http://www.web2py.com/examples/static/nightly/web2py_win.zip">For Windows</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded red" href="http://github.com/web2py/web2py/">Git Repository</a>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <a class="btn btn180 rounded red" href="http://www.web2py.com/examples/static/web2py_osx.zip">For Mac</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded yellow" href="http://www.web2py.com/examples/static/nightly/web2py_osx.zip">For Mac</a>
+        </td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>
+          <a class="btn btn180 rounded red" href="http://www.web2py.com/examples/static/web2py_src.zip">Source Code</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded yellow" href="http://www.web2py.com/examples/static/nightly/web2py_src.zip">Source Code</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded red" href="http://web2py.readthedocs.org/en/latest/">Source code docs</a>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <a class="btn btn180 rounded red" href="https://dl.dropbox.com/u/18065445/web2py/web2py_manual_5th.pdf">Manual</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded" href="https://github.com/web2py/web2py/releases">Change Log</a>
+        </td>
+        <td>
+          <a class="btn btn180 rounded" href="https://github.com/web2py/web2py/issues">Report a Bug</a>
+        </td>
+      </tr>
+    </tbody>
  </table>
 </center>

@@ -32,7 +32,7 @@ def hello1():
    return "Hello World"
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}

-    <p>If the controller function returns a string, that is the body of the rendered page.<br/>Try it here: <a href="/{{=request.application}}/simple_examples/hello1">hello1</a></p>
+    <p>If the controller function returns a string, that is the body of the rendered page.<br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/hello1">hello1</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
    {{=CODE("""
@@ -40,7 +40,7 @@ def hello2():
    return T("Hello World")
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}

-    <p>The function T() marks strings that need to be translated. Translation dictionaries can be created at /admin/default/design<br/>Try it here: <a href="/{{=request.application}}/simple_examples/hello2">hello2</a></p>
+    <p>The function T() marks strings that need to be translated. Translation dictionaries can be created at /admin/default/design<br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/hello2">hello2</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
    {{=CODE("""
@@ -51,7 +51,7 @@ def hello3():
    <b>and view: simple_examples/hello3.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/simple_examples/hello3.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>If you return a dictionary, the variables defined in the dictionery are visible to the view (template).
-    <br/>Try it here: <a href="/{{=request.application}}/simple_examples/hello3.html">hello3</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/hello3.html">hello3</a></p>

    <p>Actions can also be be rendered in other formsts like JSON, <a href="/{{=request.application}}/simple_examples/hello3.json">hello3.json</a>, and XML, <a href="/{{=request.application}}/simple_examples/hello3.xml">hello3.xml</a></p>

@@ -62,7 +62,7 @@ def hello4():
    return dict(message=T("Hello World"))
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>You can change the view, but the default is /[controller]/[function].html. If the default is not found web2py tries to render the page using the generic.html view.
-    <br/>Try it here: <a href="/{{=request.application}}/simple_examples/hello4">hello4</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/hello4">hello4</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
    {{=CODE("""
@@ -76,7 +76,7 @@ def hello5():
    <li>named arguments and name starts with '_'. These are mapped blindly into tag attributes and the '_' is removed. attributes without value like "READONLY" can be created with the argument "_readonly=ON".</li>
    <li>named arguments and name does not start with '_'. They have a special meaning. See "value=" for INPUT, TEXTAREA, SELECT tags later.
    </ul>
-    <p>Try it here: <a href="/{{=request.application}}/simple_examples/hello5">hello5</a></p>
+    <p>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/hello5">hello5</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
    {{=CODE("""
@@ -86,7 +86,7 @@ def hello6():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}

    <p>response.flash allows you to flash a message to the user when the page is returned. Use session.flash instead of response.flash to display a message after redirection. With default layout, you can click on the flash to make it disappear.
-    <br/>Try it here: <a href="/{{=request.application}}/simple_examples/hello6">hello6</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/hello6">hello6</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
    {{=CODE("""
@@ -94,7 +94,7 @@ def status():
    return dict(toobar=response.toolbar())
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>Here we are showing the request, session and response objects using the generic.html template.
-    <br/>Try it here: <a href="/{{=request.application}}/simple_examples/status">status</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/status">status</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
    {{=CODE("""
@@ -102,7 +102,7 @@ def redirectme():
    redirect(URL('hello3'))
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>You can do redirect.
-    <br/>Try it here: <a href="/{{=request.application}}/simple_examples/redirectme">redirectme</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/redirectme">redirectme</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
    {{=CODE("""
@@ -110,7 +110,7 @@ def raisehttp():
    raise HTTP(400,"internal error")
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>You can raise HTTP exceptions to return an error page.
-    <br/>Try it here: <a href="/{{=request.application}}/simple_examples/raisehttp">raisehttp</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/raisehttp">raisehttp</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
    {{=CODE("""
@@ -128,7 +128,7 @@ def servejs():
    return 'alert("This is a Javascript document, it is not supposed to run!");'
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>You can serve other than HTML pages by changing the contenttype via the response.headers. The gluon.contenttype module can help you figure the type of the file to be served. NOTICE: this is not necessary for static files unless you want to require authorization.
-    <br/>Try it here: <a href="/{{=request.application}}/simple_examples/servejs">servejs</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/servejs">servejs</a></p>

    <h3 id="example_json">Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
    {{=CODE("""
@@ -136,7 +136,7 @@ def servejs():
        return response.json(['foo', {'bar': ('baz', None, 1.0, 2)}])
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>If you are into Ajax, web2py includes gluon.contrib.<a href="http://cheeseshop.python.org/pypi/simplejson">simplejson</a>, developed by Bob Ippolito. This module provides a fast and easy way to serve asynchronous content to your Ajax page. gluon.simplesjson.dumps(...) can serialize most Python types into <a href="http://www.json.org">JSON</a>. gluon.contrib.simplejson.loads(...) performs the reverse operation.
-    <br/>Try it here: <a href="/{{=request.application}}/simple_examples/makejson">makejson</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/makejson">makejson</a></p>

    <p>New in web2py 1.63: Any normal action returning a dict is automatically serialized in JSON if '.json' is appended to the URL.</p>

@@ -152,7 +152,7 @@ def makertf():
    response.headers['Content-Type']='text/rtf'
    return q.dumps(doc)
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
-    <p>web2py also includes gluon.contrib.<a href="http://pyrtf.sourceforge.net/">pyrtf</a>, developed by Simon Cusack and revised by Grant Edwards. This module allows you to generate Rich Text Format documents including colored formatted text and pictures.<br/>Try it here: <a href="/{{=request.application}}/simple_examples/makertf">makertf</a></p>
+    <p>web2py also includes gluon.contrib.<a href="http://pyrtf.sourceforge.net/">pyrtf</a>, developed by Simon Cusack and revised by Grant Edwards. This module allows you to generate Rich Text Format documents including colored formatted text and pictures.<br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/makertf">makertf</a></p>

    <h3 id="example_rss">Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
    {{=CODE("""
@@ -179,7 +179,7 @@ def rss_aggregator():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>web2py includes gluon.contrib.<a href="http://www.dalkescientific.com/Python/PyRSS2Gen.html">rss2</a>, developed by Dalke Scientific Software, which generates RSS2 feeds, and
    gluon.contrib.<a href="http://www.feedparser.org/">feedparser</a>, developed by Mark Pilgrim, which collects RSS and ATOM feeds. The above controller collects a slashdot feed and makes new one.
-    <br/>Try it here: <a href="/{{=request.application}}/simple_examples/rss_aggregator">rss_aggregator</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/rss_aggregator">rss_aggregator</a></p>


    <h3 id="example_wiki">Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
@@ -194,7 +194,7 @@ def ajaxwiki_onclick():
    return MARKMIN(request.vars.text).xml()
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>The markmin wiki markup is described <a href="{{=URL('static','markmin.html')}}">here</a>.
-    web2py also includes gluon.contrib.<a href="http://code.google.com/p/python-markdown2/">markdown</a>.WIKI helper (markdown2) which converts WIKI markup to HTML following <a href="http://en.wikipedia.org/wiki/Markdown">this syntax</a>. In this example we added a fancy ajax effect.<br/>Try it here: <a href="/{{=request.application}}/simple_examples/ajaxwiki">ajaxwiki</a></p>
+    web2py also includes gluon.contrib.<a href="http://code.google.com/p/python-markdown2/">markdown</a>.WIKI helper (markdown2) which converts WIKI markup to HTML following <a href="http://en.wikipedia.org/wiki/Markdown">this syntax</a>. In this example we added a fancy ajax effect.<br/>Try it here: <a class="btn" href="/{{=request.application}}/simple_examples/ajaxwiki">ajaxwiki</a></p>

    <h2 id="session_examples">Session Examples</h2>

@@ -207,7 +207,7 @@ def counter():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: session_examples/counter.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/session_examples/counter.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>Click to count. The session.counter is persistent for this user and application. Every applicaiton within the system has its own separate session management.
-    <br/>Try it here: <a href="/{{=request.application}}/session_examples/counter">counter</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/session_examples/counter">counter</a></p>

    <h2 id="template_examples">Template Examples</h2>

@@ -219,7 +219,7 @@ def variables():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: template_examples/variables.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/template_examples/variables.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>A view (also known as template) is just an HTML file with &#123;&#123;...&#125;&#125; tags. You can put ANY python code into the tags, no need to indent but you must use pass to close blocks. The view is transformed into a python code and then executed. &#123;&#123;=a&#125;&#125; prints a.xml() or escape(str(a)).
-    <br/>Try it here: <a href="/{{=request.application}}/template_examples/variables">variables</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/template_examples/variables">variables</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: template_examples.py </b>
    {{=CODE("""
@@ -228,7 +228,7 @@ def test_for():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: template_examples/test_for.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/template_examples/test_for.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>You can do for and while loops.
-    <br/>Try it here: <a href="/{{=request.application}}/template_examples/test_for">test_for</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/template_examples/test_for">test_for</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: template_examples.py </b>
    {{=CODE("""
@@ -237,7 +237,7 @@ def test_if():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: template_examples/test_if.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/template_examples/test_if.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>You can do if, elif, else.
-    <br/>Try it here: <a href="/{{=request.application}}/template_examples/test_if">test_if</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/template_examples/test_if">test_if</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: template_examples.py </b>
    {{=CODE("""
@@ -246,7 +246,7 @@ def test_try():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: template_examples/test_try.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/template_examples/test_try.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>You can do try, except, finally.
-    <br/>Try it here: <a href="/{{=request.application}}/template_examples/test_try">test_try</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/template_examples/test_try">test_try</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: template_examples.py </b>
    {{=CODE("""
@@ -255,7 +255,7 @@ def test_def():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: template_examples/test_def.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/template_examples/test_def.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>You can write functions in HTML too.
-    <br/>Try it here: <a href="/{{=request.application}}/template_examples/test_def">test_def</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/template_examples/test_def">test_def</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: template_examples.py </b>
    {{=CODE("""
@@ -264,7 +264,7 @@ def escape():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: template_examples/escape.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/template_examples/escape.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>The argument of  &#123;&#123;=...&#125;&#125; is always escaped unless it is an object with a .xml() method such as link, A(...), a FORM(...), a XML(...) block, etc.
-    <br/>Try it here: <a href="/{{=request.application}}/template_examples/escape">escape</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/template_examples/escape">escape</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: template_examples.py </b>
    {{=CODE("""
@@ -273,7 +273,7 @@ def xml():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: template_examples/xml.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/template_examples/xml.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>If you do not want to escape the argument of  &#123;&#123;=...&#125;&#125; mark it as XML.
-    <br/>Try it here: <a href="/{{=request.application}}/template_examples/xml">xml</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/template_examples/xml">xml</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: template_examples.py </b>
    {{=CODE("""
@@ -282,7 +282,7 @@ def beautify():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: template_examples/beautify.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/template_examples/beautify.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>You can use BEAUTIFY to turn lists and dictionaries into organized HTML.
-    <br/>Try it here: <a href="/{{=request.application}}/template_examples/beautify">beautify</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/template_examples/beautify">beautify</a></p>

    <h2 id="layout_examples">Layout Examples</h2>

@@ -298,7 +298,7 @@ def civilized():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: layout_examples/civilized.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/layout_examples/civilized.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>You can specify the layout file at the top of your view. civilized Layout file is a view that somewhere in the body contains &#123;&#123;include&#125;&#125;.
-    <br/>Try it here: <a href="/{{=request.application}}/layout_examples/civilized">civilized</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/layout_examples/civilized">civilized</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: layout_examples.py </b>
    {{=CODE("""
@@ -310,7 +310,7 @@ def slick():
    return dict(message="you clicked on slick")
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: layout_examples/slick.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/layout_examples/slick.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
-    <p>Same here, but using a different template.<br/>Try it here: <a href="/{{=request.application}}/layout_examples/slick">slick</a></p>
+    <p>Same here, but using a different template.<br/>Try it here: <a class="btn" href="/{{=request.application}}/layout_examples/slick">slick</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: layout_examples.py </b>
    {{=CODE("""
@@ -323,7 +323,7 @@ def basic():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}<b>and view: layout_examples/basic.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/layout_examples/basic.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>'layout.html' is the default template, every application has a copy of it.
-    <br/>Try it here: <a href="/{{=request.application}}/layout_examples/basic">basic</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/layout_examples/basic">basic</a></p>

    <h2 id="form_examples">Form Examples</h2>

@@ -347,7 +347,7 @@ def form():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>You can use HTML helpers like FORM, INPUT, TEXTAREA, OPTION, SELECT to build forms. The "value=" attribute sets the initial value of the field (works for TEXTAREA and OPTION/SELECT too) and the requires attribute sets the validators.
    FORM.accepts(..) tries to validate the form and, on success, stores vars into form.vars. On failure the error messages are stored into form.errors and shown in the form.
-    <br/>Try it here: <a href="/{{=request.application}}/form_examples/form">form</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/form_examples/form">form</a></p>

    <h2 id="database_examples">Database Examples</h2>

@@ -497,7 +497,7 @@ def cache_in_ram():
    return dict(time=t,link=A('click to reload',_href=URL(r=request)))
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>The output of <tt>lambda:time.ctime()</tt> is cached in ram for 5 seconds. The string 'time' is used as cache key.
-    <br/>Try it here: <a href="/{{=request.application}}/cache_examples/cache_in_ram">cache_in_ram</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/cache_examples/cache_in_ram">cache_in_ram</a></p>


    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: cache_examples.py </b>
@@ -508,7 +508,7 @@ def cache_on_disk():
    return dict(time=t,link=A('click to reload',_href=URL(r=request)))
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>The output of <tt>lambda:time.ctime()</tt> is cached on disk (using the shelve module) for 5 seconds.
-    <br/>Try it here: <a href="/{{=request.application}}/cache_examples/cache_on_disk">cache_on_disk</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/cache_examples/cache_on_disk">cache_on_disk</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: cache_examples.py </b>
    {{=CODE("""
@@ -519,7 +519,7 @@ def cache_in_ram_and_disk():
    return dict(time=t,link=A('click to reload',_href=URL(r=request)))
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>The output of <tt>lambda:time.ctime()</tt> is cached on disk (using the shelve module) and then in ram for 5 seconds. web2py looks in ram first and if not there it looks on disk. If it is not on disk it calls the function. This is useful in a multiprocess type of environment. The two times do not have to be the same.
-    <br/>Try it here: <a href="/{{=request.application}}/cache_examples/cache_in_ram_and_disk">cache_in_ram_and_disk</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/cache_examples/cache_in_ram_and_disk">cache_in_ram_and_disk</a></p>


    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: cache_examples.py </b>
@@ -530,7 +530,7 @@ def cache_in_ram_and_disk():
    t=time.ctime()
    return dict(time=t,link=A('click to reload',_href=URL(r=request)))""".strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>Here the entire controller (dictionary) is cached in ram for 5 seconds. The result of a select cannot be cached unless it is first serialized into a table <tt>lambda:SQLTABLE(db().select(db.user.ALL)).xml()</tt>. You can read below for an even better way to do it.
-    <br/>Try it here: <a href="/{{=request.application}}/cache_examples/cache_controller_in_ram">cache_controller_in_ram</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/cache_examples/cache_controller_in_ram">cache_controller_in_ram</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: cache_examples.py </b>
    {{=CODE("""
@@ -541,7 +541,7 @@ def cache_controller_on_disk():
    return dict(time=t,link=A('click to reload',_href=URL(r=request)))
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p>Here the entire controller (dictionary) is cached on disk for 5 seconds. This will not work if the dictionary contains unpickleable objects.
-    <br/>Try it here: <a href="/{{=request.application}}/cache_examples/cache_controller_on_disk">cache_controller_on_disk</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/cache_examples/cache_controller_on_disk">cache_controller_on_disk</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: cache_examples.py </b>
    {{=CODE("""
@@ -553,7 +553,7 @@ def cache_controller_and_view():
    return response.render(d)
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <p><tt>response.render(d)</tt> renders the dictionary inside the controller, so everything is cached now for 5 seconds. This is best and fastest way of caching!
-    <br/>Try it here: <a href="/{{=request.application}}/cache_examples/cache_controller_and_view">cache_controller_and_view</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/cache_examples/cache_controller_and_view">cache_controller_and_view</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: cache_examples.py </b>
    {{=CODE("""
@@ -583,7 +583,7 @@ def data():
    <b>In view: ajax_examples/index.html</b>
    {{=CODE(open(os.path.join(request.folder,'views/ajax_examples/index.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
    <p>The javascript function "ajax" is provided in "web2py_ajax.html" and included by "layout.html". It takes three arguments, a url, a list of ids and a target id. When called, it sends to the url (via a get) the values of the ids and display the response in the value (of innerHTML) of the target id.
-    <br/>Try it here: <a href="/{{=request.application}}/ajax_examples/index">index</a></p>
+    <br/>Try it here: <a class="btn" href="/{{=request.application}}/ajax_examples/index">index</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: ajax_examples.py </b>
    {{=CODE("""
@@ -591,7 +591,7 @@ def flash():
    response.flash='this text should appear!'
    return dict()
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
-    <p>Try it here: <a href="/{{=request.application}}/ajax_examples/flash">flash</a></p>
+    <p>Try it here: <a class="btn" href="/{{=request.application}}/ajax_examples/flash">flash</a></p>

    <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: ajax_examples.py </b>
    {{=CODE("""
@@ -600,7 +600,7 @@ def fade():
    """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
    <b>In view: ajax_examples/fade.html </b><br/>
    {{=CODE(open(os.path.join(request.folder,'views/ajax_examples/fade.html'),'r').read(),language='html',link=URL('global','vars'),_class='boxCode')}}
-    <p>Try it here: <a href="/{{=request.application}}/ajax_examples/fade">fade</a></p>
+    <p>Try it here: <a class="btn" href="/{{=request.application}}/ajax_examples/fade">fade</a></p>

    <h3>Excel-like spreadsheet via Ajax</h3>
    Web2py includes a widget that acts like an Excel-like spreadsheet and can be used to build forms
@@ -1,21 +1,8 @@
 {{extend 'layout.html'}}
-{{
-import random
-quotes = [
-        ("web2py was the life saver today for me, my blog post: Standalone Usage of web2py's", "caglartoklu", "http://twitter.com/#!/caglartoklu/status/84292131707031553"),
-        ("Get Things Done - Faster, Better and More Easily with web2py",
-         "Bruno Rocha",  "http://twitter.com/#!/rochacbruno/status/73583156044890112"),
-        ("Please use www.web2py.com when using MVC , no PHP/SQL stuff please...its 2011 not 1999", "rabblesoft", "http://twitter.com/#!/rabblesoft/status/79189028431343616"),
-        ('web2py rules! as a sysadmin I like the no installation and no configuration approach a lot)', "kjogut", "http://twitter.com/#!/jkogut/status/61414554273447936"),
-        ("web2py it is. Compatible with everything under the sun and great interfaces to googleappengine", "comamitc","http://twitter.com/#!/comamitc/status/51744719071477760"),
-        ("If you are still learning python, web2py is best tool by far", "pbreit", "http://twitter.com/#!/pbreit/status/48260905775017984")
-        ]
-random.shuffle(quotes)
-}}

-<div class="row-fluid">
-  <div class="span12">
-    <div class="span8">
+<div class="container">
+  <div class="twothirds">
+    <div class="padded">
      <h3>web2py<sup>TM</sup> Web Framework</h3>
      <p>Free open source full-stack framework for rapid development of fast, scalable, <a href="http://www.web2py.com/book/default/chapter/01#Security" target="_blank">secure</a> and portable database-driven web-based applications. Written and programmable in <a href="http://www.python.org" target="_blank">Python</a>.</p>
      <table width="100%">
@@ -39,45 +26,46 @@ random.shuffle(quotes)
      </table>
      <p>Current version: <a href="{{=URL('download')}}">{{=request.env.web2py_version}} (<a href="http://www.gnu.org/licenses/lgpl.html">LGPLv3 License</a>)</p>
    </div>
-    <div class="span4" style="text-align:center">
-      <a href="http://www.infoworld.com/slideshow/24605/infoworlds-2012-technology-of-the-year-award-winners-183313#slide23"><img src="{{=URL('static','images/infoworld2012.jpeg')}}" width="200px"/></a><br/>
-      <a class="btn btn-danger" href="{{=URL('download')}}" style="margin-top:10px; width:180px; color:white">Download Now</a><br/>
-      <a class="btn btn-danger" href="https://www.pythonanywhere.com/try-web2py" style="margin-top:10px; width:180px; color:white">Try it now online</a><br/>
-      <a class="btn btn-danger" href="http://web2py.com/poweredby" style="margin-top:10px; width:180px; color:white">Sites Powered by web2py</a><br/><br/>
-      <a class="coinbase-button" data-code="df71ec5c2d5bc3b1c18139ab645f352b" data-button-style="donation_large" href="https://coinbase.com/checkouts/df71ec5c2d5bc3b1c18139ab645f352b">Donate Bitcoins</a><script src="https://coinbase.com/assets/button.js" type="text/javascript"></script>
+  </div>
+  <div class="third">
+    <div class="padded center">
+      <a href="http://www.infoworld.com/slideshow/24605/infoworlds-2012-technology-of-the-year-award-winners-183313#slide23">
+        <img src="{{=URL('static','images/infoworld2012.jpeg')}}">
+      </a>
+      <a class="btn rounded red fill" href="{{=URL('download')}}">
+        Download Now
+      </a>
+      <a class="btn rounded red fill" href="https://www.pythonanywhere.com/try-web2py">
+        Try it now online
+      </a>
+      <a class="btn rounded red fill" href="http://web2py.com/poweredby">
+        Sites Powered by web2py
+      </a>
    </div>
  </div>
 </div>
-<div class="row-fluid">
-  <div class="span12">
-    <div class="span4">
-      <h3><a href="{{=URL('what')}}">Batteries Included</a></h3>
+<div class="container">
+  <div class="third">
+    <div class="padded">
+      <h5><a href="{{=URL('what')}}">Batteries Included</a></h5>
      <p>Everything you need in one package including fast multi-threaded web server, SQL database and web-based interface. No third party dependencies but works with <a href={{=URL('what')}}>third party tools</a>.</p>
    </div>
-    <div class="span4">
-      <h3><a href="http://web2py.com/demo_admin">Web-Based IDE</a></h3>
+  </div>
+  <div class="third">
+    <div class="padded">
+      <h5><a href="http://web2py.com/demo_admin">Web-Based IDE</a></h5>
      <p>Create, modify, deploy and manage application from anywhere using your browser. One web2py instance can run multiple web sites using different databases. Try the <a href="http://www.web2py.com/demo_admin">interactive demo</a>.</p>
    </div>
-    <div class="span4">
-      <h3><a href="{{=URL('documentation')}}">Extensive Docs</a></h3>
+  </div>
+  <div class="third">
+    <div class="padded">
+      <h5><a href="{{=URL('documentation')}}">Extensive Docs</a></h5>
      <p>Start with some <a href="{{=URL('examples')}}">quick examples</a>, then read the <a href="http://www.web2py.com/book" target="_blank">manual</a> and the <a href="http://web2py.readthedocs.org/en/latest/" target="_blank">Sphinx docs</a>, watch <a href="http://vimeo.com/album/178500" target="_blank">videos</a>, and join a <a href="{{=URL('default', 'usergroups')}}">user group</a> for discussion. Take advantage of the <a href="http://www.web2py.com/layouts" target="_blank">layouts</a>, <a href="http://dev.s-cubism.com/web2py_plugins" target="_blank">plugins</a>, <a href="http://www.web2py.com/appliances" target="_blank">appliances</a>, and <a href="http://web2pyslices.com" target="_blank">recipes</a>.</p>
    </div>
  </div>
 </div>
-<div class="row-fluid">
-  <div class="span12">
+<div class="container">
+  <div class="fill padded">
    <img class="scale-with-grid centered" src="/examples/static/images/shadow-bottom.png">
  </div>
 </div>
-<div class="row-fluid">
-  <div class="span12">
-    {{for k,quote in enumerate(quotes[:3]):}}
-    <div class="span4">
-      <p style="text-align: left"><em>{{=quote[0]}}</em></p>
-      <span class="right">
-	<a href="{{=quote[2]}}">{{=quote[1]}}</a>
-      </span>
-    </div>
-    {{pass}}
-  </div>
-</div>
@@ -17,14 +17,11 @@
    <ul>
      <li><a target="_blank" href="http://experts4solutions.com">Experts4Soutions</a> (worldwide)</li>
      <li><a target="_blank" href="http://www.planethost.com">PlanetHost</a> (USA)</li>
-      <li><a target="_blank" href="http://www.10biosystems.com">10BioSystems</a> (USA)</li>
-      <li><a target="_blank" href="http://www.formatics.nl">Formatics</a> (Netherlands)</li>
      <li><a target="_blank" href="http://www.corebyte.nl">Corebyte</a> (Netherlands)</li>
      <li><a target="_blank" href="http://www.dutveul.nl">Dutveul</a> (Netherlands)</li>
      <li><a target="_blank" href="http://www.onemewebservices.com">OneMeWebServices</a> (Canada)</li>
      <li><a target="_blank" href="http://www.budgetbytes.nl">BudgetBytes</a> (The Netherlands)</li>
      <li><a target="_blank" href="http://www.androsoft.pl">ANDROSoft</a> (Poland)</li>
-
      <li><a target="_blank" href="http://www.sonnetech.com.br">Sonne Tech</a> (Brazil)</li>
      <li><a target="_blank" href="http://www.nrg.com.br">NRG Internet Solutions</a> (Brazil)</li>
      <li><a target="_blank" href="http://itjp.net.br/">ITJP</a> (Brazil)</li>
@@ -32,15 +29,15 @@
      <li><a target="_blank" href="http://www.definescope.com/">DefineScope</a> (Portugal)</li>
      <li><a target="_blank" href="http://lpfx.com.br">LPFX</a> (Brazil)</li>
      <li><a target="_blank" href="http://emotionull.com">Emotionull</a> (Greece and Cyprus)</li>
-      <li><a target="_blank" href="http://www.vsa-services.com/">VSA Services</a> (Singapore)</li>
      <li><a target="_blank" href="http://www.albendas.com">Albendas</a> (Spain)</li>
-      <li><a target="_blank" href="www.corebyte.nl">Corebyte</a> (Netherland)</li>
-      <li><a target="_blank" href="https://loadinfo-net.appspot.com">LoadInfo</a> (Bulgaria)</li>
      <li><a target="_blank" href="http://www.appliedobjects.com">Applied Objects</a> (New Zealand)</li>
      <li><a target="_blank" href="http://www.sistemasagiles.com.ar/">Sistemas Ágiles</a> ("Agile Systems") (Argentina)</li>
      <li><a target="_blank" href="http://www.definescope.com/en/services/consulting/">DefineScope</a> (Portugal)</li>
-      <li><a target="_blank" href="http://10Biosystems.com">10BioSystems</a></li>
-      <li><a target="_blank" href="http://www.dutveul.nl">Dutveul</a> (Netherlands)</li>
+      <li><a target="_blank" href="http://www.tasko.it/">Tasko</a> (Italy)</li>
+      <li><a target="_blank" href="http://www.geekondemand.it/"> GeekOnDemand</a> (Italy)</li>
+      <li><a target="_blank" href="http://stifix.com"> Stifix</a> (Indonesia)</li>
+      <li><a target="_blank" href="http://www.garciac.es"> Garciac</a> (Spain)</li>
+      <li><a target="_blank" href="http://memoriapersistente.pt "> Memoria persistente</a> (Portugal)</li>
    </ul>

 </div>
@@ -5,6 +5,7 @@

 {{block right_sidebar}}
 <center>
+  <!--
  <h3 class="feature-title">SITES POWERED BY WEB2PY</h3>
  <a href="http://web2py.com/poweredby"><img class="frame" id="img1" width="200px"/></a>
  <a href="http://web2py.com/poweredby"><img class="frame" id="img2" width="200px"/></a>
@@ -14,7 +15,7 @@
  <a href="http://web2py.com/poweredby"><img class="frame" id="img6" width="200px"/></a>
  <a href="http://web2py.com/poweredby"><img class="frame" id="img7" width="200px"/></a>
  <a href="http://web2py.com/poweredby"><img class="frame" id="img8" width="200px"/></a>
-  </div>
+  -->
 </center>
 <script>
  function showimages() {
@@ -1,173 +1,67 @@
-<!--[if HTML5]><![endif]-->
-<!DOCTYPE html>
-<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
-<!--[if lt IE 7]><html class="ie ie6 ie-lte9 ie-lte8 ie-lte7 no-js" lang="{{=T.accepted_language or 'en'}}"> <![endif]-->
-<!--[if IE 7]><html class="ie ie7 ie-lte9 ie-lte8 ie-lte7 no-js" lang="{{=T.accepted_language or 'en'}}"> <![endif]-->
-<!--[if IE 8]><html class="ie ie8 ie-lte9 ie-lte8 no-js" lang="{{=T.accepted_language or 'en'}}"> <![endif]-->
-<!--[if IE 9]><html class="ie9 ie-lte9 no-js" lang="{{=T.accepted_language or 'en'}}"> <![endif]-->
-<!--[if (gt IE 9)|!(IE)]><!--> <html class="no-js" lang="{{=T.accepted_language or 'en'}}"> <!--<![endif]-->
-<head>
-<title>{{=response.title or request.application}}</title>
-  <!--[if !HTML5]>
-      <meta http-equiv="X-UA-Compatible" content="IE=edge{{=not request.is_local and ',chrome=1' or ''}}">
-  <![endif]-->
-  <!-- www.phpied.com/conditional-comments-block-downloads/ -->
-  <!-- Always force latest IE rendering engine
-       (even in intranet) & Chrome Frame
-       Remove this if you use the .htaccess -->
-	   
-  <meta charset="utf-8" />
-
-  <!-- http://dev.w3.org/html5/markup/meta.name.html -->
-  <meta name="application-name" content="{{=request.application}}" />
-
-  <!-- Speaking of Google, don't forget to set your site up:
-       http://google.com/webmasters -->
-  <meta name="google-site-verification" content="" />
-
-  <!--  Mobile Viewport Fix
-        j.mp/mobileviewport & davidbcalhoun.com/2010/viewport-metatag
-        device-width: Occupy full width of the screen in its current orientation
-        initial-scale = 1.0 retains dimensions instead of zooming out if page height > device height
-        user-scalable = yes allows the user to zoom in -->
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
-  <link rel="shortcut icon" href="{{=URL('static','images/favicon.ico')}}" type="image/x-icon">
-  <link rel="apple-touch-icon" href="{{=URL('static','images/favicon.png')}}">
-
-  <!-- All JavaScript at the bottom, except for Modernizr which enables
-       HTML5 elements & feature detects -->
-  <script src="{{=URL('static','js/modernizr.custom.js')}}"></script>
-
-  <!-- include stylesheets -->
-  {{  
-  response.files.append(URL('static','css/web2py.css'))
-  response.files.append(URL('static','css/bootstrap.min.css'))
-  response.files.append(URL('static','css/bootstrap-responsive.min.css'))
-  response.files.append(URL('static','css/web2py_bootstrap.css'))
-  response.files.append(URL('static','css/examples.css'))
-  }}
-
-  {{include 'web2py_ajax.html'}}
-
-  {{
-  # using sidebars need to know what sidebar you want to use
-  left_sidebar_enabled = globals().get('left_sidebar_enabled',False)
-  right_sidebar_enabled = globals().get('right_sidebar_enabled',False)
-  middle_columns = {0:'span12',1:'span9',2:'span6'}[
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <link href="{{=URL('static','css/stupid.css')}}" rel="stylesheet" type="text/css"/>
+    <link href="{{=URL('static','css/calendar.css')}}" rel="stylesheet" type="text/css"/>
+    <link href="{{=URL('static','css/web2py.css')}}" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
+    <style>
+      th {color: black}
+      tbody tr:hover {background-color:transparent}
+      tbody tr {border-bottom: none}
+      p {text-align: left}
+      pre {background-color: black!important;border-radius:5px; color:white; padding:10px}
+      a.btn.btn180 {padding:20px; font-size:1.2em; width:200px!important}
+    </style>
+    {{
+    left_sidebar_enabled = globals().get('left_sidebar_enabled', False)
+    right_sidebar_enabled = globals().get('right_sidebar_enabled', False)
+    middle_column = {0: 'fill', 1: 'threequarters', 2: 'half'}[
    (left_sidebar_enabled and 1 or 0)+(right_sidebar_enabled and 1 or 0)]
-  }}
-
-  <!-- uncomment here to load jquery-ui
-       <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css" type="text/css" media="all" />
-       <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
-       uncomment to load jquery-ui //-->
-  <noscript><link href="{{=URL('static', 'css/web2py_bootstrap_nojs.css')}}" rel="stylesheet" type="text/css" /></noscript>
-  {{block head}}{{end}}
-</head>
-
-<body>
-  <!-- Navbar ================================================== -->
-  <div class="navbar navbar-inverse navbar-fixed-top">
-    <div class="flash">{{=response.flash or ''}}</div>
-    <div class="navbar-inner">
-      <div class="container">
-        <!-- the next tag is necessary for bootstrap menus, do not remove -->
-        <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-	{{=response.logo or ''}}
-        <ul id="navbar" class="nav pull-right">{{='auth' in globals() and auth.navbar(mode="dropdown") or ''}}</ul>
-        <div class="nav-collapse">
-          {{is_mobile=request.user_agent().is_mobile}}
-          {{if response.menu:}}
-          {{=MENU(response.menu, _class='mobile-menu nav' if is_mobile else 'nav',mobile=is_mobile,li_class='dropdown',ul_class='dropdown-menu')}}
-          {{pass}}
-        </div><!--/.nav-collapse -->
-      </div>
-    </div>
-  </div><!--/top navbar -->
-
-  <div class="container">
-    <!-- Masthead ================================================== -->
-    <header class="mastheader" id="header">
-      <div class="span4">
-        <div class="page-header">
-	  <img src="{{=URL('static','images/web2py_logo.png')}}" class="logo" alt="web2py logo" />
+    }}
+    {{include "web2py_ajax.html"}}
+  </head>
+  <body class="black">   
+    <header class="black padded">      
+      <div class="container middle max900">
+        <div class="fill middle">                    
+          <label class="ham padded fa fa-bars" for="menu"></label>
+          <div class="burger accordion">
+            <input type="checkbox" id="menu"/>
+            {{=MENU(response.menu,_class='menu')}}
+          </div>
        </div>
      </div>
    </header>
-  </div>
-  <div class="container">
-
-    <section id="main" class="main row">
-        {{if left_sidebar_enabled:}}
-        <div class="span3 left-sidebar">
-            {{block left_sidebar}}
-            <h3>Left Sidebar</h3>
-            <p></p>
-            {{end}}
-        </div>
-        {{pass}}
-
-        <div class="{{=middle_columns}}">
-            {{block center}}
-            {{include}}
-            {{end}}
-        </div>
-
-        {{if right_sidebar_enabled:}}
-        <div class="span3">
-            {{block right_sidebar}}
-            <h3>Right Sidebar</h3>
-            <p></p>
-            {{end}}
-        </div>
-        {{pass}}
-    </section><!--/main-->
-
-    <!-- Footer ================================================== -->
-    <div class="row">
-        <footer class="footer span12" id="footer">
-            <div class="footer-content">
-                {{block footer}} <!-- this is default footer -->
-                <div id="poweredBy" class="pull-right">
-		  {{=T('Copyright')}} &#169; {{=request.now.year}} -
-                    {{=T('Powered by')}}
-                    <a href="http://www.web2py.com/">web2py</a> -
-		    {{=T('Hosted by')}}
-                    <a href="http://pythonanywhere.com">PythonAnywhere</a>
-                </div>
-                {{end}}
-            </div>
-        </footer>
+    {{if response.flash:}}
+    <div class="w2p_flash">
+      {{=response.flash}}
    </div>
-
-  </div> <!-- /container -->
-
-  <!-- The javascript =============================================
-       (Placed at the end of the document so the pages load faster) -->
-  <script src="{{=URL('static','js/bootstrap.min.js')}}"></script>
-  <script src="{{=URL('static','js/web2py_bootstrap.js')}}"></script>
-  <!--[if lt IE 7 ]>
-      <script src="{{=URL('static','js/dd_belatedpng.js')}}"></script>
-      <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
-      <![endif]-->
-  
-  {{if response.google_analytics_id:}}
-  <script src="{{=URL('static','js/analytics.min.js')}}"></script>
-  <script type="text/javascript">
-  analytics.initialize({
-    'Google Analytics':{trackingId:'{{=response.google_analytics_id}}'} 
-  });</script>
-  {{pass}}
-  <script src="{{=URL('static','js/share.js',vars=dict(static=URL('static','images')))}}"></script>
-  <a style="position:fixed;bottom:0;left:0;z-index:1000" href="https://groups.google.com/forum/?fromgroups#!forum/web2py" target="_blank">
-    <img src="{{=URL('static','images/questions.png')}}" />
-  </a>
-
-</body>
+    {{pass}}
+    <main class="white">
+      <div class="container max900">
+        {{if left_sidebar_enabled:}}
+        <div class="quarter padded">{{block left_sidebar}}{{end}}</div>
+        {{pass}}
+        <div class="{{=middle_column}} padded">{{include}}</div>
+        {{if right_sidebar_enabled:}}
+        <div class="quarter padded">{{block right_sidebar}}{{end}}</div>
+        {{pass}}
+      </div>
+    </main>
+    <footer class="black">
+      <div class="container padded max900">
+        <div class="fill">
+          Copyright @ 2016 - Powered by Web2py
+        </div>
+      </div>
+    </footer>
+  </body>  
+  <script>
+    // prevent android horizontal scrolling
+    window.addEventListener("scroll", function(){window.scroll(0, window.pageYOffset);}, false);
+  </script>
 </html>
-
@@ -576,7 +576,7 @@ def bg_graph_model():
            meta_graphmodel = dict(group=request.application, color='#ECECEC')

        group = meta_graphmodel['group'].replace(' ', '')
-        if not subgraphs.has_key(group):
+        if group not in subgraphs:
            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
        subgraphs[group]['tables'].append(tablename)

@@ -14,10 +14,12 @@ from gluon.contrib.appconfig import AppConfig
 ## once in production, remove reload=True to gain full speed
 myconf = AppConfig(reload=True)

-
 if not request.env.web2py_runtime_gae:
    ## if NOT running on Google App Engine use SQLite or other DB
-    db = DAL(myconf.take('db.uri'), pool_size=myconf.take('db.pool_size', cast=int), check_reserved=['all'])
+    db = DAL(myconf.get('db.uri'), 
+             pool_size = myconf.get('db.pool_size'),
+             migrate_enabled = myconf.get('db.migrate'),
+             check_reserved = ['all'])
 else:
    ## connect to Google BigTable (optional 'google:datastore://namespace')
    db = DAL('google:datastore+ndb')
@@ -32,8 +34,8 @@ else:
 ## none otherwise. a pattern can be 'controller/function.extension'
 response.generic_patterns = ['*'] if request.is_local else []
 ## choose a style for forms
-response.formstyle = myconf.take('forms.formstyle')  # or 'bootstrap3_stacked' or 'bootstrap2' or other
-response.form_label_separator = myconf.take('forms.separator')
+response.formstyle = myconf.get('forms.formstyle')  # or 'bootstrap3_stacked' or 'bootstrap2' or other
+response.form_label_separator = myconf.get('forms.separator') or ''


 ## (optional) optimize handling of static files
@@ -53,7 +55,7 @@ response.form_label_separator = myconf.take('forms.separator')

 from gluon.tools import Auth, Service, PluginManager

-auth = Auth(db)
+auth = Auth(db, host=myconf.get('host.name'))
 service = Service()
 plugins = PluginManager()

@@ -62,9 +64,11 @@ auth.define_tables(username=False, signature=False)

 ## configure email
 mail = auth.settings.mailer
-mail.settings.server = 'logging' if request.is_local else myconf.take('smtp.server')
-mail.settings.sender = myconf.take('smtp.sender')
-mail.settings.login = myconf.take('smtp.login')
+mail.settings.server = 'logging' if request.is_local else myconf.get('smtp.server')
+mail.settings.sender = myconf.get('smtp.sender')
+mail.settings.login = myconf.get('smtp.login')
+mail.settings.tls = myconf.get('smtp.tls') or False
+mail.settings.ssl = myconf.get('smtp.ssl') or False

 ## configure auth policy
 auth.settings.registration_requires_verification = False
@@ -12,10 +12,10 @@ response.title = request.application.replace('_',' ').title()
 response.subtitle = ''

 ## read more at http://dev.w3.org/html5/markup/meta.name.html
-response.meta.author = 'Your Name <you@example.com>'
-response.meta.description = 'a cool new app'
-response.meta.keywords = 'web2py, python, framework'
-response.meta.generator = 'Web2py Web Framework'
+response.meta.author = myconf.get('app.author')
+response.meta.description = myconf.get('app.description')
+response.meta.keywords = myconf.get('app.keywords')
+response.meta.generator = myconf.get('app.generator')

 ## your http://google.com/analytics id
 response.google_analytics_id = None
@@ -1,17 +1,28 @@
 ; App configuration
+[app]
+name        = Welcome
+author      = Your Name <you@example.com>
+description = a cool new app
+keywords    = web2py, python, framework
+generator   = Web2py Web Framework
+
+; Host configuration
+[host]
+name = localhost

 ; db configuration
 [db]
 uri       = sqlite://storage.sqlite
-migrate   = 1
-pool_size = 1
+migrate   = true
+pool_size = 10 ; ignored for sqlite

 ; smtp address and credentials
 [smtp]
 server = smtp.gmail.com:587
 sender = you@gmail.com
 login  = username:password
-
+tls    = true
+ssl    = true

 ; form styling
 [forms]
@@ -108,7 +108,7 @@ select.autocomplete {
    background: url(../images/background.jpg) no-repeat center center;
 }
 body {
-    padding-top: 50px;
+    padding-top: 60px;
    margin-bottom: 60px;
 }
 header {
@@ -233,7 +233,7 @@ div.error_wrapper {
    line-height: 20px;
    margin-right: 2px;
    display: inline-block;
-    padding: 3px 5px;
+    padding: 6px 12px;
 }
 .web2py_counter {
    margin-top: 5px;
@@ -270,6 +270,7 @@ li.w2p_grid_breadcrumb_elem {
 .web2py_console select,
 .web2py_console a {
    margin: 2px;
+    padding: 6px 12px;
 }
 #wiki_page_body {
    width: 600px;
@@ -285,7 +286,7 @@ li.w2p_grid_breadcrumb_elem {
 .web2py_console .form-control {
    width: 20%;
    display: inline;
-    height: 100%;
+    height: 32px;
 }
 .web2py_console #w2p_keywords {
    width: 50%;
@@ -120,7 +120,7 @@ args=()
 class=handlers.RotatingFileHandler
 level=DEBUG
 formatter=simpleFormatter
-args=("logs/web2py.log", "a", 1000000, 5)
+args=("web2py.log", "a", 1000000, 5)

 [handler_osxSysLogHandler]
 class=handlers.SysLogHandler
@@ -5,6 +5,9 @@ import os
 import datetime
 import getpass

+if os.path.exists('hosts'):
+    env.hosts = [h.strip() for h in open('hosts').readlines() if h.strip()]
+
 env.hosts = env.hosts or raw_input('hostname (example.com):').split(',')
 env.user = env.user or raw_input('username              :')

@@ -85,7 +88,7 @@ def mkdir_or_backup(appname):
 def git_deploy(appname, repo):
    """fab -H username@host git_deploy:appname,username/remoname"""
    appfolder = applications+'/'+appname
-    backup = mkdir_or_backup(appfolder)
+    backup = mkdir_or_backup(appname)

    if exists(appfolder):
        with cd(appfolder):
@@ -95,7 +98,7 @@ def git_deploy(appname, repo):
        with cd(applications):
            sudo('git clone git@github.com/%s %s' % (repo, name))
            sudo('chown -R www-data:www-data %s' % name)
-    
+
 def retrieve(appname=None):
    """fab -H username@host retrieve:appname"""
    appname = appname or os.path.split(os.getcwd())[-1]
@@ -115,18 +118,22 @@ def deploy(appname=None, all=False):
    if os.path.exists('_update.zip'):
        os.unlink('_update.zip')

-    backup = mkdir_or_backup(appfolder)
+    backup = mkdir_or_backup(appname)
            
    if all=='all' or not backup:
        local('zip -r _update.zip * -x *~ -x .* -x \#* -x *.bak -x *.bak2')
    else:        
        local('zip -r _update.zip */*.py views/*.html views/*/*.html static/*')
-    put('_update.zip','/tmp/_update.zip')

-    with cd(appfolder):
-        sudo('unzip -o /tmp/_update.zip')
-        sudo('chown -R www-data:www-data *')
-        sudo('echo "%s" > DATE_DEPLOYMENT' % now)
+    put('_update.zip','/tmp/_update.zip')
+    try:
+        with cd(appfolder):
+            sudo('unzip -o /tmp/_update.zip')
+            sudo('chown -R www-data:www-data *')
+            sudo('echo "%s" > DATE_DEPLOYMENT' % now)
+    
+    finally:
+        sudo('rm /tmp/_update.zip')
               
    if backup:
        print 'TO RESTORE: fab restore:%s' % backup
@@ -476,11 +476,11 @@ def compile_views(folder, skip_failed_views=False):
            data = parse_template(fname, path)
        except Exception, e:
            if skip_failed_views:
-                failed_views.append(file)
+                failed_views.append(fname)
            else:
-                raise Exception("%s in %s" % (e, file))
+                raise Exception("%s in %s" % (e, fname))
        else:
-            filename = ('views/%s.py' % file).replace('/', '_').replace('\\', '_')
+            filename = ('views/%s.py' % fname).replace('/', '_').replace('\\', '_')
            filename = pjoin(folder, 'compiled', filename)
            write_file(filename, data)
            save_pyc(filename)
@@ -676,8 +676,8 @@ def run_view_in(environment):
    else:
        filename = pjoin(folder, 'views', view)
        if os.path.exists(path): # compiled views
-            x = view.replace('/', '_')
-            files = ['views_%s.pyc' % x]
+            x = view.replace('/', '.')
+            files = ['views.%s.pyc' % x]
            is_compiled = os.path.exists(pjoin(path, files[0]))
            # Don't use a generic view if the non-compiled view exists.
            if is_compiled or (not is_compiled and not os.path.exists(filename)):
@@ -35,7 +35,6 @@ from gluon.serializers import json_parser

 locker = thread.allocate_lock()

-
 def AppConfig(*args, **vars):

    locker.acquire()
@@ -59,6 +58,27 @@ class AppConfigDict(dict):
        dict.__init__(self, *args, **kwargs)
        self.int_cache = {}

+    def get(self, path, default=None):
+        try:
+            value = self.take(path).strip()
+            if value.lower() in ('none','null',''):
+                return None
+            elif value.lower() == 'true':
+                return True
+            elif value.lower() == 'false':
+                return False
+            elif value.isdigit() or (value[0]=='-' and value[1:].isdigit()):
+                return int(value)
+            elif ', ' in value:
+                return value.split(', ')
+            else:
+                try:
+                    return float(value)
+                except:
+                    return value
+        except:
+            return default
+
    def take(self, path, cast=None):
        parts = path.split('.')
        if path in self.int_cache:
@@ -27,10 +27,10 @@ from gluon import current

 class RESIZE(object):

-    def __init__(self, nx=160, ny=80, quality=100,
+    def __init__(self, nx=160, ny=80, quality=100, padding = False
                 error_message=' image resize'):
-        (self.nx, self.ny, self.quality, self.error_message) = (
-            nx, ny, quality, error_message)
+        (self.nx, self.ny, self.quality, self.error_message, self.padding) = (
+            nx, ny, quality, error_message, padding)

    def __call__(self, value):
        if isinstance(value, str) and len(value) == 0:
@@ -41,7 +41,14 @@ class RESIZE(object):
            img = Image.open(value.file)
            img.thumbnail((self.nx, self.ny), Image.ANTIALIAS)
            s = cStringIO.StringIO()
-            img.save(s, 'JPEG', quality=self.quality)
+            if self.padding:
+                background = Image.new('RGBA', (self.nx, self.ny), (255, 255, 255, 0))
+                background.paste(
+                    img,
+                    ((self.nx - img.size[0]) / 2, (self.ny - img.size[1]) / 2))
+                background.save(s, 'JPEG', quality=self.quality)
+            else:
+                img.save(s, 'JPEG', queality=self.quality)
            s.seek(0)
            value.file = s
        except:
@@ -421,7 +421,8 @@ def ldap_auth(server='ldap',
                    store_user_mail = None
                update_or_insert_values = {'first_name': store_user_firstname,
                                           'last_name': store_user_lastname,
-                                           'email': store_user_mail}
+                                           'email': store_user_mail,
+                                           'username': username}
                if '@' not in username:
                    # user as username
                    # ################
@@ -432,7 +433,8 @@ def ldap_auth(server='ldap',
                    # #############
                    fields = ['first_name', 'last_name']
                    user_in_db = db(db.auth_user.email == username)
-                update_or_insert_values = {f: update_or_insert_values[f] for f in fields}
+                    update_or_insert_values = dict(((f, update_or_insert_values[f]) for f in fields))
+
                if user_in_db.count() > 0:
                    actual_values = user_in_db.select(*[db.auth_user[f] for f in fields]).first().as_dict()
                    if update_or_insert_values != actual_values:  # We don't update record if values are the same
@@ -51,7 +51,7 @@ class OneallAccount(object):
            reg_id=profile.get('identity_token','')
            username=profile.get('preferredUsername',email)
            first_name=name.get('givenName', dname.split(' ')[0])
-            last_name=profile.get('familyName',dname.split(' ')[1])
+            last_name=profile.get('familyName', dname.split(' ')[1] if(len(dname.split(' ')) > 1) else None)
            return dict(registration_id=reg_id,username=username,email=email,
                        first_name=first_name,last_name=last_name)
        self.mappings.default = defaultmapping
@@ -2,20 +2,20 @@
 Developed by niphlod@gmail.com
 Released under web2py license because includes gluon/cache.py source code
 """
-import redis
-from redis.exceptions import ConnectionError
-from gluon import current
-from gluon.cache import CacheAbstract
+
 try:
-   import cPickle as pickle
+    import cPickle as pickle
 except:
-   import pickle
+    import pickle
 import time
 import re
 import logging
 import thread
 import random
-
+from gluon import current
+from gluon.cache import CacheAbstract
+from gluon.contrib.redis_utils import acquire_lock, release_lock
+from gluon.contrib.redis_utils import register_release_lock, RConnectionError

 logger = logging.getLogger("web2py.cache.redis")

@@ -24,20 +24,36 @@ locker = thread.allocate_lock()

 def RedisCache(*args, **vars):
    """
-    Usage example: put in models
+    Usage example: put in models::

-    from gluon.contrib.redis_cache import RedisCache
-    cache.redis = RedisCache('localhost:6379',db=None, debug=True, with_lock=True, password=None)
+    First of all install Redis
+    Ubuntu :
+    sudo apt-get install redis-server
+    sudo pip install redis

-    :param db: redis db to use (0..16)
-    :param debug: if True adds to stats() the total_hits and misses
-    :param with_lock: sets the default locking mode for creating new keys.
+    Then
+
+        from gluon.contrib.redis_utils import RConn
+        rconn = RConn()
+        from gluon.contrib.redis_cache import RedisCache
+        cache.redis = RedisCache(redis_conn=rconn, debug=True, with_lock=True)
+
+    Args:
+        redis_conn: a redis-like connection object
+        debug: if True adds to stats() the total_hits and misses
+        with_lock: sets the default locking mode for creating new keys.
            By default is False (usualy when you choose Redis you do it
            for performances reason)
            When True, only one thread/process can set a value concurrently
+        fail_gracefully: if redis is unavailable, returns the value computing it
+            instead of raising an exception
+
+    It can be used pretty much the same as cache.ram()
+    When you use cache.redis directly you can use :
+
+        redis_key_and_var_name = cache.redis('redis_key_and_var_name', lambda or function,
+                                             time_expire=time.time(), with_lock=True)

-    When you use cache.redis directly you can use
-        value = cache.redis('mykey', lambda: time.time(), with_lock=True)
    to enforce locking. The with_lock parameter overrides the one set in the
    cache.redis instance creation

@@ -81,22 +97,19 @@ class RedisClient(object):
    MAX_RETRIES = 5
    RETRIES = 0

-    def __init__(self, server='localhost:6379', db=None, debug=False, with_lock=False, password=None):
-        self.server = server
-        self.password = password
-        self.db = db or 0
-        host, port = (self.server.split(':') + ['6379'])[:2]
-        port = int(port)
+    def __init__(self, redis_conn=None, debug=False,
+                 with_lock=False, fail_gracefully=False):
        self.request = current.request
        self.debug = debug
        self.with_lock = with_lock
-        self.prefix = "w2p:%s:" % (self.request.application)
+        self.fail_gracefully = fail_gracefully
+        self.prefix = "w2p:cache:%s:" % self.request.application
        if self.request:
            app = self.request.application
        else:
            app = ''

-        if not app in self.meta_storage:
+        if app not in self.meta_storage:
            self.storage = self.meta_storage[app] = {
                CacheAbstract.cache_stats_name: {
                    'hit_total': 0,
@@ -105,9 +118,10 @@ class RedisClient(object):
        else:
            self.storage = self.meta_storage[app]

-        self.cache_set_key = 'w2p:%s:___cache_set' % (self.request.application)
+        self.cache_set_key = 'w2p:%s:___cache_set' % self.request.application

-        self.r_server = redis.Redis(host=host, port=port, db=self.db, password=self.password)
+        self.r_server = redis_conn
+        self._release_script = register_release_lock(self.r_server)

    def initialize(self):
        pass
@@ -121,90 +135,86 @@ class RedisClient(object):
        value = None
        ttl = 0
        try:
-            #is there a value
+            # is there a value
            obj = self.r_server.get(newKey)
-            #what's its ttl
+            # what's its ttl
            if obj:
                ttl = self.r_server.ttl(newKey)
            if ttl > time_expire:
                obj = None
            if obj:
-                #was cached
+                # was cached
                if self.debug:
                    self.r_server.incr('web2py_cache_statistics:hit_total')
                value = pickle.loads(obj)
            elif f is None:
-                #delete and never look back
+                # delete and never look back
                self.r_server.delete(newKey)
            else:
-                #naive distributed locking
+                # naive distributed locking
                if with_lock:
                    lock_key = '%s:__lock' % newKey
-                    try:
-                        while True:
-                            lock = self.r_server.setnx(lock_key, 1)
-                            if lock:
-                                value = self.cache_it(newKey, f, time_expire)
-                                break
-                            else:
-                                time.sleep(0.2)
-                                #did someone else create it in the meanwhile ?
-                                obj = self.r_server.get(newKey)
-                                if obj:
-                                    value = pickle.loads(obj)
-                                    break
-                    finally:
-                        self.r_server.delete(lock_key)
+                    randomvalue = time.time()
+                    al = acquire_lock(self.r_server, lock_key, randomvalue)
+                    # someone may have computed it
+                    obj = self.r_server.get(newKey)
+                    if obj is None:
+                        value = self.cache_it(newKey, f, time_expire)
+                    else:
+                        value = pickle.loads(obj)
+                    release_lock(self, lock_key, al)
                else:
-                    #without distributed locking
+                    # without distributed locking
                    value = self.cache_it(newKey, f, time_expire)
            return value
-        except ConnectionError:
+        except RConnectionError:
            return self.retry_call(key, f, time_expire, with_lock)

    def cache_it(self, key, f, time_expire):
        if self.debug:
            self.r_server.incr('web2py_cache_statistics:misses')
        cache_set_key = self.cache_set_key
-        expireat = int(time.time() + time_expire) + 120
-        bucket_key = "%s:%s" % (cache_set_key, expireat / 60)
+        expire_at = int(time.time() + time_expire) + 120
+        bucket_key = "%s:%s" % (cache_set_key, expire_at / 60)
        value = f()
        value_ = pickle.dumps(value, pickle.HIGHEST_PROTOCOL)
        if time_expire == 0:
            time_expire = 1
-        self.r_server.setex(key, value_, time_expire)
-        #print '%s will expire on %s: it goes in bucket %s' % (key, time.ctime(expireat))
-        #print 'that will expire on %s' % (bucket_key, time.ctime(((expireat/60) + 1)*60))
+        self.r_server.setex(key, time_expire, value_)
+        # print '%s will expire on %s: it goes in bucket %s' % (key, time.ctime(expire_at))
+        # print 'that will expire on %s' % (bucket_key, time.ctime(((expire_at / 60) + 1) * 60))
        p = self.r_server.pipeline()
-        #add bucket to the fixed set
+        # add bucket to the fixed set
        p.sadd(cache_set_key, bucket_key)
-        #sets the key
-        p.setex(key, value_, time_expire)
-        #add the key to the bucket
+        # sets the key
+        p.setex(key, time_expire, value_)
+        # add the key to the bucket
        p.sadd(bucket_key, key)
-        #expire the bucket properly
-        p.expireat(bucket_key, ((expireat/60) + 1)*60)
+        # expire the bucket properly
+        p.expireat(bucket_key, ((expire_at / 60) + 1) * 60)
        p.execute()
        return value

-    def retry_call(self, key, f, time_expire, with_locking):
+    def retry_call(self, key, f, time_expire, with_lock):
        self.RETRIES += 1
        if self.RETRIES <= self.MAX_RETRIES:
-            logger.error("sleeping %s seconds before reconnecting" %
-                         (2 * self.RETRIES))
+            logger.error("sleeping %s seconds before reconnecting" % (2 * self.RETRIES))
            time.sleep(2 * self.RETRIES)
-            self.__init__(self.server, self.db, self.debug, self.with_lock)
-            return self.__call__(key, f, time_expire, with_locking)
+            if self.fail_gracefully:
+                self.RETRIES = 0
+                return f()
+            return self.__call__(key, f, time_expire, with_lock)
        else:
            self.RETRIES = 0
-            raise ConnectionError('Redis instance is unavailable at %s' % (
-                self.server))
+            if self.fail_gracefully:
+                return f
+            raise RConnectionError('Redis instance is unavailable')

    def increment(self, key, value=1):
        try:
            newKey = self.__keyFormat__(key)
            return self.r_server.incr(newKey, value)
-        except ConnectionError:
+        except RConnectionError:
            return self.retry_increment(key, value)

    def retry_increment(self, key, value):
@@ -212,12 +222,10 @@ class RedisClient(object):
        if self.RETRIES <= self.MAX_RETRIES:
            logger.error("sleeping some seconds before reconnecting")
            time.sleep(2 * self.RETRIES)
-            self.__init__(self.server, self.db, self.debug, self.with_lock)
            return self.increment(key, value)
        else:
            self.RETRIES = 0
-            raise ConnectionError('Redis instance is unavailable at %s' % (
-                self.server))
+            raise RConnectionError('Redis instance is unavailable')

    def clear(self, regex):
        """
@@ -225,9 +233,9 @@ class RedisClient(object):
        clear cache entries
        """
        r = re.compile(regex)
-        #get all buckets
+        # get all buckets
        buckets = self.r_server.smembers(self.cache_set_key)
-        #get all keys in buckets
+        # get all keys in buckets
        if buckets:
            keys = self.r_server.sunion(buckets)
        else:
@@ -237,8 +245,8 @@ class RedisClient(object):
        for a in keys:
            if r.match(str(a).replace(prefix, '', 1)):
                pipe.delete(a)
-        if random.randrange(0,100) < 10:
-            #do this just once in a while (10% chance)
+        if random.randrange(0, 100) < 10:
+            # do this just once in a while (10% chance)
            self.clear_buckets(buckets)
        pipe.execute()

@@ -254,19 +262,19 @@ class RedisClient(object):
        return self.r_server.delete(newKey)

    def stats(self):
-        statscollector = self.r_server.info()
+        stats_collector = self.r_server.info()
        if self.debug:
-            statscollector['w2p_stats'] = dict(
+            stats_collector['w2p_stats'] = dict(
                hit_total=self.r_server.get(
                    'web2py_cache_statistics:hit_total'),
                misses=self.r_server.get('web2py_cache_statistics:misses')
            )
-        statscollector['w2p_keys'] = dict()
+        stats_collector['w2p_keys'] = dict()

        for a in self.r_server.keys("w2p:%s:*" % (
                self.request.application)):
-            statscollector['w2p_keys']["%s_expire_in_sec" % (a)] = self.r_server.ttl(a)
-        return statscollector
+            stats_collector['w2p_keys']["%s_expire_in_sec" % a] = self.r_server.ttl(a)
+        return stats_collector

    def __keyFormat__(self, key):
        return '%s%s' % (self.prefix, key.replace(' ', '_'))
@@ -0,0 +1,785 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+| This file is part of the web2py Web Framework
+| Created by niphlod@gmail.com
+| License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html)
+
+Scheduler with redis backend
+---------------------------------
+"""
+
+USAGE = """
+## Example
+
+For any existing app
+
+Create File: app/models/scheduler.py ======
+from gluon.contrib.redis_utils import RConn
+from gluon.contrib.redis_scheduler import RScheduler
+
+def demo1(*args,**vars):
+    print 'you passed args=%s and vars=%s' % (args, vars)
+    return 'done!'
+
+def demo2():
+    1/0
+
+rconn = RConn()
+mysched = RScheduler(db, dict(demo1=demo1,demo2=demo2), ...., redis_conn=rconn)
+
+## run worker nodes with:
+
+   cd web2py
+   python web2py.py -K app
+
+"""
+
+import os
+import time
+import socket
+import datetime
+import logging
+
+path = os.getcwd()
+
+if 'WEB2PY_PATH' not in os.environ:
+    os.environ['WEB2PY_PATH'] = path
+
+try:
+    from gluon.contrib.simplejson import loads, dumps
+except:
+    from simplejson import loads, dumps
+
+IDENTIFIER = "%s#%s" % (socket.gethostname(), os.getpid())
+
+logger = logging.getLogger('web2py.rscheduler.%s' % IDENTIFIER)
+
+from gluon.utils import web2py_uuid
+from gluon.storage import Storage
+from gluon.scheduler import *
+from gluon.scheduler import _decode_dict
+from gluon.contrib.redis_utils import RWatchError
+
+
+POLLING = 'POLLING'
+
+
+class RScheduler(Scheduler):
+
+    def __init__(self, db, tasks=None, migrate=True,
+                 worker_name=None, group_names=None, heartbeat=HEARTBEAT,
+                 max_empty_runs=0, discard_results=False, utc_time=False,
+                 redis_conn=None, mode=1):
+
+        """
+        Highly-experimental coordination with redis
+        Takes all args from Scheduler except redis_conn which
+        must be something closer to a StrictRedis instance.
+
+        My only regret - and the reason why I kept this under the hood for a
+        while - is that it's hard to hook up in web2py to something happening
+        right after the commit to a table, which will enable this version of the
+        scheduler to process "immediate" tasks right away instead of waiting a
+        few seconds (see FIXME in queue_task())
+
+        mode is reserved for future usage patterns.
+        Right now it moves the coordination (which is the most intensive
+        routine in the scheduler in matters of IPC) of workers to redis.
+        I'd like to have incrementally redis-backed modes of operations,
+        such as e.g.:
+            - 1: IPC through redis (which is the current implementation)
+            - 2: Store task results in redis (which will relieve further pressure
+                 from the db leaving the scheduler_run table empty and possibly
+                 keep things smooth as tasks results can be set to expire
+                 after a bit of time)
+            - 3: Move all the logic for storing and queueing tasks to redis
+                 itself - which means no scheduler_task usage too - and use
+                 the database only as an historical record-bookkeeping
+                 (e.g. for reporting)
+
+        As usual, I'm eager to see your comments.
+        """
+
+        Scheduler.__init__(self, db, tasks=tasks, migrate=migrate,
+                           worker_name=worker_name, group_names=group_names,
+                           heartbeat=heartbeat, max_empty_runs=max_empty_runs,
+                           discard_results=discard_results, utc_time=utc_time)
+
+        self.r_server = redis_conn
+        from gluon import current
+        self._application = current.request.application or 'appname'
+
+    def _nkey(self, key):
+        """Helper to restrict all keys to a namespace
+        and track them"""
+        prefix = 'w2p:rsched:%s' % self._application
+        allkeys = '%s:allkeys' % prefix
+        newkey = "%s:%s" % (prefix, key)
+        self.r_server.sadd(allkeys, newkey)
+        return newkey
+
+    def prune_all(self):
+        """
+        Just to be fair and implement a method
+        that does housekeeping
+        """
+        all_keys = self._nkey('allkeys')
+        with self.r_server.pipeline() as pipe:
+            while True:
+                try:
+                    pipe.watch('PRUNE_ALL')
+                    while True:
+                        k = pipe.spop(all_keys)
+                        if k is None:
+                            break
+                        pipe.delete(k)
+                    pipe.execute()
+                    break
+                except RWatchError:
+                    time.sleep(0.1)
+                    continue
+
+    def dt2str(self, value):
+        return value.strftime('%Y-%m-%d %H:%M:%S')
+
+    def str2date(self, value):
+        return datetime.datetime.strptime(value, '%Y-%m-%d %H:%M:%S')
+
+    def send_heartbeat(self, counter):
+        """
+        workers coordination has evolved into something is not that
+        easy. Here we try to do what we need in a single transaction,
+        and retry that transaction if something goes wrong
+        """
+        with self.r_server.pipeline() as pipe:
+            while True:
+                try:
+                    pipe.watch('SEND_HEARTBEAT')
+                    self.inner_send_heartbeat(counter, pipe)
+                    pipe.execute()
+                    self.adj_hibernation()
+                    self.sleep()
+                    break
+                except RWatchError:
+                    time.sleep(0.1)
+                    continue
+
+    def inner_send_heartbeat(self, counter, pipe):
+        """
+        Does a few things:
+        - registers the workers
+        - accepts commands sent to workers (KILL, TERMINATE, PICK, DISABLED, etc)
+        - adjusts sleep
+        - saves stats
+        - elects master
+        - does "housecleaning" for dead workers
+        - triggers tasks assignment
+        """
+        r_server = pipe
+        status_keyset = self._nkey('worker_statuses')
+        status_key = self._nkey('worker_status:%s' % (self.worker_name))
+        now = self.now()
+        mybackedstatus = r_server.hgetall(status_key)
+        if not mybackedstatus:
+            r_server.hmset(
+                status_key,
+                dict(
+                    status=ACTIVE, worker_name=self.worker_name,
+                    first_heartbeat=self.dt2str(now),
+                    last_heartbeat=self.dt2str(now),
+                    group_names=dumps(self.group_names), is_ticker=False,
+                    worker_stats=dumps(self.w_stats))
+            )
+            r_server.sadd(status_keyset, status_key)
+            if not self.w_stats.status == POLLING:
+                self.w_stats.status = ACTIVE
+                self.w_stats.sleep = self.heartbeat
+                mybackedstatus = ACTIVE
+        else:
+            mybackedstatus = mybackedstatus['status']
+            if mybackedstatus == DISABLED:
+                # keep sleeping
+                self.w_stats.status = DISABLED
+                r_server.hmset(
+                    status_key,
+                    dict(last_heartbeat=self.dt2str(now),
+                         worker_stats=dumps(self.w_stats))
+                )
+            elif mybackedstatus == TERMINATE:
+                self.w_stats.status = TERMINATE
+                logger.debug("Waiting to terminate the current task")
+                self.give_up()
+            elif mybackedstatus == KILL:
+                self.w_stats.status = KILL
+                self.die()
+            else:
+                if mybackedstatus == STOP_TASK:
+                    logger.info('Asked to kill the current task')
+                    self.terminate_process()
+                logger.info('........recording heartbeat (%s)',
+                            self.w_stats.status)
+                r_server.hmset(
+                    status_key,
+                    dict(
+                        last_heartbeat=self.dt2str(now), status=ACTIVE,
+                        worker_stats=dumps(self.w_stats)
+                    )
+                )
+                # newroutine
+                r_server.expire(status_key, self.heartbeat * 3 * 15)
+                self.w_stats.sleep = self.heartbeat  # re-activating the process
+                if self.w_stats.status not in (RUNNING, POLLING):
+                    self.w_stats.status = ACTIVE
+
+            self.do_assign_tasks = False
+            if counter % 5 == 0 or mybackedstatus == PICK:
+                try:
+                    logger.info(
+                        '    freeing workers that have not sent heartbeat')
+                    registered_workers = r_server.smembers(status_keyset)
+                    allkeys = self._nkey('allkeys')
+                    for worker in registered_workers:
+                        w = r_server.hgetall(worker)
+                        w = Storage(w)
+                        if not w:
+                            r_server.srem(status_keyset, worker)
+                            logger.info('removing %s from %s', worker, allkeys)
+                            r_server.srem(allkeys, worker)
+                            continue
+                    try:
+                        self.is_a_ticker = self.being_a_ticker(pipe)
+                    except:
+                        pass
+                    if self.w_stats.status in (ACTIVE, POLLING):
+                        self.do_assign_tasks = True
+                    if self.is_a_ticker and self.do_assign_tasks:
+                        # I'm a ticker, and 5 loops passed without reassigning tasks,
+                        # let's do that and loop again
+                        if not self.db_thread:
+                            logger.debug('thread building own DAL object')
+                            self.db_thread = DAL(
+                                self.db._uri, folder=self.db._adapter.folder)
+                            self.define_tables(self.db_thread, migrate=False)
+                        db = self.db_thread
+                        self.wrapped_assign_tasks(db)
+                        return None
+                except:
+                    logger.error('Error assigning tasks')
+
+    def being_a_ticker(self, pipe):
+        """
+        This is slightly more convoluted than the original
+        but if far more efficient
+        """
+        r_server = pipe
+        status_keyset = self._nkey('worker_statuses')
+        registered_workers = r_server.smembers(status_keyset)
+        ticker = None
+        all_active = []
+        all_workers = []
+        for worker in registered_workers:
+            w = r_server.hgetall(worker)
+            if w['worker_name'] != self.worker_name and w['status'] == ACTIVE:
+                all_active.append(w)
+                if w['is_ticker'] == 'True' and ticker is None:
+                    ticker = w
+            all_workers.append(w)
+        not_busy = self.w_stats.status in (ACTIVE, POLLING)
+        if not ticker:
+            if not_busy:
+                # only if this worker isn't busy, otherwise wait for a free one
+                for worker in all_workers:
+                    key = self._nkey('worker_status:%s' % worker['worker_name'])
+                    if worker['worker_name'] == self.worker_name:
+                        r_server.hset(key, 'is_ticker', True)
+                    else:
+                        r_server.hset(key, 'is_ticker', False)
+                logger.info("TICKER: I'm a ticker")
+            else:
+                # giving up, only if I'm not alone
+                if len(all_active) > 1:
+                    key = self._nkey('worker_status:%s' % (self.worker_name))
+                    r_server.hset(key, 'is_ticker', False)
+                else:
+                    not_busy = True
+            return not_busy
+        else:
+            logger.info(
+                "%s is a ticker, I'm a poor worker" % ticker['worker_name'])
+            return False
+
+    def assign_tasks(self, db):
+        """
+        The real beauty. We don't need to ASSIGN tasks, we just put
+        them into the relevant queue
+        """
+        st, sd = db.scheduler_task, db.scheduler_task_deps
+        r_server = self.r_server
+        now = self.now()
+        status_keyset = self._nkey('worker_statuses')
+        with r_server.pipeline() as pipe:
+            while 1:
+                try:
+                    # making sure we're the only one doing the job
+                    pipe.watch('ASSIGN_TASKS')
+                    registered_workers = pipe.smembers(status_keyset)
+                    all_workers = []
+                    for worker in registered_workers:
+                        w = pipe.hgetall(worker)
+                        if w['status'] == ACTIVE:
+                            all_workers.append(Storage(w))
+                    pipe.execute()
+                    break
+                except RWatchError:
+                    time.sleep(0.1)
+                    continue
+
+        # build workers as dict of groups
+        wkgroups = {}
+        for w in all_workers:
+            group_names = loads(w.group_names)
+            for gname in group_names:
+                if gname not in wkgroups:
+                    wkgroups[gname] = dict(
+                        workers=[{'name': w.worker_name, 'c': 0}])
+                else:
+                    wkgroups[gname]['workers'].append(
+                        {'name': w.worker_name, 'c': 0})
+        # set queued tasks that expired between "runs" (i.e., you turned off
+        # the scheduler): then it wasn't expired, but now it is
+        db(
+            (st.status.belongs((QUEUED, ASSIGNED))) &
+            (st.stop_time < now)
+        ).update(status=EXPIRED)
+
+        # calculate dependencies
+        deps_with_no_deps = db(
+            (sd.can_visit == False) &
+            (~sd.task_child.belongs(
+                db(sd.can_visit == False)._select(sd.task_parent)
+                )
+            )
+            )._select(sd.task_child)
+        no_deps = db(
+            (st.status.belongs((QUEUED, ASSIGNED))) &
+            (
+                (sd.id == None) | (st.id.belongs(deps_with_no_deps))
+
+            )
+            )._select(st.id, distinct=True, left=sd.on(
+                    (st.id == sd.task_parent) &
+                    (sd.can_visit == False)
+                    )
+            )
+
+        all_available = db(
+            (st.status.belongs((QUEUED, ASSIGNED))) &
+            ((st.times_run < st.repeats) | (st.repeats == 0)) &
+            (st.start_time <= now) &
+            ((st.stop_time == None) | (st.stop_time > now)) &
+            (st.next_run_time <= now) &
+            (st.enabled == True) &
+            (st.id.belongs(no_deps))
+        )
+
+        limit = len(all_workers) * (50 / (len(wkgroups) or 1))
+
+        # let's freeze it up
+        db.commit()
+        x = 0
+        r_server = self.r_server
+        for group in wkgroups.keys():
+            queued_list = self._nkey('queued:%s' % group)
+            queued_set = self._nkey('queued_set:%s' % group)
+            # if are running, let's don't assign them again
+            running_list = self._nkey('running:%s' % group)
+            while True:
+                # the joys for rpoplpush!
+                t = r_server.rpoplpush(running_list, queued_list)
+                if not t:
+                    # no more
+                    break
+                r_server.sadd(queued_set, t)
+
+            tasks = all_available(st.group_name == group).select(
+                limitby=(0, limit), orderby = st.next_run_time)
+
+            # put tasks in the processing list
+
+            for task in tasks:
+                x += 1
+                gname = task.group_name
+
+                if r_server.sismember(queued_set, task.id):
+                    # already queued, we don't put on the list
+                    continue
+                r_server.sadd(queued_set, task.id)
+                r_server.lpush(queued_list, task.id)
+                d = dict(status=QUEUED)
+                if not task.task_name:
+                    d['task_name'] = task.function_name
+                db(
+                    (st.id == task.id) &
+                    (st.status.belongs((QUEUED, ASSIGNED)))
+                ).update(**d)
+            db.commit()
+        # I didn't report tasks but I'm working nonetheless!!!!
+        if x > 0:
+            self.w_stats.empty_runs = 0
+        self.w_stats.queue = x
+        self.w_stats.distribution = wkgroups
+        self.w_stats.workers = len(all_workers)
+        # I'll be greedy only if tasks queued are equal to the limit
+        # (meaning there could be others ready to be queued)
+        self.greedy = x >= limit
+        logger.info('TICKER: workers are %s', len(all_workers))
+        logger.info('TICKER: tasks are %s', x)
+
+    def pop_task(self, db):
+        r_server = self.r_server
+        st = self.db.scheduler_task
+        task = None
+        # ready to process something
+        for group in self.group_names:
+            queued_set = self._nkey('queued_set:%s' % group)
+            queued_list = self._nkey('queued:%s' % group)
+            running_list = self._nkey('running:%s' % group)
+            running_dict = self._nkey('running_dict:%s' % group)
+            self.w_stats.status = POLLING
+            # polling for 1 minute in total. If more groups are in,
+            # polling is 1 minute in total
+            logger.debug('    polling on %s' , group)
+            task_id = r_server.brpoplpush(queued_list, running_list, timeout=60/len(self.group_names))
+            logger.debug('    finished polling')
+            self.w_stats.status = ACTIVE
+            if task_id:
+                r_server.hset(running_dict, task_id, self.worker_name)
+                r_server.srem(queued_set, task_id)
+                task = db(
+                    (st.id == task_id) &
+                    (st.status == QUEUED)
+                ).select().first()
+                if not task:
+                    r_server.lrem(running_list, 0, task_id)
+                    r_server.hdel(running_dict, task_id)
+                    r_server.lrem(queued_list, 0, task_id)
+                    logger.error("we received a task that isn't there (%s)" % task_id)
+                    return None
+                break
+        now = self.now()
+        if task:
+            task.update_record(status=RUNNING, last_run_time=now)
+            # noone will touch my task!
+            db.commit()
+            logger.debug('   work to do %s', task.id)
+        else:
+            logger.info('nothing to do (%s)' % self.w_stats.status)
+            return None
+        times_run = task.times_run + 1
+        if not task.prevent_drift:
+            next_run_time = task.last_run_time + datetime.timedelta(
+                seconds=task.period
+            )
+        else:
+            next_run_time = task.start_time + datetime.timedelta(
+                seconds=task.period * times_run
+            )
+        if times_run < task.repeats or task.repeats == 0:
+            # need to run (repeating task)
+            run_again = True
+        else:
+            # no need to run again
+            run_again = False
+        run_id = 0
+        while True and not self.discard_results:
+            logger.debug('    new scheduler_run record')
+            try:
+                run_id = db.scheduler_run.insert(
+                    task_id=task.id,
+                    status=RUNNING,
+                    start_time=now,
+                    worker_name=self.worker_name)
+                db.commit()
+                break
+            except:
+                time.sleep(0.5)
+                db.rollback()
+        logger.info('new task %(id)s "%(task_name)s"'
+                    ' %(application_name)s.%(function_name)s' % task)
+        return Task(
+            app=task.application_name,
+            function=task.function_name,
+            timeout=task.timeout,
+            args=task.args,  # in json
+            vars=task.vars,  # in json
+            task_id=task.id,
+            run_id=run_id,
+            run_again=run_again,
+            next_run_time=next_run_time,
+            times_run=times_run,
+            stop_time=task.stop_time,
+            retry_failed=task.retry_failed,
+            times_failed=task.times_failed,
+            sync_output=task.sync_output,
+            uuid=task.uuid,
+            group_name=task.group_name)
+
+    def report_task(self, task, task_report):
+        """
+        Needs overwriting only because we need to pop from the
+        running tasks
+        """
+        r_server = self.r_server
+        db = self.db
+        now = self.now()
+        st = db.scheduler_task
+        sr = db.scheduler_run
+        if not self.discard_results:
+            if task_report.result != 'null' or task_report.tb:
+                # result is 'null' as a string if task completed
+                # if it's stopped it's None as NoneType, so we record
+                # the STOPPED "run" anyway
+                logger.debug(' recording task report in db (%s)',
+                             task_report.status)
+                db(sr.id == task.run_id).update(
+                    status=task_report.status,
+                    stop_time=now,
+                    run_result=task_report.result,
+                    run_output=task_report.output,
+                    traceback=task_report.tb)
+            else:
+                logger.debug(' deleting task report in db because of no result')
+                db(sr.id == task.run_id).delete()
+        # if there is a stop_time and the following run would exceed it
+        is_expired = (task.stop_time
+                      and task.next_run_time > task.stop_time
+                      and True or False)
+        status = (task.run_again and is_expired and EXPIRED
+                  or task.run_again and not is_expired
+                  and QUEUED or COMPLETED)
+        if task_report.status == COMPLETED:
+            # assigned calculations
+            d = dict(status=status,
+                     next_run_time=task.next_run_time,
+                     times_run=task.times_run,
+                     times_failed=0,
+                     assigned_worker_name=self.worker_name
+                     )
+            db(st.id == task.task_id).update(**d)
+            if status == COMPLETED:
+                self.update_dependencies(db, task.task_id)
+        else:
+            st_mapping = {'FAILED': 'FAILED',
+                          'TIMEOUT': 'TIMEOUT',
+                          'STOPPED': 'FAILED'}[task_report.status]
+            status = (task.retry_failed
+                      and task.times_failed < task.retry_failed
+                      and QUEUED or task.retry_failed == -1
+                      and QUEUED or st_mapping)
+            db(st.id == task.task_id).update(
+                times_failed=db.scheduler_task.times_failed + 1,
+                next_run_time=task.next_run_time,
+                status=status,
+                assigned_worker_name=self.worker_name
+            )
+        logger.info('task completed (%s)', task_report.status)
+        running_list = self._nkey('running:%s' % task.group_name)
+        running_dict = self._nkey('running_dict:%s' % task.group_name)
+        r_server.lrem(running_list, 0, task.task_id)
+        r_server.hdel(running_dict, task.task_id)
+
+    def wrapped_pop_task(self):
+        """Commodity function to call `pop_task` and trap exceptions
+        If an exception is raised, assume it happened because of database
+        contention and retries `pop_task` after 0.5 seconds
+        """
+        db = self.db
+        db.commit()  # another nifty db.commit() only for Mysql
+        x = 0
+        while x < 10:
+            try:
+                rtn = self.pop_task(db)
+                return rtn
+                break
+            # this is here to "interrupt" any blrpoplpush op easily
+            except KeyboardInterrupt:
+                self.give_up()
+                break
+            except:
+                self.w_stats.errors += 1
+                db.rollback()
+                logger.error('    error popping tasks')
+                x += 1
+                time.sleep(0.5)
+
+    def get_workers(self, only_ticker=False):
+        """ Returns a dict holding worker_name : {**columns}
+        representing all "registered" workers
+        only_ticker returns only the worker running as a TICKER,
+        if there is any
+        """
+        r_server = self.r_server
+        status_keyset = self._nkey('worker_statuses')
+        registered_workers = r_server.smembers(status_keyset)
+        all_workers = {}
+        for worker in registered_workers:
+            w = r_server.hgetall(worker)
+            w = Storage(w)
+            if not w:
+                continue
+            all_workers[w.worker_name] = Storage(
+                status=w.status,
+                first_heartbeat=self.str2date(w.first_heartbeat),
+                last_heartbeat=self.str2date(w.last_heartbeat),
+                group_names=loads(w.group_names, object_hook=_decode_dict),
+                is_ticker=w.is_ticker == 'True' and True or False,
+                worker_stats=loads(w.worker_stats, object_hook=_decode_dict)
+            )
+        if only_ticker:
+            for k, v in all_workers.iteritems():
+                if v['is_ticker']:
+                    return {k: v}
+            return {}
+        return all_workers
+
+    def set_worker_status(self, group_names=None, action=ACTIVE,
+                          exclude=None, limit=None, worker_name=None):
+        """Internal function to set worker's status"""
+        r_server = self.r_server
+        all_workers = self.get_workers()
+        if not group_names:
+            group_names = self.group_names
+        elif isinstance(group_names, str):
+            group_names = [group_names]
+        exclusion = exclude and exclude.append(action) or [action]
+        workers = []
+        if worker_name is not None:
+            if worker_name in all_workers.keys():
+                workers = [worker_name]
+        else:
+            for k, v in all_workers.iteritems():
+                if v.status not in exclusion and set(group_names) & set(v.group_names):
+                    workers.append(k)
+        if limit and worker_name is None:
+            workers = workers[:limit]
+        if workers:
+            with r_server.pipeline() as pipe:
+                while True:
+                    try:
+                        pipe.watch('SET_WORKER_STATUS')
+                        for w in workers:
+                            worker_key = self._nkey('worker_status:%s' % w)
+                            pipe.hset(worker_key, 'status', action)
+                        pipe.execute()
+                        break
+                    except RWatchError:
+                        time.sleep(0.1)
+                        continue
+
+    def queue_task(self, function, pargs=[], pvars={}, **kwargs):
+        """
+        FIXME: immediate should put item in queue. The hard part is
+        that currently there are no hooks happening at post-commit time
+        Queue tasks. This takes care of handling the validation of all
+        parameters
+
+        Args:
+            function: the function (anything callable with a __name__)
+            pargs: "raw" args to be passed to the function. Automatically
+                jsonified.
+            pvars: "raw" kwargs to be passed to the function. Automatically
+                jsonified
+            kwargs: all the parameters available (basically, every
+                `scheduler_task` column). If args and vars are here, they should
+                be jsonified already, and they will override pargs and pvars
+
+        Returns:
+            a dict just as a normal validate_and_insert(), plus a uuid key
+            holding the uuid of the queued task. If validation is not passed
+            ( i.e. some parameters are invalid) both id and uuid will be None,
+            and you'll get an "error" dict holding the errors found.
+        """
+        if hasattr(function, '__name__'):
+            function = function.__name__
+        targs = 'args' in kwargs and kwargs.pop('args') or dumps(pargs)
+        tvars = 'vars' in kwargs and kwargs.pop('vars') or dumps(pvars)
+        tuuid = 'uuid' in kwargs and kwargs.pop('uuid') or web2py_uuid()
+        tname = 'task_name' in kwargs and kwargs.pop('task_name') or function
+        immediate = 'immediate' in kwargs and kwargs.pop('immediate') or None
+        rtn = self.db.scheduler_task.validate_and_insert(
+            function_name=function,
+            task_name=tname,
+            args=targs,
+            vars=tvars,
+            uuid=tuuid,
+            **kwargs)
+        if not rtn.errors:
+            rtn.uuid = tuuid
+            if immediate:
+                r_server = self.r_server
+                ticker = self.get_workers(only_ticker=True)
+                if ticker.keys():
+                    ticker = ticker.keys()[0]
+                    with r_server.pipeline() as pipe:
+                        while True:
+                            try:
+                                pipe.watch('SET_WORKER_STATUS')
+                                worker_key = self._nkey('worker_status:%s' % ticker)
+                                pipe.hset(worker_key, 'status', 'PICK')
+                                pipe.execute()
+                                break
+                            except RWatchError:
+                                time.sleep(0.1)
+                                continue
+        else:
+            rtn.uuid = None
+        return rtn
+
+    def stop_task(self, ref):
+        """Shortcut for task termination.
+
+        If the task is RUNNING it will terminate it, meaning that status
+        will be set as FAILED.
+
+        If the task is QUEUED, its stop_time will be set as to "now",
+            the enabled flag will be set to False, and the status to STOPPED
+
+        Args:
+            ref: can be
+
+              - an integer : lookup will be done by scheduler_task.id
+              - a string : lookup will be done by scheduler_task.uuid
+
+        Returns:
+            - 1 if task was stopped (meaning an update has been done)
+            - None if task was not found, or if task was not RUNNING or QUEUED
+
+        Note:
+            Experimental
+        """
+        r_server = self.r_server
+        st = self.db.scheduler_task
+        if isinstance(ref, int):
+            q = st.id == ref
+        elif isinstance(ref, str):
+            q = st.uuid == ref
+        else:
+            raise SyntaxError(
+                "You can retrieve results only by id or uuid")
+        task = self.db(q).select(st.id, st.status, st.group_name)
+        task = task.first()
+        rtn = None
+        if not task:
+            return rtn
+        running_dict = self._nkey('running_dict:%s' % task.group_name)
+        if task.status == 'RUNNING':
+            worker_key = r_server.hget(running_dict, task.id)
+            worker_key = self._nkey('worker_status:%s' % (worker_key))
+            r_server.hset(worker_key, 'status', STOP_TASK)
+        elif task.status == 'QUEUED':
+            rtn = self.db(q).update(
+                stop_time=self.now(),
+                enabled=False,
+                status=STOPPED)
+        return rtn
@@ -1,13 +1,18 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 Developed by niphlod@gmail.com
+License MIT/BSD/GPL
+
+Redis-backed sessions
 """

-import redis
-from gluon import current
-from gluon.storage import Storage
-import time
 import logging
 import thread
+from gluon import current
+from gluon.storage import Storage
+from gluon.contrib.redis_utils import acquire_lock, release_lock
+from gluon.contrib.redis_utils import register_release_lock

 logger = logging.getLogger("web2py.session.redis")

@@ -16,10 +21,20 @@ locker = thread.allocate_lock()

 def RedisSession(*args, **vars):
    """
-    Usage example: put in models
-    from gluon.contrib.redis_session import RedisSession
-    sessiondb = RedisSession('localhost:6379',db=0, session_expiry=False, password=None)
-    session.connect(request, response, db = sessiondb)
+    Usage example: put in models::
+
+        from gluon.contrib.redis_utils import RConn
+        rconn = RConn()
+        from gluon.contrib.redis_session
+        sessiondb = RedisSession(redis_conn=rconn, with_lock=True, session_expiry=False)
+        session.connect(request, response, db = sessiondb)
+
+    Args:
+        redis_conn: a redis-like connection object
+        with_lock: prevent concurrent modifications to the same session
+        session_expiry: delete automatically sessions after n seconds
+                        (still need to run sessions2trash.py every 1M sessions
+                        or so)

    Simple slip-in storage for session
    """
@@ -36,30 +51,9 @@ def RedisSession(*args, **vars):

 class RedisClient(object):

-    meta_storage = {}
-    MAX_RETRIES = 5
-    RETRIES = 0
-    _release_script = None
-
-    def __init__(self, server='localhost:6379', db=None, debug=False,
-            session_expiry=False, with_lock=False, password=None):
-        """session_expiry can be an integer, in seconds, to set the default expiration
-           of sessions. The corresponding record will be deleted from the redis instance,
-           and there's virtually no need to run sessions2trash.py
-        """
-        self.server = server
-        self.password = password
-        self.db = db or 0
-        host, port = (self.server.split(':') + ['6379'])[:2]
-        port = int(port)
-        self.debug = debug
-        if current and current.request:
-            self.app = current.request.application
-        else:
-            self.app = ''
-        self.r_server = redis.Redis(host=host, port=port, db=self.db, password=self.password)
-        if with_lock:
-            RedisClient._release_script = self.r_server.register_script(_LUA_RELEASE_LOCK)
+    def __init__(self, redis_conn, session_expiry=False, with_lock=False):
+        self.r_server = redis_conn
+        self._release_script = register_release_lock(self.r_server)
        self.tablename = None
        self.session_expiry = session_expiry
        self.with_lock = with_lock
@@ -93,12 +87,11 @@ class RedisClient(object):
 class MockTable(object):

    def __init__(self, db, r_server, tablename, session_expiry, with_lock=False):
+        # here self.db is the RedisClient instance
        self.db = db
-        self.r_server = r_server
        self.tablename = tablename
        # set the namespace for sessions of this app
-        self.keyprefix = 'w2p:sess:%s' % tablename.replace(
-            'web2py_session_', '')
+        self.keyprefix = 'w2p:sess:%s' % tablename.replace('web2py_session_', '')
        # fast auto-increment id (needed for session handling)
        self.serial = "%s:serial" % self.keyprefix
        # index of all the session keys of this app
@@ -126,7 +119,7 @@ class MockTable(object):
        if key == 'id':
            # return a fake query. We need to query it just by id for normal operations
            self.query = MockQuery(
-                field='id', db=self.r_server,
+                field='id', db=self.db,
                prefix=self.keyprefix, session_expiry=self.session_expiry,
                with_lock=self.with_lock, unique_key=self.unique_key
            )
@@ -140,12 +133,12 @@ class MockTable(object):
        # 'locked', 'client_ip','created_datetime','modified_datetime'
        # 'unique_key', 'session_data'
        # retrieve a new key
-        newid = str(self.r_server.incr(self.serial))
+        newid = str(self.db.r_server.incr(self.serial))
        key = self.keyprefix + ':' + newid
        if self.with_lock:
            key_lock = key + ':lock'
-            acquire_lock(self.r_server, key_lock, newid)
-        with self.r_server.pipeline() as pipe:
+            acquire_lock(self.db.r_server, key_lock, newid)
+        with self.db.r_server.pipeline() as pipe:
            # add it to the index
            pipe.sadd(self.id_idx, key)
            # set a hash key with the Storage
@@ -154,7 +147,7 @@ class MockTable(object):
                pipe.expire(key, self.session_expiry)
            pipe.execute()
        if self.with_lock:
-            release_lock(self.r_server, key_lock, newid)
+            release_lock(self.db, key_lock, newid)
        return newid


@@ -186,8 +179,8 @@ class MockQuery(object):
            # means that someone wants to retrieve the key self.value
            key = self.keyprefix + ':' + str(self.value)
            if self.with_lock:
-                acquire_lock(self.db, key + ':lock', self.value)
-            rtn = self.db.hgetall(key)
+                acquire_lock(self.db.r_server, key + ':lock', self.value, 2)
+            rtn = self.db.r_server.hgetall(key)
            if rtn:
                if self.unique_key:
                    # make sure the id and unique_key are correct
@@ -201,13 +194,13 @@ class MockQuery(object):
            rtn = []
            id_idx = "%s:id_idx" % self.keyprefix
            # find all session keys of this app
-            allkeys = self.db.smembers(id_idx)
+            allkeys = self.db.r_server.smembers(id_idx)
            for sess in allkeys:
-                val = self.db.hgetall(sess)
+                val = self.db.r_server.hgetall(sess)
                if not val:
                    if self.session_expiry:
                        # clean up the idx, because the key expired
-                        self.db.srem(id_idx, sess)
+                        self.db.r_server.srem(id_idx, sess)
                    continue
                val = Storage(val)
                # add a delete_record method (necessary for sessions2trash.py)
@@ -222,9 +215,9 @@ class MockQuery(object):
        # means that the session has been found and needs an update
        if self.op == 'eq' and self.field == 'id' and self.value:
            key = self.keyprefix + ':' + str(self.value)
-            if not self.db.exists(key):
+            if not self.db.r_server.exists(key):
                return None
-            with self.db.pipeline() as pipe:
+            with self.db.r_server.pipeline() as pipe:
                pipe.hmset(key, kwargs)
                if self.session_expiry:
                    pipe.expire(key, self.session_expiry)
@@ -238,7 +231,7 @@ class MockQuery(object):
        if self.op == 'eq' and self.field == 'id' and self.value:
            id_idx = "%s:id_idx" % self.keyprefix
            key = self.keyprefix + ':' + str(self.value)
-            with self.db.pipeline() as pipe:
+            with self.db.r_server.pipeline() as pipe:
                pipe.delete(key)
                pipe.srem(id_idx, key)
                rtn = pipe.execute()
@@ -254,29 +247,6 @@ class RecordDeleter(object):
    def __call__(self):
        id_idx = "%s:id_idx" % self.keyprefix
        # remove from the index
-        self.db.srem(id_idx, self.key)
+        self.db.r_server.srem(id_idx, self.key)
        # remove the key itself
-        self.db.delete(self.key)
-
-
-def acquire_lock(conn, lockname, identifier, ltime=10):
-    while True:
-        if conn.set(lockname, identifier, ex=ltime, nx=True):
-            return identifier
-        time.sleep(.01)
-
-
-_LUA_RELEASE_LOCK = """
-if redis.call("get", KEYS[1]) == ARGV[1]
-then
-    return redis.call("del", KEYS[1])
-else
-    return 0
-end
-"""
-
-
-def release_lock(conn, lockname, identifier):
-    return RedisClient._release_script(
-        keys=[lockname], args=[identifier],
-        client=conn)
+        self.db.r_server.delete(self.key)
@@ -0,0 +1,70 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+Developed by niphlod@gmail.com
+License MIT/BSD/GPL
+
+Serves as base to implement Redis connection object and various utils
+for redis_cache, redis_session and redis_scheduler in the future
+Should-could be overriden in case redis doesn't keep up (e.g. cluster support)
+to ensure compatibility with another - similar - library
+"""
+
+import logging
+import thread
+import time
+from gluon import current
+
+logger = logging.getLogger("web2py.redis_utils")
+
+try:
+    import redis
+    from redis.exceptions import WatchError as RWatchError
+    from redis.exceptions import ConnectionError as RConnectionError
+except ImportError:
+    logger.error("Needs redis library to work")
+    raise RuntimeError('Needs redis library to work')
+
+
+locker = thread.allocate_lock()
+
+
+def RConn(*args, **vars):
+    """
+    Istantiates a StrictRedis connection with parameters, at the first time
+    only
+    """
+    locker.acquire()
+    try:
+        instance_name = 'redis_conn_' + current.request.application
+        if not hasattr(RConn, instance_name):
+            setattr(RConn, instance_name, redis.StrictRedis(*args, **vars))
+        return getattr(RConn, instance_name)
+    finally:
+        locker.release()
+
+def acquire_lock(conn, lockname, identifier, ltime=10):
+    while True:
+        if conn.set(lockname, identifier, ex=ltime, nx=True):
+            return identifier
+        time.sleep(.01)
+
+
+_LUA_RELEASE_LOCK = """
+if redis.call("get", KEYS[1]) == ARGV[1]
+then
+    return redis.call("del", KEYS[1])
+else
+    return 0
+end
+"""
+
+
+def release_lock(instance, lockname, identifier):
+    return instance._release_script(
+        keys=[lockname], args=[identifier])
+
+
+def register_release_lock(conn):
+    rtn = conn.register_script(_LUA_RELEASE_LOCK)
+    return rtn
@@ -1,304 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-import uuid
-import time
-from gluon.serializers import json_parser
-import base64
-import hmac
-import hashlib
-from gluon.storage import Storage
-from gluon.utils import web2py_uuid
-from gluon import current
-from gluon.http import HTTP
-
-
-class Web2pyJwt(object):
-
-    """
-    If left externally, this needs the usual "singleton" approach.
-    Given I (we) don't know if to include in auth yet, let's stick to basics.
-
-    Args:
-     - secret_key: the secret. Without salting, an attacker knowing this can impersonate
-                   any user
-     - algorithm : uses as they are in the JWT specs, HS256, HS384 or HS512 basically means
-                   signing with HMAC with a 256, 284 or 512bit hash
-     - verify_expiration : verifies the expiration checking the exp claim
-     - leeway: allow n seconds of skew when checking for token expiration
-     - expiration : how many seconds a token may be valid
-     - allow_refresh: enable the machinery to get a refreshed token passing a not-already-expired
-                      token
-     - refresh_expiration_delta: to avoid continous refresh of the token
-     - header_prefix : self-explanatory. "JWT" and "Bearer" seems to be the emerging standards
-     - jwt_add_header: a dict holding additional mappings to the header. by default only alg and typ are filled
-     - user_param: the name of the parameter holding the username when requesting a token. Can be useful, e.g, for
-                   email-based authentication, with "email" as a parameter
-     - pass_param: same as above, but for the password
-     - realm: self-explanatory
-     - salt: can be static or a function that takes the payload as an argument.
-             Example:
-             def mysalt(payload):
-                return payload['hmac_key'].split('-')[0]
-     - additional_payload: can be a dict to merge with the payload or a function that takes
-                           the payload as input and returns the modified payload
-                           Example:
-                           def myadditional_payload(payload):
-                               payload['my_name_is'] = 'bond,james bond'
-                               return payload
-     - before_authorization: can be a callable that takes the deserialized token (a dict) as input.
-                             Gets called right after signature verification but before the actual
-                             authorization takes place. You can raise with HTTP a proper error message
-                             Example:
-                             def mybefore_authorization(tokend):
-                                 if not tokend['my_name_is'] == 'bond,james bond':
-                                     raise HTTP(400, u'Invalid JWT my_name_is claim')
-     - max_header_length: check max length to avoid load()ing unusually large tokens (could mean crafted, e.g. in a DDoS.)
-
-    Basic Usage:
-    in models (or the controller needing it)
-
-        myjwt = Web2pyJwt('secret', auth)
-
-    in the controller issuing tokens
-
-        def login_and_take_token():
-            return myjwt.jwt_token_manager()
-
-    A call then to /app/controller/login_and_take_token/auth with username and password returns the token
-    A call to /app/controller/login_and_take_token/refresh with the original token returns the refreshed token
-
-    To protect a function with JWT
-
-        @myjwt.requires_jwt()
-        @auth.requires_login()
-        def protected():
-            return '%s$%s' % (request.now, auth.user_id)
-
-    """
-
-    def __init__(self, secret_key,
-                 auth,
-                 algorithm='HS256',
-                 verify_expiration=True,
-                 leeway=30,
-                 expiration=60 * 5,
-                 allow_refresh=True,
-                 refresh_expiration_delta=60 * 60,
-                 header_prefix='Bearer',
-                 jwt_add_header=None,
-                 user_param='username',
-                 pass_param='password',
-                 realm='Login required',
-                 salt=None,
-                 additional_payload=None,
-                 before_authorization=None,
-                 max_header_length=4*1024,
-                 ):
-        self.secret_key = secret_key
-        self.auth = auth
-        self.algorithm = algorithm
-        if self.algorithm not in ('HS256', 'HS384', 'HS512'):
-            raise NotImplementedError('Algoritm %s not allowed' % algorithm)
-        self.verify_expiration = verify_expiration
-        self.leeway = leeway
-        self.expiration = expiration
-        self.allow_refresh = allow_refresh
-        self.refresh_expiration_delta = refresh_expiration_delta
-        self.header_prefix = header_prefix
-        self.jwt_add_header = jwt_add_header or {}
-        base_header = {'alg': self.algorithm, 'typ': 'JWT'}
-        for k, v in self.jwt_add_header.iteritems():
-            base_header[k] = v
-        self.cached_b64h = self.jwt_b64e(json_parser.dumps(base_header))
-        digestmod_mapping = {
-            'HS256': hashlib.sha256,
-            'HS384': hashlib.sha384,
-            'HS512': hashlib.sha512
-        }
-        self.digestmod = digestmod_mapping[algorithm]
-        self.user_param = user_param
-        self.pass_param = pass_param
-        self.realm = realm
-        self.salt = salt
-        self.additional_payload = additional_payload
-        self.before_authorization = before_authorization
-        self.max_header_length = max_header_length
-        print 'initialized'
-
-    @staticmethod
-    def jwt_b64e(string):
-        if isinstance(string, unicode):
-            string = string.encode('uft-8', 'strict')
-        return base64.urlsafe_b64encode(string).strip(b'=')
-
-    @staticmethod
-    def jwt_b64d(string):
-        """base64 decodes a single bytestring (and is tolerant to getting
-        called with a unicode string).
-        The result is also a bytestring.
-        """
-        if isinstance(string, unicode):
-            string = string.encode('ascii', 'ignore')
-        return base64.urlsafe_b64decode(string + '=' * (-len(string) % 4))
-
-    def generate_token(self, payload):
-        secret = self.secret_key
-        if self.salt:
-            if callable(self.salt):
-                secret = "%s$%s" % (secret, self.salt(payload))
-            else:
-                secret = "%s$%s" % (secret, self.salt)
-            if isinstance(secret, unicode):
-                secret = secret.encode('ascii', 'ignore')
-        b64h = self.cached_b64h
-        b64p = self.jwt_b64e(json_parser.dumps(payload))
-        jbody = b64h + '.' + b64p
-        mauth = hmac.new(key=secret, msg=jbody, digestmod=self.digestmod)
-        jsign = self.jwt_b64e(mauth.digest())
-        return jbody + '.' + jsign
-
-    def verify_signature(self, body, signature, secret):
-        mauth = hmac.new(key=secret, msg=body, digestmod=self.digestmod)
-        return hmac.compare_digest(self.jwt_b64e(mauth.digest()), signature)
-
-    def load_token(self, token):
-        if isinstance(token, unicode):
-            token = token.encode('utf-8', 'strict')
-        body, sig = token.rsplit('.', 1)
-        b64h, b64b = body.split('.', 1)
-        if b64h != self.cached_b64h:
-            # header not the same
-            raise HTTP(400, u'Invalid JWT Header')
-        secret = self.secret_key
-        tokend = json_parser.loads(self.jwt_b64d(b64b))
-        if self.salt:
-            if callable(self.salt):
-                secret = "%s$%s" % (secret, self.salt(tokend))
-            else:
-                secret = "%s$%s" % (secret, self.salt)
-            if isinstance(secret, unicode):
-                secret = secret.encode('ascii', 'ignore')
-        if not self.verify_signature(body, sig, secret):
-            # signature verification failed
-            raise HTTP(400, u'Token signature is invalid')
-        if self.verify_expiration:
-            now = time.mktime(datetime.datetime.utcnow().timetuple())
-            if tokend['exp'] + self.leeway < now:
-                raise HTTP(400, u'Token is expired')
-        if callable(self.before_authorization):
-            self.before_authorization(tokend)
-        return tokend
-
-    def serialize_auth_session(self, session_auth):
-        """
-        As bad as it sounds, as long as this is rarely used (vs using the token)
-        this is the faster method, even if we ditch session in jwt_token_manager().
-        We (mis)use the heavy default auth mechanism to avoid any further computation,
-        while sticking to a somewhat-stable Auth API.
-        """
-        now = time.mktime(datetime.datetime.utcnow().timetuple())
-        expires = now + self.expiration
-        payload = dict(
-            hmac_key=session_auth['hmac_key'],
-            user_groups=session_auth['user_groups'],
-            user=session_auth['user'].as_dict(),
-            iat=now,
-            exp=expires
-        )
-        return payload
-
-    def refresh_token(self, orig_payload):
-        now = time.mktime(datetime.datetime.utcnow().timetuple())
-        if self.verify_expiration:
-            orig_exp = orig_payload['exp']
-            if orig_exp + self.leeway < now:
-                # token already expired, can't be used for refresh
-                raise HTTP(400, u'Token already expired')
-        orig_iat = orig_payload.get('orig_iat') or orig_payload['iat']
-        if orig_iat + self.refresh_expiration_delta < now:
-            # refreshed too long ago
-            raise HTTP(400, u'Token issued too long ago')
-        expires = now + self.refresh_expiration_delta
-        orig_payload.update(
-            orig_iat=orig_iat,
-            iat=now,
-            exp=expires,
-            hmac_key=web2py_uuid()
-        )
-        self.alter_payload(orig_payload)
-        return orig_payload
-
-    def alter_payload(self, payload):
-        if self.additional_payload:
-            if callable(self.additional_payload):
-                payload = self.additional_payload(payload)
-            elif isinstance(self.additional_payload, dict):
-                payload.update(self.additional_payload)
-        return payload
-
-    def jwt_token_manager(self):
-        """
-        The part that issues (and refreshes) tokens.
-        Used in a controller, given myjwt is the istantiated class, as
-
-            def api_auth():
-                return myjwt.jwt_token_manager()
-
-        Then, a call to /app/c/api_auth/auth with username and password
-        returns a token, while /app/c/api_auth/refresh with the current token
-        issues another token
-        """
-        request = current.request
-        # forget and unlock response
-        if request.args(0) == 'auth':
-            current.session.forget(current.response)
-            username = request.vars[self.user_param]
-            password = request.vars[self.pass_param]
-            valid_user = self.auth.login_bare(username, password)
-            if valid_user:
-                payload = self.serialize_auth_session(current.session.auth)
-                self.alter_payload(payload)
-                return self.generate_token(payload)
-            else:
-                raise HTTP(
-                    401, u'Not Authorized',
-                    **{'WWW-Authenticate': u'JWT realm="%s"' % self.realm})
-        elif request.args(0) == 'refresh':
-            if not self.allow_refresh:
-                raise HTTP(403, u'Refreshing token is not allowed')
-            token = request.vars.token
-            tokend = self.load_token(token)
-            # verification can fail here
-            refreshed = self.refresh_token(tokend)
-            return self.generate_token(refreshed)
-
-    def inject_token(self, tokend):
-        """
-        The real deal, not touching the db but still logging-in the user
-        """
-        self.auth.user = Storage(tokend['user'])
-        self.auth.user_groups = tokend['user_groups']
-        self.auth.hmac_key = tokend['hmac_key']
-
-    def requires_jwt(self, otherwise=None):
-        """
-        The validator that checks for the header or the
-        _token var
-        """
-        request = current.request
-        token_in_header = request.env.http_authorization
-        if token_in_header:
-            parts = token_in_header.split()
-            if parts[0].lower() != self.header_prefix.lower():
-                raise HTTP(400, u'Invalid JWT header')
-            elif len(parts) == 1:
-                raise HTTP(400, u'Invalid JWT header, missing token')
-            elif len(parts) > 2:
-                raise HTTP(400, 'Invalid JWT header, token contains spaces')
-            token = parts[1]
-        else:
-            token = request.vars._token
-        if token and len(token) < self.max_header_length:
-            tokend = self.load_token(token)
-            self.inject_token(tokend)
-        return self.auth.requires(True, otherwise=otherwise)
@@ -362,20 +362,30 @@ class Request(Storage):
            redirect(URL(scheme='https', args=self.args, vars=self.vars))

    def restful(self):
-        def wrapper(action, self=self):
-            def f(_action=action, _self=self, *a, **b):
-                self.is_restful = True
-                method = _self.env.request_method
-                if len(_self.args) and '.' in _self.args[-1]:
-                    _self.args[-1], _, self.extension = self.args[-1].rpartition('.')
+        def wrapper(action, request=self):
+            def f(_action=action, *a, **b):
+                request.is_restful = True
+                env = request.env
+                is_json = env.content_type=='application/json'
+                method = env.request_method
+                if len(request.args) and '.' in request.args[-1]:
+                    request.args[-1], _, request.extension = request.args[-1].rpartition('.')
                    current.response.headers['Content-Type'] = \
-                        contenttype('.' + _self.extension.lower())
+                        contenttype('.' + request.extension.lower())
                rest_action = _action().get(method, None)
                if not (rest_action and method == method.upper()
                        and callable(rest_action)):
                    raise HTTP(405, "method not allowed")
                try:
-                    return rest_action(*_self.args, **getattr(_self, 'vars', {}))
+                    vars = request.vars
+                    if method == 'POST' and is_json:
+                        body = request.body.read()
+                        if len(body):
+                            vars = sj.loads(body)
+                    res = rest_action(*request.args, **vars)
+                    if is_json and not isinstance(res, str):
+                        res = json(res)
+                    return res
                except TypeError, e:
                    exc_type, exc_value, exc_traceback = sys.exc_info()
                    if len(traceback.extract_tb(exc_traceback)) == 1:
@@ -1859,6 +1859,8 @@ class INPUT(DIV):
                try:
                    (value, errors) = validator(value)
                except:
+                    import traceback
+                    print traceback.format_exc()
                    msg = "Validation error, field:%s %s" % (name,validator)
                    raise Exception(msg)
                if not errors is None:
@@ -2646,7 +2648,7 @@ def test():
    >>> form=FORM(INPUT(value="Hello World", _name="var", requires=IS_MATCH('^\w+$')))
    >>> isinstance(form.as_dict(), dict)
    True
-    >>> form.as_dict(flat=True).has_key("vars")
+    >>> "vars" in form.as_dict(flat=True)
    True
    >>> isinstance(form.as_json(), basestring) and len(form.as_json(sanitize=False)) > 0
    True
@@ -53,8 +53,8 @@ except:
    except:
        try:
            import win32con
-            import win32file
            import pywintypes
+            import win32file
            os_locking = 'windows'
        except:
            pass
@@ -9,7 +9,7 @@
 Generates names for cache and session files
 --------------------------------------------
 """
-import os, uuid
+import os


 def generate(filename, depth=2, base=512):
@@ -17,10 +17,10 @@ def generate(filename, depth=2, base=512):
        path, filename = os.path.split(filename)
    else:
        path = None
-    dummyhash = sum(ord(c)*256**(i % 4) for i, c in enumerate(filename)) % base**depth
+    dummyhash = sum(ord(c) * 256 ** (i % 4) for i, c in enumerate(filename)) % base ** depth
    folders = []
-    for level in range(depth-1, -1, -1):
-        code, dummyhash = divmod(dummyhash, base**level)
+    for level in range(depth - 1, -1, -1):
+        code, dummyhash = divmod(dummyhash, base ** level)
        folders.append("%03x" % code)
    folders.append(filename)
    if path:
@@ -63,17 +63,3 @@ def open(filename, mode="r", path=None):
        if mode.startswith('w') and not os.path.exists(os.path.dirname(fullfilename)):
            os.makedirs(os.path.dirname(fullfilename))
    return file(fullfilename, mode)
-
-
-def test():
-    if not os.path.exists('tests'):
-        os.mkdir('tests')
-    for k in range(20):
-        filename = os.path.join('tests', str(uuid.uuid4()) + '.test')
-        open(filename, "w").write('test')
-        assert open(filename, "r").read() == 'test'
-        if exists(filename):
-            remove(filename)
-
-if __name__ == '__main__':
-    test()
@@ -1870,3 +1870,46 @@ class WSGIWorker(Worker):
            sock_file.close()

 # Monolithic build...end of module: rocket/methods/wsgi.py
+def demo_app(environ, start_response):
+    global static_folder
+    import os
+    types = {'htm': 'text/html','html': 'text/html','gif': 'image/gif',
+             'jpg': 'image/jpeg','png': 'image/png','pdf': 'applications/pdf'}
+    if static_folder:
+        if not static_folder.startswith('/'):
+            static_folder = os.path.join(os.getcwd(),static_folder)
+        path = os.path.join(static_folder, environ['PATH_INFO'][1:] or 'index.html')
+        type = types.get(path.split('.')[-1],'text')
+        if os.path.exists(path):
+            try:
+                data = open(path,'rb').read()
+                start_response('200 OK', [('Content-Type', type)])
+            except IOError:
+                start_response('404 NOT FOUND', [])
+                data = '404 NOT FOUND'
+        else:
+            start_response('500 INTERNAL SERVER ERROR', [])
+            data = '500 INTERNAL SERVER ERROR'
+    else:
+        start_response('200 OK', [('Content-Type', 'text/html')])
+        data = '<html><body><h1>Hello from Rocket Web Server</h1></body></html>'
+    return [data]
+
+def demo():
+    from optparse import OptionParser
+    parser = OptionParser()
+    parser.add_option("-i", "--ip", dest="ip",default="127.0.0.1",
+                      help="ip address of the network interface")
+    parser.add_option("-p", "--port", dest="port",default="8000",
+                      help="post where to run web server")
+    parser.add_option("-s", "--static", dest="static",default=None,
+                      help="folder containing static files")
+    (options, args) = parser.parse_args()
+    global static_folder
+    static_folder = options.static
+    print 'Rocket running on %s:%s' % (options.ip, options.port)
+    r=Rocket((options.ip,int(options.port)),'wsgi', {'wsgi_app':demo_app})
+    r.start()
+
+if __name__=='__main__':
+    demo()
@@ -215,7 +215,7 @@ class JobGraph(object):
                nested_dict = dict(
                    (item, (dep - ordered)) for item, dep in nested_dict.items()
                    if item not in ordered
-                    )
+                )
            assert not nested_dict, "A cyclic dependency exists amongst %r" % nested_dict
            db.commit()
            return rtn
@@ -297,7 +297,7 @@ def executor(queue, task, out):
            f = task.function
            functions = current._scheduler.tasks
            if not functions:
-                #look into env
+                # look into env
                _function = _env.get(f)
            else:
                _function = functions.get(f)
@@ -314,7 +314,7 @@ def executor(queue, task, out):
            vars = loads(task.vars, object_hook=_decode_dict)
            result = dumps(_function(*args, **vars))
        else:
-            ### for testing purpose only
+            # for testing purpose only
            result = eval(task.function)(
                *loads(task.args, object_hook=_decode_dict),
                **loads(task.vars, object_hook=_decode_dict))
@@ -391,7 +391,6 @@ class MetaScheduler(threading.Thread):
        except:
            p.terminate()
            p.join()
-            self.have_heartbeat = False
            logger.debug('    task stopped by general exception')
            tr = TaskReport(STOPPED)
        else:
@@ -406,7 +405,6 @@ class MetaScheduler(threading.Thread):
                except Queue.Empty:
                    tr = TaskReport(TIMEOUT)
            elif queue.empty():
-                self.have_heartbeat = False
                logger.debug('    task stopped')
                tr = TaskReport(STOPPED)
            else:
@@ -665,7 +663,7 @@ class Scheduler(MetaScheduler):
            Field('traceback', 'text'),
            Field('worker_name', default=self.worker_name),
            migrate=self.__get_migrate('scheduler_run', migrate)
-            )
+        )

        db.define_table(
            'scheduler_worker',
@@ -677,23 +675,30 @@ class Scheduler(MetaScheduler):
            Field('group_names', 'list:string', default=self.group_names),
            Field('worker_stats', 'json'),
            migrate=self.__get_migrate('scheduler_worker', migrate)
-            )
+        )

        db.define_table(
            'scheduler_task_deps',
            Field('job_name', default='job_0'),
            Field('task_parent', 'integer',
-                requires=IS_IN_DB(db, 'scheduler_task.id',
-                                      '%(task_name)s')
-            ),
+                  requires=IS_IN_DB(db, 'scheduler_task.id', '%(task_name)s')
+                  ),
            Field('task_child', 'reference scheduler_task'),
            Field('can_visit', 'boolean', default=False),
            migrate=self.__get_migrate('scheduler_task_deps', migrate)
-            )
+        )

        if migrate is not False:
            db.commit()

+    @staticmethod
+    def total_seconds(td):
+        # backport for py2.6
+        if hasattr(td, 'total_seconds'):
+            return td.total_seconds()
+        else:
+            return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10 ** 6) / 10.0 ** 6
+
    def loop(self, worker_name=None):
        """Main loop

@@ -718,7 +723,7 @@ class Scheduler(MetaScheduler):
            while True and self.have_heartbeat:
                if self.w_stats.status == DISABLED:
                    logger.debug('Someone stopped me, sleeping until better'
-                        ' times come (%s)', self.w_stats.sleep)
+                                 ' times come (%s)', self.w_stats.sleep)
                    self.sleep()
                    continue
                logger.debug('looping...')
@@ -735,7 +740,8 @@ class Scheduler(MetaScheduler):
                    logger.debug('sleeping...')
                    if self.max_empty_runs != 0:
                        logger.debug('empty runs %s/%s',
-                            self.w_stats.empty_runs, self.max_empty_runs)
+                                     self.w_stats.empty_runs,
+                                     self.max_empty_runs)
                        if self.w_stats.empty_runs >= self.max_empty_runs:
                            logger.info(
                                'empty runs limit reached, killing myself')
@@ -791,15 +797,15 @@ class Scheduler(MetaScheduler):
        now = self.now()
        st = self.db.scheduler_task
        if self.is_a_ticker and self.do_assign_tasks:
-            #I'm a ticker, and 5 loops passed without reassigning tasks,
-            #let's do that and loop again
+            # I'm a ticker, and 5 loops passed without reassigning tasks,
+            # let's do that and loop again
            self.wrapped_assign_tasks(db)
            return None
        # ready to process something
        grabbed = db(
            (st.assigned_worker_name == self.worker_name) &
            (st.status == ASSIGNED)
-            )
+        )

        task = grabbed.select(limitby=(0, 1), orderby=st.next_run_time).first()
        if task:
@@ -819,11 +825,15 @@ class Scheduler(MetaScheduler):
        if not task.prevent_drift:
            next_run_time = task.last_run_time + datetime.timedelta(
                seconds=task.period
-                )
-        else:
-            next_run_time = task.start_time + datetime.timedelta(
-                seconds=task.period * times_run
            )
+        else:
+            # calc next_run_time based on available slots
+            # see #1191
+            next_run_time = task.start_time
+            secondspassed = self.total_seconds(now - next_run_time)
+            steps = secondspassed // task.period + 1
+            next_run_time += datetime.timedelta(seconds=task.period * steps)
+
        if times_run < task.repeats or task.repeats == 0:
            # need to run (repeating task)
            run_again = True
@@ -845,7 +855,7 @@ class Scheduler(MetaScheduler):
                time.sleep(0.5)
                db.rollback()
        logger.info('new task %(id)s "%(task_name)s"'
-            ' %(application_name)s.%(function_name)s' % task)
+                    ' %(application_name)s.%(function_name)s' % task)
        return Task(
            app=task.application_name,
            function=task.function_name,
@@ -922,13 +932,13 @@ class Scheduler(MetaScheduler):
        else:
            st_mapping = {'FAILED': 'FAILED',
                          'TIMEOUT': 'TIMEOUT',
-                          'STOPPED': 'QUEUED'}[task_report.status]
+                          'STOPPED': 'FAILED'}[task_report.status]
            status = (task.retry_failed
                      and task.times_failed < task.retry_failed
                      and QUEUED or task.retry_failed == -1
                      and QUEUED or st_mapping)
            db(st.id == task.task_id).update(
-                times_failed=db.scheduler_task.times_failed + 1,
+                times_failed=st.times_failed + 1,
                next_run_time=task.next_run_time,
                status=status
            )
@@ -982,7 +992,7 @@ class Scheduler(MetaScheduler):
                    # keep sleeping
                    self.w_stats.status = DISABLED
                    logger.debug('........recording heartbeat (%s)',
-                        self.w_stats.status)
+                                 self.w_stats.status)
                    db(sw.worker_name == self.worker_name).update(
                        last_heartbeat=now,
                        worker_stats=self.w_stats)
@@ -999,7 +1009,7 @@ class Scheduler(MetaScheduler):
                        logger.info('Asked to kill the current task')
                        self.terminate_process()
                    logger.debug('........recording heartbeat (%s)',
-                        self.w_stats.status)
+                                 self.w_stats.status)
                    db(sw.worker_name == self.worker_name).update(
                        last_heartbeat=now, status=ACTIVE,
                        worker_stats=self.w_stats)
@@ -1025,7 +1035,7 @@ class Scheduler(MetaScheduler):
                    db(
                        (st.assigned_worker_name.belongs(dead_workers_name)) &
                        (st.status == RUNNING)
-                        ).update(assigned_worker_name='', status=QUEUED)
+                    ).update(assigned_worker_name='', status=QUEUED)
                    dead_workers.delete()
                    try:
                        self.is_a_ticker = self.being_a_ticker()
@@ -1110,20 +1120,20 @@ class Scheduler(MetaScheduler):
            (sd.can_visit == False) &
            (~sd.task_child.belongs(
                db(sd.can_visit == False)._select(sd.task_parent)
-                )
            )
-            )._select(sd.task_child)
+            )
+        )._select(sd.task_child)
        no_deps = db(
            (st.status.belongs((QUEUED, ASSIGNED))) &
            (
                (sd.id == None) | (st.id.belongs(deps_with_no_deps))

            )
-            )._select(st.id, distinct=True, left=sd.on(
-                    (st.id == sd.task_parent) &
-                    (sd.can_visit == False)
-                    )
-            )
+        )._select(st.id, distinct=True, left=sd.on(
+                 (st.id == sd.task_parent) &
+                 (sd.can_visit == False)
+        )
+        )

        all_available = db(
            (st.status.belongs((QUEUED, ASSIGNED))) &
@@ -1135,7 +1145,6 @@ class Scheduler(MetaScheduler):
            (st.id.belongs(no_deps))
        )

-
        limit = len(all_workers) * (50 / (len(wkgroups) or 1))
        # if there are a moltitude of tasks, let's figure out a maximum of
        # tasks per worker. This can be further tuned with some added
@@ -1179,7 +1188,7 @@ class Scheduler(MetaScheduler):
                    db(
                        (st.id == task.id) &
                        (st.status.belongs((QUEUED, ASSIGNED)))
-                        ).update(**d)
+                    ).update(**d)
                    wkgroups[gname]['workers'][myw]['c'] += 1
            db.commit()
        # I didn't report tasks but I'm working nonetheless!!!!
@@ -1217,7 +1226,7 @@ class Scheduler(MetaScheduler):
                self.db(
                    (ws.group_names.contains(group)) &
                    (~ws.status.belongs(exclusion))
-                    ).update(status=action)
+                ).update(status=action)
        else:
            for group in group_names:
                workers = self.db((ws.group_names.contains(group)) &
@@ -1302,7 +1311,7 @@ class Scheduler(MetaScheduler):
            if immediate:
                self.db(
                    (self.db.scheduler_worker.is_ticker == True)
-                    ).update(status=PICK)
+                ).update(status=PICK)
        else:
            rtn.uuid = None
        return rtn
@@ -1352,7 +1361,7 @@ class Scheduler(MetaScheduler):
            **dict(orderby=orderby,
                   left=left,
                   limitby=(0, 1))
-            ).first()
+        ).first()
        if row and output:
            row.result = row.scheduler_run.run_result and \
                loads(row.scheduler_run.run_result,
@@ -27,7 +27,7 @@ from gluon.html import FORM, INPUT, LABEL, OPTION, SELECT, COL, COLGROUP
 from gluon.html import TABLE, THEAD, TBODY, TR, TD, TH, STYLE, SCRIPT
 from gluon.html import URL, FIELDSET, P, DEFAULT_PASSWORD_DISPLAY
 from pydal.base import DEFAULT
-from pydal.objects import Table, Row, Expression, Field
+from pydal.objects import Table, Row, Expression, Field, Set
 from pydal.adapters.base import CALLABLETYPES
 from pydal.helpers.methods import smart_query, bar_encode,  _repr_ref
 from pydal.helpers.classes import Reference, SQLCustomType
@@ -677,7 +677,23 @@ class AutocompleteWidget(object):
    def callback(self):
        if self.keyword in self.request.vars:
            field = self.fields[0]
-            if settings and settings.global_settings.web2py_runtime_gae:
+            if type(field) is FieldVirtual:
+                records = []
+                table_rows = self.db(self.db[field.tablename]).select(orderby=self.orderby)
+                count = 0
+                for row in table_rows:
+                    if self.at_beginning:
+                        if row[field.name].lower().startswith(self.request.vars[self.keyword]):
+                            count += 1
+                            records.append(row)
+                    else:
+                        if self.request.vars[self.keyword] in row[field.name].lower():
+                            count += 1
+                            records.append(row)
+                    if count == 10:
+                        break
+                rows = Rows(self.db, records, table_rows.colnames, compact=table_rows.compact)
+            elif settings and settings.global_settings.web2py_runtime_gae:
                rows = self.db(field.__ge__(self.request.vars[self.keyword]) & field.__lt__(self.request.vars[self.keyword] + u'\ufffd')).select(orderby=self.orderby, limitby=self.limitby, *(self.fields+self.help_fields))
            elif self.at_beginning:
                rows = self.db(field.like(self.request.vars[self.keyword] + '%', case_sensitive=False)).select(orderby=self.orderby, limitby=self.limitby, distinct=self.distinct, *(self.fields+self.help_fields))
@@ -725,8 +741,16 @@ class AutocompleteWidget(object):
                del attr['requires']
            attr['_name'] = key2
            value = attr['value']
-            record = self.db(
-                self.fields[1] == value).select(self.fields[0]).first()
+            if type(self.fields[0]) is FieldVirtual:
+                record = None
+                table_rows = self.db(self.db[self.fields[0].tablename]).select(orderby=self.orderby)
+                for row in table_rows:
+                    if row.id == value:
+                        record = row
+                        break
+            else:
+                record = self.db(
+                    self.fields[1] == value).select(self.fields[0]).first()
            attr['value'] = record and record[self.fields[0].name]
            attr['_onblur'] = "jQuery('#%(div_id)s').delay(1000).fadeOut('slow');" % \
                dict(div_id=div_id, u='F' + self.keyword)
@@ -912,7 +936,7 @@ def formstyle_bootstrap3_inline_factory(col_label_size=3):
            # wrappers
            _help = SPAN(help, _class='help-block')
            # embed _help into _controls
-            _controls = DIV(controls, _help, _class=col_class)
+            _controls = DIV(controls, _help, _class="%s" % (col_class))
            if isinstance(controls, INPUT):
                if controls['_type'] == 'submit':
                    controls.add_class('btn btn-primary')
@@ -938,8 +962,6 @@ def formstyle_bootstrap3_inline_factory(col_label_size=3):
            elif isinstance(controls, UL):
                for e in controls.elements("input"):
                    e.add_class('form-control')
-            elif controls is None or isinstance(controls, basestring):
-                _controls = P(controls, _class="form-control-static %s" % col_class)
            if isinstance(label, LABEL):
                label['_class'] = add_class(label.get('_class'),'control-label %s' % label_col_class)

@@ -1504,13 +1526,12 @@ class SQLFORM(FORM):
            hideerror=hideerror,
            **kwargs
        )
-
-        self.deleted = \
-            request_vars.get(self.FIELDNAME_REQUEST_DELETE, False)
+        
+        self.deleted = request_vars.get(self.FIELDNAME_REQUEST_DELETE, False)

        self.custom.end = CAT(self.hidden_fields(), self.custom.end)

-        auch = self.record_id and self.errors and self.deleted
+        delete_exception = self.record_id and self.errors and self.deleted

        if self.record_changed and self.detect_record_change:
            message_onchange = \
@@ -1522,8 +1543,9 @@ class SQLFORM(FORM):
            if message_onchange is not None:
                current.response.flash = message_onchange
            return ret
-        elif (not ret) and (not auch):
-            # auch is true when user tries to delete a record
+
+        elif (not ret) and (not delete_exception):
+            # delete_exception is true when user tries to delete a record
            # that does not pass validation, yet it should be deleted
            for fieldname in self.fields:

@@ -1679,9 +1701,6 @@ class SQLFORM(FORM):
            elif field.type == 'double':
                if value is not None:
                    fields[fieldname] = safe_float(value)
-            elif field.type in ('string', 'text'):
-                if fieldname in self.request_vars:
-                    fields[fieldname] = self.request_vars[fieldname]

        for fieldname in self.vars:
            if fieldname != 'id' and fieldname in self.table.fields\
@@ -1723,6 +1742,7 @@ class SQLFORM(FORM):
                                       self.id_field_name]).update(**fields)
                else:
                    self.vars.id = self.table.insert(**fields)
+
        self.accepted = ret
        return ret

@@ -2016,6 +2036,8 @@ class SQLFORM(FORM):
             use_cursor=False):

        formstyle = formstyle or current.response.formstyle
+        if isinstance(query, Set): 
+            query = query.query

        # jQuery UI ThemeRoller classes (empty if ui is disabled)
        if ui == 'jquery-ui':
@@ -2182,12 +2204,15 @@ class SQLFORM(FORM):

        dbset = db(query, ignore_common_filters=ignore_common_filters)
        tablenames = db._adapter.tables(dbset.query)
+        print dbset.query
+        print tablenames
        if left is not None:
            if not isinstance(left, (list, tuple)):
                left = [left]
            for join in left:
                tablenames += db._adapter.tables(join)
        tables = [db[tablename] for tablename in tablenames]
+        print tables
        if fields:
            # add missing tablename to virtual fields
            for table in tables:
@@ -2339,7 +2364,7 @@ class SQLFORM(FORM):
                if deletable(record):
                    if ondelete:
                        ondelete(table, request.args[-1])
-                    record.delete_record()
+                    db(table[table._id.name] == request.args[-1]).delete()
            if request.ajax:
                # this means javascript is enabled, so we don't need to do
                # a redirect
@@ -25,7 +25,6 @@ regex_stop_range = re.compile('(?<=\-)\d+')

 DEFAULT_CHUNK_SIZE = 64 * 1024

-
 def streamer(stream, chunk_size=DEFAULT_CHUNK_SIZE, bytes=None):
    offset = 0
    while bytes is None or offset < bytes:
@@ -51,11 +50,12 @@ def stream_file_or_304_or_206(
    status=200,
    error_message=None
    ):
-    if error_message is None:
-        error_message = rewrite.THREAD_LOCAL.routes.error_message % 'invalid request'
+    # FIX THIS
+    # if error_message is None:
+    #     error_message = rewrite.THREAD_LOCAL.routes.error_message % 'invalid request'
    try:
        open = file # this makes no sense but without it GAE cannot open files
-        fp = open(static_file)
+        fp = open(static_file,'rb')
    except IOError, e:
        if e[0] == errno.EISDIR:
            raise HTTP(403, error_message, web2py_error='file is a directory')
@@ -3,12 +3,14 @@ import sys
 from test_http import *
 from test_cache import *
 from test_contenttype import *
+from test_compileapp import *
 from test_fileutils import *
 from test_globals import *
 from test_html import *
 from test_is_url import *
 from test_languages import *
 from test_router import *
+from test_recfile import *
 from test_routes import *
 from test_storage import *
 from test_serializers import *
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+""" Unit tests for utils.py """
+
+import unittest
+from fix_path import fix_sys_path
+
+fix_sys_path(__file__)
+
+from compileapp import compile_application, remove_compiled_application
+from gluon.fileutils import w2p_pack, w2p_unpack
+import os
+
+
+class TestPack(unittest.TestCase):
+    """ Tests the compileapp.py module """
+
+    def test_compile(self):
+        #apps = ['welcome', 'admin', 'examples']
+        apps = ['welcome']
+        for appname in apps:
+            appname_path = os.path.join(os.getcwd(), 'applications', appname)
+            compile_application(appname_path)
+            remove_compiled_application(appname_path)
+            test_path = os.path.join(os.getcwd(), "%s.w2p" % appname)
+            unpack_path = os.path.join(os.getcwd(), 'unpack', appname)
+            w2p_pack(test_path, appname_path, compiled=True, filenames=None)
+            w2p_pack(test_path, appname_path, compiled=False, filenames=None)
+            w2p_unpack(test_path, unpack_path)
+        return
+
+
+if __name__ == '__main__':
+    unittest.main()
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+    Unit tests for gluon.recfile
+"""
+import unittest
+import os
+import shutil
+import uuid
+from fix_path import fix_sys_path
+
+fix_sys_path(__file__)
+
+from gluon import recfile
+
+
+class TestRecfile(unittest.TestCase):
+
+    def setUp(self):
+        os.mkdir('tests')
+
+    def tearDown(self):
+        shutil.rmtree('tests')
+
+    def testgeneration(self):
+        for k in range(20):
+            teststring = 'test%s' % k
+            filename = os.path.join('tests', str(uuid.uuid4()) + '.test')
+            with recfile.open(filename, "w") as g:
+                g.write(teststring)
+            self.assertEqual(recfile.open(filename, "r").read(), teststring)
+            is_there = recfile.exists(filename)
+            self.assertTrue(is_there)
+            recfile.remove(filename)
+            is_there = recfile.exists(filename)
+            self.assertFalse(is_there)
+
+if __name__ == '__main__':
+    unittest.main()
@@ -13,7 +13,7 @@ from utils import compare

 import hashlib
 from hashlib import md5, sha1, sha224, sha256, sha384, sha512
-from utils import simple_hash, get_digest
+from utils import simple_hash, get_digest, secure_dumps, secure_loads


 class TestUtils(unittest.TestCase):
@@ -65,27 +65,36 @@ class TestUtils(unittest.TestCase):
        self.assertEqual(data_sha512, 'fa3237f594743e1d7b6c800bb134b3255cf4a98ab8b01e2ec23256328c9f8059'
                                      '64fdef25a038d6cc3fda1b2fb45d66461eeed5c4669e506ec8bdfee71348db7e')

+    def test_secure_dumps_and_loads(self):
+        """ Tests secure_dumps and secure_loads"""
+        testobj = {'a': 1, 'b': 2}
+        testkey = 'mysecret'
+        secured = secure_dumps(testobj, testkey)
+        original = secure_loads(secured, testkey)
+        self.assertEqual(testobj, original)
+        self.assertTrue(isinstance(secured, basestring))
+        self.assertTrue(':' in secured)

+        large_testobj = [x for x in range(1000)]
+        secured_comp = secure_dumps(large_testobj, testkey, compression_level=9)
+        original_comp = secure_loads(secured_comp, testkey, compression_level=9)
+        self.assertEqual(large_testobj, original_comp)
+        secured = secure_dumps(large_testobj, testkey)
+        self.assertTrue(len(secured_comp) < len(secured))

-class TestPack(unittest.TestCase):
-    """ Tests the compileapp.py module """
+        testhash = 'myhash'
+        secured = secure_dumps(testobj, testkey, testhash)
+        original = secure_loads(secured, testkey, testhash)
+        self.assertEqual(testobj, original)

-    def test_compile(self):
-        from compileapp import compile_application, remove_compiled_application
-        from gluon.fileutils import w2p_pack, w2p_unpack
-        import os
-        #apps = ['welcome', 'admin', 'examples']
-        apps = ['welcome']
-        for appname in apps:
-            appname_path = os.path.join(os.getcwd(), 'applications', appname)
-            compile_application(appname_path)
-            remove_compiled_application(appname_path)
-            test_path = os.path.join(os.getcwd(), "%s.w2p" % appname)
-            unpack_path = os.path.join(os.getcwd(), 'unpack', appname)
-            w2p_pack(test_path, appname_path, compiled=True, filenames=None)
-            w2p_pack(test_path, appname_path, compiled=False, filenames=None)
-            w2p_unpack(test_path, unpack_path)
-        return
+        wrong1 = secure_loads(secured, testkey, 'wronghash')
+        self.assertEqual(wrong1, None)
+        wrong2 = secure_loads(secured, 'wrongkey', testhash)
+        self.assertEqual(wrong2, None)
+        wrong3 = secure_loads(secured, 'wrongkey', 'wronghash')
+        self.assertEqual(wrong3, None)
+        wrong4 = secure_loads('abc', 'a', 'b')
+        self.assertEqual(wrong4, None)

 if __name__ == '__main__':
    unittest.main()
@@ -618,6 +618,9 @@ class TestValidators(unittest.TestCase):
        self.assertEqual(rtn, (u'hell', None))
        rtn = IS_MATCH('hell', is_unicode=True)(u'hell')
        self.assertEqual(rtn, (u'hell', None))
+        # regr test for #1044
+        rtn = IS_MATCH('hello')(u'\xff')
+        self.assertEqual(rtn, (u'\xff', 'Invalid expression'))


    def test_IS_EQUAL_TO(self):
@@ -1 +0,0 @@
-
@@ -32,11 +32,14 @@ import cStringIO
 import ConfigParser
 import email.utils
 import random
+import hmac
+import hashlib
 from email import MIMEBase, MIMEMultipart, MIMEText, Encoders, Header, message_from_string, Charset

+from gluon.serializers import json_parser
 from gluon.contenttype import contenttype
 from gluon.storage import Storage, StorageList, Settings, Messages
-from gluon.utils import web2py_uuid
+from gluon.utils import web2py_uuid, compare
 from gluon.fileutils import read_file, check_credentials
 from gluon import *
 from gluon.contrib.autolinks import expand_one
@@ -49,17 +52,6 @@ import gluon.serializers as serializers
 Table = DAL.Table
 Field = DAL.Field

-try:
-    # try stdlib (Python 2.6)
-    import json as json_parser
-except ImportError:
-    try:
-        # try external module
-        import simplejson as json_parser
-    except:
-        # fallback to pure-Python module
-        import gluon.contrib.simplejson as json_parser
-
 __all__ = ['Mail', 'Auth', 'Recaptcha', 'Recaptcha2', 'Crud', 'Service', 'Wiki',
           'PluginManager', 'fetch', 'geocode', 'reverse_geocode', 'prettydate']

@@ -261,7 +253,7 @@ class Mail(object):
            MIMEBase.MIMEBase.__init__(self, *content_type.split('/', 1))
            self.set_payload(payload)
            self['Content-Disposition'] = 'attachment; filename="%s"' % filename
-            if not content_id is None:
+            if content_id is not None:
                self['Content-Id'] = '<%s>' % content_id.encode(encoding)
            Encoders.encode_base64(self)

@@ -785,16 +777,16 @@ class Mail(object):
                if attachments:
                    result = mail.send_mail(
                        sender=sender, to=origTo,
-                        subject=unicode(subject), body=unicode(text), html=html,
+                        subject=unicode(subject, encoding), body=unicode(text, encoding), html=html,
                        attachments=attachments, **xcc)
                elif html and (not raw):
                    result = mail.send_mail(
                        sender=sender, to=origTo,
-                        subject=unicode(subject), body=unicode(text), html=html, **xcc)
+                        subject=unicode(subject, encoding), body=unicode(text, encoding), html=html, **xcc)
                else:
                    result = mail.send_mail(
                        sender=sender, to=origTo,
-                        subject=unicode(subject), body=unicode(text), **xcc)
+                        subject=unicode(subject, encoding), body=unicode(text, encoding), **xcc)
            else:
                smtp_args = self.settings.server.split(':')
                kwargs = dict(timeout=self.settings.timeout)
@@ -1136,6 +1128,310 @@ def addrow(form, a, b, c, style, _id, position=-1):
                                    TD(c, _class='w2p_fc'), _id=_id))


+class AuthJWT(object):
+
+    """
+    Experimental!
+
+    Args:
+     - secret_key: the secret. Without salting, an attacker knowing this can impersonate
+                   any user
+     - algorithm : uses as they are in the JWT specs, HS256, HS384 or HS512 basically means
+                   signing with HMAC with a 256, 284 or 512bit hash
+     - verify_expiration : verifies the expiration checking the exp claim
+     - leeway: allow n seconds of skew when checking for token expiration
+     - expiration : how many seconds a token may be valid
+     - allow_refresh: enable the machinery to get a refreshed token passing a not-already-expired
+                      token
+     - refresh_expiration_delta: to avoid continous refresh of the token
+     - header_prefix : self-explanatory. "JWT" and "Bearer" seems to be the emerging standards
+     - jwt_add_header: a dict holding additional mappings to the header. by default only alg and typ are filled
+     - user_param: the name of the parameter holding the username when requesting a token. Can be useful, e.g, for
+                   email-based authentication, with "email" as a parameter
+     - pass_param: same as above, but for the password
+     - realm: self-explanatory
+     - salt: can be static or a function that takes the payload as an argument.
+             Example:
+             def mysalt(payload):
+                return payload['hmac_key'].split('-')[0]
+     - additional_payload: can be a dict to merge with the payload or a function that takes
+                           the payload as input and returns the modified payload
+                           Example:
+                           def myadditional_payload(payload):
+                               payload['my_name_is'] = 'bond,james bond'
+                               return payload
+     - before_authorization: can be a callable that takes the deserialized token (a dict) as input.
+                             Gets called right after signature verification but before the actual
+                             authorization takes place. It may be use to cast
+                             the extra auth_user fields to their actual types.
+                             You can raise with HTTP a proper error message
+                             Example:
+                             def mybefore_authorization(tokend):
+                                 if not tokend['my_name_is'] == 'bond,james bond':
+                                     raise HTTP(400, u'Invalid JWT my_name_is claim')
+     - max_header_length: check max length to avoid load()ing unusually large tokens (could mean crafted, e.g. in a DDoS.)
+
+    Basic Usage:
+    in models (or the controller needing it)
+
+        myjwt = AuthJWT(auth, secret_key='secret')
+
+    in the controller issuing tokens
+
+        def login_and_take_token():
+            return myjwt.jwt_token_manager()
+
+    A call then to /app/controller/login_and_take_token with username and password returns the token
+    A call to /app/controller/login_and_take_token with the original token returns the refreshed token
+
+    To protect a function with JWT
+
+        @myjwt.allows_jwt()
+        @auth.requires_login()
+        def protected():
+            return '%s$%s' % (request.now, auth.user_id)
+
+    """
+
+    def __init__(self,
+                 auth,
+                 secret_key,
+                 algorithm='HS256',
+                 verify_expiration=True,
+                 leeway=30,
+                 expiration=60 * 5,
+                 allow_refresh=True,
+                 refresh_expiration_delta=60 * 60,
+                 header_prefix='Bearer',
+                 jwt_add_header=None,
+                 user_param='username',
+                 pass_param='password',
+                 realm='Login required',
+                 salt=None,
+                 additional_payload=None,
+                 before_authorization=None,
+                 max_header_length=4*1024,
+                 ):
+        self.secret_key = secret_key
+        self.auth = auth
+        self.algorithm = algorithm
+        if self.algorithm not in ('HS256', 'HS384', 'HS512'):
+            raise NotImplementedError('Algoritm %s not allowed' % algorithm)
+        self.verify_expiration = verify_expiration
+        self.leeway = leeway
+        self.expiration = expiration
+        self.allow_refresh = allow_refresh
+        self.refresh_expiration_delta = refresh_expiration_delta
+        self.header_prefix = header_prefix
+        self.jwt_add_header = jwt_add_header or {}
+        base_header = {'alg': self.algorithm, 'typ': 'JWT'}
+        for k, v in self.jwt_add_header.iteritems():
+            base_header[k] = v
+        self.cached_b64h = self.jwt_b64e(json_parser.dumps(base_header))
+        digestmod_mapping = {
+            'HS256': hashlib.sha256,
+            'HS384': hashlib.sha384,
+            'HS512': hashlib.sha512
+        }
+        self.digestmod = digestmod_mapping[algorithm]
+        self.user_param = user_param
+        self.pass_param = pass_param
+        self.realm = realm
+        self.salt = salt
+        self.additional_payload = additional_payload
+        self.before_authorization = before_authorization
+        self.max_header_length = max_header_length
+
+    @staticmethod
+    def jwt_b64e(string):
+        if isinstance(string, unicode):
+            string = string.encode('utf-8', 'strict')
+        return base64.urlsafe_b64encode(string).strip(b'=')
+
+    @staticmethod
+    def jwt_b64d(string):
+        """base64 decodes a single bytestring (and is tolerant to getting
+        called with a unicode string).
+        The result is also a bytestring.
+        """
+        if isinstance(string, unicode):
+            string = string.encode('ascii', 'ignore')
+        return base64.urlsafe_b64decode(string + '=' * (-len(string) % 4))
+
+    def generate_token(self, payload):
+        secret = self.secret_key
+        if self.salt:
+            if callable(self.salt):
+                secret = "%s$%s" % (secret, self.salt(payload))
+            else:
+                secret = "%s$%s" % (secret, self.salt)
+            if isinstance(secret, unicode):
+                secret = secret.encode('ascii', 'ignore')
+        b64h = self.cached_b64h
+        b64p = self.jwt_b64e(serializers.json(payload))
+        jbody = b64h + '.' + b64p
+        mauth = hmac.new(key=secret, msg=jbody, digestmod=self.digestmod)
+        jsign = self.jwt_b64e(mauth.digest())
+        return jbody + '.' + jsign
+
+    def verify_signature(self, body, signature, secret):
+        mauth = hmac.new(key=secret, msg=body, digestmod=self.digestmod)
+        return compare(self.jwt_b64e(mauth.digest()), signature)
+
+    def load_token(self, token):
+        if isinstance(token, unicode):
+            token = token.encode('utf-8', 'strict')
+        body, sig = token.rsplit('.', 1)
+        b64h, b64b = body.split('.', 1)
+        if b64h != self.cached_b64h:
+            # header not the same
+            raise HTTP(400, u'Invalid JWT Header')
+        secret = self.secret_key
+        tokend = serializers.loads_json(self.jwt_b64d(b64b))
+        if self.salt:
+            if callable(self.salt):
+                secret = "%s$%s" % (secret, self.salt(tokend))
+            else:
+                secret = "%s$%s" % (secret, self.salt)
+            if isinstance(secret, unicode):
+                secret = secret.encode('ascii', 'ignore')
+        if not self.verify_signature(body, sig, secret):
+            # signature verification failed
+            raise HTTP(400, u'Token signature is invalid')
+        if self.verify_expiration:
+            now = time.mktime(datetime.datetime.utcnow().timetuple())
+            if tokend['exp'] + self.leeway < now:
+                raise HTTP(400, u'Token is expired')
+        if callable(self.before_authorization):
+            self.before_authorization(tokend)
+        return tokend
+
+    def serialize_auth_session(self, session_auth):
+        """
+        As bad as it sounds, as long as this is rarely used (vs using the token)
+        this is the faster method, even if we ditch session in jwt_token_manager().
+        We (mis)use the heavy default auth mechanism to avoid any further computation,
+        while sticking to a somewhat-stable Auth API.
+        """
+        ## is the following safe or should we use
+        ## calendar.timegm(datetime.datetime.utcnow().timetuple())
+        ## result seem to be the same (seconds since epoch, in UTC)
+        now = time.mktime(datetime.datetime.now().timetuple())
+        expires = now + self.expiration
+        payload = dict(
+            hmac_key=session_auth['hmac_key'],
+            user_groups=session_auth['user_groups'],
+            user=session_auth['user'].as_dict(),
+            iat=now,
+            exp=expires
+        )
+        return payload
+
+    def refresh_token(self, orig_payload):
+        now = time.mktime(datetime.datetime.now().timetuple())
+        if self.verify_expiration:
+            orig_exp = orig_payload['exp']
+            if orig_exp + self.leeway < now:
+                # token already expired, can't be used for refresh
+                raise HTTP(400, u'Token already expired')
+        orig_iat = orig_payload.get('orig_iat') or orig_payload['iat']
+        if orig_iat + self.refresh_expiration_delta < now:
+            # refreshed too long ago
+            raise HTTP(400, u'Token issued too long ago')
+        expires = now + self.expiration
+        orig_payload.update(
+            orig_iat=orig_iat,
+            iat=now,
+            exp=expires,
+            hmac_key=web2py_uuid()
+        )
+        self.alter_payload(orig_payload)
+        return orig_payload
+
+    def alter_payload(self, payload):
+        if self.additional_payload:
+            if callable(self.additional_payload):
+                payload = self.additional_payload(payload)
+            elif isinstance(self.additional_payload, dict):
+                payload.update(self.additional_payload)
+        return payload
+
+    def jwt_token_manager(self):
+        """
+        The part that issues (and refreshes) tokens.
+        Used in a controller, given myjwt is the istantiated class, as
+
+            def api_auth():
+                return myjwt.jwt_token_manager()
+
+        Then, a call to /app/c/api_auth with username and password
+        returns a token, while /app/c/api_auth with the current token
+        issues another token
+        """
+        request = current.request
+        response = current.response
+        session = current.session
+        # forget and unlock response
+        session.forget(response)
+        valid_user = None
+        ret = None
+        if request.vars.token:
+            if not self.allow_refresh:
+                raise HTTP(403, u'Refreshing token is not allowed')
+            token = request.vars.token
+            tokend = self.load_token(token)
+            # verification can fail here
+            refreshed = self.refresh_token(tokend)
+            ret = {'token': self.generate_token(refreshed)}
+        elif self.user_param in request.vars and self.pass_param in request.vars:
+            username = request.vars[self.user_param]
+            password = request.vars[self.pass_param]
+            valid_user = self.auth.login_bare(username, password)
+        else:
+            valid_user = self.auth.user
+        if valid_user:
+            payload = self.serialize_auth_session(current.session.auth)
+            self.alter_payload(payload)
+            ret = {'token': self.generate_token(payload)}
+        elif ret is None:
+            raise HTTP(
+                401, u'Not Authorized - need to be logged in, to pass a token for refresh or username and password for login',
+                **{'WWW-Authenticate': u'JWT realm="%s"' % self.realm})
+        response.headers['Content-Type'] = 'application/json'
+        return serializers.json(ret)
+
+    def inject_token(self, tokend):
+        """
+        The real deal, not touching the db but still logging-in the user
+        """
+        self.auth.user = Storage(tokend['user'])
+        self.auth.user_groups = tokend['user_groups']
+        self.auth.hmac_key = tokend['hmac_key']
+
+    def allows_jwt(self, otherwise=None):
+        """
+        The validator that checks for the header or the
+        _token var
+        """
+        request = current.request
+        token_in_header = request.env.http_authorization
+        if token_in_header:
+            parts = token_in_header.split()
+            if parts[0].lower() != self.header_prefix.lower():
+                raise HTTP(400, u'Invalid JWT header')
+            elif len(parts) == 1:
+                raise HTTP(400, u'Invalid JWT header, missing token')
+            elif len(parts) > 2:
+                raise HTTP(400, 'Invalid JWT header, token contains spaces')
+            token = parts[1]
+        else:
+            token = request.vars._token
+        if token and len(token) < self.max_header_length:
+            tokend = self.load_token(token)
+            self.inject_token(tokend)
+        return self.auth.requires(True, otherwise=otherwise)
+
+
 class Auth(object):

    default_settings = dict(
@@ -1414,8 +1710,9 @@ class Auth(object):
            args = []
        if vars is None:
            vars = {}
+        host = scheme and self.settings.host
        return URL(c=self.settings.controller,
-                   f=f, args=args, vars=vars, scheme=scheme)
+                   f=f, args=args, vars=vars, scheme=scheme, host=host)

    def here(self):
        return URL(args=current.request.args, vars=current.request.get_vars)
@@ -1424,7 +1721,7 @@ class Auth(object):
                 hmac_key=None, controller='default', function='user',
                 cas_provider=None, signature=True, secure=False,
                 csrf_prevention=True, propagate_extension=None,
-                 url_index=None):
+                 url_index=None, jwt=None, host=None):

        ## next two lines for backward compatibility
        if not db and environment and isinstance(environment, DAL):
@@ -1467,9 +1764,10 @@ class Auth(object):
        # ## what happens after registration?

        settings = self.settings = Settings()
-        settings.update(Auth.default_settings)
+        settings.update(Auth.default_settings)        
+        host = host or request.env.http_host
        settings.update(
-            cas_domains=[request.env.http_host],
+            cas_domains=[host],
            enable_tokens=False,
            cas_provider=cas_provider,
            cas_actions=dict(login='login',
@@ -1519,6 +1817,7 @@ class Auth(object):
            label_separator=current.response.form_label_separator,
            two_factor_methods = [],
            two_factor_onvalidation = [],
+            host = host,
        )
        settings.lock_keys = True
        # ## these are messages that can be customized
@@ -1544,6 +1843,7 @@ class Auth(object):
            self.define_signature()
        else:
            self.signature = None
+        self.jwt_handler = jwt and AuthJWT(self, **jwt)

    def get_vars_next(self):
        next = current.request.vars._next
@@ -1612,7 +1912,7 @@ class Auth(object):
                       'reset_password', 'request_reset_password',
                       'change_password', 'profile', 'groups',
                       'impersonate', 'not_authorized', 'confirm_registration',
-                       'bulk_register','manage_tokens'):
+                       'bulk_register','manage_tokens','jwt'):
            if len(request.args) >= 2 and args[0] == 'impersonate':
                return getattr(self, args[0])(request.args[1])
            else:
@@ -2653,7 +2953,7 @@ class Auth(object):
                    if user:
                        # user in db, check if registration pending or disabled
                        temp_user = user
-                        if temp_user.registration_key == 'pending':
+                        if (temp_user.registration_key or '').startswith('pending'):
                            response.flash = self.messages.registration_pending
                            return form
                        elif temp_user.registration_key in ('disabled', 'blocked'):
@@ -3028,7 +3328,11 @@ class Auth(object):
                   DIV(_id="pre-reg", *self.settings.pre_registration_div),
                   '', formstyle, '')

-        table_user.registration_key.default = key = web2py_uuid()
+        key = web2py_uuid()
+        if self.settings.registration_requires_approval:
+            key = 'pending-'+key
+
+        table_user.registration_key.default = key
        if form.accepts(request, session if self.csrf_prevention else None,
                        formname='register',
                        onvalidation=onvalidation,
@@ -3242,11 +3546,12 @@ class Auth(object):
                        formname='retrieve_password', dbio=False,
                        onvalidation=onvalidation, hideerror=self.settings.hideerror):
            user = table_user(email=form.vars.email)
+            key = user.registration_key
            if not user:
                current.session.flash = \
                    self.messages.invalid_email
                redirect(self.url(args=request.args))
-            elif user.registration_key in ('pending', 'disabled', 'blocked'):
+            elif key in ('pending', 'disabled', 'blocked') or (key or '').startswith('pending'):
                current.session.flash = \
                    self.messages.registration_pending
                redirect(self.url(args=request.args))
@@ -3451,6 +3756,11 @@ class Auth(object):
            session.flash = self.messages.invalid_reset_password
            redirect(next, client_side=self.settings.client_side)

+        key = user.registration_key
+        if key in ('pending', 'disabled', 'blocked') or (key or '').startswith('pending'):
+            session.flash = self.messages.registration_pending
+            redirect(next, client_side=self.settings.client_side)
+
        if onvalidation is DEFAULT:
            onvalidation = self.settings.reset_password_onvalidation
        if onaccept is DEFAULT:
@@ -3544,11 +3854,12 @@ class Auth(object):
                        onvalidation=onvalidation,
                        hideerror=self.settings.hideerror):
            user = table_user(**{userfield:form.vars.get(userfield)})
+            key = user.registration_key
            if not user:
                session.flash = self.messages['invalid_%s' % userfield]
                redirect(self.url(args=request.args),
                         client_side=self.settings.client_side)
-            elif user.registration_key in ('pending', 'disabled', 'blocked'):
+            elif key in ('pending', 'disabled', 'blocked') or (key or '').startswith('pending'):
                session.flash = self.messages.registration_pending
                redirect(self.url(args=request.args),
                         client_side=self.settings.client_side)
@@ -3727,6 +4038,50 @@ class Auth(object):
            for callback in onaccept:
                callback(form)

+    def jwt(self):
+        """
+        To use JWT authentication:
+        1) instantiate auth with::
+
+            auth = Auth(db, jwt = {'secret_key':'secret'})
+
+        where 'secret' is your own secret string.
+
+        2) Decorate functions that require login but should accept the JWT token credentials::
+
+            @auth.allows_jwt()
+            @auth.requires_login()
+            def myapi(): return 'hello %s' % auth.user.email
+
+        Notice jwt is allowed but not required. if user is logged in, myapi is accessible.
+
+        3) Use it!
+
+        Now API users can obtain a token with
+
+            http://.../app/default/user/jwt?username=...&password=....
+
+        (returns json object with a token attribute)
+        API users can refresh an existing token with
+
+            http://.../app/default/user/jwt?token=...
+
+        they can authenticate themselves when calling http:/.../myapi by injecting a header
+
+            Authorization: Bearer <the jwt token>
+
+        Any additional attributes in the jwt argument of Auth() below::
+
+           auth = Auth(db, jwt = {...})
+
+        are passed to the constructor of class AuthJWT. Look there for documentation.
+        """
+        if not self.jwt_handler:
+            raise HTTP(400, "Not authorized")
+        else:
+            rtn = self.jwt_handler.jwt_token_manager()
+            raise HTTP(200, rtn, cookies=None, **current.response.headers)
+
    def is_impersonating(self):
        return self.is_logged_in() and 'impersonator' in current.session.auth

@@ -3825,6 +4180,12 @@ class Auth(object):
            raise HTTP(403, 'ACCESS DENIED')
        return self.messages.access_denied

+    def allows_jwt(self, otherwise=None):
+        if not self.jwt_handler:
+            raise HTTP(400, "Not authorized")
+        else:
+            return self.jwt_handler.allows_jwt(otherwise=otherwise)
+
    def requires(self, condition, requires_login=True, otherwise=None):
        """
        Decorator that prevents access to action if not logged in
@@ -3836,7 +4197,6 @@ class Auth(object):

                basic_allowed, basic_accepted, user = self.basic()
                user = user or self.user
-
                login_required = requires_login
                if callable(login_required):
                    login_required = login_required()
@@ -3845,7 +4205,7 @@ class Auth(object):
                    if not user:
                        if current.request.ajax:
                            raise HTTP(401, self.messages.ajax_failed_authentication)
-                        elif not otherwise is None:
+                        elif otherwise is not None:
                            if callable(otherwise):
                                return otherwise()
                            redirect(otherwise)
@@ -3883,7 +4243,7 @@ class Auth(object):
        return self.requires(True, otherwise=otherwise)

    def requires_login_or_token(self, otherwise=None):
-        if self.settings.enable_tokens == True:
+        if self.settings.enable_tokens is True:
            user = None
            request = current.request
            token = request.env.http_web2py_user_token or request.vars._token
@@ -4328,7 +4688,7 @@ class Auth(object):
        if resolve:
            if slug:
                wiki = self._wiki.read(slug, force_render)
-                if isinstance(wiki, dict) and wiki.has_key('content'):  # FIXME: .has_key() is deprecated
+                if isinstance(wiki, dict) and 'content' in wiki:
                    # We don't want to return a dict object, just the wiki
                    wiki = wiki['content']
            else:
@@ -5345,7 +5705,7 @@ class Service(object):

        def return_error(id, code, message=None, data=None):
            error = {'code': code}
-            if Service.jsonrpc_errors.has_key(code):
+            if code in Service.jsonrpc_errors:
                error['message'] = Service.jsonrpc_errors[code][0]
                error['data'] = Service.jsonrpc_errors[code][1]
            if message is not None:
@@ -64,6 +64,10 @@ else:
        except (ImportError, ValueError):
            HAVE_PBKDF2 = False

+HAVE_COMPARE_DIGEST = False
+if hasattr(hmac, 'compare_digest'):
+    HAVE_COMPARE_DIGEST = True
+
 logger = logging.getLogger("web2py")


@@ -77,6 +81,8 @@ def AES_new(key, IV=None):

 def compare(a, b):
    """ Compares two strings and not vulnerable to timing attacks """
+    if HAVE_COMPARE_DIGEST:
+        return hmac.compare_digest(a, b)
    if len(a) != len(b):
        return False
    result = 0
@@ -143,6 +149,7 @@ DIGEST_ALG_BY_SIZE = {
    512 / 4: 'sha512',
 }

+
 def get_callable_argspec(fn):
    if inspect.isfunction(fn) or inspect.ismethod(fn):
        inspectable = fn
@@ -154,6 +161,7 @@ def get_callable_argspec(fn):
        inspectable = fn
    return inspect.getargspec(inspectable)

+
 def pad(s, n=32, padchar=' '):
    return s + (32 - len(s) % 32) * padchar

@@ -172,7 +180,7 @@ def secure_dumps(data, encryption_key, hash_key=None, compression_level=None):


 def secure_loads(data, encryption_key, hash_key=None, compression_level=None):
-    if not ':' in data:
+    if ':' not in data:
        return None
    if not hash_key:
        hash_key = sha1(encryption_key).hexdigest()
@@ -22,7 +22,7 @@ import decimal
 import unicodedata
 from cStringIO import StringIO
 from gluon.utils import simple_hash, web2py_uuid, DIGEST_ALG_BY_SIZE
-from pydal.objects import FieldVirtual, FieldMethod
+from pydal.objects import Field, FieldVirtual, FieldMethod

 regex_isint = re.compile('^[+-]?\d+$')

@@ -201,12 +201,15 @@ class IS_MATCH(Validator):

    def __call__(self, value):
        if self.is_unicode:
-            if isinstance(value,unicode):
-                match = self.regex.search(value)
-            else:
+            if not isinstance(value, unicode):
                match = self.regex.search(str(value).decode('utf8'))
+            else:
+                match = self.regex.search(value)
        else:
-            match = self.regex.search(str(value))
+            if not isinstance(value, unicode):
+                match = self.regex.search(str(value))
+            else:
+                match = self.regex.search(value.encode('utf8'))
        if match is not None:
            return (self.extract and match.group() or value, None)
        return (value, translate(self.error_message))
@@ -509,34 +512,44 @@ class IS_IN_DB(Validator):
        zero='',
        sort=False,
        _and=None,
-        left=None
+        left=None,
+        delimiter=None,
+        auto_add=False,
    ):
        from pydal.objects import Table
-        if isinstance(field, Table):
-            field = field._id
-
        if hasattr(dbset, 'define_table'):
            self.dbset = dbset()
        else:
            self.dbset = dbset
+
+        if isinstance(field, Table):
+            field = field._id
+        elif isinstance(field, str):
+            items = field.split('.')
+            if len(items)==1: items+=['id']
+            field = self.dbset.db[items[0]][items[1]]
+
        (ktable, kfield) = str(field).split('.')
        if not label:
            label = '%%(%s)s' % kfield
        if isinstance(label, str):
            if regex1.match(str(label)):
                label = '%%(%s)s' % str(label).split('.')[-1]
-            ks = regex2.findall(label)
-            if kfield not in ks:
-                ks += [kfield]
-            fields = ks
+            fieldnames = regex2.findall(label)
+            if kfield not in fieldnames:
+                fieldnames.append(kfield) # kfield must be last
+        elif isinstance(label, Field):
+            fieldnames = [label.name, kfield] # kfield must be last
+            label = '%%(%s)s' % label.name
+        elif callable(label):
+            fieldnames = '*'
        else:
-            ks = [kfield]
-            fields = 'all'
-        self.fields = fields
+            raise NotImplementedError
+        self.field = field # the lookup field
+        self.fieldnames = fieldnames # fields requires to build the formatting
        self.label = label
        self.ktable = ktable
        self.kfield = kfield
-        self.ks = ks
        self.error_message = error_message
        self.theset = None
        self.orderby = orderby
@@ -548,6 +561,8 @@ class IS_IN_DB(Validator):
        self.sort = sort
        self._and = _and
        self.left = left
+        self.delimiter = delimiter
+        self.auto_add = auto_add

    def set_self_id(self, id):
        if self._and:
@@ -555,10 +570,10 @@ class IS_IN_DB(Validator):

    def build_set(self):
        table = self.dbset.db[self.ktable]
-        if self.fields == 'all':
+        if self.fieldnames == '*':
            fields = [f for f in table]
        else:
-            fields = [table[k] for k in self.fields]
+            fields = [table[k] for k in self.fieldnames]
        ignore = (FieldVirtual, FieldMethod)
        fields = filter(lambda f: not isinstance(f, ignore), fields)
        if self.dbset.db._dbname != 'gae':
@@ -591,18 +606,41 @@ class IS_IN_DB(Validator):
            items.insert(0, ('', self.zero))
        return items

+    def maybe_add(self, table, fieldname, value):
+        d = {fieldname: value}
+        record = table(**d)
+        if record:
+            return record.id
+        else:
+            return table.insert(**d)
+
    def __call__(self, value):
        table = self.dbset.db[self.ktable]
        field = table[self.kfield]
+
        if self.multiple:
            if self._and:
                raise NotImplementedError
            if isinstance(value, list):
                values = value
+            elif self.delimiter:
+                values = value.split(self.delimiter) # because of autocomplete
            elif value:
                values = [value]
            else:
                values = []
+
+            if self.field.type in ('id','integer'):
+                new_values = []
+                for value in values:
+                    if not (isinstance(value,(int,long)) or value.isdigit()):
+                        if self.auto_add:
+                            value = str(self.maybe_add(table, self.fieldnames[0], value))
+                        else:
+                            return (values, translate(self.error_message))
+                    new_values.append(value)
+                values = new_values
+
            if isinstance(self.multiple, (tuple, list)) and \
                    not self.multiple[0] <= len(values) < self.multiple[1]:
                return (values, translate(self.error_message))
@@ -621,18 +659,32 @@ class IS_IN_DB(Validator):
                        return (values, None)
                elif count(values) == len(values):
                    return (values, None)
-        elif self.theset:
-            if str(value) in self.theset:
-                if self._and:
-                    return self._and(value)
-                else:
-                    return (value, None)
        else:
-            if self.dbset(field == value).count():
-                if self._and:
-                    return self._and(value)
+            if self.field.type in ('id','integer'):
+                if isinstance(value,(int,long)) or value.isdigit():
+                    value = int(value)
+                elif self.auto_add:
+                    value = self.maybe_add(table, self.fieldnames[0], value)
                else:
-                    return (value, None)
+                    return (value, translate(self.error_message))
+
+                try:
+                    value = int(value)
+                except TypeError:
+                    return (values, translate(self.error_message))
+
+            if self.theset:
+                if str(value) in self.theset:
+                    if self._and:
+                        return self._and(value)
+                    else:
+                        return (value, None)
+            else:
+                if self.dbset(field == value).count():
+                    if self._and:
+                        return self._and(value)
+                    else:
+                        return (value, None)
        return (value, translate(self.error_message))


@@ -40,8 +40,8 @@ ProgramInfo = '''%s
                 %s
                 %s''' % (ProgramName, ProgramAuthor, ProgramVersion)

-if not sys.version[:3] in ['2.5', '2.6', '2.7']:
-    msg = 'Warning: web2py requires Python 2.5, 2.6 or 2.7 but you are running:\n%s'
+if not sys.version[:3] in ['2.6', '2.7']:
+    msg = 'Warning: web2py requires Python 2.6 or 2.7 but you are running:\n%s'
    msg = msg % sys.version
    sys.stderr.write(msg)

@@ -56,8 +56,8 @@ def run_system_tests(options):
    major_version = sys.version_info[0]
    minor_version = sys.version_info[1]
    if major_version == 2:
-        if minor_version in (5, 6):
-            sys.stderr.write("Python 2.5 or 2.6\n")
+        if minor_version in (6,):
+            sys.stderr.write('Python 2.6\n')
            ret = subprocess.call(['unit2', '-v', 'gluon.tests'])
        elif minor_version in (7,):
            call_args = [sys.executable, '-m', 'unittest', '-v', 'gluon.tests']
@@ -150,7 +150,7 @@ class web2pyDialog(object):
        self.scheduler_processes = {}
        self.menu = Tkinter.Menu(self.root)
        servermenu = Tkinter.Menu(self.menu, tearoff=0)
-        httplog = os.path.join(self.options.folder, 'httpserver.log')
+        httplog = os.path.join(self.options.folder, self.options.log_filename)
        iconphoto = os.path.join('extras', 'icons', 'web2py.gif')
        if os.path.exists(iconphoto):
            img = Tkinter.PhotoImage(file=iconphoto)
@@ -225,9 +225,9 @@ class web2pyDialog(object):
                      text=str(ProgramVersion + "\n" + ProgramAuthor),
                      font=('Helvetica', 11), justify=Tkinter.CENTER,
                      foreground='#195866', background=bg_color,
-                      height=3).pack( side='top',
-                                      fill='both',
-                                      expand='yes')
+                      height=3).pack(side='top',
+                                     fill='both',
+                                     expand='yes')

        self.bannerarea.after(1000, self.update_canvas)

@@ -322,11 +322,15 @@ class web2pyDialog(object):
            self.tb = None

    def update_schedulers(self, start=False):
+        applications_folder = os.path.join(self.options.folder, 'applications')
        apps = []
-        available_apps = [arq for arq in os.listdir('applications/')]
-        available_apps = [arq for arq in available_apps
-                          if os.path.exists(
-                'applications/%s/models/scheduler.py' % arq)]
+        ##FIXME - can't start scheduler in the correct dir from Tk
+        if self.options.folder:
+            return
+        available_apps = [
+            arq for arq in os.listdir(applications_folder)
+            if os.path.exists(os.path.join(applications_folder, arq, 'models', 'scheduler.py'))
+        ]
        if start:
            # the widget takes care of starting the scheduler
            if self.options.scheduler and self.options.with_scheduler:
@@ -414,9 +418,11 @@ class web2pyDialog(object):
    def connect_pages(self):
        """ Connects pages """
        # reset the menu
-        available_apps = [arq for arq in os.listdir('applications/')
-                          if os.path.exists(
-                'applications/%s/__init__.py' % arq)]
+        applications_folder = os.path.join(self.options.folder, 'applications')
+        available_apps = [
+            arq for arq in os.listdir(applications_folder)
+            if os.path.exists(os.path.join(applications_folder, arq, '__init__.py'))
+        ]
        self.pagesmenu.delete(0, len(available_apps))
        for arq in available_apps:
            url = self.url + arq
@@ -552,14 +558,15 @@ class web2pyDialog(object):
    def update_canvas(self):
        """ Updates canvas """

+        httplog = os.path.join(self.options.folder, self.options.log_filename)
        try:
-            t1 = os.path.getsize('httpserver.log')
+            t1 = os.path.getsize(httplog)
        except:
            self.canvas.after(1000, self.update_canvas)
            return

        try:
-            fp = open('httpserver.log', 'r')
+            fp = open(httplog, 'r')
            fp.seek(self.t0)
            data = fp.read(t1 - self.t0)
            fp.close()
@@ -1051,6 +1058,8 @@ def start_schedulers(options):
        apps = options.scheduler_groups
    code = "from gluon import current;current._scheduler.loop()"
    logging.getLogger().setLevel(options.debuglevel)
+    if options.folder:
+        os.chdir(options.folder)
    if len(apps) == 1 and not options.with_scheduler:
        app_, code = get_code_for_scheduler(apps[0], options)
        if not app_:
@@ -1117,11 +1126,12 @@ def start(cron=True):
            if hasattr(options, key):
                setattr(options, key, getattr(options2, key))

-    logfile0 = os.path.join('extras', 'examples', 'logging.example.conf')
-    if not os.path.exists('logging.conf') and os.path.exists(logfile0):
+    logfile0 = os.path.join('examples', 'logging.example.conf')
+    logfile1 = os.path.join(options.folder, 'logging.conf')
+    if not os.path.exists(logfile1) and os.path.exists(logfile0):
        import shutil
        sys.stdout.write("Copying logging.conf.example to logging.conf ... ")
-        shutil.copyfile('logging.example.conf', logfile0)
+        shutil.copyfile(logfile0, logfile1)
        sys.stdout.write("OK\n")

    # ## if -T run doctests (no cron)
@@ -74,7 +74,7 @@ class ServiceBase(Base):
            key = config['https_key']
            cert = config['https_cert']
            if key != '' and cert != '':
-                interfaces.append('%s:%s:%s:%s' % (ip, port, cert, key))
+                interfaces.append('%s:%s:%s:%s' % (ip, port, key, cert))
                ports.append(ports)
        if len(interfaces) == 0:
            sys.exit('Configuration error. Must have settings for http and/or https')
@@ -92,7 +92,7 @@ class ServiceBase(Base):
        interfaces = ';'.join(interfaces)
        args.append('--interfaces=%s' % interfaces)

-        if 'log_filename' in config.key():
+        if 'log_filename' in config.keys():
            log_filename = config['log_filename']
            args.append('--log_filename=%s' % log_filename)

@@ -104,12 +104,10 @@ class SessionSetDb(SessionSet):

    def get(self):
        """Return list of SessionDb instances for existing sessions."""
-        sessions = []
        table = current.response.session_db_table
        if table:
            for row in table._db(table.id > 0).select():
-                sessions.append(SessionDb(row))
-        return sessions
+                yield SessionDb(row)


 class SessionSetFiles(SessionSet):
@@ -6,9 +6,21 @@ if [[ $EUID -ne 0 ]]; then
   echo "You must run the script as root or using sudo"
   exit 1
 fi
+# parse command line arguments
+nopassword=0
+nocertificate=0
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    --no-password) nopassword=1; shift 1;;
+    --no-certificate) nocertificate=1; shift 1;;
+  esac
+done
 # Get Web2py Admin Password
-echo -e "Web2py Admin Password: \c "
-read  PW
+if [ "$nopassword" -eq 0 ]
+then
+  echo -e "Web2py Admin Password: \c "
+  read  PW
+fi
 # Upgrade and install needed software
 apt-get update
 apt-get -y upgrade
@@ -115,13 +127,13 @@ ln -s /etc/nginx/sites-available/web2py /etc/nginx/sites-enabled/web2py
 rm /etc/nginx/sites-enabled/default
 mkdir /etc/nginx/ssl
 cd /etc/nginx/ssl
-
-openssl genrsa 1024 > web2py.key
-chmod 400 web2py.key
-openssl req -new -x509 -nodes -sha1 -days 1780 -key web2py.key > web2py.crt
-openssl x509 -noout -fingerprint -text < web2py.crt > web2py.info
-
-
+if [ "$nocertificate" -eq 0 ]
+then
+  openssl genrsa 1024 > web2py.key
+  chmod 400 web2py.key
+  openssl req -new -x509 -nodes -sha1 -days 1780 -key web2py.key > web2py.crt
+  openssl x509 -noout -fingerprint -text < web2py.crt > web2py.info
+fi
 # Prepare folders for uwsgi
 sudo mkdir /etc/uwsgi
 sudo mkdir /var/log/uwsgi
@@ -176,13 +188,24 @@ mv web2py/handlers/wsgihandler.py web2py/wsgihandler.py
 rm web2py_src.zip
 chown -R www-data:www-data web2py
 cd /home/www-data/web2py
-sudo -u www-data python -c "from gluon.main import save_password; save_password('$PW',443)"
+if [ "$nopassword" -eq 0 ]
+then
+   sudo -u www-data python -c "from gluon.main import save_password; save_password('$PW',443)"
+fi
 start uwsgi-emperor
 /etc/init.d/nginx restart

-## you can reload uwsgi with
-# restart uwsgi-emperor
-## and stop it with
-# stop uwsgi-emperor
-## to reload web2py only (without restarting uwsgi)
-# touch /etc/uwsgi/web2py.ini
+echo <<EOF
+you can reload uwsgi with
+
+  restart uwsgi-emperor
+
+and stop it with
+
+  stop uwsgi-emperor
+
+to reload web2py only (without restarting uwsgi)
+
+  touch /etc/uwsgi/web2py.ini
+EOF
+
@@ -3,6 +3,8 @@

 import os
 import sys
+from multiprocessing import freeze_support
+# import gluon.import_all ##### This should be uncommented for py2exe.py

 if hasattr(sys, 'frozen'):
    path = os.path.dirname(os.path.abspath(sys.executable))  # for py2exe
@@ -14,17 +16,14 @@ os.chdir(path)

 sys.path = [path] + [p for p in sys.path if not p == path]

-# import gluon.import_all ##### This should be uncommented for py2exe.py
+# important that this import is after the os.chdir
+
 import gluon.widget

 # Start Web2py and Web2py cron service!
 if __name__ == '__main__':
-    try:
-        from multiprocessing import freeze_support
-        freeze_support()
-    except:
-        sys.stderr.write('Sorry, -K only supported for python 2.6-2.7\n')
-    if os.environ.has_key("COVERAGE_PROCESS_START"):
+    freeze_support()
+    if 'COVERAGE_PROCESS_START' in os.environ:
        try:
            import coverage
            coverage.process_startup()
Author	SHA1	Message	Date
mdipierro	f93191f406	new admin	2016-03-09 11:55:36 -06:00
mdipierro	b487583f92	admin2 - experimental	2016-03-09 11:53:07 -06:00
mdipierro	702e7cbea2	added missing file	2016-03-09 11:50:48 -06:00
mdipierro	18a901cce4	fixed buttons in quick examples	2016-03-09 09:44:51 -06:00
mdipierro	f23115cb9c	better spacing and buttons examples	2016-03-09 09:35:01 -06:00
mdipierro	ea5e86e11e	powered by fixed	2016-03-09 09:25:52 -06:00
mdipierro	db223dc70a	examples in stupid.css	2016-03-09 09:24:47 -06:00
mdipierro	bcc4ae2ec6	remporarily addressing issue #1203 , thanks Simone	2016-03-08 17:22:02 -06:00
mdipierro	4b81f721ac	Merge branch 'master' of github.com:web2py/web2py	2016-03-08 16:44:05 -06:00
mdipierro	66f231eb4b	Merge pull request #1193 from CzechErface/master Fixed a bug whereby calling 'delete_record()' on a row object caused …	2016-03-08 16:39:54 -06:00
mdipierro	5fc9517803	Merge pull request #1194 from chenl/master invalid view for purely compiled app	2016-03-08 16:38:34 -06:00
mdipierro	98294e0c69	Merge pull request #1199 from boriscougar/master Update imageutils.py	2016-03-08 16:37:20 -06:00
mdipierro	5e28112eda	new welcome css	2016-03-02 08:47:58 -06:00
mdipierro	dc5cac07e1	fixed bs3 form alignment	2016-03-01 23:39:08 -06:00
Boris Aramis Aguilar Rodríguez	8058dc2ce6	Update imageutils.py Adding a padding statement into imageutils, the goal is to allow a padding transparent/white border on pictures when being resized in different aspect ratio.	2016-03-01 20:24:28 -06:00
mdipierro	3808b1f6ae	optional parameters for setup-web2py-nginx-uwsgi-ubuntu.sh	2016-02-29 11:34:57 -06:00
mdipierro	10f2e4c3ad	updates support.html, thanks Gael	2016-02-27 08:16:19 -06:00
mdipierro	3c6af5f920	updated support page	2016-02-27 00:12:01 -06:00
mdipierro	a5269b1a1a	Merge branch 'master' of github.com:web2py/web2py	2016-02-26 23:37:47 -06:00
mdipierro	9a079e092f	fixed typo in auth	2016-02-26 14:24:21 -06:00
mdipierro	218817753a	myconf.take, myconf.get	2016-02-26 14:20:18 -06:00
mdipierro	ef9bf73973	example in rocket.py	2016-02-26 13:52:00 -06:00
mdipierro	f92f21b060	Merge pull request #1195 from niphlod/fix/1191 fixes #1191	2016-02-25 13:59:14 -06:00
niphlod	642ec2b934	fixes #1191 fix is in lines 828-835 . needed to backport total_seconds for py2.6 (694-701). everything else is just pep8.	2016-02-25 02:46:36 +01:00
Chen Levy	d494ec9c88	fix invalid view for purly complied app When packing a compiled app, and distributing it without the non-compiled view views, run_view_in searches only the old style compiled view file: e.g. views_default_index.html.pyc and not in views.default.index.html.pyc, resulting in "invalid view (default/index.html)" 404 Exception.	2016-02-22 14:13:02 +02:00
Jonathan Vasek	c4d1f3f414	Fixed a bug whereby calling 'delete_record()' on a row object caused an AttributeError.	2016-02-21 00:19:49 -06:00
mdipierro	5a59149514	italian group	2016-02-12 16:03:16 -06:00
mdipierro	484f02cae1	fixed grid button alignment, thanks SanDiego	2016-02-10 16:04:27 -06:00
mdipierro	d5db67d5ea	Merge pull request #1182 from preactive/patch-1 Update ldap_auth.py	2016-02-07 00:14:31 -06:00
mdipierro	1480a10d6b	Merge pull request #1176 from cccaballero/master Added virtual field support to autocomplete widget	2016-02-07 00:14:22 -06:00
mdipierro	7259f273f3	fixed some body padding in welcome	2016-02-07 00:12:33 -06:00
mdipierro	8645365f58	fixed some button style issues in grid	2016-02-07 00:10:38 -06:00
mdipierro	106930ed73	fabfile now reads applications/app/hosts	2016-02-07 00:09:55 -06:00
preactive	f79b38a335	Update ldap_auth.py In regards to comments in: https://github.com/BuhtigithuB/web2py/commit/0036d9c45bdf476d858fa00dd69e854c4623858b And: https://github.com/web2py/web2py/issues/1178	2016-02-04 13:41:49 -08:00
mdipierro	35216db750	grid(Set(..)) as well as grid(Query(..))	2016-02-03 22:11:38 -06:00
Carlos Cesar Caballero Díaz	faa3d1d477	Added virtual field support to autocomplete widget Added support to use Virtual Fields in autocomplete widget. Gotchas: - Using Virtual Fields is slower than normal fields. - Virtual Fields must be declared with name and table_name attributes.	2016-01-30 10:20:37 -05:00
mdipierro	7aff79ca57	Merge pull request #1172 from dmatic/master Fixed error with oneall login when login provider doesn't send user's full name	2016-01-29 22:20:51 -06:00
mdipierro	63bb4a7e8a	Merge pull request #1171 from matclab/fix/1043 Fix #1170 by reverting fix to #1043	2016-01-29 22:20:26 -06:00
mdipierro	8fc322254e	Merge pull request #1169 from BuhtigithuB/Improve/cache-redis-contrib PEP8 enhancements, improve docstring and some vars rename	2016-01-29 22:18:28 -06:00
mdipierro	b4c28516ae	Merge pull request #1166 from Rimbo/overblown-sessions-cleanup Make SessionSetDb.get() a generator.	2016-01-29 22:18:18 -06:00
mdipierro	d233d3babb	Merge pull request #1163 from rafaelol/fixes_mail_encoding_bug_for_non_ascii_text Fix bug on Mail.send() when text or input are Unicode	2016-01-29 22:17:07 -06:00
mdipierro	f18a1d0555	fabfile remove _update.zip	2016-01-29 22:14:38 -06:00
Dragan Matic	2cb55b52e9	fixed error with oneall login when login provider doesn't send full name	2016-01-17 22:45:38 +01:00
Mathieu Clabaut	4f361b5aad	Fix #1170 by reverting fix to #1043 The problem is only a styling issue and not a HTML one. It was solved in `864dbe73f2` by adding a `readonly ` class to labels which allow for properly vertical align with CSS. This reverts commit `353db90a64` which add specific HTML for some filed types and which breaks display of comments.	2016-01-16 10:02:12 +01:00
Dragan Matic	db122e7709	Merge pull request #2 from web2py/master update from original	2016-01-15 17:05:39 +01:00
Richard Vézina	005e565a11	PEP8 enhancements, improve docstring and some vars rename	2016-01-14 12:28:05 -05:00
Jimmy Rimmer	1656c6cdeb	Make the same change for SessionSetDb that's in SessionSetFiles: Make get() a generator, so that memory doesn't get blown out if there are 18 million sessions there to clean up.	2016-01-11 14:09:25 -08:00
mdipierro	b7a0f2043c	fixed fabfile error	2016-01-09 22:20:42 -06:00
mdipierro	05df3b3029	smarter request.restful checks content-type for json body	2016-01-08 21:29:04 -06:00
rafaelol	ba2cb811be	Changes encoding of text and subject on Mail.send() On the previous commit we changed text and subject from unicode to str. After a better solution from @cassiobotaro, we're using unicode again, selecting the encoding as the one passed via encoding parameter.	2016-01-07 14:59:58 -02:00
rafaelol	6a7c0525f5	Fix bug on Mail.send() when text or input are Unicode On PR #964 @matclab forced the encoding of both subject and text variables to unicode. After merging it, matclab realized that when we send Unicode text to the method it raises an exception and asked if he should change the commit. Unfortunately this thing was kept untouched. This problem exists because we previously encode the unicode variables to utf-8 (for instance here https://github.com/web2py/web2py/blob/master/gluon/tools.py#L478-L481) and then force again to unicode. This piece of code shows what happens: ``` >>> a = u'áéí' >>> a u'\xe1\xe9\xed' >>> b = a.encode('utf-8') >>> b '\xc3\xa1\xc3\xa9\xc3\xad' >>> unicode(a) u'\xe1\xe9\xed' >>> unicode(b) Traceback (most recent call last): File "<stdin>", line 1, in <module> UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 0: ordinal not in range(128) ``` If we force to str, just like @matclab suggested, we solve this issue.	2016-01-07 11:47:29 -02:00
mdipierro	5132616c6c	check_all	2016-01-05 07:29:53 -06:00
mdipierro	e528c10c21	Merge pull request #1160 from sceeter89/portalocker-issues Changed order of imports	2016-01-04 09:44:20 -06:00
mdipierro	41fd02fa2c	Merge pull request #1158 from niphlod/enhancement/redis_toolset new redis toolset to use with web2py	2016-01-04 09:43:58 -06:00
mdipierro	26dab37d9f	Merge pull request #1157 from niphlod/fix/scheduler_stopped fix for STOPPED tasks via stop_task()	2016-01-04 09:43:13 -06:00
mdipierro	cc40018e87	Merge pull request #1155 from niphlod/tests/recfile tests for modules NEED to be in a separate unittest	2016-01-04 09:42:23 -06:00
mdipierro	b6db314612	Merge pull request #1154 from niphlod/fix/1044 fixes #1044	2016-01-04 09:41:58 -06:00
mdipierro	3498666115	Merge pull request #1153 from niphlod/fix/1100 fixes #1100	2016-01-04 09:41:43 -06:00
mdipierro	562a559169	Merge pull request #1152 from niphlod/fix/1143 fixes #1143	2016-01-04 09:40:35 -06:00
mdipierro	47cec80939	Merge pull request #1151 from niphlod/tests/reorg better test_utils and reorg to compileapp	2016-01-04 09:39:59 -06:00
mdipierro	eceb579cdd	Merge pull request #1149 from niphlod/enhancement/constant_time_compare bultin constant time checking	2016-01-04 09:39:38 -06:00
Adam Marszałek	bd19986380	Changed order of imports	2016-01-04 13:23:22 +01:00
niphlod	12acdb51d7	new redis toolset to use with web2py This is a refactor of everything web2py uses with redis. Specifically: - a refactored redis_cache.py that fixes #958, allowing a "fail gracefully" behaviour in case redis is not available - a refactored redis_session.py that blocks less with with_lock=True (although still not optimal) - a new (and NEEDED) redis_utils.py that serves as the base for everything else, allowing an RConn object that you can freely use as a redis.StrictRedis connection, and that you can override in case you're using a different library (or that web2py will use in case redis-py won't be the de-facto standard around) - a newly - and much anticipated - redis_scheduler.py. It's a slip-in replacement for the standard scheduler that uses redis for workers coordination. Feel free to dig in the code and improve it. For redis_cache and redis_session changes are BREAKING. It means that users will need to change the import locations and tune a bit the code. Now every module depends on an gluon.contrib.redis_utils.RConn object (or similar) that in turns is very similar to a redis.StrictRedis one. The redis instance is EXTERNAL to the modules themselves (no more "host, port, db, password" parameters in RedisCache or RedisSession) See the relevant docstrings for usage examples	2016-01-02 23:15:00 +01:00
niphlod	918590d1f3	fix for STOPPED tasks via stop_task() they previously killed the main process	2016-01-02 22:50:27 +01:00
niphlod	d57428e8f0	fixes #1156 and other few issues	2016-01-01 20:48:55 +01:00
niphlod	13e3adf22d	tests for modules NEED to be in a separate unittest	2015-12-30 21:20:24 +01:00
niphlod	d4ffcaf1b1	fixes #1044 This shouldn't have took that much to solve. Really sorry for the delay	2015-12-30 16:38:43 +01:00
niphlod	17f1a51133	fixes #1100 now elements with data-w2p_disable are not disabled. in addition, for non-ajax forms, disabled submit buttons are reenabled after 5 seconds plus reindented, refactored AND jslinted	2015-12-30 16:19:39 +01:00
niphlod	d4bca008a8	better docstrings	2015-12-30 14:55:37 +01:00
niphlod	90c33911ab	fixes #1143 don't even get me started about the current messy status of admin	2015-12-30 12:07:18 +01:00
niphlod	0a263ffc8d	better test_utils and reorg to compileapp	2015-12-30 11:42:49 +01:00
niphlod	e94946d3d5	bultin constant time checking - if hmac.compare_digest is there, we should use it instead of our own fallback. - jwt handler has been updated to use utils.compare (reported in #web2py-users) - includes the same mods as https://github.com/web2py/web2py/pull/1146	2015-12-30 10:37:14 +01:00
mdipierro	1ca0c9b0c0	Merge pull request #1145 from niphlod/fix/1142 fixes #1142	2015-12-29 12:07:40 -06:00
mdipierro	cee0f91b36	Merge pull request #1144 from niphlod/fix/external_folder better support for -f	2015-12-29 12:06:54 -06:00
niphlod	eb49831726	fixes #1142	2015-12-28 15:05:51 +01:00
niphlod	b517c898b8	better support for -f as exposed in https://groups.google.com/d/msg/web2py-developers/uJoQeUlCABw/-MCXocwGAgAJ	2015-12-28 14:48:29 +01:00
mdipierro	71fba07e3a	some sqlhtml renaming	2015-12-27 07:12:56 -06:00
mdipierro	2a7a4a3d04	removed print statements	2015-12-27 05:39:08 -06:00
mdipierro	999f235b75	IS_IN_DB(...,delimiter=',',auto_add=True)	2015-12-27 05:33:29 -06:00
mdipierro	da22554aed	allow for IS_IN_DB(db,db.thing.id,db.thing.name)	2015-12-27 02:46:23 -06:00
mdipierro	0409d6f725	R-2.13.4	2015-12-25 22:56:50 -06:00
mdipierro	b6235249da	fixed path issue when starting web2py	2015-12-25 22:56:13 -06:00
mdipierro	fabadcd21f	do not remove gluon/packages/dal/.* files	2015-12-24 09:40:08 -06:00
mdipierro	8e4ea3497b	fixed issue #1138 , ldap and python 2.6.x problem	2015-12-24 09:15:19 -06:00
mdipierro	4b0e1856b5	reverted `2a245d36`	2015-12-24 09:04:45 -06:00
mdipierro	94841c90c3	R-2.13.3	2015-12-24 08:50:24 -06:00
mdipierro	f14e5f728c	fixing mess	2015-12-24 08:48:19 -06:00
mdipierro	8443c17839	sync'ed appadmins	2015-12-24 08:36:16 -06:00
mdipierro	be8114127e	Merge pull request #1141 from gi0baro/master Tracking latest pyDAL changes	2015-12-24 08:30:31 -06:00
gi0baro	4eaef303ff	Tracking latest pyDAL changes	2015-12-24 15:21:52 +01:00
mdipierro	319a3fc1dc	Merge branch 'BuhtigithuB-fix/no-more-deprecated-has-key'	2015-12-23 23:11:55 -06:00
mdipierro	463d643e2c	fmerged	2015-12-23 23:11:34 -06:00
mdipierro	0cbed12952	Merge pull request #1137 from cassiobotaro/fix_logging fixing logging old behaviour	2015-12-23 23:08:17 -06:00
mdipierro	b5994e57a4	Merge pull request #1136 from cassiobotaro/remove_25_support update files removing 2.5 things	2015-12-23 23:07:54 -06:00
Cássio Botaro	e239b975be	Change to re-run AppVeyor	2015-12-23 11:19:19 -02:00
Richard Vézina	0259ea3d29	no more deprecated .has_key(...)	2015-12-22 15:39:32 -05:00
cassiobotaro	db4c008de3	Minor changes	2015-12-21 15:40:25 -02:00
cassiobotaro	7921e5148a	fixing logging old behaviour	2015-12-21 12:10:50 -02:00
cassiobotaro	ee23eab77a	update files removing 2.5 things	2015-12-21 11:55:44 -02:00
mdipierro	2344386f77	better docstring for Auth.jwt	2015-12-18 19:19:43 -06:00
mdipierro	b5e12031c5	added Auth(db,jwt=dict(secret_key='secret')) and auth.allows_jwt() before auth.requires_login()	2015-12-18 19:12:41 -06:00
mdipierro	85e6840cf0	Merge branch 'master' of github.com:web2py/web2py	2015-12-18 18:09:09 -06:00
mdipierro	4c3006acb4	Merge pull request #1135 from gi0baro/master Track latest pyDAL GAE fix by @mdipierro	2015-12-18 18:08:53 -06:00
gi0baro	f8f008cab5	Track latest pyDAL GAE fix by @mdipierro	2015-12-18 12:51:17 +01:00
mdipierro	6bff8af458	CHANGELOG	2015-12-18 04:52:43 -06:00
mdipierro	b67edb083e	fixed compileapp problem in appveyor test (2nd attempt)	2015-12-18 04:44:03 -06:00
mdipierro	4125a97ce1	fixed compileapp problem in appveyor test	2015-12-18 04:39:51 -06:00
mdipierro	78cf55bf9a	R-2.13.2	2015-12-18 04:28:16 -06:00
mdipierro	931daaff89	fixed security issue in reset password when registration_requires_authorization, thanks Giovanni Verde	2015-12-18 04:11:26 -06:00
mdipierro	c6550f0adc	fixed a condition that allows reset_password if a reset link is sent before a user is blocked	2015-12-18 03:40:12 -06:00