Merge pull request #13 from olinjs/swalters/office-hrs-update

Updating office hours for project time
olinjs · Mar 28, 2016 · e2bb82a · e2bb82a
2 parents 04bdc90 + c0c777d
commit e2bb82a
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 120 deletions.
diff --git a/ical/monday.ics b/ical/monday.ics
@@ -1,45 +1,42 @@
 BEGIN:VCALENDAR
-PRODID:-//Microsoft Corporation//Outlook 14.0 MIMEDIR//EN
+PRODID:-//Google Inc//Google Calendar 70.9054//EN
 VERSION:2.0
+CALSCALE:GREGORIAN
 METHOD:PUBLISH
-X-MS-OLK-FORCEINSPECTOROPEN:TRUE
+X-WR-CALNAME:Olin.js Monday
+X-WR-TIMEZONE:America/New_York
+X-WR-CALDESC:
 BEGIN:VTIMEZONE
-TZID:Eastern Standard Time
-BEGIN:STANDARD
-DTSTART:16011104T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
+TZID:America/New_York
+X-LIC-LOCATION:America/New_York
 BEGIN:DAYLIGHT
-DTSTART:16010311T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19700308T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19701101T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
 END:VTIMEZONE
 BEGIN:VEVENT
-CLASS:PUBLIC
-CREATED:20160120T060728Z
-DESCRIPTION:\n
-DTEND;TZID="Eastern Standard Time":20160118T223000
-DTSTAMP:20160120T060729Z
-DTSTART;TZID="Eastern Standard Time":20160118T180000
-LAST-MODIFIED:20160120T060728Z
+DTSTART;TZID=America/New_York:20160328T180000
+DTEND;TZID=America/New_York:20160328T193000
+RRULE:FREQ=WEEKLY;UNTIL=20160425T220000Z;BYDAY=MO
+DTSTAMP:20160328T161450Z
+UID:fopgltqp062hl1lsema7k74lsk@google.com
+CREATED:20160328T161425Z
+DESCRIPTION:
+LAST-MODIFIED:20160328T161426Z
 LOCATION:EH1
-PRIORITY:5
-RRULE:FREQ=WEEKLY;COUNT=15;BYDAY=MO
 SEQUENCE:0
-SUMMARY;LANGUAGE=en-us:Olin.js office hours
+STATUS:CONFIRMED
+SUMMARY:Olin.js office hours
 TRANSP:OPAQUE
-UID:040000008200E00074C5B7101A82E008000000001ACEEEA41D53D101000000000000000
-	01000000097E50B1A1F567442AD10E5514D2E52AF
-X-ALT-DESC;FMTTYPE=text/html:<html><head><style type="text/css" style="disp
-	lay:none"><!-- p { margin-top: 0px\; margin-bottom: 0px\; }--></Style></He
-	ad><body dir="ltr" style="font-size:12pt\;color:#000000\;background-color:
-	#FFFFFF\;font-family:Calibri\,Arial\,Helvetica\,sans-serif\;"><p><br>\n</P
-	></Body></Html>
-X-MICROSOFT-CDO-BUSYSTATUS:BUSY
-X-MICROSOFT-CDO-IMPORTANCE:1
 END:VEVENT
 END:VCALENDAR
diff --git a/ical/thursday.ics b/ical/thursday.ics
diff --git a/ical/thursday1.ics b/ical/thursday1.ics
@@ -0,0 +1,42 @@
+BEGIN:VCALENDAR
+PRODID:-//Google Inc//Google Calendar 70.9054//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
+X-WR-CALNAME:Olin.js
+X-WR-TIMEZONE:America/New_York
+X-WR-CALDESC:
+BEGIN:VTIMEZONE
+TZID:America/New_York
+X-LIC-LOCATION:America/New_York
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19700308T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19701101T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTART;TZID=America/New_York:20160331T180000
+DTEND;TZID=America/New_York:20160331T190000
+RRULE:FREQ=WEEKLY;UNTIL=20160428T220000Z;BYDAY=TH
+DTSTAMP:20160328T161651Z
+UID:7912be05bkeouavea8fi4qapgc@google.com
+CREATED:20160328T161634Z
+DESCRIPTION:
+LAST-MODIFIED:20160328T161634Z
+LOCATION:
+SEQUENCE:0
+STATUS:CONFIRMED
+SUMMARY:Olin.js office hours
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
diff --git a/ical/thursday2.ics b/ical/thursday2.ics
@@ -0,0 +1,42 @@
+BEGIN:VCALENDAR
+PRODID:-//Google Inc//Google Calendar 70.9054//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
+X-WR-CALNAME:Olin.js
+X-WR-TIMEZONE:America/New_York
+X-WR-CALDESC:
+BEGIN:VTIMEZONE
+TZID:America/New_York
+X-LIC-LOCATION:America/New_York
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19700308T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19701101T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTART;TZID=America/New_York:20160331T200000
+DTEND;TZID=America/New_York:20160331T210000
+RRULE:FREQ=WEEKLY;UNTIL=20160429T000000Z;BYDAY=TH
+DTSTAMP:20160328T161747Z
+UID:7912be05bkeouavea8fi4qapgc@google.com
+CREATED:20160328T161634Z
+DESCRIPTION:
+LAST-MODIFIED:20160328T161721Z
+LOCATION:
+SEQUENCE:1
+STATUS:CONFIRMED
+SUMMARY:Olin.js office hours
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
diff --git a/ical/tuesday.ics b/ical/tuesday.ics
diff --git a/index.html b/index.html
diff --git a/jade/index.jade b/jade/index.jade
@@ -39,10 +39,10 @@ html(lang="en")
 				h5 Meets Tuesdays and Fridays 3:20–5:00 in AC328 (<a href="ical/class.ics">iCal</a>)
 
 				h3 Office Hours
-				h5 Mondays 6:00-10:30pm in EH1 (<a href="ical/monday.ics">iCal</a>)
-				h5 Tuesdays 7:00-9:00pm in EH2 (<a href="ical/tuesday.ics">iCal</a>)
+				h5 Mondays 6:00-7:30pm in EH1 (<a href="ical/monday.ics">iCal</a>)
 				h5 Wednesdays 8:00-10:00pm in the Library (<a href="ical/wednesday.ics">iCal</a>)
-				h5 Thursdays 7:00-10:00pm in the Library (<a href="ical/thursday.ics">iCal</a>)
+				h5 Thursdays 7:00-8:00pm in the Library (<a href="ical/thursday1.ics">iCal</a>)
+				h5 Thursdays 9:00-10:00pm in the Library (<a href="ical/thursday2.ics">iCal</a>)
 		.container
 			p <span class="drop-cap">Olin.js</span> is a student-led and -developed project-oriented approach to learning modern web application development. With server and client technology advancing so rapidly, the modern website looks very different from that of even a few years ago, and the web will only become a bigger part of our lives in the near future. Olin.js quickly familiarizes students with Node.js as a web server framework and ES5 JavaScript as a responsive client-side language with four weeks of introductory instruction and three weeks of partner labs.