Fixes #3492: DateField should have an option to show week numbers

svn changeset:12061/svn branch:6.3

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
index 6cf1880c0788eb9720afff1f7f28d03163fbf56d..c788481e3d324e5dc488bc6d9d47c878a3f85e4f 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
@@ -154,15 +154,15 @@ td.v-datefield-calendarpanel-nextyear {
        color: #eaeff1;
        text-shadow: #3b4651 0 -1px 0;
        vertical-align: top;
-}/*
-.v-datefield-calendarpanel-weeknumber td {
+}
+.v-datefield-calendarpanel-weeknumbers td {
        width: 12.4%;
-}*/
+}
 .v-datefield-calendarpanel-weekdays strong {
        display: block;
        text-align: right;
-       padding-right: 5px;
-       height: 15px;
+       padding: 1px 5px 0 0;
+       height: 14px;
        border-top: 1px solid #596775;
 }
 .v-datefield-calendarpanel-weekdays .v-first {
@@ -194,7 +194,12 @@ td.v-datefield-calendarpanel-nextyear {
 .v-datefield-calendarpanel-day-today {
        padding: 2px 5px 2px 0;
        display: block;
-       margin: 1px 0 0 6px;
+       margin: 1px 0 0 5px;
+}
+.v-datefield-calendarpanel-weeknumber {
+       margin: 0;
+       padding-top: 4px;
+       padding-bottom: 3px;
 }
 .v-datefield-calendarpanel-day-today {
        color: #4095d1;

diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index cccb71c82cf3928bad2d3da9c7d47607f4246a04..020647e14b54a9f5d485cc27d46fac51bd21961b 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -2873,15 +2873,15 @@ td.v-datefield-calendarpanel-nextyear {
        color: #eaeff1;
        text-shadow: #3b4651 0 -1px 0;
        vertical-align: top;
-}/*
-.v-datefield-calendarpanel-weeknumber td {
+}
+.v-datefield-calendarpanel-weeknumbers td {
        width: 12.4%;
-}*/
+}
 .v-datefield-calendarpanel-weekdays strong {
        display: block;
        text-align: right;
-       padding-right: 5px;
-       height: 15px;
+       padding: 1px 5px 0 0;
+       height: 14px;
        border-top: 1px solid #596775;
 }
 .v-datefield-calendarpanel-weekdays .v-first {
@@ -2917,7 +2917,12 @@ td.v-datefield-calendarpanel-nextyear {
 .v-datefield-calendarpanel-day-today {
        padding: 2px 5px 2px 0;
        display: block;
-       margin: 1px 0 0 6px;
+       margin: 1px 0 0 5px;
+}
+.v-datefield-calendarpanel-weeknumber {
+       margin: 0;
+       padding-top: 4px;
+       padding-bottom: 3px;
 }
 .v-datefield-calendarpanel-day-today {
        color: #4095d1;

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
index 34c596ac206d581af66a223cbd2b2e77b5edd0c3..7f0b3b6d8464cf0861320e296e9eaa30b956a315 100644 (file)
--- 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 {
 \r
         days.getFlexCellFormatter().setStyleName(headerRow, weekColumn,\r
                 "v-week");\r
+        days.setHTML(headerRow, weekColumn, "<strong></strong>");\r
         // Hide the week column if week numbers are not to be displayed.\r
         days.getFlexCellFormatter().setVisible(headerRow, weekColumn,\r
                 showISOWeekNumbers);\r
 \r
-        days.getFlexCellFormatter().setStyleName(headerRow, firstWeekdayColumn,\r
-                "v-first");\r
-        days.getFlexCellFormatter().setStyleName(headerRow,\r
-                firstWeekdayColumn + 6, "v-last");\r
         days.getRowFormatter().setStyleName(headerRow,\r
                 VDateField.CLASSNAME + "-calendarpanel-weekdays");\r
 \r
+        if (showISOWeekNumbers) {\r
+            days.getFlexCellFormatter().setStyleName(headerRow, weekColumn,\r
+                    "v-first");\r
+            days.getFlexCellFormatter().setStyleName(headerRow,\r
+                    firstWeekdayColumn, "");\r
+            days.getRowFormatter().addStyleName(headerRow,\r
+                    VDateField.CLASSNAME + "-calendarpanel-weeknumbers");\r
+        } else {\r
+            days.getFlexCellFormatter().setStyleName(headerRow, weekColumn, "");\r
+            days.getFlexCellFormatter().setStyleName(headerRow,\r
+                    firstWeekdayColumn, "v-first");\r
+        }\r
+\r
+        days.getFlexCellFormatter().setStyleName(headerRow,\r
+                firstWeekdayColumn + 6, "v-last");\r
+\r
         // Print weekday names\r
         final int firstDay = datefield.getDateTimeService().getFirstDayOfWeek();\r
         for (int i = 0; i < 7; i++) {\r