From f9212bc75e5ab327428b571e0c4afb8b190f88a6 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 18 Mar 2015 18:19:15 -0500
Subject: [PATCH] removed api collections json, fixed spilling list:string
 widget

---
 applications/welcome/controllers/default.py          | 12 ------------
 .../welcome/static/css/web2py-bootstrap3.css         |  2 +-
 gluon/packages/dal                                   |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/applications/welcome/controllers/default.py b/applications/welcome/controllers/default.py
index 912675cd..d33a43de 100644
--- a/applications/welcome/controllers/default.py
+++ b/applications/welcome/controllers/default.py
@@ -6,7 +6,6 @@
 ## - index is the default action of any application
 ## - user is required for authentication and authorization
 ## - download is for downloading files uploaded in the db (does streaming)
-## - api is an example of Hypermedia API support and access control
 #########################################################################
 
 def index():
@@ -58,14 +57,3 @@ def call():
     return service()
 
 
-@auth.requires_login() 
-def api():
-    """
-    this is example of API with access control
-    WEB2PY provides Hypermedia API (Collection+JSON) Experimental
-    """
-    from gluon.contrib.hypermedia import Collection
-    rules = {
-        '<tablename>': {'GET':{},'POST':{},'PUT':{},'DELETE':{}},
-        }
-    return Collection(db).process(request,response,rules)
diff --git a/applications/welcome/static/css/web2py-bootstrap3.css b/applications/welcome/static/css/web2py-bootstrap3.css
index 5689ce39..02578473 100644
--- a/applications/welcome/static/css/web2py-bootstrap3.css
+++ b/applications/welcome/static/css/web2py-bootstrap3.css
@@ -57,7 +57,7 @@ ul.w2p_list {
 }
 .w2p_list li input {
     display: inline-block;
-    width: 90%;
+    width: 85%;
     margin-right: 4px;
 }
 .w2p_list li a {
diff --git a/gluon/packages/dal b/gluon/packages/dal
index c6397d37..da1b8e2a 160000
--- a/gluon/packages/dal
+++ b/gluon/packages/dal
@@ -1 +1 @@
-Subproject commit c6397d3719d82949ae5553dc3c857757965d31d8
+Subproject commit da1b8e2a2143b6e0fb87893f80a1fc15714a2b32