CalendarField ui changes

svn changeset:2052/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendar.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendar.java
index 23a5e7c677eaf50c592cd8b1a3cfb470bcb9eb27..f6473430c01f546ec9b624bcd13bff46f70c80a4 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendar.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendar.java
@@ -7,6 +7,8 @@ import java.util.Iterator;
 import java.util.List;\r
 \r
 import com.google.gwt.user.client.ui.FlexTable;\r
+import com.google.gwt.user.client.ui.HTMLTable;\r
+import com.google.gwt.user.client.ui.SimplePanel;\r
 import com.google.gwt.user.client.ui.SourcesTableEvents;\r
 import com.google.gwt.user.client.ui.TableListener;\r
 import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;\r
@@ -19,7 +21,7 @@ public class ICalendar extends IDateField {
 \r
     private ICalendarPanel calPanel;\r
 \r
-    private FlexTable hourTable;\r
+    private HTMLTable hourTable;\r
 \r
     private EntrySource entrySource;\r
 \r
@@ -76,6 +78,11 @@ public class ICalendar extends IDateField {
            hourTable = new FlexTable();\r
            firstRender = true;\r
            hourTable.addTableListener(this.ftListener);\r
+           SimplePanel p = new SimplePanel();\r
+           p.add(hourTable);\r
+           p.setStyleName(getStyleName() + "-hours");\r
+           this.calPanel.getFlexCellFormatter().setColSpan(8, 0, 7);\r
+           this.calPanel.setWidget(8, 0, p);\r
        }\r
        Date curr = new Date(date.getTime());\r
        for (int i = 0; i < 24; i++) {\r
@@ -94,8 +101,9 @@ public class ICalendar extends IDateField {
                    String ampm = (i < 12 ? "am" : "pm");\r
                    hstr = (i <= 12 ? i : i - 12) + ":00 " + ampm;\r
                }\r
-               hourTable.setHTML(i, 0, "<span class=\"" + getStyleName()\r
-                       + "-time\" >" + hstr + "</span>");\r
+               hourTable.setHTML(i, 0, "<span>" + hstr + "</span>");\r
+               hourTable.getCellFormatter().setStyleName(i, 0,\r
+                       getStyleName() + "-time");\r
            }\r
            List entries = this.entrySource.getEntries(curr,\r
                    DateTimeService.RESOLUTION_HOUR);\r
@@ -106,13 +114,12 @@ public class ICalendar extends IDateField {
                    text += (text == "" ? "" : ", ")\r
                            + (title != null ? title : "?");\r
                }\r
-               hourTable.setHTML(i, 1, "<span class=\"" + getStyleName()\r
-                       + "-title\" >" + text + "</span>");\r
+               hourTable.setHTML(i, 1, "<span>" + text + "</span>");\r
+               hourTable.getCellFormatter().setStyleName(i, 1,\r
+                       getStyleName() + "-title");\r
            }\r
        }\r
 \r
-       this.calPanel.getFlexCellFormatter().setColSpan(8, 0, 7);\r
-       this.calPanel.setWidget(8, 0, hourTable);\r
     }\r
 \r
     private class HourTableListener implements TableListener {\r
@@ -143,7 +150,9 @@ public class ICalendar extends IDateField {
            if (items.containsKey(id)) {\r
                items.remove(id);\r
            }\r
-           items.put(id, new ICalendarEntry(startDate, endDate, title, notime));\r
+           items\r
+                   .put(id, new ICalendarEntry(startDate, endDate, title,\r
+                           notime));\r
        }\r
 \r
        public List getEntries(Date date, int resolution) {\r

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/datefield/ICalendarPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/datefield/ICalendarPanel.java
index df4c32bcca1c27f04b537ac2abdcb6b31879e239..6633f3e18a4e1b21c8b13daeac669d5b4e0ef006 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/datefield/ICalendarPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/datefield/ICalendarPanel.java
@@ -179,7 +179,7 @@ public class ICalendarPanel extends FlexTable implements MouseListener,
                                        .hasNext();) {\r
                                    ICalendarEntry entry = (ICalendarEntry) it\r
                                            .next();\r
-                                   title += (title.length() > 0 ? "\n" : "")\r
+                                   title += (title.length() > 0 ? ", " : "")\r
                                            + entry.getStringForDate(curr);\r
                                }\r
                            }\r

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/datefield/css/datefield.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/datefield/css/datefield.css
index b990a94631def4bed3d2b6446d8a2904bf102e9e..bbad2bacb97764819c2b5e0e8bcc8b87a36fd9fc 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/datefield/css/datefield.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/datefield/css/datefield.css
@@ -40,6 +40,19 @@
        background-color: #1C3E6E;\r
        cursor: default;\r
 }\r
+.i-datefield-calendarpanel-day-entry {\r
+       color: #0074D9;\r
+}\r
+.i-datefield-calendarpanel-day-disabled {\r
+       font-weight: normal;\r
+       color: #dddddd;\r
+       cursor: default;\r
+       opacity: 0.5;\r
+}\r
+.i-datefield-calendarpanel-day-entry.i-datefield-calendarpanel-day-disabled {\r
+       color: #ABC8E2;\r
+}\r
+\r
 .i-datefield-time {\r
        white-space: nowrap;\r
 }\r
@@ -47,7 +60,6 @@
        display: inline;\r
 }\r
 \r
-\r
 .i-datefield-calendar {\r
        border: 1px solid #29528a;\r
        padding: 5px;\r
@@ -68,4 +80,39 @@
        background: transparent url(../../panel/img/bottom-right.png) no-repeat right top;\r
        content: url(../../panel/img/bottom-left.png);\r
        margin: 5px -6px -6px -6px;\r
-}
\ No newline at end of file
+}\r
+\r
+.i-datefield-entrycalendar-hours {\r
+       height: 150px;\r
+       overflow: auto;\r
+}\r
+.i-datefield-entrycalendar-hours table {\r
+       width: 92%;\r
+}\r
+\r
+.i-datefield-entrycalendar-row-even {\r
+       cursor: pointer;\r
+       background-color: #fefefe;\r
+}\r
+.i-datefield-entrycalendar-row-odd {\r
+       cursor: pointer;\r
+       background-color: #eeeeee;\r
+}\r
+.i-datefield-entrycalendar-row-selected {\r
+       color: #fff;\r
+       background-color: #1C3E6E;\r
+}\r
+td.i-datefield-entrycalendar-time {\r
+       padding-right: 2px;\r
+       text-align: right;\r
+       white-space: nowrap;\r
+}\r
+td.i-datefield-entrycalendar-title {\r
+       padding-left: 2px;\r
+       text-align: left;\r
+       width: 80%;\r
+       color: #0074D9;\r
+}\r
+.i-datefield-entrycalendar-row-selected td span {\r
+       color: #fff;\r
+}\r