From 75bef53af57a70dd7e0b79600a048c42076743ba Mon Sep 17 00:00:00 2001
From: "mikep%oeone.com" <mikep%oeone.com>
Date: Tue, 10 Sep 2002 18:26:37 +0000
Subject: [PATCH] Adding in publishing, small fixes for wording and look and
 feel.

---
 calendar/resources/content/calendar.js        |  17 +-
 .../resources/content/calendarImportExport.js |   2 +-
 .../content/calendarPublishDialog.js          | 125 +++++++++++++++
 .../content/calendarPublishDialog.xul         | 148 ++++++++++++++++++
 .../resources/content/calendarServerDialog.js |   4 +-
 .../content/calendarServerDialog.xul          |  58 ++++---
 calendar/resources/content/importExport.js    |   2 +-
 calendar/resources/content/publishDialog.js   | 125 +++++++++++++++
 calendar/resources/content/publishDialog.xul  | 148 ++++++++++++++++++
 calendar/resources/content/serverDialog.js    |   4 +-
 calendar/resources/content/serverDialog.xul   |  58 ++++---
 calendar/resources/jar.mn                     |   2 +
 calendar/resources/locale/en-US/calendar.dtd  |  22 ++-
 13 files changed, 667 insertions(+), 48 deletions(-)
 create mode 100644 calendar/resources/content/calendarPublishDialog.js
 create mode 100644 calendar/resources/content/calendarPublishDialog.xul
 create mode 100644 calendar/resources/content/publishDialog.js
 create mode 100644 calendar/resources/content/publishDialog.xul

diff --git a/calendar/resources/content/calendar.js b/calendar/resources/content/calendar.js
index 84b81181f0a0..6db4c9da696e 100644
--- a/calendar/resources/content/calendar.js
+++ b/calendar/resources/content/calendar.js
@@ -770,19 +770,26 @@ function print()
 {
    // print sample monthcalendar if in month-view, and june is selected
    if( gCalendarWindow.currentView == gCalendarWindow.monthView && gCalendarWindow.getSelectedDate().getMonth() == 5)
-      printEventArray( 
-         gCalendarWindow.EventSelection.selectedEvents, "chrome://calendar/content/converters/ecsJune.xsl" );
+      printEventArray( gCalendarWindow.EventSelection.selectedEvents, "chrome://calendar/content/converters/ecsJune.xsl" );
    else
-   printEventArray(
-      gCalendarWindow.EventSelection.selectedEvents, "chrome://calendar/content/converters/sortEvents.xsl" );
+      printEventArray( gCalendarWindow.EventSelection.selectedEvents, "chrome://calendar/content/converters/sortEvents.xsl" );
 }
 
 
 function publishCalendarData()
