Merge pull request #765 from uw-it-aca/hlee2/vs-summer

Hlee2/vs summer
uw-it-aca · Jul 11, 2017 · fd09677 · fd09677
2 parents 149920f + 1eef7bc
commit fd09677
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/myuw/data/category_links_import.csv b/myuw/data/category_links_import.csv
@@ -76,7 +76,8 @@ Events & Activities,Stay Connected,all,,,http://instagram.com/uofwa,UW Instagram
 Events & Activities,Stay Connected,all,,,http://twitter.com/UW,UW Twitter,http://twitter.com/UWBothell,UW Bothell Twitter,,,no
 Events & Activities,Stay Connected,all,,,http://www.linkedin.com/company/university-of-washington,UW LinkedIn,https://www.linkedin.com/groups/University-Washington-Bothell-92858?home=&gid=92858,UW Bothell LinkedIn,,,no
 Employment,,all,,,http://careers.washington.edu/,Career Center,http://www.bothell.washington.edu/careers,Career Services,http://www.tacoma.uw.edu/career-development/career-development-education,Career Development,no
-Employment,,all,https://www.washington.edu/ess/,Employee Self-Service (ESS),,,,,,,yes
+Employment,,all,https://wd5.myworkday.com/uw/d/home.htmld,Workday,,,,,,,yes
+Employment,,all,https://prp.admin.uw.edu/legacyess,Legacy ESS,,,,,,,yes
 Employment,,all,https://careers.uw.edu/jobs/,Career and Internship Center,,,,,,,yes
 Employment,,all,http://www.lib.washington.edu/about/employment/students,Student Employment in the Libraries,,,,,,,no
 Employment,,all,http://www.huskyjobs.washington.edu/students,Husky Jobs,,,,,,,no
diff --git a/myuw/data/quicklinks.csv b/myuw/data/quicklinks.csv
@@ -4,7 +4,7 @@ http://canvas.uw.edu/,Canvas LMS,,student,
 https://myplan.uw.edu,MyPlan,,student,
 https://sdb.admin.uw.edu/sisStudents/uwnetid/grades.aspx,Grade Report,,student,
 http://www.washington.edu/home/peopledir/,Faculty/Staff/Student Directory,,employee,
-https://prp.admin.uw.edu/LegacyESS/,Employee Self-Service (ESS),,employee,
+https://wd5.myworkday.com/uw/d/home.htmld,Workday,,employee,
 https://sdb.admin.uw.edu/students/uwnetid/register.asp,Register using SLN codes,,student,
 https://sdb.admin.uw.edu/sisStudents/uwnetid/finaidstatus.aspx,Financial Aid Status,,student,
 http://www.uwb.edu/students/registration/time/index.xhtml,Time Schedule - Bothell,bothell,student,

diff --git a/myuw/static/css/mobile.less b/myuw/static/css/mobile.less
@@ -1774,7 +1774,13 @@ label { font-weight: normal; }
 
         ul { list-style: none; padding-left: 0; }
     }
-
+	// Visual schedule: text above the grid
+	.summer-dates {
+		font-size:.85em;
+		color: #555;
+		margin-bottom: 1.25em;
+	}
+
     // visual schedule-period control
     .schedule-period-module {
 	    margin-bottom: 1em;

diff --git a/myuw/templates/base.html b/myuw/templates/base.html
@@ -224,7 +224,7 @@ <h2 id="categories" class="sr-only">Categorized Resources</h2>
                     </li>
                     <li class="pull-left">
                         <a href="/resource/employment" class="navigation-item hover"><span class="navigation-item-text">Employment</span>
-                            <div class="subcategories">Career Center, Husky Jobs, Employee Self-Service&#8230;</div></a>
+                            <div class="subcategories">Career Center, Husky Jobs, Workday&#8230;</div></a>
                     </li>
                 </ul>
             </div>

diff --git a/myuw/templates/handlebars/card/emp_fac_student.html b/myuw/templates/handlebars/card/emp_fac_student.html
@@ -8,7 +8,7 @@ <h3 class="sr-only">Student Employee or Faculty</h3>
 	<!-- if employee -->
     {{#if is_employee}}
 	<h3>Student Employees</h3>
-	<p>A link to Employee Self-Services (ESS) is on the <a href="/resource/employment">Employment page</a>, but you can also use the <a href="https://myuw.washington.edu/servlet/user?tab=7" target="_blank">old version of MyUW</a> to access additional employment resources.</p>
+	<p>A link to Workday is on the <a href="/resource/employment">Employment page</a>, but you can also use the <a href="https://myuw.washington.edu/servlet/user?tab=7" target="_blank">old version of MyUW</a> to access additional employment resources.</p>
 	{{/if}}
 	<!-- /if employee -->
 

diff --git a/myuw/templates/handlebars/card/schedule/visual.html b/myuw/templates/handlebars/card/schedule/visual.html
@@ -47,7 +47,7 @@ <h3 class="sr-only">Your {{ucfirst quarter}} {{year}} final exam</h3>
     <h3 id="quarter-info" aria-hidden="true">
         {{ucfirst quarter}} {{year}} Schedule
         {{#if summer_term}}
-        <span class="shortTitle">{{summer_term}}</span>
+        <span class="shortTitle">{{summer_term}}</span> 
         {{/if}}
     </h3>
     <div id="schedule-tabs" class="schedule-period-module">
@@ -57,8 +57,11 @@ <h3 id="quarter-info" aria-hidden="true">
         {{ /each }}
 		</ul>
     </div>
+	<div>{{#if summer_term}}
+        <p class="summer-dates"><strong>A-term classes end Jul 19</strong>  and <strong>B-term classes begin Jul 20</strong>. </p> 
+        {{/if}}
+	</div>
 <div id="schedule_area">
-
     {{#if display_hours }}
     <!-- week view -->
     <div class="visual-schedule {{schedule_hours_class}}" aria-hidden="true">

diff --git a/myuw/test/dao/category_links.py b/myuw/test/dao/category_links.py
@@ -8,9 +8,9 @@
 
 class TestCategoryLinks(TestCase):
 
-    def test_get_all_likes(self):
+    def test_get_all_links(self):
         all_links = Res_Links.get_all_links()
-        self.assertEquals(len(all_links), 155)
+        self.assertEquals(len(all_links), 156)
         val = URLValidator()
         for link in all_links:
             try: