dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no more class='' but class=None, thanks Jonathan

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-05-17 09:55:50 -05:00
parent ce01842e2d
commit 60c4a912cd
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-05-16 18:23:15) dev Version 2.00.0 (2012-05-17 09:55:01) dev
gluon/sqlhtml.py
+16 -16
View File
@@ -1546,27 +1546,27 @@ class SQLFORM(FORM):
buttonurl=url(args=[]),callback=None,delete=None,trap=True): buttonurl=url(args=[]),callback=None,delete=None,trap=True):
if showbuttontext: if showbuttontext:
if callback: if callback:
return A(SPAN(_class=ui.get(buttonclass,'')), return A(SPAN(_class=ui.get(buttonclass)),
SPAN(T(buttontext),_title=buttontext, SPAN(T(buttontext),_title=buttontext,
_class=ui.get('buttontext','')), _class=ui.get('buttontext')),
callback=callback,delete=delete, callback=callback,delete=delete,
_class=trap_class(ui.get('button',''),trap)) _class=trap_class(ui.get('button'),trap))
else: else:
return A(SPAN(_class=ui.get(buttonclass,'')), return A(SPAN(_class=ui.get(buttonclass)),
SPAN(T(buttontext),_title=buttontext, SPAN(T(buttontext),_title=buttontext,
_class=ui.get('buttontext','')), _class=ui.get('buttontext')),
_href=buttonurl, _href=buttonurl,
_class=trap_class(ui.get('button',''),trap)) _class=trap_class(ui.get('button'),trap))
else: else:
if callback: if callback:
return A(SPAN(_class=ui.get(buttonclass,'')), return A(SPAN(_class=ui.get(buttonclass)),
callback=callback,delete=delete, callback=callback,delete=delete,
_title=buttontext, _title=buttontext,
_class=trap_class(ui.get('buttontext',''),trap)) _class=trap_class(ui.get('buttontext'),trap))
else: else:
return A(SPAN(_class=ui.get(buttonclass,'')), return A(SPAN(_class=ui.get(buttonclass)),
_href=buttonurl,_title=buttontext, _href=buttonurl,_title=buttontext,
_class=trap_class(ui.get('buttontext',''),trap)) _class=trap_class(ui.get('buttontext'),trap))
dbset = db(query) dbset = db(query)
tablenames = db._adapter.tables(dbset.query) tablenames = db._adapter.tables(dbset.query)
if left!=None: tablenames+=db._adapter.tables(left) if left!=None: tablenames+=db._adapter.tables(left)
@@ -1772,9 +1772,9 @@ class SQLFORM(FORM):
else: else:
orderby = (order[:1]=='~' and ~sort_field) or sort_field orderby = (order[:1]=='~' and ~sort_field) or sort_field
head = TR(_class=ui.get('header','')) head = TR(_class=ui.get('header'))
if selectable: if selectable:
head.append(TH(_class=ui.get('default',''))) head.append(TH(_class=ui.get('default')))
for field in fields: for field in fields:
if columns and not str(field) in columns: continue if columns and not str(field) in columns: continue
if not field.readable: continue if not field.readable: continue
@@ -1791,19 +1791,19 @@ class SQLFORM(FORM):
header = A(header,marker,_href=url(vars=dict( header = A(header,marker,_href=url(vars=dict(
keywords=request.vars.keywords or '', keywords=request.vars.keywords or '',
order=key)),_class=trap_class()) 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: if links and links_in_grid:
for link in links: for link in links:
if isinstance(link,dict): 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 extra column for buttons if needed.
include_buttons_column = (details or editable or deletable or include_buttons_column = (details or editable or deletable or
(links and links_in_grid and (links and links_in_grid and
not all([isinstance(link, dict) for link in links]))) not all([isinstance(link, dict) for link in links])))
if include_buttons_column: if include_buttons_column:
head.append(TH(_class=ui.get('default',''))) head.append(TH(_class=ui.get('default')))
paginator = UL() paginator = UL()
if paginate and paginate<nrows: if paginate and paginate<nrows:
@@ -1938,7 +1938,7 @@ class SQLFORM(FORM):
DIV(htmltable,_class="web2py_table"), DIV(htmltable,_class="web2py_table"),
DIV(paginator,_class=\ DIV(paginator,_class=\
"web2py_paginator %(header)s %(cornerbottom)s" % ui), "web2py_paginator %(header)s %(cornerbottom)s" % ui),
_class='%s %s' % (_class, ui.get('widget',''))) _class='%s %s' % (_class, ui.get('widget')))
res.create_form = create_form res.create_form = create_form
res.update_form = update_form res.update_form = update_form
res.view_form = view_form res.view_form = view_form