+{
+   var args = new Object();
+   
+   args.onOk =  self.publishCalendarDataDialogResponse;
+   
+   openDialog("chrome://calendar/content/calendarPublishDialog.xul", "caPublishEvents", "chrome,modal", args );
+}
+
+function publishCalendarDataDialogResponse( CalendarPublishObject )
 {
    var calendarString = eventArrayToICalString( gCalendarWindow.EventSelection.selectedEvents );
    
-   calendarPublish(calendarString, "http://localhost/webdav/", "TestCalendar.ics", "", "", "text/calendar");
+   calendarPublish(calendarString, CalendarPublishObject.url, CalendarPublishObject.remotePath, CalendarPublishObject.username, CalendarPublishObject.password, "text/calendar");
 }
 
 /*
diff --git a/calendar/resources/content/calendarImportExport.js b/calendar/resources/content/calendarImportExport.js
index 3cdd6a91cbfb..0e8f293d5061 100644
--- a/calendar/resources/content/calendarImportExport.js
+++ b/calendar/resources/content/calendarImportExport.js
@@ -124,7 +124,7 @@ function loadEventsFromFile()
       
       var buttonPressed =      
       promptService.confirmEx(window, 
-           "Import", "About to import " + calendarEventArray.length + " event(s). Do you want to open all events to import before importing?", 
+           "Import", "About to import " + calendarEventArray.length + " event(s).\nDo you want to open all events to import before importing?", 
            (promptService.BUTTON_TITLE_YES * promptService.BUTTON_POS_0) + 
            (promptService.BUTTON_TITLE_NO * promptService.BUTTON_POS_1) + 
            (promptService.BUTTON_TITLE_CANCEL * promptService.BUTTON_POS_2), 
diff --git a/calendar/resources/content/calendarPublishDialog.js b/calendar/resources/content/calendarPublishDialog.js
new file mode 100644
index 000000000000..50060785fb22
--- /dev/null
+++ b/calendar/resources/content/calendarPublishDialog.js
@@ -0,0 +1,125 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OEone Calendar Code, released October 31st, 2001.
+ *
+ * The Initial Developer of the Original Code is
+ * OEone Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Garth Smedley <garths@oeone.com>
+ *                 Mike Potter <mikep@oeone.com>
+ *                 Colin Phillips <colinp@oeone.com> 
+ *                 Chris Charabaruk <ccharabaruk@meldstar.com>
+ *                 ArentJan Banck <ajbanck@planet.nl>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+
+/***** calendar/calendarEventDialog.js
+* AUTHOR
+*   Garth Smedley
+* REQUIRED INCLUDES 
+*   <script type="application/x-javascript" src="chrome://calendar/content/dateUtils.js"/>
+*   <script type="application/x-javascript" src="chrome://calendar/content/calendarEvent.js"/>
+*
+* NOTES
+*   Code for the calendar's new/edit event dialog.
+*
+*  Invoke this dialog to create a new event as follows:
+
+   var args = new Object();
+   args.mode = "new";               // "new" or "edit"
+   args.onOk = <function>;          // funtion to call when OK is clicked
+   args.calendarEvent = calendarEvent;    // newly creatd calendar event to be editted
+    
+   calendar.openDialog("caNewEvent", "chrome://calendar/content/calendarEventDialog.xul", true, args );
+*
+*  Invoke this dialog to edit an existing event as follows:
+*
+   var args = new Object();
+   args.mode = "edit";                    // "new" or "edit"
+   args.onOk = <function>;                // funtion to call when OK is clicked
+   args.calendarEvent = calendarEvent;    // javascript object containin the event to be editted
+
+* When the user clicks OK the onOk function will be called with a calendar event object.
+*
+*  
+* IMPLEMENTATION NOTES 
+**********
+*/
+
+
+/*-----------------------------------------------------------------
+*   W I N D O W      V A R I A B L E S
+*/
+
+
+var gOnOkFunction;   // function to be called when user clicks OK
+
+/*-----------------------------------------------------------------
+*   W I N D O W      F U N C T I O N S
+*/
+
+/**
+*   Called when the dialog is loaded.
+*/
+
+function loadCalendarPublishDialog()
+{
+   // Get arguments, see description at top of file
+   
+   var args = window.arguments[0];
+   
+   gOnOkFunction = args.onOk;
+   
+   var firstFocus = document.getElementById( "server-name-textbox" );
+   firstFocus.focus();
+}
+
+
+
+/**
+*   Called when the OK button is clicked.
+*/
+
+function onOKCommand()
+{
+   var CalendarPublishObject = new Object();
+
+   CalendarPublishObject.url = document.getElementById( "publish-url-textbox" ).value;
+   CalendarPublishObject.remotePath = document.getElementById( "publish-remotefilename-textbox" ).value;
+   CalendarPublishObject.username = document.getElementById( "publish-username-textbox" ).value;
+   CalendarPublishObject.password = document.getElementById( "publish-password-textbox" ).value;
+
+   // call caller's on OK function
+   gOnOkFunction( CalendarPublishObject );
+      
+   // tell standard dialog stuff to close the dialog
+   return true;
+}
+
diff --git a/calendar/resources/content/calendarPublishDialog.xul b/calendar/resources/content/calendarPublishDialog.xul
new file mode 100644
index 000000000000..3ab76d5eeb13
--- /dev/null
+++ b/calendar/resources/content/calendarPublishDialog.xul
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is OEone Calendar Code, released October 31st, 2001.
+   -
+   - The Initial Developer of the Original Code is
+   - OEone Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 2001
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s): Mike Potter <mikep@oeone.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!-- CSS File with all styles specific to the dialog -->
+<?xml-stylesheet href="chrome://calendar/skin/dialogOverlay.css" type="text/css"?>
+
+<!-- DTD File with all strings specific to the calendar -->
+<!DOCTYPE dialog 
+[
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
+]>
+
+
+<dialog
+   id="calendar-publishwindow"
+   title="&calendar.publish.dialog.title;"
+   buttons="accept,cancel"
+   ondialogaccept="return onOKCommand();"
+   ondialogcancel="return true;"
+   onload="loadCalendarPublishDialog()"
+   persist="screenX screenY"
+   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+   xmlns:nc="http://home.netscape.com/NC-rdf#">
+    
+   
+   <!-- Javascript includes -->
+   
+   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+   <script type="application/x-javascript" src="chrome://calendar/content/calendarPublishDialog.js"/>
+   
+   <!-- Data used in JS from dtd -->
+   
+   <keyset id="dialogKeys"/>
+
+   <!-- The dialog -->
+    
+   <!-- dialog-box: from dialogOverlay.xul -->
+    
+   <vbox id="dialog-box" flex="1">  
+   
+      <!-- standard-dialog-content: from dialogOverlay.xul  -->
+        
+      <vbox id="standard-dialog-content"  flex="1">
+        
+         <grid>
+            
+                <columns>
+                    <column />
+                    <column flex="1"/>
+                </columns>
+                
+                <rows>
+            
+                    <!-- URL -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end">
+                            <description>&calendar.publish.url.label;</description>
+                        </hbox>
+                        <textbox flex="1" id="publish-url-textbox"/>
+                    </row>
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end"/>
+                        <description>Something like http://www.myserver.com/webdav/</description>
+                    </row>
+                    
+                    <!-- File Name -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end">
+                            <description>&calendar.publish.remotefilename.label;</description>
+                        </hbox>
+                        <textbox flex="1" id="publish-remotefilename-textbox"/>
+                    </row>
+                  
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end"/>
+                        <description>The filename to save to on the remote server.</description>
+                    </row>
+                    
+                    <!-- Username -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end">
+                            <description>&calendar.publish.username.label;</description>
+                        </hbox>
+                        <textbox id="publish-username-textbox" flex="1" /> 
+                    </row>
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end"/>
+                        <description>(Optional) The username to upload to this server.</description>
+                    </row>
+                    
+                    <!-- Password -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end">
+                            <description>&calendar.publish.password.label;</description>
+                        </hbox>
+                        <textbox type="password" id="publish-password-textbox" flex="1" />
+                    </row>
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end"/>
+                        <description>(Optional) The password to upload to this server.</description>
+                    </row>
+                  </rows>
+               </grid> 
+            
+            
+      </vbox> <!-- standard-dialog-content -->
+   </vbox> <!-- dialog-box -->
+
+</dialog>
diff --git a/calendar/resources/content/calendarServerDialog.js b/calendar/resources/content/calendarServerDialog.js
index c17cb6b823e6..2db0732d5f25 100644
--- a/calendar/resources/content/calendarServerDialog.js
+++ b/calendar/resources/content/calendarServerDialog.js
@@ -117,6 +117,8 @@ function loadCalendarServerDialog()
       document.getElementById( "server-path-textbox" ).setAttribute( "readonly", "true" );
    }
    
