From 6026b5996ceca005c3274950ab173e33c202aecd Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 28 Dec 2012 01:22:05 -0600 Subject: [PATCH] changed color scheme and fixed bug in graph model --- VERSION | 2 +- applications/admin/controllers/appadmin.py | 13 +++++++------ applications/examples/controllers/appadmin.py | 13 +++++++------ applications/welcome/controllers/appadmin.py | 13 +++++++------ 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/VERSION b/VERSION index 95a7a744..c163047c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2012.12.28.01.07.49 +Version 2.4.1-alpha.2+timestamp.2012.12.28.01.21.20 diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index 1f979eb1..99a0186d 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -490,15 +490,15 @@ def table_template(table): # This is horribe HTML but the only one graphiz understands rows = [] cellpadding = 4 - color = "#7B7B7B" - bgcolor = "#F1F2AD" + color = "#000000" + bgcolor = "#FFFFFF" face = "Helvetica" face_bold = "Helvetica Bold" border = 0 - rows.append(TR(TD(FONT(table, _face=face_bold, _color="white"), + rows.append(TR(TD(FONT(table, _face=face_bold, _color=bgcolor), _colspan=3, _cellpadding=cellpadding, - _align="center", _bgcolor="#FFA21F"))) + _align="center", _bgcolor=color))) for row in db[table]: rows.append(TR(TD(FONT(row.name, _color=color, _face=face_bold), _align="left", _cellpadding=cellpadding, @@ -509,8 +509,9 @@ def table_template(table): TD(FONT(types(row), _color=color, _face=face), _align="center", _cellpadding=cellpadding, _border=border))) - return "< %s >" % TABLE(*rows, _bgcolor=bgcolor, _border=1, - _cellborder=0, _cellspacing=0).xml() + return "< %s >" % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1, + _cellborder=0, _cellspacing=0) + ).xml() def bg_graph_model(): diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py index 1f979eb1..99a0186d 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -490,15 +490,15 @@ def table_template(table): # This is horribe HTML but the only one graphiz understands rows = [] cellpadding = 4 - color = "#7B7B7B" - bgcolor = "#F1F2AD" + color = "#000000" + bgcolor = "#FFFFFF" face = "Helvetica" face_bold = "Helvetica Bold" border = 0 - rows.append(TR(TD(FONT(table, _face=face_bold, _color="white"), + rows.append(TR(TD(FONT(table, _face=face_bold, _color=bgcolor), _colspan=3, _cellpadding=cellpadding, - _align="center", _bgcolor="#FFA21F"))) + _align="center", _bgcolor=color))) for row in db[table]: rows.append(TR(TD(FONT(row.name, _color=color, _face=face_bold), _align="left", _cellpadding=cellpadding, @@ -509,8 +509,9 @@ def table_template(table): TD(FONT(types(row), _color=color, _face=face), _align="center", _cellpadding=cellpadding, _border=border))) - return "< %s >" % TABLE(*rows, _bgcolor=bgcolor, _border=1, - _cellborder=0, _cellspacing=0).xml() + return "< %s >" % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1, + _cellborder=0, _cellspacing=0) + ).xml() def bg_graph_model(): diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py index 1f979eb1..99a0186d 100644 --- a/applications/welcome/controllers/appadmin.py +++ b/applications/welcome/controllers/appadmin.py @@ -490,15 +490,15 @@ def table_template(table): # This is horribe HTML but the only one graphiz understands rows = [] cellpadding = 4 - color = "#7B7B7B" - bgcolor = "#F1F2AD" + color = "#000000" + bgcolor = "#FFFFFF" face = "Helvetica" face_bold = "Helvetica Bold" border = 0 - rows.append(TR(TD(FONT(table, _face=face_bold, _color="white"), + rows.append(TR(TD(FONT(table, _face=face_bold, _color=bgcolor), _colspan=3, _cellpadding=cellpadding, - _align="center", _bgcolor="#FFA21F"))) + _align="center", _bgcolor=color))) for row in db[table]: rows.append(TR(TD(FONT(row.name, _color=color, _face=face_bold), _align="left", _cellpadding=cellpadding, @@ -509,8 +509,9 @@ def table_template(table): TD(FONT(types(row), _color=color, _face=face), _align="center", _cellpadding=cellpadding, _border=border))) - return "< %s >" % TABLE(*rows, _bgcolor=bgcolor, _border=1, - _cellborder=0, _cellspacing=0).xml() + return "< %s >" % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1, + _cellborder=0, _cellspacing=0) + ).xml() def bg_graph_model():