You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2008/05/15 23:57:37 UTC
svn commit: r656863 - in
/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp:
WEB-INF/tags/layout/ overview/ tobago-resource/html/charlotteville/
tobago-resource/html/charlotteville/standard/
tobago-resource/html/charlotteville/standard/...
Author: lofwyr
Date: Thu May 15 14:57:36 2008
New Revision: 656863
URL: http://svn.apache.org/viewvc?rev=656863&view=rev
Log:
TOBAGO-518: Simplifying and cleanup
Added:
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/charlotteville/
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/charlotteville/standard/
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/charlotteville/standard/image/
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/charlotteville/standard/property/
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/charlotteville/standard/property/overview.properties.xml
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/richmond/standard/image/theme-photo.jpg (with props)
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/richmond/standard/property/
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/richmond/standard/property/overview.properties.xml
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/scarborough/standard/image/theme-photo.jpg (with props)
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/scarborough/standard/property/
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/scarborough/standard/property/overview.properties.xml
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/speyside/standard/image/theme-photo.jpg (with props)
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/speyside/standard/property/
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/speyside/standard/property/overview.properties.xml
Modified:
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/overview/theme.jsp
Modified: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag?rev=656863&r1=656862&r2=656863&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag Thu May 15 14:57:36 2008
@@ -1,3 +1,11 @@
+<%@ tag import="org.apache.myfaces.tobago.example.reference.SimpleBean" %>
+<%@ tag import="org.apache.myfaces.tobago.model.TreeState" %>
+<%@ tag import="javax.faces.application.FacesMessage" %>
+<%@ tag import="javax.faces.context.FacesContext" %>
+<%@ tag import="javax.swing.tree.DefaultMutableTreeNode" %>
+<%@ tag import="java.io.PrintWriter" %>
+<%@ tag import="java.io.StringWriter" %>
+<%@ tag import="java.util.Date" %>
<%--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +27,7 @@
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<f:view locale="#{clientConfigController.locale}">
<tc:loadBundle basename="overview" var="overviewBundle"/>
- <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle}" id="page" width="1000px" height="700px">
+ <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle}" id="page" width="1000px" height="750px">
<jsp:include page="/menu.jsp" />
<%--f:facet name="backButtonDetector">
Modified: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/overview/theme.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/overview/theme.jsp?rev=656863&r1=656862&r2=656863&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/overview/theme.jsp (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/overview/theme.jsp Thu May 15 14:57:36 2008
@@ -23,33 +23,48 @@
<jsp:body>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="120px;150px;1* " />
+ <tc:gridLayout rows="120px;1* " />
</f:facet>
<tc:out escape="false" value="#{overviewBundle.theme_text}" />
<tc:box label="#{overviewBundle.theme_title}" >
<f:facet name="layout">
- <tc:gridLayout rows="fixed;1*;fixed" />
+ <tc:gridLayout rows="fixed;1*" />
</f:facet>
- <tx:selectOneChoice value="#{clientConfigController2.theme}"
- label="#{overviewBundle.theme_label}">
- <f:selectItems value="#{clientConfigController2.themeItems}" />
- </tx:selectOneChoice>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;100px" />
+ </f:facet>
- <tc:cell/>
+ <tx:selectOneChoice value="#{clientConfigController2.theme}"
+ label="#{overviewBundle.theme_label}">
+ <f:selectItems value="#{clientConfigController2.themeItems}" />
+ </tx:selectOneChoice>
+ <tc:button action="#{clientConfigController2.submit}" label="#{overviewBundle.theme_submit}" />
+ </tc:panel>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="*;100px" />
+ <tc:gridLayout columns="*;480px;*" rows="*;320px;*" />
</f:facet>
+
+ <tc:cell spanX="3"/>
+
<tc:cell/>
- <tc:button action="#{clientConfigController2.submit}" label="#{overviewBundle.theme_submit}" />
+ <tc:image value="image/theme-photo.jpg"/>
+ <tc:cell/>
+
+ <tc:cell/>
+ <tc:out escape="false" value="#{overviewBundle.theme_photo}" />
+ <tc:cell/>
+
+ <tc:cell spanX="3"/>
+
</tc:panel>
</tc:box>
- <tc:cell />
</tc:panel>
</jsp:body>
</layout:overview>
Added: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/charlotteville/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/charlotteville/standard/property/overview.properties.xml?rev=656863&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/charlotteville/standard/property/overview.properties.xml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/charlotteville/standard/property/overview.properties.xml Thu May 15 14:57:36 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+
+<properties>
+ <entry key="theme_photo">Pier</entry>
+</properties>
Added: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/richmond/standard/image/theme-photo.jpg
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/richmond/standard/image/theme-photo.jpg?rev=656863&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/richmond/standard/image/theme-photo.jpg
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/richmond/standard/image/theme-photo.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/richmond/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/richmond/standard/property/overview.properties.xml?rev=656863&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/richmond/standard/property/overview.properties.xml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/richmond/standard/property/overview.properties.xml Thu May 15 14:57:36 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+
+<properties>
+ <entry key="theme_photo">Richmond Great House</entry>
+</properties>
Added: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/scarborough/standard/image/theme-photo.jpg
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/scarborough/standard/image/theme-photo.jpg?rev=656863&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/scarborough/standard/image/theme-photo.jpg
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/scarborough/standard/image/theme-photo.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/scarborough/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/scarborough/standard/property/overview.properties.xml?rev=656863&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/scarborough/standard/property/overview.properties.xml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/scarborough/standard/property/overview.properties.xml Thu May 15 14:57:36 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+
+<properties>
+ <entry key="theme_photo">Sundown from hill</entry>
+</properties>
Added: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/speyside/standard/image/theme-photo.jpg
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/speyside/standard/image/theme-photo.jpg?rev=656863&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/speyside/standard/image/theme-photo.jpg
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/speyside/standard/image/theme-photo.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/speyside/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/speyside/standard/property/overview.properties.xml?rev=656863&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/speyside/standard/property/overview.properties.xml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/tobago-resource/html/speyside/standard/property/overview.properties.xml Thu May 15 14:57:36 2008
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * 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.
+-->
+
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+
+<properties>
+ <entry key="theme_photo">Parrot</entry>
+</properties>