Merge branch '38-Outlook_Export_Instructions' into 'master'

Added calendar import instruction for Outlook

Closes #38

See merge request !44

schedules/app/views/schedules/show.html.erb

@@ -69,6 +69,20 @@ Want to share your schedule with your friends? Send them this link:<br/>
 		Click the "Download calendar file" button. This will download the calendar file which you may then open and
 		add to your calendar.
 		<hr />
+		<h5>Outlook Calendar</h5>
+		<strong>On desktop (Windows):</strong>
+		<br>
+		First, download the calendar file using the “Download calendar file” button below. In Outlook, choose File, then Open and Export, and then Import/Export. In the Import and Export Wizard Box, choose “Import and iCalendar (.ics) or vCalendar file (.vcs)” and the “next” button. Search for the button you downloaded in the beginning. Click “Okay” and then “Import.”
+		<br>
+		<strong>On desktop (Mac):</strong>
+		First, download the calendar file using the “Download calendar file” button below. Open Outlook and make sure the calendar in which you want to import the file into has a checkmark next to it. Alternatively, you can add it into a new calendar by clicking the “Organize” tab and then the “New Calendar” button. Double click the new Calendar to rename it. Open the Finder application and search for the file you downloaded in the beginning. Then, drag and drop the file into the desired Calendar area.
+		<br>
+		<strong>Outlook Online (Classic Layout)</strong>
+		To check if you are using the Classic Layout, look in the top right and see if “The new Outlook” bar is slid to the left. If it is not, you may consider reading “The New Outlook Layout” instructions or clicking the bar to slide it to the left. First, download the calendar file using the “Download calendar file” button below. Login onto your <a href=https://outlook.live.com/owa/ target="blank">Outlook</a> and click the calendar icon on the bottom left. On the menu bar, located above the Calendar, choose the “Add Calendar” menu. From the drop down menu, click import from file and browse for the calendar file you downloaded in the beginning. Click the save icon, then the calendar will be imported.
+		<br>
+		<strong>Outlook Online (New Outlook Layout)</strong>
+		To check if you are using the New Outlook Layout, look in the top right and see if “The new Outlook” bar is slid to the right. If it is not, you may consider reading the “Classic Layout” instructions or clicking the bar to slide it to the right. First download the calendar file using the “Download calendar file” button below. Login onto your <a href=https://outlook.live.com/owa/ target="blank">Outlook</a> and click the calendar icon on the bottom left. On the left side bar, under “Calendars”, click the “Discover calendars” button. Choose on the “From File” menu under the “Import” Section. Then click the browse button and search for the file you downloaded in the beginning. Lastly, choose “Import” and your calendar will be displayed.
+
 		<h5>.ics file</h5>
 		To download a .ics file containing your schedule, click the "Download calendar file" button below.
 	    </div>