[Pkg-owncloud-commits] [owncloud-doc] 222/270: calendar changes
David Prévot
taffit at moszumanska.debian.org
Thu Jul 31 03:53:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud-doc.
commit 2a9e3f53b6fcc932de0b020fb32f6ccef78efa20
Author: Mark Barnard <keyboardmidas88 at gmail.com>
Date: Wed Jul 9 09:24:36 2014 -0400
calendar changes
Work in progress
---
user_manual/images/Thumbs.db | Bin 948736 -> 0 bytes
user_manual/images/calendar_create_event.PNG | Bin 0 -> 10393 bytes
.../images/calendar_create_event_advanced.PNG | Bin 0 -> 12664 bytes
.../images/calendar_create_event_repeat.PNG | Bin 0 -> 5671 bytes
.../calendar_create_event_repeat_advanced.PNG | Bin 0 -> 9287 bytes
user_manual/images/calendar_create_new.PNG | Bin 0 -> 8572 bytes
user_manual/images/calendar_default.png | Bin 0 -> 67569 bytes
user_manual/images/calendar_default.snag | Bin 0 -> 57368 bytes
user_manual/images/calendar_settings.PNG | Bin 0 -> 15142 bytes
user_manual/pim/calendar.rst | 122 +++++++++++++++++----
10 files changed, 101 insertions(+), 21 deletions(-)
diff --git a/user_manual/images/Thumbs.db b/user_manual/images/Thumbs.db
deleted file mode 100644
index 113192c..0000000
Binary files a/user_manual/images/Thumbs.db and /dev/null differ
diff --git a/user_manual/images/calendar_create_event.PNG b/user_manual/images/calendar_create_event.PNG
new file mode 100644
index 0000000..3acd3ac
Binary files /dev/null and b/user_manual/images/calendar_create_event.PNG differ
diff --git a/user_manual/images/calendar_create_event_advanced.PNG b/user_manual/images/calendar_create_event_advanced.PNG
new file mode 100644
index 0000000..19fbb67
Binary files /dev/null and b/user_manual/images/calendar_create_event_advanced.PNG differ
diff --git a/user_manual/images/calendar_create_event_repeat.PNG b/user_manual/images/calendar_create_event_repeat.PNG
new file mode 100644
index 0000000..6f90f66
Binary files /dev/null and b/user_manual/images/calendar_create_event_repeat.PNG differ
diff --git a/user_manual/images/calendar_create_event_repeat_advanced.PNG b/user_manual/images/calendar_create_event_repeat_advanced.PNG
new file mode 100644
index 0000000..d29189e
Binary files /dev/null and b/user_manual/images/calendar_create_event_repeat_advanced.PNG differ
diff --git a/user_manual/images/calendar_create_new.PNG b/user_manual/images/calendar_create_new.PNG
new file mode 100644
index 0000000..02ae8c7
Binary files /dev/null and b/user_manual/images/calendar_create_new.PNG differ
diff --git a/user_manual/images/calendar_default.png b/user_manual/images/calendar_default.png
new file mode 100644
index 0000000..2a5ad6d
Binary files /dev/null and b/user_manual/images/calendar_default.png differ
diff --git a/user_manual/images/calendar_default.snag b/user_manual/images/calendar_default.snag
new file mode 100644
index 0000000..2b36a87
Binary files /dev/null and b/user_manual/images/calendar_default.snag differ
diff --git a/user_manual/images/calendar_settings.PNG b/user_manual/images/calendar_settings.PNG
new file mode 100644
index 0000000..69c78cc
Binary files /dev/null and b/user_manual/images/calendar_settings.PNG differ
diff --git a/user_manual/pim/calendar.rst b/user_manual/pim/calendar.rst
index 646e89b..0a118ab 100644
--- a/user_manual/pim/calendar.rst
+++ b/user_manual/pim/calendar.rst
@@ -1,47 +1,127 @@
Using the Calendar App
======================
-Creating a calendar
--------------------
+The ownCloud Calendar app enables you to create and edit events, synchronize to
+other calendars you might use, and create new, personalized calendars.
-.. figure:: ../images/calendar_manage-calendars.png
-Calendar view
+By default, when you access the Calendar app for the first time, you get a
+"Personal" calendar that you can use or modify as you like.
-If you use the calendar the first time, there will be already a calendar called
-"Default calendar". You can manage your calendars with a click on the "Calendar"
-button in the top right corner. In the dialog, which will appear, you can add,
-edit, export, enable, disable and delete your calendars. There will be also a
-link for CalDAV access.
+.. figure:: ../images/calendar_default.png
+ :scale: 75%
-Synchronising Calendars with CalDAV
------------------------------------
+ **Calendar app (default)**
+
+The Calendar app contains the following fields and controls:
-Assuming you access your web interface via an address like this::
+- Calendar Date Field -- Provides the current date or enables you to select a
+ date that you want to view.
+
+- Calendar View Options -- Enables you to choose between a day, week, or month
+ view for the main Calendar app window. Also provides a quick jump button to
+ access the current day (Today).
+
+- Calendar Selection -- Enables you to choose the calendar that you want to view.
+
+- Calendar Controls -- Provides controls for each individual calendar. These
+ controls include sharing, obtaining an external URL link to the calendar, an
+ export function, an edit function, and a delete (trash) button.
+
+- Calendar Settings -- Provides access to the calendar-specific settings. These
+ settings include the calendar timezone selection, time format selection, week
+ start day, cache setting, primary CalDAV address, and iOS/OS X CalDAV address
+ settings.
+
+Creating a New Calendar
+-----------------------
+
+The ownCloud Calendar app enables you to create new calendars for work or other
+activities that you want to keep separated. You can manage each calendar
+separately.
+
+To create a new calendar:
+
+1. Access the Calendar app.
+
+2. Click the ``+ New Calendar`` field.
+
+ A dialog opens to enable you to create a new calendar.
+
+ .. figure:: ../images/calendar_create_new.png
+
+ **New calendar**
+
+3. Specify a name for the new calendar.
+
+4. (Optional) Specify a color for the new calendar.
+
+5. Click the blue checkbox.
+
+ The Calendar app creates a new calendar using the name and color specified.
+
+Managing Calendar Settings
+--------------------------
+
+The Calendar app settings enable you to modify the following:
+
+- Timezone -- Provides an alphabetical listing of all available countries
+ categorized by continent.
+
+- Time format -- Provides the option of using 24 hour or 12 hour time format.
+
+- Start day -- Provides the option of starting the calendar week on Monday,
+ Sunday, or Saturday.
+
+- Cache -- Enables you to clear the calendar cache for repeating events.
+
+- Primary CalDAV address -- Provides the primary CalDAV link URL.
+
+- iOS/OS X CalDAV address -- Provides the iOS/OS X CalDAV link URL.
+
+.. note:: The Calendar app settings are global and apply to all calendars that
+ you have created.
+
+Synchronizing Calendars Using CalDAV
+------------------------------------
+*Calendaring Extensions to WebDAV*, referred to as *CalDAV*, enables clients to
+access scheduling information on remote servers. As an extension to WebDAV,
+CalDAV (defined by RFC 4791) uses the iCalendar format to manage calendar data.
+CalDAV enables multiple clients to access the same information for use in
+cooperative planning and information sharing.
+
+The Calendar app provides both the Primary CalDAV address and the iOS/OSX CalDAV
+address. Using these addresses, you can use CalDAV-compatible programs (for
+example, Kontact, Evolution, or Thunderbird) using the address provided.
+
+To better understand the URL creation, consider the following examples:
+
+Let's assume you access your ownCloud web interface using the following address::
http://ADDRESS
-Then you can access your calendars with CalDAV-compatible programs like
-Kontact, Evolution, Thunderbird using the following URL::
+To access your ownCloud calendars using CalDAV-compatible programs like
+Kontact, Evolution, or Thunderbird, you would use the following URL::
http://ADDRESS/remote.php/caldav
-To use the ownCloud calendar with Apple iCal you will need to use the following
-URL, including the trailing slash::
+To access your ownCloud calendars using Apple iCal you would use the following
+URL, making sure to include the final slash::
http://ADDRESS/remote.php/caldav/principals/username/
-Mozilla Lightning users need to this URL scheme::
+To access your ownCloud calendars using Mozilla Lightning you would use the
+following URL::
https://ADDRESS/remote.php/caldav/calendars/USERNAME/CALENDARNAME
- Example for a simple calendar: The "Default calendar" is referred to as "defaultcalendar",
+The following is an example showing the completed URL where the calendar name is
+``defaultcalendar`` and the username is ``test``::
and the users' name here is "test".
- The full URL (which on the picture can't be seen because of the
- short edit field) is then::
https://localhost/owncloud/remote.php/caldav/calendars/test/defaultcalendar
-.. Note: the calendar names are lowercased and the spaces removed. They are not to be URL-encoded anymore.
+.. Note: Calendar names are lower case and any spaces are removed. They are not
+ URL-encoded.
Creating events
---------------
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git
More information about the Pkg-owncloud-commits
mailing list