From 4ddb7dea285367c89551b0f52cc435334dfdf9c3 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 26 Dec 2012 11:44:41 -0600 Subject: [PATCH] graph font style, thanks Jose --- VERSION | 2 +- applications/admin/controllers/appadmin.py | 11 +++++++---- applications/examples/controllers/appadmin.py | 11 +++++++---- applications/welcome/controllers/appadmin.py | 11 +++++++---- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/VERSION b/VERSION index 407a25af..009d60ba 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2012.12.25.21.01.19 +Version 2.4.1-alpha.2+timestamp.2012.12.26.11.43.58 diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index b815f47a..1f979eb1 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -469,8 +469,10 @@ def ccache(): def table_template(table): from gluon.html import TR, TD, TABLE, TAG + def FONT(*args, **kwargs): return TAG.font(*args, **kwargs) + def types(field): f_type = field.type if not isinstance(f_type,str): @@ -478,7 +480,7 @@ def table_template(table): elif f_type == 'string': return field.length elif f_type == 'id': - return B('pk') + return B('pk') elif f_type.startswith('reference') or \ f_type.startswith('list:reference'): return B('fk') @@ -490,14 +492,15 @@ def table_template(table): cellpadding = 4 color = "#7B7B7B" bgcolor = "#F1F2AD" - face = "Helvetica Bold" + face = "Helvetica" + face_bold = "Helvetica Bold" border = 0 - rows.append(TR(TD(FONT(table, _face=face, _color="white"), + rows.append(TR(TD(FONT(table, _face=face_bold, _color="white"), _colspan=3, _cellpadding=cellpadding, _align="center", _bgcolor="#FFA21F"))) for row in db[table]: - rows.append(TR(TD(FONT(row.name, _color=color, _face=face), + rows.append(TR(TD(FONT(row.name, _color=color, _face=face_bold), _align="left", _cellpadding=cellpadding, _border=border), TD(FONT(row.type, _color=color, _face=face), diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py index b815f47a..1f979eb1 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -469,8 +469,10 @@ def ccache(): def table_template(table): from gluon.html import TR, TD, TABLE, TAG + def FONT(*args, **kwargs): return TAG.font(*args, **kwargs) + def types(field): f_type = field.type if not isinstance(f_type,str): @@ -478,7 +480,7 @@ def table_template(table): elif f_type == 'string': return field.length elif f_type == 'id': - return B('pk') + return B('pk') elif f_type.startswith('reference') or \ f_type.startswith('list:reference'): return B('fk') @@ -490,14 +492,15 @@ def table_template(table): cellpadding = 4 color = "#7B7B7B" bgcolor = "#F1F2AD" - face = "Helvetica Bold" + face = "Helvetica" + face_bold = "Helvetica Bold" border = 0 - rows.append(TR(TD(FONT(table, _face=face, _color="white"), + rows.append(TR(TD(FONT(table, _face=face_bold, _color="white"), _colspan=3, _cellpadding=cellpadding, _align="center", _bgcolor="#FFA21F"))) for row in db[table]: - rows.append(TR(TD(FONT(row.name, _color=color, _face=face), + rows.append(TR(TD(FONT(row.name, _color=color, _face=face_bold), _align="left", _cellpadding=cellpadding, _border=border), TD(FONT(row.type, _color=color, _face=face), diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py index b815f47a..1f979eb1 100644 --- a/applications/welcome/controllers/appadmin.py +++ b/applications/welcome/controllers/appadmin.py @@ -469,8 +469,10 @@ def ccache(): def table_template(table): from gluon.html import TR, TD, TABLE, TAG + def FONT(*args, **kwargs): return TAG.font(*args, **kwargs) + def types(field): f_type = field.type if not isinstance(f_type,str): @@ -478,7 +480,7 @@ def table_template(table): elif f_type == 'string': return field.length elif f_type == 'id': - return B('pk') + return B('pk') elif f_type.startswith('reference') or \ f_type.startswith('list:reference'): return B('fk') @@ -490,14 +492,15 @@ def table_template(table): cellpadding = 4 color = "#7B7B7B" bgcolor = "#F1F2AD" - face = "Helvetica Bold" + face = "Helvetica" + face_bold = "Helvetica Bold" border = 0 - rows.append(TR(TD(FONT(table, _face=face, _color="white"), + rows.append(TR(TD(FONT(table, _face=face_bold, _color="white"), _colspan=3, _cellpadding=cellpadding, _align="center", _bgcolor="#FFA21F"))) for row in db[table]: - rows.append(TR(TD(FONT(row.name, _color=color, _face=face), + rows.append(TR(TD(FONT(row.name, _color=color, _face=face_bold), _align="left", _cellpadding=cellpadding, _border=border), TD(FONT(row.type, _color=color, _face=face),