Monotone-Parent: f050642fcfd85a888681137f9572e2646d4cadc9

Monotone-Revision: 4836e88278f663b165807bc739419dea0b0b3c73 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-06-05T04:46:12 Monotone-Branch: ca.inverse.sogo
2010-06-05 04:46:12 +00:00 · 2010-06-05 04:46:12 +00:00 · c5232d42a5
parent d5ae782764
commit c5232d42a5
19 changed files with 130 additions and 4 deletions
--- a/4
+++ b/4
@ -1,5 +1,9 @@
 2010-06-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>

+	* UI/Scheduler/UIxCalendarProperties.m (-calDavURL, -webDavICSURL)
+	(-webDavXMLURL): new accessors for the URL now appearing at the
+	bottom of the properties page.
+
 	* UI/WebServerResources/generic.js (onBodyClickContextMenu):
 	leave the context menu to appear on "A" elements with a
 	"clickableLink" class.
--- a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
@ -529,6 +529,11 @@ vtodo_class2 = "(Tarefa Confidencial)";
 "Show alarms" = "Show alarms";
 "Show tasks" = "Show tasks";

+"Links to this Calendar" = "Links to this Calendar";
+"CalDAV url" = "CalDAV url";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Please specify a numerical value in the Days field greater or equal to 1.";
 "weekFieldInvalid" = "Please specify a numerical value in the Week(s) field greater or equal to 1.";
--- a/UI/Scheduler/Czech.lproj/Localizable.strings
+++ b/UI/Scheduler/Czech.lproj/Localizable.strings
@ -529,6 +529,11 @@ vtodo_class2 = "(Důvěrný úkol)";
 "Show alarms" = "Zobrazit upomínky";
 "Show tasks" = "Zobrazit úkoly";

+"Links to this Calendar" = "Links to this Calendar";
+"CalDAV url" = "CalDAV url";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Please specify a numerical value in the Days field greater or equal to 1.";
 "weekFieldInvalid" = "Please specify a numerical value in the Week(s) field greater or equal to 1.";
--- a/UI/Scheduler/Dutch.lproj/Localizable.strings
+++ b/UI/Scheduler/Dutch.lproj/Localizable.strings
@ -529,6 +529,11 @@ vtodo_class2 = "(Vertrouwelijke taak)";
 "Show alarms" = "Show alarms";
 "Show tasks" = "Show tasks";

+"Links to this Calendar" = "Links to this Calendar";
+"CalDAV url" = "CalDAV url";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Please specify a numerical value in the Days field greater or equal to 1.";
 "weekFieldInvalid" = "Please specify a numerical value in the Week(s) field greater or equal to 1.";
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@ -529,6 +529,11 @@ vtodo_class2 = "(Confidential task)";
 "Show alarms" = "Show alarms";
 "Show tasks" = "Show tasks";

+"Links to this Calendar" = "Links to this Calendar";
+"CalDAV url" = "CalDAV url";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Please specify a numerical value in the Days field greater or equal to 1.";
 "weekFieldInvalid" = "Please specify a numerical value in the Week(s) field greater or equal to 1.";
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@ -529,6 +529,11 @@ vtodo_class2 = "(Tâche confidentielle)";
 "Show alarms" = "Afficher les alarmes";
 "Show tasks" = "Afficher les tâches";

+"Links to this Calendar" = "Liens vers cet agenda";
+"CalDAV url" = "Accès en CalDAV";
+"WebDAV ICS URL" = "Représentation ICS en WebDAV";
+"WebDAV XML URL" = "Représentation XML en WebDAV";
+
 /* Error messages */
 "dayFieldInvalid" = "Veuillez spécifier un chiffre supérieur ou égal à 1 dans le champ Jours.";
 "weekFieldInvalid" = "Veuillez spécifier un chiffre supérieur ou égal à 1 dans le champ Semaine(s).";
--- a/UI/Scheduler/German.lproj/Localizable.strings
+++ b/UI/Scheduler/German.lproj/Localizable.strings
@ -529,6 +529,11 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
 "Show alarms" = "Zeige Erinnerungen";
 "Show tasks" = "Zeige Aufgaben";

+"Links to this Calendar" = "Links to this Calendar";
+"CalDAV url" = "CalDAV url";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Im Feld Tage ist ein numerischer Wert größer oder gleich 1 erforderlich.";
 "weekFieldInvalid" = "Im Feld Woche(n) ist ein numerischer Wert größer oder gleich 1 erforderlich.";
--- a/UI/Scheduler/Hungarian.lproj/Localizable.strings
+++ b/UI/Scheduler/Hungarian.lproj/Localizable.strings
@ -529,6 +529,11 @@ vtodo_class2 = "(Bizalmas feladat)";
 "Show alarms" = "Show alarms";
 "Show tasks" = "Show tasks";

+"Links to this Calendar" = "Links to this Calendar";
+"CalDAV url" = "CalDAV url";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Please specify a numerical value in the Days field greater or equal to 1.";
 "weekFieldInvalid" = "Please specify a numerical value in the Week(s) field greater or equal to 1.";
--- a/UI/Scheduler/Italian.lproj/Localizable.strings
+++ b/UI/Scheduler/Italian.lproj/Localizable.strings
@ -529,6 +529,11 @@ vtodo_class2 = "(Attività confidenziale)";
 "Show alarms" = "Show alarms";
 "Show tasks" = "Show tasks";

+"Links to this Calendar" = "Links to this Calendar";
+"CalDAV url" = "CalDAV url";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Please specify a numerical value in the Days field greater or equal to 1.";
 "weekFieldInvalid" = "Please specify a numerical value in the Week(s) field greater or equal to 1.";
--- a/UI/Scheduler/Russian.lproj/Localizable.strings
+++ b/UI/Scheduler/Russian.lproj/Localizable.strings
@ -529,6 +529,11 @@ vtodo_class2 = "(Confidential task)";
 "Show alarms" = "Show alarms";
 "Show tasks" = "Show tasks";

+"Links to this Calendar" = "Links to this Calendar";
+"CalDAV url" = "CalDAV url";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Please specify a numerical value in the Days field greater or equal to 1.";
 "weekFieldInvalid" = "Please specify a numerical value in the Week(s) field greater or equal to 1.";
--- a/UI/Scheduler/Spanish.lproj/Localizable.strings
+++ b/UI/Scheduler/Spanish.lproj/Localizable.strings
@ -529,6 +529,11 @@ vtodo_class2 = "(Tarea confidencial)";
 "Show alarms" = "Show alarms";
 "Show tasks" = "Show tasks";

+"Links to this Calendar" = "Links to this Calendar";
+"CalDAV url" = "CalDAV url";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Please specify a numerical value in the Days field greater or equal to 1.";
 "weekFieldInvalid" = "Please specify a numerical value in the Week(s) field greater or equal to 1.";
--- a/UI/Scheduler/Swedish.lproj/Localizable.strings
+++ b/UI/Scheduler/Swedish.lproj/Localizable.strings
@ -529,6 +529,11 @@ vtodo_class2 = "(Konfidentiell uppgift)";
 "Show alarms" = "Visa alarm";
 "Show tasks" = "Visa uppgifter";

+"Links to this Calendar" = "Links to this Calendar";
+"CalDAV url" = "CalDAV url";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Ange ett numeriskt värde in dagsfältet större än eller lika med 1.";
 "weekFieldInvalid" = "Ange ett numeriskt värde in veckofältet större än eller lika med 1.";
--- a/UI/Scheduler/UIxCalendarProperties.h
+++ b/UI/Scheduler/UIxCalendarProperties.h
@ -29,6 +29,7 @@
@interface UIxCalendarProperties : UIxComponent
 {
  SOGoAppointmentFolder *calendar;
+  NSString *baseCalDAVURL;
  BOOL reloadTasks;
 }

--- a/UI/Scheduler/UIxCalendarProperties.m
+++ b/UI/Scheduler/UIxCalendarProperties.m
@ -22,6 +22,7 @@

 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
+#import <Foundation/NSURL.h>

 #import <NGObjWeb/WORequest.h>

@ -39,12 +40,19 @@
  if ((self = [super init]))
    {
      calendar = [self clientObject];
+      baseCalDAVURL = nil;
      reloadTasks = NO;
    }

  return self;
 }

+- (void) dealloc
+{
+  [baseCalDAVURL release];
+  [super dealloc];
+}
+
 - (NSString *) calendarID
 {
  return [calendar folderReference];
@ -241,4 +249,36 @@
  return [self jsCloseWithRefreshMethod: action];
 }

