Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • myuw/my-root
  • andrew-petro/my-root
  • dwitter2/my-root
  • PNOGAL/my-root
4 results
Show changes
Commits on Source (62)
Hide whitespace changes
Inline Side-by-side
Showing
with 89 additions and 59 deletions
CHANGELOG.md
View file @ 040b1f70
# Root context and error valve change log
## 1.2.0
## 1.3.2 - 2024-02-26
2021-10-22
+ Normalize on font-weight 630 for headings
+ Adjust font-size and line-height
## 1.3.1
(This version partially published due to a transient artifactorydoit error.)
## 1.3.0 - 2024-01-17
+ Link to Applications and Resources KB page
+ Use Red Hat fonts
+ Add text attributing the 500 error page.
## 1.2.1 - 2022-03-14
+ Update root 500 service error page. Refreshes link labels and URLs and organization of page.
## 1.2.0 - 2021-10-22
+ Label the root 403 error page with error code MYUW-002.
+ Label the root 404 error page with error code MYUW-003.
......
README.md
View file @ 040b1f70
......@@ -3,6 +3,10 @@
There are two modules here: a webapp to serve as the root web application
context and plugin to customize Tomcat's error handling.
## Maven repository usage
✅ Publishes artifacts to artifactorydoit.jfrog.io.
## MyUW root webapp
This is a small webapp to serve as the root, default servlet application in MyUW
......@@ -23,12 +27,13 @@ Customizes Tomcat to use the error pages in the custom root webapp.
The root webapp and the valve are versioned and released together.
From the root directory of this project
Release using the [myuw-root-RELEASE][] Jenkins job.
```
mvn release:prepare
mvn release:perform
```
This will publish a release for whatever snapshot version the pom.xml indicates.
(So, if the root pom.xml indicates 1.4.2-SNAPSHOT, the Jenkins job will release 1.4.2).
After releasing, manually update the `pom.xml` files (plural) to build the new SNAPSHOT version.
(So, if you release 1.4.2, update to now build 1.4.3-SNAPSHOT or 1.5.0-SNAPSHOT or 2.0.0-SNAPASHOT depending upon what kinds of changes you expect to make next.)
When you release a new version of this project, you'll publish both a root
webapp .war and a Tomcat error valve .jar.
......@@ -38,6 +43,8 @@ For these to be actually used in MyUW, update the tier-specific ears to
and update the Tomcat container to
[use the new valve version][MyUW Tomcat use of valve].
[myuw-root-RELEASE]: https://tools.my.wisc.edu/jenkins/job/myuw-root-RELEASE
[MyUW ear use of root webapp]: https://git.doit.wisc.edu/myuw-overlay/myuw-ear/-/blob/qa/pom.xml#L54
[MyUW Tomcat use of valve]: https://git.doit.wisc.edu/myuw/tomcat7-java8/-/blob/master/Dockerfile#L8
myuw-error-valve/pom.xml
View file @ 040b1f70
......@@ -3,7 +3,7 @@
<parent>
<groupId>edu.wisc.my.app.root</groupId>
<artifactId>root-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.3.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
myuw-root-webapp/pom.xml
View file @ 040b1f70
......@@ -3,7 +3,7 @@
<parent>
<groupId>edu.wisc.my.app.root</groupId>
<artifactId>root-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.3.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
myuw-root-webapp/src/main/webapp/403.html
View file @ 040b1f70
......@@ -5,6 +5,8 @@
<!-- 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">
<link rel="preload" href="https://cdn.wisc.cloud/fonts/uw-rh/0.0.1/redhat-display-latin.v14.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="https://cdn.wisc.cloud/fonts/uw-rh/0.0.1/redhat-text-latin.v13.woff2" as="font" type="font/woff2" crossorigin>
<!-- LOCAL STYLES -->
<link rel="stylesheet" href="webapp.css">
</head>
......@@ -13,11 +15,8 @@
<div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
<header class="mdl-layout__header">
<div class="mdl-layout__header-row">
<div class="photo-div">
<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">MYUW-002 Access Denied</h1>
<h1 class="outage-title">MYUW-002 Access Denied</h1>
</div>
</header>
<main class="mdl-layout__content content-centered">
......
myuw-root-webapp/src/main/webapp/404.html
View file @ 040b1f70
......@@ -7,6 +7,8 @@
<!-- 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">
<link rel="preload" href="https://cdn.wisc.cloud/fonts/uw-rh/0.0.1/redhat-display-latin.v14.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="https://cdn.wisc.cloud/fonts/uw-rh/0.0.1/redhat-text-latin.v13.woff2" as="font" type="font/woff2" crossorigin>
<!-- LOCAL STYLES -->
<link rel="stylesheet" href="webapp.css">
</head>
......@@ -15,11 +17,8 @@
<div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
<header class="mdl-layout__header">
<div class="mdl-layout__header-row">
<div class="photo-div">
<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">MYUW-003: Page Not Found</h1>
<h1 class="outage-title">MYUW-003: Page Not Found</h1>
</div>
</header>
<main class="mdl-layout__content content-centered">
......@@ -29,8 +28,7 @@
<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='/portal/p/feedback'>feedback form</a>. When offering feedback or contacting the Help Desk, please mention <strong>MyUW error code MYUW-003</strong>.</p>
<p class="apologize">It looks like you're trying to launch an application or navigate to a website. You might find a link to the service or application you're looking for on our <a href="https://kb.wisc.edu/myuw/132200" target="_blank">backup webpage</a>. We apologize for the inconvenience. We welcome your <a href='/portal/p/feedback'>feedback</a> about what's missing in MyUW. When offering feedback or contacting the Help Desk, please mention <strong>MyUW error code MYUW-003</strong>.</p>
<p>(Technical detail: HTTP status code 404 NOT FOUND presented by root servlet context.)</p>
</div>
<div class="mdl-cell mdl-cell--2-col mdl-cell--1-col-phone"></div>
......@@ -39,3 +37,4 @@
</div>
</body>
</html>
myuw-root-webapp/src/main/webapp/500.html
View file @ 040b1f70
......@@ -5,6 +5,8 @@
<!-- 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">
<link rel="preload" href="https://cdn.wisc.cloud/fonts/uw-rh/0.0.1/redhat-display-latin.v14.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="https://cdn.wisc.cloud/fonts/uw-rh/0.0.1/redhat-text-latin.v13.woff2" as="font" type="font/woff2" crossorigin>
<!-- LOCAL STYLES -->
<link rel="stylesheet" href="webapp.css">
</head>
......@@ -13,11 +15,8 @@
<div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
<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="University of Wisconsin System Logo" class="uw-logo">
</div>
<!-- Title -->
<h1 class="mdl-layout-title outage-title">Server Error</h1>
<h1 class="outage-title">Server Error</h1>
</div>
</header>
<main class="mdl-layout__content mr-main__content">
......@@ -30,7 +29,8 @@
<ul role="menu">
<li role="menuitem">If you are trying to access the Local & Emergency Contact admin interface for an emergency situation, please call the <a href="https://kb.wisc.edu/helpdesk/">Help Desk</a> at 608-264-4357 immediately.</li>
<li role="menuitem">More information about this outage may be available at the <a href="http://outages.wisconsin.edu/">UW System Outages Page</a> or <a href="http://outages.doit.wisc.edu/">UW Madison Outages Page</a>.</li>
<li role="menuitem">If the resource you need is not listed below, the <a href="https://kb.wisc.edu/helpdesk/">Help Desk</a> may be able to assist you during this outage.</li>
<li>Launch many applications and resources from our <a href="https://kb.wisc.edu/myuw/132200">backup webpage in the KnowledgeBase</a>. That backup page may be available even when MyUW is not available.</li>
<li>If the application resource you need is not listed below, the <a href="https://kb.wisc.edu/helpdesk/">Help Desk</a> may be able to assist you during this outage.</li>
</ul>
<!-- SERVICE LINKS -->
......@@ -41,13 +41,13 @@
<h4>UW-Madison Top Resources</h4>
<h5>Apps</h5>
<ul role="menu" aria-labelledby="service-links__uw-madison">
<li role="menuitem"><a href="https://my.wisc.edu/web/apps/details/box">Box</a></li>
<li role="menuitem"><a href="https://outlook.office.com/calendar/view/month">Calendar (Outlook)</a></li>
<li role="menuitem"><a href="https://uwmadison.box.com/">Box</a></li>
<li role="menuitem"><a href="https://outlook.office.com/calendar/view/month?realm=wisc.edu">Calendar (Outlook)</a></li>
<li role="menuitem"><a href="https://canvas.wisc.edu/">Canvas</a></li>
<li role="menuitem"><a href="https://doodle.com/en/">Doodle</a></li>
<li role="menuitem"><a href="https://outlook.office365.com/owa?realm=wisc.edu">Email (Outlook)</a></li>
<li role="menuitem"><a href="https://drive.google.com/a/wisc.edu/">Google Drive </a></li>
<li role="menuitem"><a href="https://docs.google.com/a/wisc.edu/">Google Google Docs</a></li>
<li role="menuitem"><a href="https://docs.google.com/a/wisc.edu/">Google Docs</a></li>
<li role="menuitem"><a href="https://app.joinhandshake.com/configure_auth">Handshake</a></li>
<li role="menuitem"><a href="https://shopuwplus.wisc.edu/">ShopUW+</a></li>
<li role="menuitem"><a href="https://wisc.starfishsolutions.com/starfish-ops">Starfish</a></li>
......@@ -60,41 +60,41 @@
<li role="menuitem"><a href="https://secfac.wisc.edu/academic-calendar/">Academic Calendar</a></li>
<li role="menuitem"><a href="https://advising.wisc.edu/">Advising Resources</a></li>
<li role="menuitem"><a href="https://enroll.wisc.edu/">Course Search & Enroll</a></li>
<li role="menuitem"><a href="https://dars.services.wisc.edu/dars/">Degree Audit Reporting System (DARS)</a></li>
<li role="menuitem"><a href="https://apply.grad.wisc.edu/Account/Login?ReturnUrl=%2f">Grad Application Status</a></li>
<li role="menuitem"><a href="https://myuhs.uhs.wisc.edu/login_dualauthentication.aspx">MyUHS</a></li>
<li role="menuitem"><a href="https://todo.newstudent.wisc.edu/">New Student To-Do List</a></li>
<li role="menuitem"><a href="https://myvote.wi.gov/en-us/">Register to vote or check voting status</a></li>
<li role="menuitem"><a href="https://madison.sis.wisc.edu/psc/sissso/EMPLOYEE/SA/c/NUI_FRAMEWORK.PT_LANDINGPAGE.GBL">Student Center</a></li>
<li role="menuitem"><a href="https://studentjobs.wisc.edu/">Student Jobs</a></li>
<li role="menuitem"><a href="https://soar.wisc.edu/">Student Orientation and Registration (SOAR)</a></li>
<li role="menuitem"><a href="https://terradotta.wisc.edu/">Terra Dotta</a></li>
<li role="menuitem"><a href="https://go.wisc.edu/my-housing">University Housing</a></li>
<li role="menuitem"><a href="https://online.wiscard.wisc.edu/login.php?cid=120">Wiscard</a></li>
<li role="menuitem"><a href="https://wisc.academicworks.com/users/shibboleth/init">Wisconsin Scholarship Hub</a></li>
</ul>
<h5>Employee Resources</h5>
<ul role="menu" aria-labelledby="service-links__uw-madison">
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/NUI_FRAMEWORK.PT_AGSTARTPAGE_NUI.GBL?CONTEXTIDPARAMS=TEMPLATE_ID%3aPTPPNAVCOL&scname=HC_SELF_SERVICE_EBEN&PTPPB_GROUPLET_ID=BENEFITSNAV&CRefName=HC_EBEN_SS_NAVCOLL_FL&AJAXTRANSFER=Y&JumpPage=N">Benefits Information</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=Approvals">Approve things in HRS (for example, approve absences)</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=BenefitsSummary">Benefits Information</a></li>
<li role="menuitem"><a href="https://ct.wisc.edu/">Cost Transfer Tool</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=EarningStatement">Earnings statements</a></li>
<li role="menuitem"><a href="https://working.wisc.edu/">Employee Resources</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/NUI_FRAMEWORK.PT_AGSTARTPAGE_NUI.GBL?CONTEXTIDPARAMS=TEMPLATE_ID:PTPPNAVCOL&scname=HC_TIME&AJAXTransfer=Y&PanelCollapsible=Y&PTPPB_GROUPLET_ID=TL_TIME_ESS&CRefName=HC_NAVCOLL_7">Employee Time and Absence</a></li>
<li role="menuitem"><a href="https://madison.sis.wisc.edu/psp/sissso/EMPLOYEE/SA/c/SA_LEARNING_MANAGEMENT.SS_FACULTY.GBL">Faculty Center</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/EOAWMA_MAIN_FL.EOAWMA_MAIN_FL.GBL">Human Resources Approvals</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/NUI_FRAMEWORK.PT_AGSTARTPAGE_NUI.GBL?CONTEXTIDPARAMS=TEMPLATE_ID:PTPPNAVCOL&scname=HC_SELF_SERVICE_PAYROLL&PTPPB_GROUPLET_ID=PAYROLL&ptgpid=ADMN_S202001071517395625097148">Manager Time and Absence Dashboard</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/NUI_FRAMEWORK.PT_AGSTARTPAGE_NUI.GBL?CONTEXTIDPARAMS=TEMPLATE_ID:PTPPNAVCOL&scname=HC_SELF_SERVICE_PAYROLL&PTPPB_GROUPLET_ID=PAYROLL&ptgpid=ADMN_S202001071517395625097148">Payroll Information (earnings, tax statements, W4, direct deposit, etc.)</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=TimeAbsenceDashboard">Manager Time and Absence Dashboard</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/NUI_FRAMEWORK.PT_AGSTARTPAGE_NUI.GBL?CONTEXTIDPARAMS=TEMPLATE_ID:PTPPNAVCOL&scname=HC_SELF_SERVICE_PAYROLL&PTPPB_GROUPLET_ID=PAYROLL&CRefName=HC_PY_SS_NAVCOLL_FL">Payroll Information (earnings, tax statements, W4, direct deposit, etc.)</a></li>
<li role="menuitem"><a href="http://performance-managment-development-program">Performance Management (PMPD)</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=PersonalInformation">Personal Information</a></li>
<li role="menuitem"><a href="https://hr.wisc.edu/professional-development/">Professional Development</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=RequestAbsence">Request absence</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=Timesheet">Timesheet (in HRS)</a></li>
<li role="menuitem"><a href="https://portal.sfs.wisconsin.edu/psc/sfs/EMPLOYEE/ERP/c/NUI_FRAMEWORK.PT_LANDINGPAGE.GBL">Travel Reimbursement</a></li>
<li role="menuitem"><a href="https://www.wisconsin.edu/information-for-uw-employees/">UW System Career Opportunities</a></li>
<li role="menuitem"><a href="http://www.foxworldtravel.com/UW/">UW TravelWIse/Concur</a></li>
</ul>
</div>
<!-- UW SYSTEM LINKS -->
<div id="service-links__uw-system">
<h4>Top UW System Resources (non-Madison schools)</h4>
<h4>UW System Top Resources (non-Madison schools)</h4>
<h5>Apps</h5>
<ul role="menu" aria-labelledby="service-links__uw-system">
<li role="menuitem"><a href="https://uws.instructure.com/">Canvas</a></li>
......@@ -114,21 +114,26 @@
<h5>Employee Resources</h5>
<ul role="menu" aria-labelledby="service-links__uw-system">
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/NUI_FRAMEWORK.PT_AGSTARTPAGE_NUI.GBL?CONTEXTIDPARAMS=TEMPLATE_ID%3aPTPPNAVCOL&scname=HC_SELF_SERVICE_EBEN&PTPPB_GROUPLET_ID=BENEFITSNAV&CRefName=HC_EBEN_SS_NAVCOLL_FL&AJAXTRANSFER=Y&JumpPage=N">Benefits Information</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=Approvals">Approve things in HRS (for example, approve absences)</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=BenefitsSummary">Benefits Information</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=EarningStatement">Earnings statements</a></li>
<li role="menuitem"><a href="https://www.wisconsin.edu/ohrwd/benefits/formspubs/">Employee Benefits Forms and Resources</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=TimeAbsenceDashboard">Employee Time and Absence </a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/h/?tab=HC_TL_MGR_DASHBOARD_GBL&amp;pslnkid=HC_TL_MGR_DASHBOARD_LINK">Manager Time and Absence Dashboard</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=TimeAbsenceDashboard">Manager Time and Absence Dashboard</a></li>
<li role="menuitem"><a href="https://uwservice.wisconsin.edu/calendars-schedules/">Payroll Calendars</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/NUI_FRAMEWORK.PT_AGSTARTPAGE_NUI.GBL?CONTEXTIDPARAMS=TEMPLATE_ID:PTPPNAVCOL&scname=HC_SELF_SERVICE_PAYROLL&PTPPB_GROUPLET_ID=PAYROLL&ptgpid=ADMN_S202001071517395625097148">Payroll Information (earnings, tax statements, W4, direct deposit, etc.)</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/NUI_FRAMEWORK.PT_AGSTARTPAGE_NUI.GBL?CONTEXTIDPARAMS=TEMPLATE_ID:PTPPNAVCOL&scname=HC_SELF_SERVICE_PAYROLL&PTPPB_GROUPLET_ID=PAYROLL&CRefName=HC_PY_SS_NAVCOLL_FL">Payroll Information (earnings, tax statements, W4, direct deposit, etc.)</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=PersonalInformation">Personal Information</a></li>
<li role="menuitem"><a href="https://uwservice.wisconsin.edu/news/">HR, Payroll and Benefits News</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/EOAWMA_MAIN_FL.EOAWMA_MAIN_FL.GBL">Human Resources Approvals</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=RequestAbsence">Request absence</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=Timesheet">Timesheet (in HRS)</a></li>
<li role="menuitem"><a href="https://go.wisc.edu/5uzz8h">UW System Information Security Training</a></li>
<li role="menuitem"><a href="https://go.wisc.edu/0l32io">UW System Sexual Harassment Training</a></li>
<li role="menuitem"><a href="https://www.wisconsin.edu/ohrwd/benefits/">UW System Employee Benefits Website</a></li>
<li role="menuitem"><a href="https://www.wisconsin.edu/ohrwd/well-being/">Well-being Resources
</ul>
</div>
<div>
<p>Troubleshooting notes: (root) /500.html</p>
</div>
</div>
</div>
<div class="mdl-cell mdl-cell--2-col mdl-cell--1-col-phone"></div>
......
myuw-root-webapp/src/main/webapp/main_logo_w_all.png deleted 100644 → 0
View file @ ad7b12fb
myuw-root-webapp/src/main/webapp/main_logo_w_all.png

