diff --git a/fields/__init__.py b/fields/__init__.py
index cba79b1..e72f422 100644
--- a/fields/__init__.py
+++ b/fields/__init__.py
@@ -555,7 +555,7 @@ class Field:
if 'cell' not in layouts:
layouts['cell'] = Table(other=layouts['view'], derivedType='cell')
# Put the required CSS classes in the layouts
- layouts['cell'].addCssClasses('noStyle')
+ layouts['cell'].addCssClasses('no')
if self.focus:
# We need to make it flashy
layouts['view'].addCssClasses('focus')
diff --git a/fields/calendar.py b/fields/calendar.py
index 6ffce3a..8b768d4 100644
--- a/fields/calendar.py
+++ b/fields/calendar.py
@@ -200,21 +200,27 @@ class Calendar(Field):
# For timeline rendering, the row displaying month names
pxTimeLineMonths = Px('''
-
|
- ::mInfo.month | |
''')
+
+ |
+ ::mInfo.month |
+ |
+
''')
# For timeline rendering, the row displaying day letters
pxTimelineDayLetters = Px('''
- |
+
+ |
:namesOfDays[date.aDay()].name[0] |
- |
''')
+ |
+ ''')
# For timeline rendering, the row displaying day numbers
pxTimelineDayNumbers = Px('''
- |
- :str(date.day()).zfill(2) |
- |
''')
+
+ |
+ :str(date.day()).zfill(2) |
+ |
+
''')
# Legend for a timeline calendar
pxTimelineLegend = Px('''
@@ -263,14 +269,14 @@ class Calendar(Field):
style="float:right" id=":'%s_tcs' % ajaxHookId"
var="totals=field.computeTotals('col', zobj, grid, others, \
preComputed)">
-
-
+
+ |
+
+
:col.name
|
-
- |
@@ -280,9 +286,18 @@ class Calendar(Field):
::field.getOthersSep(\
len(field.totalCols))
-
-
|
- |
+
+
+ |
+
+
+
+ :col.name
+ |
+
+
+ |
+
''')
# Timeline view for a calendar
@@ -1590,6 +1605,7 @@ class Calendar(Field):
def computeTotals(self, totalType, obj, grid, others, preComputed):
'''Compute the totals for every column (p_totalType == 'row') or row
(p_totalType == "col").'''
+ obj = obj.appy()
allTotals = getattr(self, 'total%ss' % totalType.capitalize())
if not allTotals: return
# Count other calendars and dates in the grid
@@ -1605,11 +1621,11 @@ class Calendar(Field):
res[totals.name] = [Total(totals.initValue) \
for i in range(totalCount)]
# Get the status of validation checkboxes
- status = self.getValidationCheckboxesStatus(obj.REQUEST)
+ status = self.getValidationCheckboxesStatus(obj.request)
# Walk every date within every calendar
indexes = {'i': -1, 'j': -1}
- ii = (totalType == 'row') and 'i' or 'j'
- jj = (totalType == 'row') and 'j' or 'i'
+ ii = isRow and 'i' or 'j'
+ jj = isRow and 'j' or 'i'
for other in sutils.IterSub(others):
indexes['i'] += 1
indexes['j'] = -1
diff --git a/fields/dict.py b/fields/dict.py
index 992e46f..d76642c 100644
--- a/fields/dict.py
+++ b/fields/dict.py
@@ -35,7 +35,7 @@ class Dict(List):
:field.pxRender |
+ tagCss='no'">:field.pxRender
''')
# PX for rendering the dict (shared between pxView and pxEdit)
diff --git a/fields/list.py b/fields/list.py
index a6776f3..48dda1d 100644
--- a/fields/list.py
+++ b/fields/list.py
@@ -32,7 +32,7 @@ class List(Field):
:field.pxRender |
+ tagCss='no'">:field.pxRender
|