+   document.getElementById( "calendar-serverwindow" ).setAttribute( "title", titleDataItem.getAttribute( "value" ) );
+
    document.getElementById( "server-name-textbox" ).value = gCalendarObject.name;
 
    if( gCalendarObject.remote == true )
@@ -161,7 +163,7 @@ function launchFilePicker()
 
    // caller can force disable of sand box, even if ON globally
 
-   fp.init(window, "Save As", nsIFilePicker.modeSave);
+   fp.init(window, "Open", nsIFilePicker.modeOpen);
 
    var ServerName = document.getElementById( "server-name-textbox" ).value;
 
diff --git a/calendar/resources/content/calendarServerDialog.xul b/calendar/resources/content/calendarServerDialog.xul
index 5be80786c209..4affceafd77c 100644
--- a/calendar/resources/content/calendarServerDialog.xul
+++ b/calendar/resources/content/calendarServerDialog.xul
@@ -51,8 +51,8 @@
 
 
 <dialog
-   id="calendar-new-serverwindow"
-   title="Calendar Server"
+   id="calendar-serverwindow"
+   title="&calendar.server.dialog.title.new;"
    buttons="accept,cancel"
    ondialogaccept="return onOKCommand();"
    ondialogcancel="return true;"
@@ -70,11 +70,10 @@
    <!-- Data used in JS from dtd -->
    
    <dataset>