8.38 KiB

myuw-root-webapp/src/main/webapp/webapp.css
View file @ 040b1f70
@import url(https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700);
body, html{
font-family: Roboto, sans-serif;
font-family: Red Hat Text, sans-serif;
margin: 0;
}
......@@ -25,6 +25,11 @@ a:hover{
font-size: 32px;
}
h1, h2, h3, h4, h5, h6 {
font-family: Red Hat Display, sans-serif;
font-weight: 630;
}
h3 {
font-size: 22px;
line-height: 1.2;
......@@ -33,14 +38,17 @@ h3 {
h4 {
font-size: 20px;
font-weight: 500;
line-height: 1.2;
margin-bottom: 0px;
}
h5 {
font-size: 18px;
font-weight: 400;
}
p, ul {
font-size: 18px;
line-height: 1.6;
}
.mr-main__content {
......
pom.xml
View file @ 040b1f70
......@@ -4,7 +4,7 @@
<groupId>edu.wisc.my.app.root</groupId>
<artifactId>root-parent</artifactId>
<packaging>pom</packaging>
<version>1.2.1-SNAPSHOT</version>
<version>1.3.3-SNAPSHOT</version>
<name>MyUW ROOT parent</name>
<url>https://git.doit.wisc.edu/myuw/my-root</url>
......@@ -22,12 +22,12 @@
<distributionManagement>
<repository>
<id>myuw-public-releases</id>
<url>https://artifacts.doit.wisc.edu/artifactory/myuw-public-releases/</url>
<id>myuw-releases-artifactorydoit</id>
<url>https://artifactorydoit.jfrog.io/artifactory/myuw-maven-local-release-cloud/</url>
</repository>
<snapshotRepository>
<id>myuw-public-snapshots</id>
<url>https://artifacts.doit.wisc.edu/artifactory/myuw-public-snapshots/</url>
<id>myuw-snapshots-artifactorydoit</id>
<url>https://artifactorydoit.jfrog.io/artifactory/myuw-maven-local-snapshot-cloud/</url>
</snapshotRepository>
</distributionManagement>
......@@ -45,16 +45,11 @@
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.4.2</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.8.1</version>
</dependency>
</dependencies>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<pushChanges>false</pushChanges>
<autoVersionSubmodules>true</autoVersionSubmodules>
<localCheckout>true</localCheckout>
<tagNameFormat>release-@{project.version}</tagNameFormat>
<pushChanges>false</pushChanges>
</configuration>
</plugin>
</plugins>
......