From 2283accd32261b1c944b1f667955b561ae9959c4 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Tue, 1 May 2012 10:42:53 +0200 Subject: [PATCH] more standard fields; set css class where appropriate, + class definitions in style sheets --- browser/skin/lobo/lobo.css | 8 ++++++++ expert/browser/results.pt | 4 +++- expert/field.py | 31 +++++++++++++++++-------------- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/browser/skin/lobo/lobo.css b/browser/skin/lobo/lobo.css index 712e4ca..565d93a 100644 --- a/browser/skin/lobo/lobo.css +++ b/browser/skin/lobo/lobo.css @@ -490,6 +490,14 @@ img.notselected { margin-bottom: 4px; } +.center { + text-align: center; +} + +.right { + text-align: right; +} + /* lobo layout-specific classes */ .legend { diff --git a/expert/browser/results.pt b/expert/browser/results.pt index 20ecae9..35af863 100644 --- a/expert/browser/results.pt +++ b/expert/browser/results.pt @@ -20,6 +20,7 @@ @@ -29,7 +30,8 @@ - + diff --git a/expert/field.py b/expert/field.py index 710aeb8..6166846 100644 --- a/expert/field.py +++ b/expert/field.py @@ -56,7 +56,7 @@ class DecimalField(Field): format = 'decimal' pattern = u'#,##0.00;-#,##0.00' - renderer = 'right' + renderer = cssClass = 'right' styleData = {'text-align':'right'} styleData = dict(Field.style.data, **styleData) style = TableCellStyle(**styleData) @@ -76,9 +76,20 @@ class DecimalField(Field): return '%.2f' % value +class IntegerField(Field): + + renderer = cssClass = 'right' + + def getSortValue(self, row): + value = self.getValue(row) + if value.isdigit(): + return int(value) + + class DateField(Field): format = ('date', 'short') + renderer = cssClass = 'right' def getDisplayValue(self, row): value = self.getRawValue(row) @@ -154,6 +165,11 @@ class UrlField(Field): url=nv.getUrlForTarget(baseObject(row.context))) +class IntegerUrlField(IntegerField, UrlField): + + renderer = 'target' + + class RelationField(Field): renderer = 'target' @@ -183,19 +199,6 @@ class TargetField(RelationField): return util.getObjectForUid(value) -class IntegerField(Field): - - def getSortValue(self, row): - value = self.getValue(row) - if value.isdigit(): - return int(value) - - -class IntegerUrlField(IntegerField, UrlField): - - pass - - class MultiLineField(Field): renderer = 'multiline'