Skip to content

Commit

Permalink
Updating images etc for User Guide
Browse files Browse the repository at this point in the history
  • Loading branch information
envycontent committed May 20, 2016
1 parent 6be2d13 commit 55f0859
Show file tree
Hide file tree
Showing 13 changed files with 65 additions and 71 deletions.
22 changes: 11 additions & 11 deletions docs/source/user/talk-users/add-to-your-calendar.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. Note:: |upcoming|



Copy talks to your own calendar
Expand All @@ -13,16 +13,16 @@ Find the Add to Calendar link

.. image:: images/add-to-your-calendar/find-the-add-to-calendar-link.png
:alt: Find the Add to Calendar link
:height: 222px
:width: 593px
:height: 303px
:width: 610px
:align: center


* For a single talk, click on the **calendar icon** next to any talk

.. image:: images/add-to-your-calendar/306f6c30-18aa-46b9-b32c-a4a1703b6d55.png
:alt:
:height: 195px
.. image:: images/add-to-your-calendar/536c841c-c8cd-463d-9a97-9600c5ecadf7.png
:alt:
:height: 158px
:width: 614px
:align: center

Expand All @@ -45,7 +45,7 @@ Using Internet Explorer and Outlook (PC)
* Click **Open**

.. image:: images/add-to-your-calendar/a76b304c-99bd-41f3-a3a6-8e8196a54840.png
:alt:
:alt:
:height: 379px
:width: 600px
:align: center
Expand All @@ -69,7 +69,7 @@ Using Safari and Calendar (Mac)
* If you choose to add the talk to your Nexus calendar, you may get this message

.. image:: images/add-to-your-calendar/dbfadfa7-5d03-4c94-b499-59a1d773259c.png
:alt:
:alt:
:height: 290px
:width: 567px
:align: center
Expand All @@ -94,7 +94,7 @@ Using Chrome and Google Calendar
* In Google Calendar, choose **Import calendar** from the options for **Other calendars**

.. image:: images/add-to-your-calendar/09b5c8b5-2f97-4050-99c4-93004870fab0.png
:alt:
:alt:
:height: 378px
:width: 614px
:align: center
Expand All @@ -105,7 +105,7 @@ Using Chrome and Google Calendar
#. Click import to add your talk(s) to your chosen calendar

.. image:: images/add-to-your-calendar/b36986a4-a369-4e8b-a1a7-0f065b34c676.png
:alt:
:alt:
:height: 328px
:width: 588px
:align: center
Expand All @@ -117,4 +117,4 @@ Further Information
There are also guides on how to:

* :doc:`Subscribe to a continuously updated feed of events <feed-in-your-calendar>`
* :doc:`Set up reminders in your calendar <email-reminders>`
* :doc:`Set up reminders in your calendar <email-reminders>`
4 changes: 2 additions & 2 deletions docs/source/user/talk-users/email-reminders.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.. Note:: |upcoming|



Set up email reminders
======================

Reminders and notifications by email are scheduled for the next phase of development. Meanwhile, there are a few limited options to set up email reminders using your own calendar.
Reminders and notifications by email are not yet available. Meanwhile, there are a few limited options to set up email reminders using your own calendar.

Google Calendar
---------------
Expand Down
80 changes: 37 additions & 43 deletions docs/source/user/talk-users/explore-talks.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. Note:: |upcoming|



Explore Oxford Talks
Expand All @@ -9,19 +9,19 @@ An introduction to Oxford Talks
Browse and Search
-----------------

Today's talks are always displayed on the Home Page of Oxford Talks. To find out more about upcoming talks use the **Browse Talks** button or the **Search** box
Today's talks are always displayed on the Home Page of Oxford Talks. Don't forget you can use the **Search** box if you're looking for something specific.

.. image:: images/explore-talks/browse-and-search.png
:alt: Browse and Search
:height: 117px
:width: 570px
:height: 180px
:width: 614px
:align: center


View upcoming talks
-------------------

The Browse Talks page will show you all talks for the next 8 weeks. Use the date filters on the filter panel to adjust this.
The Home Page will show you all talks for the next 30 days - you can use the tabs to see tomorrow's or next week's talks. If you're looking for talks in a particular time-frame, use the date filters on the filter panel to adjust this.

