Author: tmjee
Date: Thu Jul 20 07:07:22 2006
New Revision: 423938
URL: http://svn.apache.org/viewvc?rev=423938&view=rev
Log:
WW-1367
- moved css styles from /WEB-INF/* to /webapp/* cause browser style
tag href can't
access /WEB-INF/*
Added:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/styles/
- copied from r423525,
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/styles/
Removed:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/styles/
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml?rev=423938&r1=423937&r2=423938&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
Thu Jul 20 07:07:22 2006
@@ -19,20 +19,20 @@
<resource>src/main/webapp/WEB-INF/decorators/main.ftl</resource>
<resource>src/main/webapp/WEB-INF/applicationContext.xml</resource>
<resource>src/main/webapp/WEB-INF/decorators.xml</resource>
- <resource>src/main/webapp/WEB-INF/styles/main.css</resource>
- <resource>src/main/webapp/WEB-INF/styles/forms.css</resource>
- <resource>src/main/webapp/WEB-INF/styles/layout.css</resource>
- <resource>src/main/webapp/WEB-INF/styles/layout-1col.css</resource>
-
<resource>src/main/webapp/WEB-INF/styles/layout-navleft-1col.css</resource>
-
<resource>src/main/webapp/WEB-INF/styles/layout-navleft-2col.css</resource>
-
<resource>src/main/webapp/WEB-INF/styles/layout-navtop-1col.css</resource>
-
<resource>src/main/webapp/WEB-INF/styles/layout-navtop-3col.css</resource>
-
<resource>src/main/webapp/WEB-INF/styles/layout-navtop-localleft.css</resource>
-
<resource>src/main/webapp/WEB-INF/styles/layout-navtop-subright.css</resource>
- <resource>src/main/webapp/WEB-INF/styles/nav-horizontal.css</resource>
- <resource>src/main/webapp/WEB-INF/styles/nav-vertical.css</resource>
- <resource>src/main/webapp/WEB-INF/styles/tools.css</resource>
- <resource>src/main/webapp/WEB-INF/styles/typo.css</resource>
+ <resource>src/main/webapp/styles/main.css</resource>
+ <resource>src/main/webapp/styles/forms.css</resource>
+ <resource>src/main/webapp/styles/layout.css</resource>
+ <resource>src/main/webapp/styles/layout-1col.css</resource>
+ <resource>src/main/webapp/styles/layout-navleft-1col.css</resource>
+ <resource>src/main/webapp/styles/layout-navleft-2col.css</resource>
+ <resource>src/main/webapp/styles/layout-navtop-1col.css</resource>
+ <resource>src/main/webapp/styles/layout-navtop-3col.css</resource>
+ <resource>src/main/webapp/styles/layout-navtop-localleft.css</resource>
+ <resource>src/main/webapp/styles/layout-navtop-subright.css</resource>
+ <resource>src/main/webapp/styles/nav-horizontal.css</resource>
+ <resource>src/main/webapp/styles/nav-vertical.css</resource>
+ <resource>src/main/webapp/styles/tools.css</resource>
+ <resource>src/main/webapp/styles/typo.css</resource>
<resource>src/main/webapp/WEB-INF/dwr.xml</resource>
<resource>src/main/webapp/WEB-INF/sitemesh.xml</resource>
<resource>src/main/webapp/WEB-INF/sitemesh-decorator.tld</resource>
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl?rev=423938&r1=423937&r2=423938&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl
Thu Jul 20 07:07:22 2006
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
<title>${title}</title>
- <link href="<@saf.url value='/WEB-INF/styles/main.css'/>" rel="stylesheet"
type="text/css" media="all"/>
+ <link href="<@saf.url value='/styles/main.css'/>" rel="stylesheet"
type="text/css" media="all"/>
<link href="<@saf.url value='/struts/niftycorners/niftyCorners.css'/>"
rel="stylesheet" type="text/css"/>
<link href="<@saf.url value='/struts/niftycorners/niftyPrint.css'/>"
rel="stylesheet" type="text/css" media="print"/>
<script language="JavaScript" type="text/javascript" src="<@saf.url
value='/struts/niftycorners/nifty.js'/>"></script>
