Index: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 1979)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 1981)
@@ -4229,4 +4229,20 @@
 
   <!--+++++++++++++++ Calendars ++++++++++++++++++++-->
+
+   <!--
+    Calendar templates depend heavily on calendar types:
+
+    calTypes: 0 - Folder
+              1 - Calendar
+              2 - Trash
+              3 - Deleted
+              4 - Busy
+              5 - Inbox
+              6 - Outbox
+              7 - Alias
+              8 - External subscription
+              9 - Resource collection
+  -->
+
   <xsl:template match="calendars" mode="manageCalendars">
     <h2>Manage Calendars &amp; Subscriptions</h2>
@@ -4239,8 +4255,8 @@
               <xsl:when test="/bedework/page='calendarDescriptions' or
                               /bedework/page='displayCalendar'">
-                <xsl:apply-templates select="calendar[calType &lt; 2]" mode="listForDisplay"/>
+                <xsl:apply-templates select="calendar[number(calType) &lt; 2 or number(calType) = 4 or number(calType) &gt; 6]" mode="listForDisplay"/>
               </xsl:when>
               <xsl:otherwise>
-                <xsl:apply-templates select="calendar[calType &lt; 2]" mode="listForUpdate"/>
+                <xsl:apply-templates select="calendar[number(calType) &lt; 2 or number(calType) = 4 or number(calType) &gt; 6]" mode="listForUpdate"/>
               </xsl:otherwise>
             </xsl:choose>
@@ -4274,19 +4290,4 @@
   </xsl:template>
 
-  <!--
-    Calendar templates depend heavily on calendar types:
-
-    calTypes: 0 - Folder
-              1 - Calendar
-              2 - Trash
-              3 - Deleted
-              4 - Busy
-              5 - Inbox
-              6 - Outbox
-              7 - Alias
-              8 - External subscription
-              9 - Resource collection
-  -->
-
   <xsl:template match="calendar" mode="myCalendars">
     <!-- this template receives calType 0,1,4,7,8,9  -->
@@ -4297,6 +4298,6 @@
           <xsl:when test="/bedework/selectionState/selectionType = 'calendar'
                           and path = /bedework/selectionState/calendar/path">selected</xsl:when>
-          <xsl:when test="calType = 0">folder</xsl:when>
-          <xsl:when test="calType = 7">alias</xsl:when>
+          <xsl:when test="calType = '0'">folder</xsl:when>
+          <xsl:when test="calType = '7' or calType = '8'">alias</xsl:when>
           <xsl:otherwise>calendar</xsl:otherwise>
         </xsl:choose>
@@ -4308,5 +4309,7 @@
       <xsl:if test="calendar">
         <ul>
-          <xsl:apply-templates select="calendar[canAlias = 'true']" mode="myCalendars"/>
+          <xsl:apply-templates select="calendar[canAlias = 'true']" mode="myCalendars">
+            <xsl:sort select="name" order="ascending" case-order="upper-first"/>
+          </xsl:apply-templates>
         </ul>
       </xsl:if>
@@ -4325,5 +4328,5 @@
           <xsl:when test="calType='5'">inbox</xsl:when>
           <xsl:when test="calType='6'">outbox</xsl:when>
-          <xsl:when test="calendarCollection='false'">folder</xsl:when>
+          <xsl:when test="calType='0'">folder</xsl:when>
           <xsl:otherwise>calendar</xsl:otherwise>
         </xsl:choose>
@@ -4370,9 +4373,11 @@
 
   <xsl:template match="calendar" mode="listForUpdate">
+    <!-- this template receives calType 0,1,4,7,8,9 -->
     <xsl:variable name="calPath" select="encodedPath"/>
     <li>
       <xsl:attribute name="class">
         <xsl:choose>
-          <xsl:when test="calendarCollection='false'">folder</xsl:when>
+          <xsl:when test="calType = '0'">folder</xsl:when>
+          <xsl:when test="calType = '7' or calType = '8'">alias</xsl:when>
           <xsl:otherwise>calendar</xsl:otherwise>
         </xsl:choose>
@@ -4381,5 +4386,5 @@
         <xsl:value-of select="name"/>
       </a>
-      <xsl:if test="calendarCollection='false'">
+      <xsl:if test="calType = '0'">
         <xsl:text> </xsl:text>
         <a href="{$calendar-initAdd}&amp;calPath={$calPath}" title="add a calendar or folder">
@@ -4389,6 +4394,6 @@
       <xsl:if test="calendar">
         <ul>
-          <xsl:apply-templates select="calendar" mode="listForUpdate">
-            <!--<xsl:sort select="title" order="ascending" case-order="upper-first"/>-->
+          <xsl:apply-templates select="calendar[number(calType) &lt; 2 or number(calType) = 4 or number(calType) &gt; 6]" mode="listForUpdate">
+            <xsl:sort select="name" order="ascending" case-order="upper-first"/>
           </xsl:apply-templates>
         </ul>
