diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 1841c855665ad3704de3969d5363294be53e80ef..0000000000000000000000000000000000000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-job1:
- tags:
- - java8
- script:
- - mvn clean package
\ No newline at end of file
diff --git a/myuw-root-webapp/src/main/webapp/403.html b/myuw-root-webapp/src/main/webapp/403.html
index 54d66b4ad69888a4803d84fcb857f57ece1f0b1d..632746b23add58b629432b8504494363ee276f90 100644
--- a/myuw-root-webapp/src/main/webapp/403.html
+++ b/myuw-root-webapp/src/main/webapp/403.html
@@ -1,15 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
+<html lang="en">
<head>
<title>Access Denied</title>
<!-- MATERIAL DESIGN LITE STYLES -->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.indigo-pink.min.css">
<!-- LOCAL STYLES -->
- <style>
- @import url(https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700);.mr-header,.mr-tabs,.mr-title,p.apologize,p.centered{text-align:center}.mdl-tabs__tab,a,a:hover{text-decoration:none}body,html{font-family:Roboto,sans-serif;margin:0}a{color:#c5050c}a:hover{color:#600}p.apologize{padding:20px 0 50px}.mr-header{min-height:64px}.mr-title{font-size:20px;font-weight:500}.mr-main__content{padding:0 15px}.outage-title{margin:0 auto;font-weight:100;color:#fff;line-height:64px;font-size:20px;letter-spacing:.02em}.photo-div{position:absolute}.crest,.mdl-tabs__tab{position:relative;overflow:hidden}.crest{display:block;width:200px;z-index:5;padding:15px 0}.img__bucky-sad{display:block;margin:0 auto;padding:16px 16px 0}.mdl-layout__header,.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after,.mdl-tabs__tab .mdl-tabs__ripple-container .mdl-ripple{background:#c5050c}.mdl-layout__fixed-header .mdl-layout__header-row,.mdl-layout__header-row{padding:0 16px}.mdl-data-table__cell--non-numeric{text-align:left}.mdl-tabs__tab-bar{justify-content:flex-start;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-justify-content:flex-start;-ms-flex-pack:start;-webkit-align-content:space-between;align-content:space-between;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;height:48px;padding:0;margin:0;border-bottom:1px solid #e0e0e0}.mdl-tabs__tab{margin:0;border:none;padding:0 24px;float:left;display:block;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(0,0,0,.54)}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:#c5050c;-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1) .01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1) .01s alternate forwards;transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-tabs.is-upgraded .mdl-tabs__panel{padding:12px 0;text-align:center}.mdl-tabs.is-upgraded .mdl-tabs__panel:not(.is-active){display:none}.mdl-data-table{white-space:normal;margin:0 auto}@media (min-width:599px){.mdl-data-table td:first-of-type,.mdl-data-table th:first-of-type{min-width:162px}}
- </style>
- <script type="text/javascript" src='/simple.js'></script>
+ <link rel="stylesheet" href="webapp.css">
</head>
<body>
@@ -17,20 +14,20 @@
<header class="mdl-layout__header">
<div class="mdl-layout__header-row">
<div class="photo-div">
- <img src="/main_logo_w_all.png" class="crest">
+ <img src="/main_logo_w_all.png" alt="University of Wisconsin System Logo" class="uw-logo">
</div>
<!-- Title -->
- <span class="mdl-layout-title outage-title">Access Denied</span>
+ <h1 class="mdl-layout-title outage-title">Access Denied</h1>
</div>
</header>
- <main class="mdl-layout__content">
+ <main class="mdl-layout__content content-centered">
<div class="mdl-grid">
<div class="mdl-cell mdl-cell--2-col mdl-cell--1-col-phone"></div>
<div class="mdl-cell mdl-cell--8-col mdl-cell--10-col-phone">
- <img src="/bucky-sad.png" alt="sad bucky" class="img__bucky-sad" id="img__bucky-sad">
- <h1 class="mr-title">Sorry, you're not authorized to access this page.</h1>
- <p class="centered">If you're here by accident, head back to your MyUW <a href='/web'>homepage</a>.</p>
- <p class="centered">For help with authorization, contact the DoIT <a href="https://kb.wisc.edu/helpdesk/"></a>Help Desk</a>.</p>
+ <img src="/alert-icon.png" alt="Line art image of an exclamation mark inside of a triangle" class="alert-icon">
+ <h2 class="mr-title">Sorry, you're not authorized to access this page.</h2>
+ <p>If you're here by accident, head back to your MyUW <a href='/web'>homepage</a>.</p>
+ <p>For help with authorization, contact the DoIT <a href="https://kb.wisc.edu/helpdesk/">Help Desk</a>.</p>
</div>
<div class="mdl-cell mdl-cell--2-col mdl-cell--1-col-phone"></div>
</div>
diff --git a/myuw-root-webapp/src/main/webapp/404.html b/myuw-root-webapp/src/main/webapp/404.html
index 3b4048678e0abab5109a078f6af4368ab5ae1395..10975219b44365dbcc8088935d1728c25a8412a5 100644
--- a/myuw-root-webapp/src/main/webapp/404.html
+++ b/myuw-root-webapp/src/main/webapp/404.html
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
+<html lang="en">
<head>
<title>MyUW Page Not Found</title>
<!-- MATERIAL DESIGN LITE STYLES -->
@@ -8,10 +8,7 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.indigo-pink.min.css">
<!-- LOCAL STYLES -->
- <style>
- @import url(https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700);.mr-header,.mr-tabs,.mr-title,p.apologize,p.centered{text-align:center}.mdl-tabs__tab,a,a:hover{text-decoration:none}body,html{font-family:Roboto,sans-serif;margin:0}a{color:#c5050c}a:hover{color:#600}p.apologize{padding:20px 0 50px}.mr-header{min-height:64px}.mr-title{font-size:20px;font-weight:500}.mr-main__content{padding:0 15px}.outage-title{margin:0 auto;font-weight:100;color:#fff;line-height:64px;font-size:20px;letter-spacing:.02em}.photo-div{position:absolute}.crest,.mdl-tabs__tab{position:relative;overflow:hidden}.crest{display:block;width:200px;z-index:5;padding:15px 0}.img__bucky-sad{display:block;margin:0 auto;padding:16px 16px 0}.mdl-layout__header,.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after,.mdl-tabs__tab .mdl-tabs__ripple-container .mdl-ripple{background:#c5050c}.mdl-layout__fixed-header .mdl-layout__header-row,.mdl-layout__header-row{padding:0 16px}.mdl-data-table__cell--non-numeric{text-align:left}.mdl-tabs__tab-bar{justify-content:flex-start;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-justify-content:flex-start;-ms-flex-pack:start;-webkit-align-content:space-between;align-content:space-between;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;height:48px;padding:0;margin:0;border-bottom:1px solid #e0e0e0}.mdl-tabs__tab{margin:0;border:none;padding:0 24px;float:left;display:block;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(0,0,0,.54)}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:#c5050c;-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1) .01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1) .01s alternate forwards;transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-tabs.is-upgraded .mdl-tabs__panel{padding:12px 0;text-align:center}.mdl-tabs.is-upgraded .mdl-tabs__panel:not(.is-active){display:none}.mdl-data-table{white-space:normal;margin:0 auto}@media (min-width:599px){.mdl-data-table td:first-of-type,.mdl-data-table th:first-of-type{min-width:162px}}
- </style>
- <script type="text/javascript" src='/simple.js'></script>
+ <link rel="stylesheet" href="webapp.css">
</head>
<body>
@@ -19,20 +16,19 @@
<header class="mdl-layout__header">
<div class="mdl-layout__header-row">
<div class="photo-div">
- <img src="/main_logo_w_all.png" class="crest">
+ <img src="/main_logo_w_all.png" alt="University of Wisconsin System Logo" class="uw-logo">
</div>
<!-- Title -->
- <span class="mdl-layout-title outage-title">Page Not Found</span>
+ <h1 class="mdl-layout-title outage-title">Page Not Found</h1>
</div>
</header>
- <main class="mdl-layout__content">
+ <main class="mdl-layout__content content-centered">
<div class="mdl-grid">
<div class="mdl-cell mdl-cell--2-col mdl-cell--1-col-phone"></div>
<div class="mdl-cell mdl-cell--8-col mdl-cell--10-col-phone">
- <img src="/bucky-sad.png" alt="sad bucky" class="img__bucky-sad" id="img__bucky-sad">
- <h1 class="mr-title">Sorry, the page you are looking for does not exist or you don't have access to it. Please go
- to the <a href='/'>MyUW home page</a>.
- </h1>
+ <img src="/alert-icon.png" alt="Line art image of an exclamation mark inside of a triangle" class="alert-icon">
+ <h2 class="mr-title">Sorry, the page you are looking for does not exist or you don't have access to it.</h2>
+ <p>Please go to the <a href='/'>MyUW home page</a>.</p>
<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>
diff --git a/myuw-root-webapp/src/main/webapp/500.html b/myuw-root-webapp/src/main/webapp/500.html
index d11a8cb45553811e6477dcaa24a0aa3ab32f45d2..2c0bc0a0cffe6b107365a97c48da8d7cda59c4ff 100644
--- a/myuw-root-webapp/src/main/webapp/500.html
+++ b/myuw-root-webapp/src/main/webapp/500.html
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.indigo-pink.min.css">
<!-- LOCAL STYLES -->
- <link rel="stylesheet" href="style.css">
+ <link rel="stylesheet" href="webapp.css">
</head>
<body>
@@ -14,7 +14,7 @@
<header class="mdl-layout__header mr-header">
<div class="mdl-layout__header-row">
<div class="photo-div">
- <img src="/main_logo_w_all.png" alt="UW Logo" class="crest">
+ <img src="/main_logo_w_all.png" alt="University of Wisconsin System Logo" class="uw-logo">
</div>
<!-- Title -->
<h1 class="mdl-layout-title outage-title">Server Error</h1>
diff --git a/myuw-root-webapp/src/main/webapp/alert-icon.png b/myuw-root-webapp/src/main/webapp/alert-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..bde8f41af06636027ddbe3814a6e06c3857d48d0
Binary files /dev/null and b/myuw-root-webapp/src/main/webapp/alert-icon.png differ
diff --git a/myuw-root-webapp/src/main/webapp/bucky-sad.png b/myuw-root-webapp/src/main/webapp/bucky-sad.png
deleted file mode 100644
index 4e7d6c7e87c9bddff15b29192cac089405dec010..0000000000000000000000000000000000000000
Binary files a/myuw-root-webapp/src/main/webapp/bucky-sad.png and /dev/null differ
diff --git a/myuw-root-webapp/src/main/webapp/simple.js b/myuw-root-webapp/src/main/webapp/simple.js
deleted file mode 100644
index c3c3891977355947430f6863791dba8804a624be..0000000000000000000000000000000000000000
--- a/myuw-root-webapp/src/main/webapp/simple.js
+++ /dev/null
@@ -1,9 +0,0 @@
-window.onload=function(){
- if(window.location.hostname
- && !window.location.hostname.includes("my.wisc.edu")) {
- var sadBucky = document.getElementById('img__bucky-sad');
- if(sadBucky){
- sadBucky.parentElement.removeChild(sadBucky);
- }
- }
-};
diff --git a/myuw-root-webapp/src/main/webapp/style.css b/myuw-root-webapp/src/main/webapp/style.css
deleted file mode 100644
index 8463741520f793d002356f011c05fcc65b6998b9..0000000000000000000000000000000000000000
--- a/myuw-root-webapp/src/main/webapp/style.css
+++ /dev/null
@@ -1,75 +0,0 @@
-@import url(https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700);
-
-body, html{
- font-family: Roboto, sans-serif;
- margin: 0;
-}
-
-a {
- color: #c5050c;
-}
-
-a:hover{
- color: #600;
-}
-
-.mr-header {
- min-height: 64px;
-}
-
-.mr-title {
- font-size: 32px;
-}
-
-h3 {
- font-size: 22px;
- line-height: 1.2;
- margin-bottom: 0px;
-}
-
-h4 {
- font-size: 20px;
- line-height: 1.2;
- margin-bottom: 0px;
-}
-
-.mr-main__content {
- padding: 0 15px;
-}
-
-.outage-title {
- margin: 0 auto;
- font-weight: 100;
- color:#fff;
- line-height: 64px;
- font-size: 20px;
- letter-spacing:.02em;
-}
-
-.photo-div {
- position: absolute;
-}
-
-.crest {
- position: relative;
- overflow: hidden;
- display: block;
- width: 200px;
- z-index: 5;
- padding: 15px 0;
-}
-
-.img__bucky-sad {
- display: block;
- margin: 0 auto;
- padding: 16px 16px 0;
-}
-
-.mdl-layout__header {
- background: #c5050c;
-}
-
-.mdl-layout__fixed-header .mdl-layout__header-row,
-.mdl-layout__header-row {
- padding: 0 16px;
-}
diff --git a/myuw-root-webapp/src/main/webapp/webapp.css b/myuw-root-webapp/src/main/webapp/webapp.css
index 3e6057f788867938181a31b92474da1e7d333c2e..153123b523ffad0a2ac8884488715e85d60fbe51 100644
--- a/myuw-root-webapp/src/main/webapp/webapp.css
+++ b/myuw-root-webapp/src/main/webapp/webapp.css
@@ -1,164 +1,86 @@
@import url(https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700);
-a,
-a:hover {
- text-decoration: none;
-}
-.mr-title,
-p.apologize,
-p.centered {
- text-align: center;
+body, html{
+ font-family: Roboto, sans-serif;
+ margin: 0;
}
-body,
-html {
- font-family: Roboto, sans-serif;
- margin: 0;
+.content-centered {
+ text-align: center;
}
a {
- color: #c5050c;
-}
-
-a:hover {
- color: #600;
+ color: #c5050c;
}
-p.apologize {
- padding: 20px 0 50px;
+a:hover{
+ color: #600;
}
.mr-header {
- min-height: 64px;
- text-align: center;
+ min-height: 64px;
}
.mr-title {
- font-size: 20px;
- font-weight: 500;
+ font-size: 32px;
}
-.mr-main__content {
- padding: 0 15px;
+h3 {
+ font-size: 22px;
+ line-height: 1.2;
+ margin-bottom: 0px;
+}
+
+h4 {
+ font-size: 20px;
+ line-height: 1.2;
+ margin-bottom: 0px;
}
-.mr-tabs {
- text-align: center;
+.mr-main__content {
+ padding: 0 15px;
}
.outage-title {
- margin: 0 auto;
- font-weight: 100;
- color: #fff;
- line-height: 64px;
- font-size: 20px;
- letter-spacing: .02em;
+ margin: 0 auto;
+ color:#fff;
+ line-height: 64px;
+ font-size: 20px;
+ letter-spacing:.02em;
}
.photo-div {
- position: absolute;
+ position: absolute;
}
-.crest {
- display: block;
- position: relative;
- width: 200px;
- z-index: 5;
- overflow: hidden;
- padding: 15px 0;
+.uw-logo {
+ position: relative;
+ overflow: hidden;
+ display: block;
+ width: 200px;
+ z-index: 5;
+ padding: 15px 0;
}
-.img__bucky-sad {
- display: block;
- margin: 0 auto;
- padding: 16px 16px 0;
+.alert-icon {
+ display: block;
+ margin: 0 auto;
+ padding: 16px 16px 0;
+ width: 100px;
}
-.mdl-layout__header,
-.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after,
-.mdl-tabs__tab .mdl-tabs__ripple-container .mdl-ripple {
- background: #c5050c;
+.mdl-layout__header {
+ background: #c5050c;
}
-.mdl-layout__fixed-header .mdl-layout__header-row,
.mdl-layout__header-row {
- padding: 0 16px;
-}
-
-.mdl-data-table__cell--non-numeric {
- text-align: left;
-}
-
-.mdl-tabs__tab-bar {
- justify-content: flex-start;
- display: -webkit-flex;
- display: -ms-flexbox;
- display: flex;
- -webkit-flex-direction: row;
- -ms-flex-direction: row;
- flex-direction: row;
- -webkit-justify-content: flex-start;
- -ms-flex-pack: start;
- -webkit-align-content: space-between;
- align-content: space-between;
- -webkit-align-items: flex-start;
- -ms-flex-align: start;
- align-items: flex-start;
- height: 48px;
- padding: 0;
- margin: 0;
- border-bottom: 1px solid #e0e0e0;
-}
-
-.mdl-tabs__tab {
- margin: 0;
- border: none;
- padding: 0 24px;
- float: left;
- position: relative;
- display: block;
- text-decoration: none;
- height: 48px;
- line-height: 48px;
- text-align: center;
- font-weight: 500;
- font-size: 14px;
- text-transform: uppercase;
- color: rgba(0,0,0,.54);
- overflow: hidden;
-}
-
-.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after {
- height: 2px;
- width: 100%;
- display: block;
- content: " ";
- bottom: 0;
- left: 0;
- position: absolute;
- background: #c5050c;
- -webkit-animation: border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;
- animation: border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;
- transition: all 1s cubic-bezier(.4,0,1,1);
-}
-
-.mdl-tabs.is-upgraded .mdl-tabs__panel {
- padding: 12px 0;
- text-align: center;
-}
-
-.mdl-tabs.is-upgraded .mdl-tabs__panel:not(.is-active) {
- display: none;
-}
-
-.mdl-data-table {
- white-space: normal;
- margin: 0 auto;
-}
-
-@media (min-width:599px) {
- .mdl-data-table td:first-of-type,
- .mdl-data-table th:first-of-type {
- min-width: 162px;
- }
-}
\ No newline at end of file
+ padding: 0 16px;
+}
+
+@media screen and (max-width: 599px) {
+ .outage-title {
+ margin: 0px 20px 0px 0px;
+ right: 0px;
+ position: absolute;
+ }
+}