+- (NSString *) _baseCalDAVURL
+{
+  NSString *davURL;
+
+  if (!baseCalDAVURL)
+    {
+      davURL = [[calendar realDavURL] absoluteString];
+      if ([davURL hasSuffix: @"/"])
+        baseCalDAVURL = [davURL substringToIndex: [davURL length] - 1];
+      else
+        baseCalDAVURL = davURL;
+      [baseCalDAVURL retain];
+    }
+
+  return baseCalDAVURL;
+}
+
+- (NSString *) calDavURL
+{
+  return [NSString stringWithFormat: @"%@/", [self _baseCalDAVURL]];
+}
+
+- (NSString *) webDavICSURL
+{
+  return [NSString stringWithFormat: @"%@.ics", [self _baseCalDAVURL]];
+}
+
+- (NSString *) webDavXMLURL
+{
+  return [NSString stringWithFormat: @"%@.xml", [self _baseCalDAVURL]];
+}
+
@end
--- a/UI/Scheduler/Ukrainian.lproj/Localizable.strings
+++ b/UI/Scheduler/Ukrainian.lproj/Localizable.strings
@ -521,6 +521,11 @@ vtodo_class2 = "(Конфіденційне завдання)";
 "Show alarms" = "Сповіщення";
 "Show tasks" = "Завдання";

+"Links to this Calendar" = "Links to this Calendar";
+"CalDAV url" = "CalDAV url";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Будь ласка, зазначте числове значення в полі дні, що більше або рівно 1.";
 "weekFieldInvalid" = "Будь ласка, зазначте числове значення в полі тиждень(і), що більше або рівно 1.";
--- a/UI/Scheduler/Welsh.lproj/Localizable.strings
+++ b/UI/Scheduler/Welsh.lproj/Localizable.strings
@ -529,6 +529,11 @@ vtodo_class2 = "(Tasg gyhoeddus)";
 "Show alarms" = "Show alarms";
 "Show tasks" = "Show tasks";

+"Links to this Calendar" = "Links to this Calendar";
+"CalDAV url" = "CalDAV url";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
 /* Error messages */
 "dayFieldInvalid" = "Please specify a numerical value in the Days field greater or equal to 1.";
 "weekFieldInvalid" = "Please specify a numerical value in the Week(s) field greater or equal to 1.";
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@ -99,6 +99,17 @@
                /></label></div></var:if>
      </fieldset>

+      <var:if condition="isWebCalendar" const:negate="YES"
+        ><fieldset id="davLinks">
+          <legend><var:string label:value="Links to this Calendar"/></legend>
+          <a const:class="clickableLink" var:href="calDavURL"
+            ><var:string label:value="CalDAV url"/></a><br/>
+            <a const:class="clickableLink" var:href="webDavICSURL"
+              ><var:string label:value="WebDAV ICS URL"/></a><br/>
+            <a const:class="clickableLink" var:href="webDavXMLURL"
+              ><var:string label:value="WebDAV XML URL"/></a>
+        </fieldset></var:if>
+
      <div id="buttons">
        <a href="#" class="button actionButton" id="okButton" 
          name="okButton">
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@ -2231,7 +2231,7 @@ function onCalendarModify(event) {
    var url = ApplicationBaseURL + calendarID + "/properties";
    var windowID = sanitizeWindowName(calendarID + " properties");
    var width = 310;
-    var height = 275;
+    var height = 330;
    var isWebCalendar = false;
    if (UserSettings['Calendar']
        && UserSettings['Calendar']['WebCalendars']) {
@ -2245,10 +2245,12 @@ function onCalendarModify(event) {
    if (owner == UserLogin) {
        height += 24;
    }
-    if (isWebCalendar)
-        height += 41;
-    else if (calendarID == "/personal")
+    if (isWebCalendar) {
+        height -= 38;
+    }
+    else if (calendarID == "/personal") {
        height -= 26;
+    }

    var properties = window.open(url, windowID,
                                 "width="+width+",height="+height+",resizable=0");
--- a/UI/WebServerResources/UIxCalendarProperties.css
+++ b/UI/WebServerResources/UIxCalendarProperties.css
@ -53,6 +53,9 @@ INPUT#calendarSyncTag
 LABEL
 { white-space: nowrap; }

+#davLinks A
+{ margin-left: 60px; }
+
 #webCalendarUrl SPAN.content
 { white-space: nowrap;
  overflow: hidden; }