From c553eb9cb5e586329dd31847e154b1418465cf05 Mon Sep 17 00:00:00 2001 From: Jeremy Grelle Date: Thu, 16 Aug 2007 23:13:17 +0000 Subject: [PATCH] Polish --- .../booking-jsf/src/main/webapp/WEB-INF/faces-config.xml | 6 +++--- .../booking-jsf/src/main/webapp/WEB-INF/web.xml | 2 +- .../booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml | 2 +- .../booking-jsf/src/main/webapp/css/screen.css | 7 +++++-- .../booking-jsf/src/main/webapp/intro.xhtml | 2 +- .../booking-jsf/src/main/webapp/template.xhtml | 2 +- .../sellitem-jsf/.settings/org.eclipse.jpt.core.prefs | 5 +++++ .../sellitem-jsf/src/main/webapp/WEB-INF/faces-config.xml | 6 +++--- .../sellitem-jsf/src/main/webapp/WEB-INF/web.xml | 2 +- 9 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jpt.core.prefs diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/faces-config.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/faces-config.xml index d7b5ce35..3f9ef237 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/faces-config.xml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/faces-config.xml @@ -5,15 +5,15 @@ - org.springframework.webflow.executor.jsf.FlowNavigationHandler - org.springframework.webflow.executor.jsf.DelegatingFlowVariableResolver + org.springframework.faces.webflow.FlowNavigationHandler + org.springframework.faces.webflow.el.DelegatingFlowVariableResolver org.springframework.web.jsf.DelegatingVariableResolver com.sun.facelets.FaceletViewHandler org.springframework.webflow.samples.booking.util.DebuggingPhaseListener - org.springframework.webflow.executor.jsf.FlowPhaseListener + org.springframework.faces.webflow.FlowPhaseListener diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml index f618a581..2c217be5 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml @@ -43,7 +43,7 @@ Flow System Cleanup Filter - org.springframework.webflow.executor.jsf.FlowSystemCleanupFilter + org.springframework.faces.webflow.FlowSystemCleanupFilter diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml index 40c26b0d..7ee69ce4 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/webflow-config.xml @@ -47,7 +47,7 @@ - + diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/css/screen.css b/spring-webflow-samples/booking-jsf/src/main/webapp/css/screen.css index 0c65e65f..fa316795 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/css/screen.css +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/css/screen.css @@ -156,7 +156,10 @@ input[type="submit"], input[type="button"] { font-size: small; color: #8B7869; line-height: 150%; + padding-top: 10px; padding-bottom: 10px; + padding-left: 5px; + padding-right: 5px; } #sidebar li { font-size: small; @@ -177,7 +180,7 @@ input[type="submit"], input[type="button"] { #content .section { float: left; width: 518px; - padding: 15px 15px 0 3px; + padding: 15px 15px 0 10px; } #content .section h1 { font-family: "Trebuchet MS", Arial, sans-serif; @@ -212,7 +215,7 @@ input[type="submit"], input[type="button"] { border-left: 1px solid #E4DBD5; padding: 4px; border-bottom: 1px solid #D2C9C4; - font-size: small; + font-size: 8pt; } #content dt { font-weight: bold; diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml index fa80785a..abd66b19 100755 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/intro.xhtml @@ -49,7 +49,7 @@ - + \ No newline at end of file diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/template.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/template.xhtml index f17e9bc4..7a8c19e4 100644 --- a/spring-webflow-samples/booking-jsf/src/main/webapp/template.xhtml +++ b/spring-webflow-samples/booking-jsf/src/main/webapp/template.xhtml @@ -34,7 +34,7 @@ - + \ No newline at end of file diff --git a/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jpt.core.prefs b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jpt.core.prefs new file mode 100644 index 00000000..102d5856 --- /dev/null +++ b/spring-webflow-samples/sellitem-jsf/.settings/org.eclipse.jpt.core.prefs @@ -0,0 +1,5 @@ +#Thu Aug 09 13:12:30 EDT 2007 +eclipse.preferences.version=1 +instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true +org.eclipse.jpt.core.discoverAnnotatedClasses=true +org.eclipse.jpt.core.platform=generic diff --git a/spring-webflow-samples/sellitem-jsf/src/main/webapp/WEB-INF/faces-config.xml b/spring-webflow-samples/sellitem-jsf/src/main/webapp/WEB-INF/faces-config.xml index a040566f..d41e580d 100644 --- a/spring-webflow-samples/sellitem-jsf/src/main/webapp/WEB-INF/faces-config.xml +++ b/spring-webflow-samples/sellitem-jsf/src/main/webapp/WEB-INF/faces-config.xml @@ -5,11 +5,11 @@ - org.springframework.webflow.executor.jsf.FlowNavigationHandler - org.springframework.webflow.executor.jsf.DelegatingFlowVariableResolver + org.springframework.faces.webflow.FlowNavigationHandler + org.springframework.f.el.DelegatingFlowVariableResolver - org.springframework.webflow.executor.jsf.FlowPhaseListener + org.springframework.faces.webflow.FlowPhaseListener \ No newline at end of file diff --git a/spring-webflow-samples/sellitem-jsf/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/sellitem-jsf/src/main/webapp/WEB-INF/web.xml index ca044e25..9897504a 100644 --- a/spring-webflow-samples/sellitem-jsf/src/main/webapp/WEB-INF/web.xml +++ b/spring-webflow-samples/sellitem-jsf/src/main/webapp/WEB-INF/web.xml @@ -26,7 +26,7 @@ Flow System Cleanup Filter - org.springframework.webflow.executor.jsf.FlowSystemCleanupFilter + org.springframework.faces.webflow.FlowSystemCleanupFilter