-       <data id="data-event-title-new"             value="&event.title.new;" />
-       <data id="data-event-title-edit"            value="&event.title.edit;" />
+       <data id="data-event-title-new"             value="&calendar.server.dialog.title.new;" />
+       <data id="data-event-title-edit"            value="&calendar.server.dialog.title.edit;" />
    </dataset>
 
-
    <keyset id="dialogKeys"/>
 
    <!-- The dialog -->
@@ -87,22 +86,45 @@
         
       <vbox id="standard-dialog-content"  flex="1">
         
-         <hbox>
-            <description>Name:</description> 
-            <textbox flex="1" id="server-name-textbox"/>
-         </hbox>
-         <vbox>
-            <hbox>
-               <description>File Location:</description> 
+         <grid>
             
-               <textbox id="server-path-textbox" flex="1" />
-            </hbox>
+                <columns>
+                    <column />
+                    <column flex="1"/>
+                </columns>
+                
+                <rows>
             
-            <description flex="1" style="max-width: 500px;">You can enter a local file path, or a remote file path like 
-            http://www.mozilla.org/projects/calendar/caldata/CanadaHolidays.ics</description>
-            <button flex="0" oncommand="launchFilePicker()" label="Browse For Local File..."/>      
+                    <!-- Name -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end">
+                            <description>&calendar.server.dialog.name.label;</description>
+                        </hbox>
+                        <textbox flex="1" id="server-name-textbox"/>
+                    </row>
+                    
+                    <!-- Location -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end">
+                            <description>&calendar.server.dialog.location.label;</description>
+                        </hbox>
+                        <hbox>
+                           <textbox id="server-path-textbox" flex="1" /> 
+                           <button oncommand="launchFilePicker()" label="&calendar.server.dialog.browse.label;"/>
+                        </hbox>
+                    </row>
+                    
+                    <!-- File Picker Button -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end"/>
+                        <hbox style="max-width: 400px;"> 
+                           
+                           <description flex="1">&calendar.server.dialog.help.label;</description>
+                        </hbox>
+                    </row>
+                  </rows>
+               </grid> 
             
-         </vbox>
             
       </vbox> <!-- standard-dialog-content -->
    </vbox> <!-- dialog-box -->
