From dd723f8f99434606eee7f41de52d1ca84c5ab371 Mon Sep 17 00:00:00 2001
From: "mostafah%oeone.com" <mostafah%oeone.com>
Date: Tue, 2 Nov 2004 20:39:21 +0000
Subject: [PATCH] Checked in attachment 164223 for bug 226209:Cleanup calendar
 code

---
 .../resources/content/pref/nsPrefWindow.js    |  6 +-
 calendar/resources/content/pref/pref.xul      |  2 +-
 .../content/pref/prefBirdOverlay.xul          | 61 +++++++-----
 .../resources/content/pref/prefOverlay.xul    | 98 +++++++++++--------
 4 files changed, 95 insertions(+), 72 deletions(-)

diff --git a/calendar/resources/content/pref/nsPrefWindow.js b/calendar/resources/content/pref/nsPrefWindow.js
index fc884b411e78..b01f318a408e 100644
--- a/calendar/resources/content/pref/nsPrefWindow.js
+++ b/calendar/resources/content/pref/nsPrefWindow.js
@@ -154,7 +154,7 @@ nsPrefWindow.prototype =
                   }
               }
             return "!/!ERROR_UNDEFINED_PREF!/!";
-          }    ,
+          },
 
       setPref:
         function ( aPrefType, aPrefString, aValue )
@@ -272,10 +272,10 @@ nsPrefWindow.prototype =
                       dump(e + "\n");
                     }
                 }
-          },                        
+          },
 
       switchPage:
-        function (aNewURL, aNewTag)
+        function ( aNewURL, aNewTag )
           {
             var oldURL = document.getElementById( this.contentFrame ).getAttribute("tag");
             if( !oldURL )
diff --git a/calendar/resources/content/pref/pref.xul b/calendar/resources/content/pref/pref.xul
index 941e71558209..2e7656c7be37 100644
--- a/calendar/resources/content/pref/pref.xul
+++ b/calendar/resources/content/pref/pref.xul
@@ -67,7 +67,7 @@
     var newTag = aEvent.target.getAttribute("tag");
     if (hPrefWindow)
       hPrefWindow.switchPage(newURL, newTag);
-  }    
+  }
 
   function visitLink(aEvent)
   {
diff --git a/calendar/resources/content/pref/prefBirdOverlay.xul b/calendar/resources/content/pref/prefBirdOverlay.xul
index 7930da28f46a..8c93d41414ee 100644
--- a/calendar/resources/content/pref/prefBirdOverlay.xul
+++ b/calendar/resources/content/pref/prefBirdOverlay.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 <!-- ***** BEGIN LICENSE BLOCK *****
    - Version: MPL 1.1/GPL 2.0/LGPL 2.1
    -
@@ -19,7 +19,7 @@
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s):
-   -  Mike Potter <mikep@oeone.com> 
+   -  Mike Potter <mikep@oeone.com>
    -  Eric Belhaire <belhaire@ief.u-psud.fr>
    -
    - Alternatively, the contents of this file may be used under the terms of
@@ -37,41 +37,52 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay [
-   <!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/prefs.dtd" >
-   %calendarPrefsOverlayDTD;
+  <!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/prefs.dtd" >
+  %calendarPrefsOverlayDTD;
 ]>
 
 <overlay id="calendarPrefOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-   
-    <treechildren id="panelChildren">
+  <treechildren id="panelChildren">
     <treeitem id="calendarPanel" container="false">
-        <treerow>
-            <treecell class="treecell-indent" url="chrome://calendar/content/pref/calendarPref.xul" label="&calendar.general.label;" id="calendar"/>
-        </treerow>
+      <treerow>
+        <treecell class="treecell-indent"
+                  url="chrome://calendar/content/pref/calendarPref.xul"
+                  label="&calendar.general.label;"
+                  id="calendar"/>
+      </treerow>
     </treeitem>
     <treeitem id="calendarPublishPanel" container="false">
-        <treerow>
-            <treecell class="treecell-indent" url="chrome://calendar/content/pref/alarmPrefs.xul" label="&calendar.alarms.label;" id="calendarAlarm"/>
-        </treerow>
+      <treerow>
+        <treecell class="treecell-indent"
+                  url="chrome://calendar/content/pref/alarmPrefs.xul"
+                  label="&calendar.alarms.label;"
+                  id="calendarAlarm"/>
+      </treerow>
     </treeitem>
     <treeitem id="calendarPublishPanel" container="false">
-        <treerow>
-            <treecell class="treecell-indent" url="chrome://calendar/content/pref/publishPrefs.xul" label="&calendar.publish.label;" id="calendarPublish"/>
-        </treerow>
+      <treerow>
+        <treecell class="treecell-indent"
+                  url="chrome://calendar/content/pref/publishPrefs.xul"
+                  label="&calendar.publish.label;"
+                  id="calendarPublish"/>
+      </treerow>
     </treeitem>
-    <treeitem id="calendarPublishPanel" container="false">
-        <treerow>
-	    <treecell class="treecell-indent" url="chrome://calendar/content/pref/viewPrefs.xul" label="&calendar.views.label;" id="calendarView"/>
-        </treerow>
+    <treeitem id="calendarViewPanel" container="false">
+      <treerow>
+        <treecell class="treecell-indent"
+                  url="chrome://calendar/content/pref/viewPrefs.xul"
+                  label="&calendar.views.label;"
+                  id="calendarView"/>
+      </treerow>
     </treeitem>
     <treeitem id="calendarTimezonePanel" container="false">