#. Click the calendar icon on the **Start Date** or **End Date** filters to set the date
#. If you want to see all the upcoming talks, use the **clear** button on the **End Date** filter
Expand All @@ -34,10 +34,25 @@ The Browse Talks page will show you all talks for the next 8 weeks. Use the date
:align: center


Find a seminar series
---------------------

If you are interested in a particular seminar series, or meetings of a society:

* Use the **Series** box in the filter panel if you know the name of the series you are interested in
* Alternatively, browse the full list of **Lecture/Seminar Series** using the link from the left hand panel

.. image:: images/explore-talks/find-a-seminar-series.png
:alt: Find a seminar series
:height: 281px
:width: 614px
:align: center


See my department's talks
-------------------------

To see all upcoming talks happening in your department
To see all upcoming talks happening in your department:

#. Start typing into the **Department** box on the filter panel. You don't need to type the full name (for instance, 'HI' will find the Faculty of History, acronyms like 'DPAG' will also work)
#. Remember to click **Submit**
Expand All @@ -49,18 +64,12 @@ To see all upcoming talks happening in your department
:align: center


Find a seminar series
---------------------

If you are interested in a particular seminar series, or meetings of a society:
Alternatively use the **Departments** link on the Home Page, this will take you to a listing of the main University departments, listed by Division.

* Use the **Series** box in the filter panel if you know the name of the series you are interested in
* Alternatively, browse the full list of series from the **View all** panel

.. image:: images/explore-talks/find-a-seminar-series.png
:alt: Find a seminar series
:height: 281px
:width: 463px
.. image:: images/explore-talks/438c25c0-eceb-4d98-9f2d-1f02f16e81bd.png
:alt:
:height: 293px
:width: 580px
:align: center


Expand All @@ -69,48 +78,32 @@ Discover talks on an interesting topic

It's also possible to find talks on a on a particular topic - you don't need to know the series talk belongs to or the organising department - there are two ways to do this:

**Public Lists**

* Click **Public Lists** in the **View all** panel to see collections of talks made by other people

.. image:: images/explore-talks/discover-talks-on-an-interesting-topic.png
:alt: Discover talks on an interesting topic
:height: 317px
:width: 523px
:align: center
**Public Collections**

* Click **Talk Collections** in the left hand panel to see collections of talks made by other people

**Topics**

Talks Editors are also beginning to tag talks with a huge range of topics (based on the Library of Congress subject headings). Ways to browse talks by topic will be delivered in the next phases of development.

Meanwhile:
Talks Editors are also beginning to tag talks with a huge range of topics (based on the Library of Congress subject headings).

* To find talks in a particular subject area use the **Search** box to type your search term
* Click **Topics** in the left hand panel to see the topics currently in use (this page can take a little time to load)

.. image:: images/explore-talks/1eeac054-56b9-461b-81e7-a0299f31b32b.png
:alt:
:height: 339px
:width: 552px
.. image:: images/explore-talks/discover-talks-on-an-interesting-topic.png
:alt: Discover talks on an interesting topic
:height: 306px
:width: 473px
:align: center


* All the topics assigned to a talk or series are clickable, so you can explore a topic further from an individual talk
* All the topics assigned to a talk or series are clickable, so you can also explore a topic further from an individual talk

.. image:: images/explore-talks/204ed603-33b8-48b4-9ff3-c84675a70818.png
:alt:
:alt:
:height: 501px
:width: 487px
:align: center


.. image:: images/explore-talks/88fe1021-88ef-4e74-8082-b0fa4e6684bd.png
:alt:
:height: 286px
:width: 548px
:align: center


Further Information
-------------------

Expand All @@ -119,3 +112,4 @@ There are further guides on:
* :doc:`Making your own collected list of talks <make-a-list>`
* :doc:`Copying talks to your calendar <add-to-your-calendar>`
* :doc:`Getting a feed of talks into your calendar <feed-in-your-calendar>`