diff --git a/calendar/resources/content/importExport.js b/calendar/resources/content/importExport.js
index 3cdd6a91cbfb..0e8f293d5061 100644
--- a/calendar/resources/content/importExport.js
+++ b/calendar/resources/content/importExport.js
@@ -124,7 +124,7 @@ function loadEventsFromFile()
       
       var buttonPressed =      
       promptService.confirmEx(window, 
-           "Import", "About to import " + calendarEventArray.length + " event(s). Do you want to open all events to import before importing?", 
+           "Import", "About to import " + calendarEventArray.length + " event(s).\nDo you want to open all events to import before importing?", 
            (promptService.BUTTON_TITLE_YES * promptService.BUTTON_POS_0) + 
            (promptService.BUTTON_TITLE_NO * promptService.BUTTON_POS_1) + 
            (promptService.BUTTON_TITLE_CANCEL * promptService.BUTTON_POS_2), 
diff --git a/calendar/resources/content/publishDialog.js b/calendar/resources/content/publishDialog.js
new file mode 100644
index 000000000000..50060785fb22
--- /dev/null
+++ b/calendar/resources/content/publishDialog.js
@@ -0,0 +1,125 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OEone Calendar Code, released October 31st, 2001.
+ *
+ * The Initial Developer of the Original Code is
+ * OEone Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Garth Smedley <garths@oeone.com>
+ *                 Mike Potter <mikep@oeone.com>
+ *                 Colin Phillips <colinp@oeone.com> 
+ *                 Chris Charabaruk <ccharabaruk@meldstar.com>
+ *                 ArentJan Banck <ajbanck@planet.nl>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+
+/***** calendar/calendarEventDialog.js
+* AUTHOR
+*   Garth Smedley
+* REQUIRED INCLUDES 
+*   <script type="application/x-javascript" src="chrome://calendar/content/dateUtils.js"/>
+*   <script type="application/x-javascript" src="chrome://calendar/content/calendarEvent.js"/>
+*
+* NOTES
+*   Code for the calendar's new/edit event dialog.
+*
+*  Invoke this dialog to create a new event as follows:
+
+   var args = new Object();
+   args.mode = "new";               // "new" or "edit"
+   args.onOk = <function>;          // funtion to call when OK is clicked
+   args.calendarEvent = calendarEvent;    // newly creatd calendar event to be editted
+    
+   calendar.openDialog("caNewEvent", "chrome://calendar/content/calendarEventDialog.xul", true, args );
+*
+*  Invoke this dialog to edit an existing event as follows:
+*
+   var args = new Object();
+   args.mode = "edit";                    // "new" or "edit"
+   args.onOk = <function>;                // funtion to call when OK is clicked
+   args.calendarEvent = calendarEvent;    // javascript object containin the event to be editted
+
+* When the user clicks OK the onOk function will be called with a calendar event object.
+*
+*  
+* IMPLEMENTATION NOTES 
+**********
+*/
+
+
+/*-----------------------------------------------------------------
+*   W I N D O W      V A R I A B L E S
+*/
+
+
+var gOnOkFunction;   // function to be called when user clicks OK
+
+/*-----------------------------------------------------------------
+*   W I N D O W      F U N C T I O N S
+*/
+
+/**
+*   Called when the dialog is loaded.
+*/
+
+function loadCalendarPublishDialog()
+{
+   // Get arguments, see description at top of file
+   
+   var args = window.arguments[0];
+   
+   gOnOkFunction = args.onOk;
+   
+   var firstFocus = document.getElementById( "server-name-textbox" );
+   firstFocus.focus();
+}
+
+
+
+/**
+*   Called when the OK button is clicked.
+*/
+
+function onOKCommand()
+{
+   var CalendarPublishObject = new Object();
+
+   CalendarPublishObject.url = document.getElementById( "publish-url-textbox" ).value;
+   CalendarPublishObject.remotePath = document.getElementById( "publish-remotefilename-textbox" ).value;
+   CalendarPublishObject.username = document.getElementById( "publish-username-textbox" ).value;
+   CalendarPublishObject.password = document.getElementById( "publish-password-textbox" ).value;
+
+   // call caller's on OK function
+   gOnOkFunction( CalendarPublishObject );
+      
+   // tell standard dialog stuff to close the dialog
+   return true;
+}
+
diff --git a/calendar/resources/content/publishDialog.xul b/calendar/resources/content/publishDialog.xul
new file mode 100644
index 000000000000..3ab76d5eeb13
--- /dev/null
+++ b/calendar/resources/content/publishDialog.xul
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is OEone Calendar Code, released October 31st, 2001.
+   -
+   - The Initial Developer of the Original Code is
+   - OEone Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 2001
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s): Mike Potter <mikep@oeone.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!-- CSS File with all styles specific to the dialog -->
+<?xml-stylesheet href="chrome://calendar/skin/dialogOverlay.css" type="text/css"?>
+
+<!-- DTD File with all strings specific to the calendar -->
+<!DOCTYPE dialog 
+[
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
+]>
+
+
+<dialog
+   id="calendar-publishwindow"
+   title="&calendar.publish.dialog.title;"
+   buttons="accept,cancel"
+   ondialogaccept="return onOKCommand();"
+   ondialogcancel="return true;"
+   onload="loadCalendarPublishDialog()"
+   persist="screenX screenY"
+   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+   xmlns:nc="http://home.netscape.com/NC-rdf#">
+    
+   
+   <!-- Javascript includes -->
+   
+   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+   <script type="application/x-javascript" src="chrome://calendar/content/calendarPublishDialog.js"/>
+   
+   <!-- Data used in JS from dtd -->
+   
+   <keyset id="dialogKeys"/>
+
+   <!-- The dialog -->
+    
+   <!-- dialog-box: from dialogOverlay.xul -->
+    
+   <vbox id="dialog-box" flex="1">  
+   
+      <!-- standard-dialog-content: from dialogOverlay.xul  -->
+        
+      <vbox id="standard-dialog-content"  flex="1">
+        
+         <grid>
+            
+                <columns>
+                    <column />
+                    <column flex="1"/>
+                </columns>
+                
+                <rows>
+            
+                    <!-- URL -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end">
+                            <description>&calendar.publish.url.label;</description>
+                        </hbox>
+                        <textbox flex="1" id="publish-url-textbox"/>
+                    </row>
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end"/>
+                        <description>Something like http://www.myserver.com/webdav/</description>
+                    </row>
+                    
+                    <!-- File Name -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end">
+                            <description>&calendar.publish.remotefilename.label;</description>
+                        </hbox>
+                        <textbox flex="1" id="publish-remotefilename-textbox"/>
+                    </row>
+                  
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end"/>
+                        <description>The filename to save to on the remote server.</description>
+                    </row>
+                    
+                    <!-- Username -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end">
+                            <description>&calendar.publish.username.label;</description>
+                        </hbox>
+                        <textbox id="publish-username-textbox" flex="1" /> 
+                    </row>
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end"/>
+                        <description>(Optional) The username to upload to this server.</description>
+                    </row>
+                    
+                    <!-- Password -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end">
+                            <description>&calendar.publish.password.label;</description>
+                        </hbox>
+                        <textbox type="password" id="publish-password-textbox" flex="1" />
+                    </row>
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end"/>
+                        <description>(Optional) The password to upload to this server.</description>
+                    </row>
+                  </rows>
+               </grid> 
+            
+            
+      </vbox> <!-- standard-dialog-content -->
+   </vbox> <!-- dialog-box -->
+
+</dialog>
diff --git a/calendar/resources/content/serverDialog.js b/calendar/resources/content/serverDialog.js
index c17cb6b823e6..2db0732d5f25 100644
--- a/calendar/resources/content/serverDialog.js
+++ b/calendar/resources/content/serverDialog.js
@@ -117,6 +117,8 @@ function loadCalendarServerDialog()
       document.getElementById( "server-path-textbox" ).setAttribute( "readonly", "true" );
    }
    
