From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 25 Sep 2009 08:45:31 +0000 (+0000)
Subject: Merged:
X-Git-Tag: 6.7.0.beta1~2465
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=048862257557375b8694dc4b2eabeaf8d4829e41;p=vaadin-framework.git

Merged:
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:8921/svn branch:6.2
---

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 "