Move images into /static directory so that ETag filtering applies (#1072

) Resolves: https://jira.duraspace.org/browse/FCREPO-2084
fcrepo · Jul 21, 2016 · ac3cb5d · ac3cb5d
1 parent f512251
commit ac3cb5d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/fcrepo-http-api/src/main/resources/views/common-head.vsl b/fcrepo-http-api/src/main/resources/views/common-head.vsl
@@ -1,5 +1,5 @@
+<link rel="icon" type="image/png" href="$uriInfo.baseUriBuilder.build()../static/images/fcrepo-favicon.png">
 <script src="$uriInfo.baseUriBuilder.build()../static/js/jquery-1.9.1.min.js" ></script>
-
 <script src="$uriInfo.baseUriBuilder.build()../static/js/bootstrap-3.0.0.min.js"></script>
 <link href="$uriInfo.baseUriBuilder.build()../static/css/bootstrap-3.0.0.min.css" rel="stylesheet">
 <script type="text/javascript" src="$uriInfo.baseUriBuilder.build()fcr:assets/common.js"></script>

diff --git a/fcrepo-webapp/pom.xml b/fcrepo-webapp/pom.xml
@@ -506,7 +506,7 @@
                   <goal>createconsole</goal>
                 </goals>
                 <configuration>
-                  <backgroundImage>${basedir}/src/main/webapp/images/fedora_logo_10in.png</backgroundImage>
+                  <backgroundImage>${basedir}/src/main/webapp/static/images/fedora_logo_10in.png</backgroundImage>
                   <destinationFile>
                     ${project.build.directory}${file.separator}${project.artifactId}-${project.version}-jetty-console.jar
                   </destinationFile>

diff --git a/fcrepo-webapp/src/main/webapp/index.html b/fcrepo-webapp/src/main/webapp/index.html
@@ -1,7 +1,7 @@
 <html>
 <head>
   <title>Fedora Commons Repository 4.0</title>
-  <link rel="icon" type="image/x-icon" href="favicon.ico"/>
+  <link rel="icon" type="image/png" href="static/images/fcrepo-favicon.png"/>
   <script src="static/js/jquery-1.9.1.min.js" ></script>
 
   <script src="static/js/bootstrap-3.0.0.min.js"></script>
@@ -22,7 +22,7 @@
 <div class="container">
 <div class="col-md-12">
 <div class="jumbotron">
-<a href="rest/" class="thumbnail" style=""><img src="images/fedora_logo_10in.png" /></a>
+<a href="rest/" class="thumbnail" style=""><img src="static/images/fedora_logo_10in.png" /></a>
 <p>This is the exciting stub page for your Fedora ${project.version} repository that we have placed
 here.</p>
 

diff --git a/...src/main/webapp/images/fcrepo-favicon.png → ...n/webapp/static/images/fcrepo-favicon.png b/...src/main/webapp/images/fcrepo-favicon.png → ...n/webapp/static/images/fcrepo-favicon.png
diff --git a/...c/main/webapp/images/fedora_logo_10in.png → ...webapp/static/images/fedora_logo_10in.png b/...c/main/webapp/images/fedora_logo_10in.png → ...webapp/static/images/fedora_logo_10in.png