+   document.getElementById( "calendar-serverwindow" ).setAttribute( "title", titleDataItem.getAttribute( "value" ) );
+
    document.getElementById( "server-name-textbox" ).value = gCalendarObject.name;
 
    if( gCalendarObject.remote == true )
@@ -161,7 +163,7 @@ function launchFilePicker()
 
    // caller can force disable of sand box, even if ON globally
 
-   fp.init(window, "Save As", nsIFilePicker.modeSave);
+   fp.init(window, "Open", nsIFilePicker.modeOpen);
 
    var ServerName = document.getElementById( "server-name-textbox" ).value;
 
diff --git a/calendar/resources/content/serverDialog.xul b/calendar/resources/content/serverDialog.xul
index 5be80786c209..4affceafd77c 100644
--- a/calendar/resources/content/serverDialog.xul
+++ b/calendar/resources/content/serverDialog.xul
@@ -51,8 +51,8 @@
 
 
 <dialog
-   id="calendar-new-serverwindow"
-   title="Calendar Server"
+   id="calendar-serverwindow"
+   title="&calendar.server.dialog.title.new;"
    buttons="accept,cancel"
    ondialogaccept="return onOKCommand();"
    ondialogcancel="return true;"
@@ -70,11 +70,10 @@
    <!-- Data used in JS from dtd -->
    
    <dataset>
-       <data id="data-event-title-new"             value="&event.title.new;" />
-       <data id="data-event-title-edit"            value="&event.title.edit;" />
+       <data id="data-event-title-new"             value="&calendar.server.dialog.title.new;" />
+       <data id="data-event-title-edit"            value="&calendar.server.dialog.title.edit;" />
    </dataset>
 
-
    <keyset id="dialogKeys"/>
 
    <!-- The dialog -->
@@ -87,22 +86,45 @@
         
       <vbox id="standard-dialog-content"  flex="1">
         
-         <hbox>
-            <description>Name:</description> 
-            <textbox flex="1" id="server-name-textbox"/>
-         </hbox>
-         <vbox>
-            <hbox>
-               <description>File Location:</description> 
+         <grid>
             
-               <textbox id="server-path-textbox" flex="1" />
-            </hbox>
+                <columns>
+                    <column />
+                    <column flex="1"/>
+                </columns>
+                
+                <rows>
             
