From 60c4a912cdfc237953f37de3b6d889cece8eaca9 Mon Sep 17 00:00:00 2001 From: Massimo Di Pierro Date: Thu, 17 May 2012 09:55:50 -0500 Subject: [PATCH] no more class='' but class=None, thanks Jonathan --- VERSION | 2 +- gluon/sqlhtml.py | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/VERSION b/VERSION index 54906232..8ef9b363 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-05-16 18:23:15) dev +Version 2.00.0 (2012-05-17 09:55:01) dev diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 55fd6f7e..981f0167 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1546,27 +1546,27 @@ class SQLFORM(FORM): buttonurl=url(args=[]),callback=None,delete=None,trap=True): if showbuttontext: if callback: - return A(SPAN(_class=ui.get(buttonclass,'')), + return A(SPAN(_class=ui.get(buttonclass)), SPAN(T(buttontext),_title=buttontext, - _class=ui.get('buttontext','')), + _class=ui.get('buttontext')), callback=callback,delete=delete, - _class=trap_class(ui.get('button',''),trap)) + _class=trap_class(ui.get('button'),trap)) else: - return A(SPAN(_class=ui.get(buttonclass,'')), + return A(SPAN(_class=ui.get(buttonclass)), SPAN(T(buttontext),_title=buttontext, - _class=ui.get('buttontext','')), + _class=ui.get('buttontext')), _href=buttonurl, - _class=trap_class(ui.get('button',''),trap)) + _class=trap_class(ui.get('button'),trap)) else: if callback: - return A(SPAN(_class=ui.get(buttonclass,'')), + return A(SPAN(_class=ui.get(buttonclass)), callback=callback,delete=delete, _title=buttontext, - _class=trap_class(ui.get('buttontext',''),trap)) + _class=trap_class(ui.get('buttontext'),trap)) else: - return A(SPAN(_class=ui.get(buttonclass,'')), + return A(SPAN(_class=ui.get(buttonclass)), _href=buttonurl,_title=buttontext, - _class=trap_class(ui.get('buttontext',''),trap)) + _class=trap_class(ui.get('buttontext'),trap)) dbset = db(query) tablenames = db._adapter.tables(dbset.query) if left!=None: tablenames+=db._adapter.tables(left) @@ -1772,9 +1772,9 @@ class SQLFORM(FORM): else: orderby = (order[:1]=='~' and ~sort_field) or sort_field - head = TR(_class=ui.get('header','')) + head = TR(_class=ui.get('header')) if selectable: - head.append(TH(_class=ui.get('default',''))) + head.append(TH(_class=ui.get('default'))) for field in fields: if columns and not str(field) in columns: continue if not field.readable: continue @@ -1791,19 +1791,19 @@ class SQLFORM(FORM): header = A(header,marker,_href=url(vars=dict( keywords=request.vars.keywords or '', order=key)),_class=trap_class()) - head.append(TH(header, _class=ui.get('default',''))) + head.append(TH(header, _class=ui.get('default'))) if links and links_in_grid: for link in links: if isinstance(link,dict): - head.append(TH(link['header'], _class=ui.get('default',''))) + head.append(TH(link['header'], _class=ui.get('default'))) # Include extra column for buttons if needed. include_buttons_column = (details or editable or deletable or (links and links_in_grid and not all([isinstance(link, dict) for link in links]))) if include_buttons_column: - head.append(TH(_class=ui.get('default',''))) + head.append(TH(_class=ui.get('default'))) paginator = UL() if paginate and paginate