Author: evenisse Date: Thu Jan 5 05:38:07 2006 New Revision: 366178 URL: http://svn.apache.org/viewcvs?rev=366178&view=rev Log: Remove all , and from jsp and use continuum data tag instead for presentation, so it will be more easy to update jsps without need to know html to use for rendering Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java (with props) maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/data.vm (with props) Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/file.vm maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld maven/continuum/trunk/continuum-webapp/src/main/webapp/about.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java?rev=366178&view=auto ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java (added) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java Thu Jan 5 05:38:07 2006 @@ -0,0 +1,37 @@ +package org.apache.maven.continuum.web.view.jsp.ui; + +/* + * Copyright 2004-2005 The Apache Software Foundation. + * + * Licensed 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. + */ + +import com.opensymphony.webwork.views.jsp.ui.AbstractUITag; + +/** + * @author Emmanuel Venisse + * @version $Id$ + */ +public class DataTag + extends AbstractUITag +{ + /** + * The name of the default template for the SubmitCancelTag + */ + final public static String TEMPLATE = "data"; + + protected String getDefaultTemplate() + { + return TEMPLATE; + } +} Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=366178&r1=366177&r2=366178&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original) +++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Thu Jan 5 05:38:07 2006 @@ -17,6 +17,7 @@ workingCopy = Working Copy builds = Builds info = Info +or = OR // ---------------------------------------------------------------------- // Page: Top Added: maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/data.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/data.vm?rev=366178&view=auto ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/data.vm (added) +++ maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/data.vm Thu Jan 5 05:38:07 2006 @@ -0,0 +1 @@ +#parse("/template/default/controlheader.vm")#if ($parameters.nameValue) $!webwork.htmlEncode($parameters.nameValue) #end#parse("/template/default/controlfooter.vm") Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/data.vm ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/data.vm ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/file.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/file.vm?rev=366178&r1=366177&r2=366178&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/file.vm (original) +++ maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/file.vm Thu Jan 5 05:38:07 2006 @@ -1 +1,2 @@ +#if (!$parameters.size) #set ($parameters.size = '100') #end #parse("/template/default/controlheader.vm")#parse("/template/simple/file.vm")#parse("/template/default/controlfooter.vm") Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld?rev=366178&r1=366177&r2=366178&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld Thu Jan 5 05:38:07 2006 @@ -10,7 +10,7 @@ date org.apache.maven.continuum.web.view.jsp.ui.DateTag JSP - visitor tag + date tag name true @@ -25,6 +25,23 @@ nice false true + + + + + data + org.apache.maven.continuum.web.view.jsp.ui.DataTag + JSP + data tag + + label + false + true + + + name + false + false Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/about.jsp URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/about.jsp?rev=366178&r1=366177&r2=366178&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/about.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/about.jsp Thu Jan 5 05:38:07 2006 @@ -1,4 +1,5 @@ <%@ taglib uri="webwork" prefix="ww" %> +<%@ taglib uri="continuum" prefix="c1" %> @@ -9,10 +10,9 @@

- - - - + + +
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp?rev=366178&r1=366177&r2=366178&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp Thu Jan 5 05:38:07 2006 @@ -11,28 +11,15 @@

- - - - - - - - - - - - - -
- -

-
  - OR -
- -

-
+ +

+
+ + + + +

+
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp?rev=366178&r1=366177&r2=366178&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp Thu Jan 5 05:38:07 2006 @@ -11,28 +11,15 @@

- - - - - - - - - - - - - -
- -

-
  - OR -
- -

-
+ +

+
+ + + + +

+
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp?rev=366178&r1=366177&r2=366178&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp Thu Jan 5 05:38:07 2006 @@ -26,50 +26,24 @@
"> - - - - - - - - - - - - - - - - - - - - - - - - - -
- -

-
- -

-
- -

-
- -

-
- -

-
- -

-
+ +

+
+ +

+
+ +

+
+ +

+
+ +

+
+ +

+
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp?rev=366178&r1=366177&r2=366178&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp Thu Jan 5 05:38:07 2006 @@ -25,33 +25,28 @@
- - - - - - - - - - - - - - - - - - - - + + + + + + + + TODO + + + TODO + + + + + + + +   + + +
TODO
TODO
- - - - -   - -
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp?rev=366178&r1=366177&r2=366178&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp Thu Jan 5 05:38:07 2006 @@ -1,4 +1,5 @@ <%@ taglib uri="webwork" prefix="ww" %> +<%@ taglib uri="continuum" prefix="c1" %> @@ -10,41 +11,22 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
- - - - - - -
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp?rev=366178&r1=366177&r2=366178&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp Thu Jan 5 05:38:07 2006 @@ -1,6 +1,7 @@ <%@ taglib uri="webwork" prefix="ww" %> <%@ taglib uri="/tld/extremecomponents" prefix="ec" %> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib uri="continuum" prefix="c1" %> @@ -20,22 +21,10 @@
- - - - - - - - - - - - - - - - + + + +
"/>