fixed colgroup wrapping, thanks Anthony

This commit is contained in:
mdipierro
2013-11-02 09:26:19 -05:00
parent fc72cdf3d0
commit a3bf95e423
2 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -1 +1 @@
Version 2.7.4-stable+timestamp.2013.11.01.20.10.58 Version 2.7.4-stable+timestamp.2013.11.02.09.25.14
+5 -5
View File
@@ -17,7 +17,7 @@ import os
from gluon.http import HTTP from gluon.http import HTTP
from gluon.html import XmlComponent from gluon.html import XmlComponent
from gluon.html import XML, SPAN, TAG, A, DIV, CAT, UL, LI, TEXTAREA, BR, IMG, SCRIPT from gluon.html import XML, SPAN, TAG, A, DIV, CAT, UL, LI, TEXTAREA, BR, IMG, SCRIPT
from gluon.html import FORM, INPUT, LABEL, OPTION, SELECT from gluon.html import FORM, INPUT, LABEL, OPTION, SELECT, COL, COLGROUP
from gluon.html import TABLE, THEAD, TBODY, TR, TD, TH, STYLE from gluon.html import TABLE, THEAD, TBODY, TR, TD, TH, STYLE
from gluon.html import URL, truncate_string, FIELDSET from gluon.html import URL, truncate_string, FIELDSET
from gluon.dal import DAL, Field, Table, Row, CALLABLETYPES, smart_query, \ from gluon.dal import DAL, Field, Table, Row, CALLABLETYPES, smart_query, \
@@ -2411,9 +2411,9 @@ class SQLFORM(FORM):
limitby = None limitby = None
if rows: if rows:
cols = [TAG.col(_id=str(c).replace('.','-'),data={'position':i}) cols = [COL(_id=str(c).replace('.','-'),data={'position':i})
for i,c in enumerate(columns)] for i,c in enumerate(columns)]
htmltable = TABLE(TAG.colgroup(*cols),THEAD(head)) htmltable = TABLE(COLGROUP(*cols),THEAD(head))
tbody = TBODY() tbody = TBODY()
numrec = 0 numrec = 0
for row in rows: for row in rows:
@@ -2890,9 +2890,9 @@ class SQLTABLE(TABLE):
field = sqlrows.db[t][f] field = sqlrows.db[t][f]
headers[c] = field.label headers[c] = field.label
if colgroup: if colgroup:
cols = [TAG.col(_id=c.replace('.','-'),data={'position':i}) cols = [COL(_id=c.replace('.','-'),data={'position':i})
for i,c in enumerate(columns)] for i,c in enumerate(columns)]
components.append(TAG.colgroup(*cols)) components.append(COLGROUP(*cols))
if headers is None: if headers is None:
headers = {} headers = {}