You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/02/26 16:50:18 UTC
svn commit: r631260 - in
/myfaces/orchestra/trunk/examples/src/main/webapp/mops: CustomerLogin.jsp
EditCustomerGroup.jsp EditProduct.jsp ProductDetail.jsp SearchProduct.jsp
footer.jspf header.jspf
Author: skitching
Date: Tue Feb 26 07:50:17 2008
New Revision: 631260
URL: http://svn.apache.org/viewvc?rev=631260&view=rev
Log:
Minor layout tidyups
Added:
myfaces/orchestra/trunk/examples/src/main/webapp/mops/footer.jspf
Modified:
myfaces/orchestra/trunk/examples/src/main/webapp/mops/CustomerLogin.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/mops/EditCustomerGroup.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/mops/EditProduct.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/mops/ProductDetail.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/mops/SearchProduct.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/mops/header.jspf
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/mops/CustomerLogin.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/mops/CustomerLogin.jsp?rev=631260&r1=631259&r2=631260&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/mops/CustomerLogin.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/mops/CustomerLogin.jsp Tue Feb 26 07:50:17 2008
@@ -25,15 +25,7 @@
<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
<f:view>
- <t:documentHead>
- <f:verbatim>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
- </f:verbatim>
- <t:stylesheet path="../styles/mops_default.css" media="screen"/>
- <f:verbatim>
- <title>Apache MyFaces Orchestra</title>
- </f:verbatim>
- </t:documentHead>
+ <%@ include file="/mops/header.jspf" %>
<t:div styleClass="login_position">
<t:div styleClass="login_content">
<h:form>
@@ -71,5 +63,5 @@
</h:form>
</t:div>
</t:div>
- <%@ include file="../footer.jspf" %>
+ <%@ include file="/mops/footer.jspf" %>
</f:view>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/mops/EditCustomerGroup.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/mops/EditCustomerGroup.jsp?rev=631260&r1=631259&r2=631260&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/mops/EditCustomerGroup.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/mops/EditCustomerGroup.jsp Tue Feb 26 07:50:17 2008
@@ -25,7 +25,7 @@
<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
<f:view>
- <%@ include file="../header.jspf" %>
+ <%@ include file="/mops/header.jspf" %>
<h:form>
@@ -121,5 +121,5 @@
</h:form>
- <%@ include file="../footer.jspf" %>
+ <%@ include file="/mops/footer.jspf" %>
</f:view>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/mops/EditProduct.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/mops/EditProduct.jsp?rev=631260&r1=631259&r2=631260&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/mops/EditProduct.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/mops/EditProduct.jsp Tue Feb 26 07:50:17 2008
@@ -25,7 +25,7 @@
<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
<f:view>
-<%@ include file="../header.jspf" %>
+<%@ include file="/mops/header.jspf" %>
<h:form>
@@ -175,5 +175,5 @@
</h:form>
-<%@ include file="../footer.jspf" %>
+<%@ include file="/mops/footer.jspf" %>
</f:view>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/mops/ProductDetail.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/mops/ProductDetail.jsp?rev=631260&r1=631259&r2=631260&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/mops/ProductDetail.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/mops/ProductDetail.jsp Tue Feb 26 07:50:17 2008
@@ -25,7 +25,7 @@
<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
<f:view>
- <%@ include file="../header.jspf" %>
+ <%@ include file="/mops/header.jspf" %>
<h:form>
@@ -59,5 +59,5 @@
</h:form>
- <%@ include file="../footer.jspf" %>
+ <%@ include file="/mops/footer.jspf" %>
</f:view>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/mops/SearchProduct.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/mops/SearchProduct.jsp?rev=631260&r1=631259&r2=631260&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/mops/SearchProduct.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/mops/SearchProduct.jsp Tue Feb 26 07:50:17 2008
@@ -25,8 +25,7 @@
<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox"%>
<f:view>
- <%@ include file="./header.jspf"%>
-
+ <%@ include file="/mops/header.jspf"%>
<t:div styleClass="moduleheader">
<t:htmlTag value="h2">
<h:outputText value="Search Product" />
@@ -140,5 +139,5 @@
</h:form>
</t:div>
- <%@ include file="../footer.jspf"%>
+ <%@ include file="/mops/footer.jspf"%>
</f:view>
Added: myfaces/orchestra/trunk/examples/src/main/webapp/mops/footer.jspf
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/mops/footer.jspf?rev=631260&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/mops/footer.jspf (added)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/mops/footer.jspf Tue Feb 26 07:50:17 2008
@@ -0,0 +1,31 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ --%>
+
+<%-- See comments in file header.jspf --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+
+
+<h:messages showDetail="true" />
+
+<t:documentBody state="end" />
+
+<t:document state="end" />
\ No newline at end of file
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/mops/header.jspf
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/mops/header.jspf?rev=631260&r1=631259&r2=631260&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/mops/header.jspf (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/mops/header.jspf Tue Feb 26 07:50:17 2008
@@ -44,14 +44,22 @@
<t:div styleClass="stdheader">
<t:div styleClass="navigation">
<h:form>
- <h:outputLink value="/">
- <h:outputText value="Home" />
- </h:outputLink>
+ <h:outputLink value="#{facesContext.externalContext.requestContextPath}">
+ <h:outputText value="Home" />
+ </h:outputLink>
<o:separateConversationContext>
- <h:outputLink value="/" target="_blank">
+ <h:outputLink value="#{facesContext.externalContext.requestContextPath}" target="_blank">
<h:outputText value="Home in new window" />
</h:outputLink>
</o:separateConversationContext>
+ <h:outputLink value="#{facesContext.externalContext.requestContextPath}/mops">
+ <h:outputText value="Petshop" />
+ </h:outputLink>
+ <o:separateConversationContext>
+ <h:outputLink value="#{facesContext.externalContext.requestContextPath}/mops" target="_blank">
+ <h:outputText value="Petshop in new window" />
+ </h:outputLink>
+ </o:separateConversationContext>
</h:form>
</t:div>
</t:div>