From 61834b2e4ae6c3fd97945c40a1285b948c4e5bde Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 17 Jul 2012 17:13:40 -0500 Subject: [PATCH] better export buttons in grid, thanks Niphlod --- VERSION | 2 +- applications/welcome/static/css/web2py.css | 4 ++++ gluon/sqlhtml.py | 15 +++++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 5d5a641e..b0cfd7bf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-07-17 17:11:20) dev +Version 2.00.0 (2012-07-17 17:13:37) dev diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css index 9e6dbf30..b6ae2a25 100644 --- a/applications/welcome/static/css/web2py.css +++ b/applications/welcome/static/css/web2py.css @@ -225,8 +225,12 @@ div.error { .web2py_console form { width:100%; + display: inline; } +.web2py_console form select { + margin: 0; +} .web2py_search_actions{ float:left; diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 19f6423b..8cee165b 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1840,13 +1840,16 @@ class SQLFORM(FORM): else: label = k options.append(OPTION(T(label),_value=k)) - f = FORM(SELECT(options, _name="export_type"), - INPUT(_type="submit", _value="export"), - INPUT(_type="hidden", _name="order", _value=request.vars.order), - INPUT(_type="hidden", _name="keywords", _value=request.vars.keywords or ''), - _method="GET", - _action=url(args=['export'])) + f = FORM(BUTTON(SPAN(_class="icon downarrow icon-download"), + "Export", _type="submit", _class="btn button"), + SELECT(options, _name="export_type"), + INPUT(_type="hidden", _name="order", + _value=request.vars.order), + INPUT(_type="hidden", _name="keywords", + _value=request.vars.keywords or ''), + _method="GET", _action=url(args=['export'])) search_actions.append(f) + #================================================================ console.append(search_actions)