-            <description flex="1" style="max-width: 500px;">You can enter a local file path, or a remote file path like 
-            http://www.mozilla.org/projects/calendar/caldata/CanadaHolidays.ics</description>
-            <button flex="0" oncommand="launchFilePicker()" label="Browse For Local File..."/>      
+                    <!-- Name -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end">
+                            <description>&calendar.server.dialog.name.label;</description>
+                        </hbox>
+                        <textbox flex="1" id="server-name-textbox"/>
+                    </row>
+                    
+                    <!-- Location -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end">
+                            <description>&calendar.server.dialog.location.label;</description>
+                        </hbox>
+                        <hbox>
+                           <textbox id="server-path-textbox" flex="1" /> 
+                           <button oncommand="launchFilePicker()" label="&calendar.server.dialog.browse.label;"/>
+                        </hbox>
+                    </row>
+                    
+                    <!-- File Picker Button -->    
+                    <row align="center">
+                        <hbox class="field-label-box-class" pack="end"/>
+                        <hbox style="max-width: 400px;"> 
+                           
+                           <description flex="1">&calendar.server.dialog.help.label;</description>
+                        </hbox>
+                    </row>
+                  </rows>
+               </grid> 
             
-         </vbox>
             
       </vbox> <!-- standard-dialog-content -->
    </vbox> <!-- dialog-box -->
diff --git a/calendar/resources/jar.mn b/calendar/resources/jar.mn
index f389dab7c8dc..05d2e655f374 100644
--- a/calendar/resources/jar.mn
+++ b/calendar/resources/jar.mn
@@ -21,6 +21,8 @@ calendar.jar:
     content/calendar/calendarOverlay.js  (content/calendarOverlay.js)
     content/calendar/calendarOverlay.xul (content/calendarOverlay.xul) 
     content/calendar/calendarPublish.js  (content/calendarPublish.js)
+    content/calendar/calendarPublishDialog.js  (content/calendarPublishDialog.js)    
+    content/calendar/calendarPublishDialog.xul  (content/calendarPublishDialog.xul)
     content/calendar/calendarSelection.js (content/calendarSelection.js) 
     content/calendar/calendarServerDialog.js (content/calendarServerDialog.js) 
     content/calendar/calendarServerDialog.xul (content/calendarServerDialog.xul) 
diff --git a/calendar/resources/locale/en-US/calendar.dtd b/calendar/resources/locale/en-US/calendar.dtd
index af1a7893bf97..2075f9deb72a 100644
--- a/calendar/resources/locale/en-US/calendar.dtd
+++ b/calendar/resources/locale/en-US/calendar.dtd
@@ -255,9 +255,9 @@
 
                                                                  
 <!-- Server Context Menu -->
-<!ENTITY calendar.context.newserver.label              "New Server">
-<!ENTITY calendar.context.editserver.label             "Edit Server">
-<!ENTITY calendar.context.deleteserver.label           "Delete Server">
+<!ENTITY calendar.context.newserver.label              "New Calendar">
+<!ENTITY calendar.context.editserver.label             "Edit Calendar">
+<!ENTITY calendar.context.deleteserver.label           "Delete Calendar">
 <!ENTITY calendar.context.refreshserver.label          "Refresh Remote Calendars">
 
 <!-- About Dialog -->
@@ -276,3 +276,19 @@
 <!ENTITY calendar.alarm.acknowledgeall.label        "Acknowledge All Alarms" >
 <!ENTITY calendar.alarm.snooze.label                "Snooze" >
 
+  
+<!-- Calendar Server Dialog -->
+<!ENTITY calendar.server.dialog.title.new           "Add New Calendar">
+<!ENTITY calendar.server.dialog.title.edit          "Edit Calendar">
+<!ENTITY calendar.server.dialog.name.label          "Name">
+<!ENTITY calendar.server.dialog.location.label      "Location">
+<!ENTITY calendar.server.dialog.browse.label        "Browse For Local File...">
+<!ENTITY calendar.server.dialog.help.label          "You can enter a local file path, or a remote file path like http://www.mozilla.org/projects/calendar/caldata/CanadaHolidays.ics">
+
+<!-- Calendar Publish Dialog -->
+<!ENTITY calendar.publish.dialog.title              "Publish Calendar">
+<!ENTITY calendar.publish.url.label                 "Publishing URL">
+<!ENTITY calendar.publish.remotefilename.label      "Remote File Name">
+<!ENTITY calendar.publish.username.label            "Username">
+<!ENTITY calendar.publish.password.label            "Password">
+