GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remapped static resources as /petclinic/static/images/... 

Renamed tutorial from petclinic.html -> tutorial.html


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@636 50f2f4bb-b051-0410-bef5-90022cba6387
pull/1/head
Chris Beams 17 years ago
parent
9f3c071fd1
commit
dff1f12fb0
6 changed files with 12 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/footer.jsp
  2. 2
      org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/header.jsp
  3. 4
      org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp
  4. 24
      org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml
  5. 0
      org.springframework.samples.petclinic/src/main/webapp/html/tutorial.html
  6. 4
      org.springframework.samples.petclinic/src/main/webapp/styles/petclinic.css

2
org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/footer.jsp
Unescape View File

@ -2,7 +2,7 @@
<table class="footer"> <table class="footer">
<tr> <tr>
<td><a href="<spring:url value="/" escapeXml="true" />">Home</a></td> <td><a href="<spring:url value="/" escapeXml="true" />">Home</a></td>
<td align="right"><img src="<spring:url value="/images/springsource-logo.png" escapeXml="true" />" alt="Sponsored by SpringSource"/></td> <td align="right"><img src="<spring:url value="/static/images/springsource-logo.png" escapeXml="true" />" alt="Sponsored by SpringSource"/></td>
</tr> </tr>
</table> </table>

2
org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/header.jsp
Unescape View File

@ -5,7 +5,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" href="<spring:url value="/styles/petclinic.css" escapeXml="true" />" type="text/css"/> <link rel="stylesheet" href="<spring:url value="/static/styles/petclinic.css" escapeXml="true" />" type="text/css"/>
<title>PetClinic :: a Spring Framework demonstration</title> <title>PetClinic :: a Spring Framework demonstration</title>
</head> </head>

4
org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp
Unescape View File

@ -1,13 +1,13 @@
<%@ include file="/WEB-INF/jsp/includes.jsp" %> <%@ include file="/WEB-INF/jsp/includes.jsp" %>
<%@ include file="/WEB-INF/jsp/header.jsp" %> <%@ include file="/WEB-INF/jsp/header.jsp" %>
<img src="<spring:url value="/images/pets.png" escapeXml="true" />" align="right" style="position:relative;right:30px;"> <img src="<spring:url value="/static/images/pets.png" escapeXml="true" />" align="right" style="position:relative;right:30px;">
<h2><fmt:message key="welcome"/></h2> <h2><fmt:message key="welcome"/></h2>
<ul> <ul>
<li><a href="<spring:url value="/owners/search" escapeXml="true" />">Find owner</a></li> <li><a href="<spring:url value="/owners/search" escapeXml="true" />">Find owner</a></li>
<li><a href="<spring:url value="/vets" escapeXml="true" />">Display all veterinarians</a></li> <li><a href="<spring:url value="/vets" escapeXml="true" />">Display all veterinarians</a></li>
<li><a href="<spring:url value="/html/petclinic.html" escapeXml="true" />">Tutorial</a></li> <li><a href="<spring:url value="/static/html/tutorial.html" escapeXml="true" />">Tutorial</a></li>
</ul> </ul>
<p>&nbsp;</p> <p>&nbsp;</p>

24
org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml
Unescape View File

@ -14,6 +14,8 @@
<param-name>webAppRootKey</param-name> <param-name>webAppRootKey</param-name>
<param-value>petclinic.root</param-value> <param-value>petclinic.root</param-value>
</context-param> </context-param>
<!-- <!--
Location of the Log4J config file, for initialization and refresh checks. Location of the Log4J config file, for initialization and refresh checks.
@ -88,26 +90,14 @@
<!-- <!--
- Map static resources to the default servlet - Map static resources to the default servlet
- examples: - examples:
- http://localhost:8080/images/pets.png - http://localhost:8080/static/images/pets.png
- http://localhost:8080/styles/petclinic.css - http://localhost:8080/static/styles/petclinic.css
--> -->
<servlet-mapping> <servlet-mapping>
<servlet-name>default</servlet-name> <servlet-name>default</servlet-name>
<url-pattern>*.png</url-pattern> <url-pattern>/static/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>*.gif</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>*.css</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>*.html</url-pattern>
</servlet-mapping>
<!-- <!--
- Servlet that dispatches request to registered handlers (Controller implementations). - Servlet that dispatches request to registered handlers (Controller implementations).
- Has its own application context, by default defined in "{servlet-name}-servlet.xml", - Has its own application context, by default defined in "{servlet-name}-servlet.xml",
@ -168,6 +158,4 @@
</resource-ref> </resource-ref>
--> -->
</web-app> </web-app>

0
org.springframework.samples.petclinic/src/main/webapp/html/petclinic.html → org.springframework.samples.petclinic/src/main/webapp/html/tutorial.html
Unescape View File

4
org.springframework.samples.petclinic/src/main/webapp/styles/petclinic.css
Unescape View File

@ -111,7 +111,7 @@ li {
} }
li ul { li ul {
list-style: square url(images/sub-bullet.gif); list-style: square url(../images/bullet-arrow.png);
} }
li ul li ul { li ul li ul {
@ -231,4 +231,4 @@ fieldset th {
padding:2px 8px; padding:2px 8px;
font-size:11px; font-size:11px;
color:#888888; color:#888888;
} }

Write Preview
Loading…
Cancel
Save