30 changes: 15 additions & 15 deletions docs/source/user/talk-users/feed-in-your-calendar.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. Note:: |upcoming|



Get an up-to-date feed in your own calendar
Expand All @@ -12,7 +12,7 @@ Get the feed URL
----------------

* Find the series you would like to subscribe to
* Right click on the **add to your calendar** button to copy the feed to URL to your clipboard (the **Copy Shortcut** or **Copy Link Address** option)
* Right click on the **add to your calendar** button to copy the feed to URL to your clipboard (the **Copy Shortcut** or **Copy Link Address** option)

.. image:: images/feed-in-your-calendar/get-the-feed-url.png
:alt: Get the feed URL
Expand All @@ -35,21 +35,21 @@ Outlook
:align: center


* Paste the URL into the **New Internet Calendar Subscription** box
* Paste the URL into the **New Internet Calendar Subscription** box
* Click **OK**

.. image:: images/feed-in-your-calendar/259b158e-511c-4d98-a0d9-aa04f7f2a2bc.png
:alt:
:alt:
:height: 206px
:width: 440px
:align: center


* The calendar takes the last part of the web address as its name (for example: aed697e6-1a92-473d-a686-f77487689e0b.ics)
* The calendar takes the last part of the web address as its name (for example: aed697e6-1a92-473d-a686-f77487689e0b.ics)
* To change the name click **Advanced ...**

.. image:: images/feed-in-your-calendar/05c12bfe-f11a-4fed-ac29-69a32b196c1b.png
:alt:
:alt:
:height: 245px
:width: 452px
:align: center
Expand All @@ -59,7 +59,7 @@ Outlook
#. Click **OK**

.. image:: images/feed-in-your-calendar/2ff94965-ef90-4a28-9727-4fc7c5c024d1.png
:alt:
:alt:
:height: 387px
:width: 600px
:align: center
Expand All @@ -69,7 +69,7 @@ Outlook
* The calendar will open as a new calendar in Outlook

.. image:: images/feed-in-your-calendar/bace9430-3270-44c4-b3e5-fb1f5b5422f5.png
:alt:
:alt:
:height: 227px
:width: 425px
:align: center
Expand All @@ -94,7 +94,7 @@ Calendar (Mac)
* Click **Subscribe**

.. image:: images/feed-in-your-calendar/6c7df1e8-27fb-43f8-977a-bb481c49e3ca.png
:alt:
:alt:
:height: 194px
:width: 594px
:align: center
Expand All @@ -109,7 +109,7 @@ You will be asked to confirm the settings:


.. image:: images/feed-in-your-calendar/18e90ec9-3a2d-4f0a-b12a-6c55535cc4cf.png
:alt:
:alt:
:height: 371px
:width: 586px
:align: center
Expand All @@ -119,7 +119,7 @@ You will be asked to confirm the settings:
* The little wireless symbol reminds you that it is a subscription to a calendar feed

.. image:: images/feed-in-your-calendar/7a0d4fa3-d429-4a44-a059-b61a512c7e74.png
:alt:
:alt:
:height: 239px
:width: 362px
:align: center
Expand All @@ -139,11 +139,11 @@ Google Calendar
:align: center


* Paste the feed URL into the **URL** box
* Paste the feed URL into the **URL** box
* Click **Add Calendar**

.. image:: images/feed-in-your-calendar/654d4252-95f3-4336-b485-b3266858bed5.png
:alt:
:alt:
:height: 272px
:width: 593px
:align: center
Expand All @@ -153,7 +153,7 @@ Google Calendar
#. Click the calendar's drop-down list and select **Calendar settings** to change the name of the calendar to something more readable

.. image:: images/feed-in-your-calendar/d1a25472-216a-4056-bf0d-c2c1fac769cd.png
:alt:
:alt:
:height: 318px
:width: 517px
:align: center
Expand All @@ -162,4 +162,4 @@ Google Calendar
Further Information
-------------------

If you are using Google Calendar, look at the :doc:`Get email reminders <email-reminders>` section to see how to set these up.
If you are using Google Calendar, look at the :doc:`Get email reminders <email-reminders>` section to see how to set these up.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 55f0859

Please sign in to comment.