@@ -4398,9 +4403,11 @@
 
   <xsl:template match="calendar" mode="listForDisplay">
+    <!-- this template receives calType 0,1,4,7,8,9 -->
     <xsl:variable name="calPath" select="encodedPath"/>
     <li>
       <xsl:attribute name="class">
         <xsl:choose>
-          <xsl:when test="calendarCollection='false'">folder</xsl:when>
+          <xsl:when test="calType = '0'">folder</xsl:when>
+          <xsl:when test="calType = '7' or calType = '8'">alias</xsl:when>
           <xsl:otherwise>calendar</xsl:otherwise>
         </xsl:choose>
@@ -4411,6 +4418,6 @@
       <xsl:if test="calendar">
         <ul>
-          <xsl:apply-templates select="calendar" mode="listForDisplay">
-            <!--<xsl:sort select="title" order="ascending" case-order="upper-first"/>-->
+          <xsl:apply-templates select="calendar[number(calType) &lt; 2 or number(calType) = 4 or number(calType) &gt; 6]" mode="listForDisplay">
+            <xsl:sort select="name" order="ascending" case-order="upper-first"/>
           </xsl:apply-templates>
         </ul>
@@ -4613,5 +4620,6 @@
                  Value is false only for folders, so we default it to true here.  -->
             <input type="hidden" value="true" name="calendarCollection"/>
-            <input type="hidden" value="" name="type" id="bwCalType"/>
+            <!-- type is defaulted to calendar.  It is changed when a typeSwitch is clicked. -->
+            <input type="hidden" value="calendar" name="type" id="bwCalType"/>
             <input type="radio" value="calendar" name="typeSwitch" checked="checked" onclick="changeClass('subscriptionTypes','invisible');setField('bwCalType',this.value);"/> Calendar
             <input type="radio" value="folder" name="typeSwitch" onclick="changeClass('subscriptionTypes','invisible');setField('bwCalType',this.value);"/> Folder
@@ -4626,5 +4634,6 @@
         <p>
           <strong>Subscription Type:</strong><br/>
-          <input type="hidden" value="" name="subType" id="bwSubType"/>
+          <!-- subType is defaulted to public.  It is changed when a subTypeSwitch is clicked. -->
+          <input type="hidden" value="public" name="subType" id="bwSubType"/>
           <input type="radio" name="subTypeSwitch" value="public" checked="checked" onclick="changeClass('subscriptionTypePublic','visible');changeClass('subscriptionTypeExternal','invisible');changeClass('subscriptionTypeUser','invisible');setField('bwSubType',this.value);"/> Public calendar
           <input type="radio" name="subTypeSwitch" value="user" onclick="changeClass('subscriptionTypePublic','invisible');changeClass('subscriptionTypeExternal','invisible');changeClass('subscriptionTypeUser','visible');setField('bwSubType',this.value);"/> User calendar
Index: trunk/deployment/webuser/webapp/resources/demoskins/resources/bedework.js
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/resources/bedework.js (revision 1979)
+++ trunk/deployment/webuser/webapp/resources/demoskins/resources/bedework.js (revision 1981)
@@ -186,14 +186,20 @@
 // calendar input field and update the displayed text
 function updatePublicCalendarAlias(newCalPath,calDisplay,calendarCollection) {
-  calendarAliasHolder = document.getElementById("publicAliasHolder");
-  calendarAliasHolder.value = "bwcal://" + newCalPath;
-  bwCalDisplay = document.getElementById("bwPublicCalDisplay");
+  var calendarAliasHolder = document.getElementById("publicAliasHolder");
+  calendarAliasHolder.value = newCalPath;
+  var bwCalDisplay = document.getElementById("bwPublicCalDisplay");
   bwCalDisplay.innerHTML = "Selected calendar: <strong>" + calDisplay + "</strong>";
 }
 // set the subscription URI when creating or updating a subscription
 function setCalendarAlias(formObj) {
+  if (!formObj) {
+    alert("The subscription form is not available.");
+    return false;
+  }
+
   // set the aliasUri to an empty string.  Only set it if user
   // has requested a subscription.
   formObj.aliasUri.value == "";
+
   if (formObj.type.value == "folder") {
     formObj.calendarCollection.value = "false";
@@ -201,5 +207,5 @@
     switch (formObj.subType.value) {
       case "public":
-        formObj.aliasUri.value = formObj.publicAliasHolder.value;
+        formObj.aliasUri.value = "bwcal://" + formObj.publicAliasHolder.value;
         break;
       case "user":
@@ -212,6 +218,8 @@
     }
   }
+  return true;
 }
 // build a uri based on user and path in the subscription form
+// DEPRECATED - use setCalendarAlias() above.
 function setBwSubscriptionUri(formObj, publicUri) {
   if (!formObj) {