diff options
| author | Artur Signell <artur.signell@itmill.com> | 2009-09-25 08:40:42 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2009-09-25 08:40:42 +0000 |
| commit | 1b7ca5421fcf1f66151d990bff765a9579d67804 (patch) | |
| tree | 26e265ef138f97c54dada59b72746e9096a4d30e | |
| parent | 8866b23d3870dc99ead53b42bb1c4f908ea32871 (diff) | |
| download | vaadin-framework-1b7ca5421fcf1f66151d990bff765a9579d67804.tar.gz vaadin-framework-1b7ca5421fcf1f66151d990bff765a9579d67804.zip | |
Fixed #3397 - Change reservr to use in-memory hsqldb
Fixed #3391 - Reservr reservation table (tab 2) should be full screen
Fixed #3390 - Reservr top-right car graphic is cut
svn changeset:8920/svn branch:6.1
| -rw-r--r-- | WebContent/VAADIN/themes/reservr/styles.css | 3 | ||||
| -rw-r--r-- | src/com/vaadin/demo/reservation/ReservationApplication.java | 18 | ||||
| -rw-r--r-- | src/com/vaadin/demo/reservation/SampleDB.java | 2 |
3 files changed, 14 insertions, 9 deletions
diff --git a/WebContent/VAADIN/themes/reservr/styles.css b/WebContent/VAADIN/themes/reservr/styles.css index 9bcb6d961f..380df00591 100644 --- a/WebContent/VAADIN/themes/reservr/styles.css +++ b/WebContent/VAADIN/themes/reservr/styles.css @@ -11,7 +11,8 @@ .v-app-ReservationApplication .v-label-logo { font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; padding-left: 13px; - padding-bottom: 10px;
+ padding-bottom: 10px; + padding-top: 10px; color: #F14C1A;
font-size: 22px;
letter-spacing: -0.03em;
diff --git a/src/com/vaadin/demo/reservation/ReservationApplication.java b/src/com/vaadin/demo/reservation/ReservationApplication.java index 631233cdf3..1b9777dcb2 100644 --- a/src/com/vaadin/demo/reservation/ReservationApplication.java +++ b/src/com/vaadin/demo/reservation/ReservationApplication.java @@ -60,21 +60,26 @@ public class ReservationApplication extends Application { //
db = new SampleDB(getProperty("jdbcUrl"));
- final Window mainWindow = new Window("Reservr ");
+ VerticalLayout mainLayout = new VerticalLayout();
+ mainLayout.setSizeFull();
+ mainLayout.setMargin(true);
+
+ final Window mainWindow = new Window("Reservr ", mainLayout);
setMainWindow(mainWindow);
setTheme("reservr");
- mainWindow.getContent().setWidth("100%");
Label logo = new Label("Reservr");
logo.setStyleName("logo");
- mainWindow.addComponent(logo);
+ mainLayout.addComponent(logo);
Label slogan = new Label("Representational vehicles on-the-road");
slogan.setStyleName("slogan");
- mainWindow.addComponent(slogan);
+ mainLayout.addComponent(slogan);
final TabSheet mainTabs = new TabSheet();
- mainWindow.addComponent(mainTabs);
+ mainTabs.setSizeFull();
+ mainLayout.addComponent(mainTabs);
+ mainLayout.setExpandRatio(mainTabs, 1);
final VerticalLayout reservationTab = new VerticalLayout();
reservationTab.setWidth("100%");
@@ -184,8 +189,7 @@ public class ReservationApplication extends Application { });
allTable = new Table();
- allTable.setWidth("100%");
- allTable.setHeight("450px");
+ allTable.setSizeFull();
allTable.setColumnCollapsingAllowed(true);
allTable.setColumnReorderingAllowed(true);
mainTabs.addTab(allTable, "All reservations", null);
diff --git a/src/com/vaadin/demo/reservation/SampleDB.java b/src/com/vaadin/demo/reservation/SampleDB.java index 9be151c9e0..59eb7ef010 100644 --- a/src/com/vaadin/demo/reservation/SampleDB.java +++ b/src/com/vaadin/demo/reservation/SampleDB.java @@ -60,7 +60,7 @@ public class SampleDB { + "_RESERVED_TO"; } - private static final String DEFAULT_JDBC_URL = "jdbc:hsqldb:file:reservation.db"; + private static final String DEFAULT_JDBC_URL = "jdbc:hsqldb:mem:reservation.db"; private static Object dbMutex = new Object(); private static final String CREATE_TABLE_USER = "CREATE TABLE " |