-        <treerow>
-	    <treecell class="treecell-indent" 
-		      url="chrome://calendar/content/pref/timezonePrefs.xul" 
-		      label="&calendar.timezone.label;" id="timezone"/>
-        </treerow>
+      <treerow>
+        <treecell class="treecell-indent"
+                  url="chrome://calendar/content/pref/timezonePrefs.xul"
+                  label="&calendar.timezone.label;"
+                  id="timezone"/>
+      </treerow>
     </treeitem>
   </treechildren>
-  
 </overlay>
diff --git a/calendar/resources/content/pref/prefOverlay.xul b/calendar/resources/content/pref/prefOverlay.xul
index 76d78877d2f6..cb413fb2f777 100644
--- a/calendar/resources/content/pref/prefOverlay.xul
+++ b/calendar/resources/content/pref/prefOverlay.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 <!-- ***** BEGIN LICENSE BLOCK *****
    - Version: MPL 1.1/GPL 2.0/LGPL 2.1
    -
@@ -19,7 +19,7 @@
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s):
-   -  Mike Potter <mikep@oeone.com> 
+   -  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
@@ -36,61 +36,73 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay [
-   <!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/prefs.dtd" >
-   %calendarPrefsOverlayDTD;
+  <!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/prefs.dtd" >
+    %calendarPrefsOverlayDTD;
 ]>
 
 <overlay id="calendarPrefOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-   <script type="application/x-javascript">
-   <![CDATA[
+  <script type="application/x-javascript">
+  <![CDATA[
     var panel;
     if ((panel != undefined)&&(panel == "chrome://communicator/content/pref/pref-appearance.xul"))
     {
-        _elementIDs.push("generalStartupCalendar");
+       _elementIDs.push("generalStartupCalendar");
     }
-   ]]>
-   </script>         
-   
-   <!-- calendar startup toggle -->
-   <groupbox id="generalStartupPreferences">           
-      <checkbox id="generalStartupCalendar" wsm_persist="true" position="4"
+  ]]>
+  </script>
+
+  <!-- calendar startup toggle -->
+  <groupbox id="generalStartupPreferences">
+    <checkbox id="generalStartupCalendar" wsm_persist="true" position="4"
               label="&calendar.label;" accesskey="&calendar.accesskey;"
               pref="true" preftype="bool" prefstring="general.startup.calendar"
-              prefattribute="checked"/>         
-   </groupbox>
-   
-   <treechildren id="panelChildren">
+              prefattribute="checked"/>
+  </groupbox>
+
+  <treechildren id="panelChildren">
     <treeitem id="calendarPanel" container="true">
-        <treerow>
-            <treecell class="treecell-indent" url="chrome://calendar/content/pref/calendarPref.xul" label="&calendar.label;" id="calendar"/>
-        </treerow>
-        <treechildren id="calendarPrefChildren">
-            <treeitem id="calendarPublishPanel" container="false">
-                <treerow>
-                    <treecell class="treecell-indent" url="chrome://calendar/content/pref/alarmPrefs.xul" label="&calendar.alarms.label;" id="calendarAlarm"/>
-                </treerow>
-            </treeitem>
-		<treeitem id="calendarPublishPanel" container="false">
-            <treerow>
-                <treecell class="treecell-indent" url="chrome://calendar/content/pref/publishPrefs.xul" label="&calendar.publish.label;" id="calendarPublish"/>
-            </treerow>
- 	    </treeitem>
+      <treerow>
+        <treecell class="treecell-indent"
+                  url="chrome://calendar/content/pref/calendarPref.xul"
+                  label="&calendar.label;"
+                  id="calendar"/>
+      </treerow>
+      <treechildren id="calendarPrefChildren">
         <treeitem id="calendarPublishPanel" container="false">
-            <treerow>
-		        <treecell class="treecell-indent" url="chrome://calendar/content/pref/viewPrefs.xul" label="&calendar.views.label;" id="calendarView"/>
-            </treerow>
- 	    </treeitem>
+          <treerow>
+            <treecell class="treecell-indent"
+                      url="chrome://calendar/content/pref/alarmPrefs.xul"
+                      label="&calendar.alarms.label;"
+                      id="calendarAlarm"/>
+          </treerow>
+        </treeitem>
+        <treeitem id="calendarPublishPanel" container="false">
+          <treerow>
+            <treecell class="treecell-indent"
+                      url="chrome://calendar/content/pref/publishPrefs.xul"
+                      label="&calendar.publish.label;"
+                      id="calendarPublish"/>
+          </treerow>
+        </treeitem>
+        <treeitem id="calendarViewPanel" container="false">
+          <treerow>
+            <treecell class="treecell-indent"
+                      url="chrome://calendar/content/pref/viewPrefs.xul"
+                      label="&calendar.views.label;"
+                      id="calendarView"/>
+          </treerow>
+        </treeitem>
         <treeitem id="calendarTimezonePanel" container="false">
-            <treerow>
-		        <treecell class="treecell-indent" 
-			        url="chrome://calendar/content/pref/timezonePrefs.xul" 
-			        label="&calendar.timezone.label;" id="timezone"/>
-            </treerow>
- 	    </treeitem>
-     </treechildren>
+          <treerow>
+            <treecell class="treecell-indent"
+                      url="chrome://calendar/content/pref/timezonePrefs.xul"
+                      label="&calendar.timezone.label;"
+                      id="timezone"/>
+          </treerow>
+        </treeitem>
+      </treechildren>
     </treeitem>
   </treechildren>
-  
 </overlay>