diff --git a/pom.xml b/pom.xml index 4a486a69db45c645dcccbbb27ed219099fd71cca..9f061978452ea6bd7e6a671e1c9cd3e969a244f6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,34 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <groupId>edu.wisc.doit.code</groupId> + <artifactId>shared-tools-uw-parent</artifactId> + <version>9</version> + </parent> + <modelVersion>4.0.0</modelVersion> <groupId>edu.wisc.my.app.root</groupId> - <artifactId>root-webapp</artifactId> + <artifactId>ROOT</artifactId> <packaging>war</packaging> <version>1.0.0-SNAPSHOT</version> <name>MyUW ROOT webapp</name> <url>git@git.doit.wisc.edu:myuw/my-root.git</url> <build> <finalName>ROOT</finalName> + <plugins> + <plugin> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>9.3.0.M2</version> + <configuration> + <webApp> + <baseResource implementation="org.eclipse.jetty.util.resource.ResourceCollection"> + <resourcesAsCSV>src/main/webapp,${webapp.target.directory}</resourcesAsCSV> + </baseResource> + </webApp> + </configuration> + </plugin> + </plugins> </build> </project> diff --git a/src/main/webapp/400.html b/src/main/webapp/400.html deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/main/webapp/404.html b/src/main/webapp/404.html new file mode 100644 index 0000000000000000000000000000000000000000..621dfea6cda80a2fde1f2420f65d45f798f66333 --- /dev/null +++ b/src/main/webapp/404.html @@ -0,0 +1,122 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>MyUW Page Not Found</title> + <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet"> + <style> + a { + color:#b70101; + } + a:hover { + color:#660000; + } + p.apologize { + text-align:center; + padding:20px 0px 50px; + } + .header { + background-color:#b70101; + text-align:center; + padding:10px; + height:53px; + } + .header h1 { + font-size:2.3em; + font-weight:100; + color:#fff; + text-align:center; + margin-top:0px; + white-space:nowrap; + } + .header h2 { + color:#fff; + text-align:left; + font-size:1.8em; + font-weight:200; + margin:2px 0px 0px 30px; + padding:0; + white-space:nowrap; + } + .header div { + display:inline; + } + .main-content { + text-align:center; + padding-top:30px; + } + .main-content p { + font-size:1.2em; + padding:10px 0px; + } + .main-content strong { + font-size:1.7em; + font-weight:200; + text-align:center; + } + .service { + width:35%; + } + .crest { + display:block; + position:absolute; + width:200px; + z-index:5; + overflow:hidden; + } + .madison { + text-align: center; + margin:30px 0px 15px + } + @media (max-width:768px) { + .main-content strong { + font-size:1.55em; + } + .main-content p { + font-size:1.1em; + } + .header h1 { + font-size:1.8em; + margin:3px -50% 0px; + white-space:no-wrap; + } + .header h2 { + font-size:1.3em; + margin-top:7px; + } + .outage-title { + padding:0 -50%; + } + } + @media (max-width:500px) { + .header h1 { + margin:3px 0px 0px; + } + } + </style> +</head> + +<body> + <div id="row"> + <div class="col-xs-12 header"> + <div class="col-xs-4 col-sm-4 photo-div"> + <img src="main_logo_w_all.png" class="crest"> + </div> + <div class="col-xs-4 outage-title"> + <h1>Page Not Found</h1> + </div> + <div class="col-sm-4"> + </div> + </div> + </div> + <div class="container-fluid"> + <div class="row"> + <div class="col-xs-10 col-xs-offset-1 col-sm-8 col-sm-offset-2 main-content"> + <p><strong>Sorry, the page your are looking for does not exist or you don't have access to it. Please go to the <a href='/'>MyUW home page</a>.</strong></p> + </div> + </div> + <div> + <p class="apologize">We apologize for the inconvenience. If you feel as though this URL should exist, please drop us a line on our <a href='https://my.wisc.edu/portal/p/feedback'>feedback form</a>.</p> + </div> + </div> +</body> +</html> diff --git a/src/main/webapp/500.html b/src/main/webapp/500.html index 138ab98463fec398cd2fd42a3754143e0a93e0d6..5fecfd1fe1fde0255ed289a02fe82df4c790ca22 100644 --- a/src/main/webapp/500.html +++ b/src/main/webapp/500.html @@ -3,7 +3,7 @@ <head> <title>MyUW-Madison Outage</title> <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet"> - <style type="text/css"> + <style> a { color:#b70101; } @@ -99,7 +99,7 @@ <div id="row"> <div class="col-xs-12 header"> <div class="col-xs-4 col-sm-4 photo-div"> - <img src="./main_logo_w_all.png" class="crest"> + <img src="main_logo_w_all.png" class="crest"> </div> <div class="col-xs-4 outage-title"> <h1>Server Error</h1> diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index f7fde4432dd5f6de03848c2039373bae6249413e..234227617ee05eaa01389dcc143c560af438bc52 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -9,4 +9,9 @@ <error-code>500</error-code> <location>/500.html</location> </error-page> + + <error-page> + <error-code>404</error-code> + <location>/404.html</location> + </error-page> </web-app>