diff options
| author | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2010-03-24 11:48:34 +0000 |
|---|---|---|
| committer | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2010-03-24 11:48:34 +0000 |
| commit | b525addb90af3b239bce8c3e06d6581ea0034e39 (patch) | |
| tree | 6cf481ee9205f505d6b239ddc34caa1a56121590 /src/com/vaadin | |
| parent | 34f8e119c17870845ef0155be747dd7865b35f9f (diff) | |
| download | vaadin-framework-b525addb90af3b239bce8c3e06d6581ea0034e39.tar.gz vaadin-framework-b525addb90af3b239bce8c3e06d6581ea0034e39.zip | |
Fixes #3492: DateField should have an option to show week numbers
svn changeset:12061/svn branch:6.3
Diffstat (limited to 'src/com/vaadin')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java index 34c596ac20..7f0b3b6d84 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java @@ -176,17 +176,30 @@ public class VCalendarPanel extends FlexTable implements MouseListener { days.getFlexCellFormatter().setStyleName(headerRow, weekColumn,
"v-week");
+ days.setHTML(headerRow, weekColumn, "<strong></strong>");
// Hide the week column if week numbers are not to be displayed.
days.getFlexCellFormatter().setVisible(headerRow, weekColumn,
showISOWeekNumbers);
- days.getFlexCellFormatter().setStyleName(headerRow, firstWeekdayColumn,
- "v-first");
- days.getFlexCellFormatter().setStyleName(headerRow,
- firstWeekdayColumn + 6, "v-last");
days.getRowFormatter().setStyleName(headerRow,
VDateField.CLASSNAME + "-calendarpanel-weekdays");
+ if (showISOWeekNumbers) {
+ days.getFlexCellFormatter().setStyleName(headerRow, weekColumn,
+ "v-first");
+ days.getFlexCellFormatter().setStyleName(headerRow,
+ firstWeekdayColumn, "");
+ days.getRowFormatter().addStyleName(headerRow,
+ VDateField.CLASSNAME + "-calendarpanel-weeknumbers");
+ } else {
+ days.getFlexCellFormatter().setStyleName(headerRow, weekColumn, "");
+ days.getFlexCellFormatter().setStyleName(headerRow,
+ firstWeekdayColumn, "v-first");
+ }
+
+ days.getFlexCellFormatter().setStyleName(headerRow,
+ firstWeekdayColumn + 6, "v-last");
+
// Print weekday names
final int firstDay = datefield.getDateTimeService().getFirstDayOfWeek();
for (int i = 0; i < 7; i++) {
|