[Bedework-commit] r438 - trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default

[svnadmin at bedework.org]

Author: johnsa
Date: 2006-05-02 14:08:37 -0400 (Tue, 02 May 2006)
New Revision: 438

Modified:
   trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
   trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl
Log:
personal client: making certain form fields use unencoded path

Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2006-05-02 17:00:49 UTC (rev 437)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2006-05-02 18:08:37 UTC (rev 438)
@@ -1312,7 +1312,7 @@
             Calendar:
           </td>
           <td class="fieldval">
-            <xsl:variable name="calPath" select="/bedework/formElements/form/calendar/encodedPath"/>
+            <xsl:variable name="calPath" select="/bedework/formElements/form/calendar/path"/>
             <input type="hidden" name="calPath" value="{$calPath}"/>
             <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable>
             <span id="bwEventCalDisplay">
@@ -1691,7 +1691,7 @@
             Calendar:
           </td>
           <td class="fieldval">
-            <xsl:variable name="calPath" select="/bedework/formElements/form/calendar/encodedPath"/>
+            <xsl:variable name="calPath" select="/bedework/formElements/form/calendar/path"/>
             <input type="hidden" name="calPath" value="{$calPath}"/>
             <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable>
             <span id="bwEventCalDisplay">
@@ -1997,9 +1997,9 @@
         </p>
         <p>
           Access rights:<br/>
-          <input type="radio" value="r" name="how" checked="checked"/> read<br/>
-          <input type="radio" value="Rc" name="how"/> write<br/>
-          <input type="radio" value="f" name="how"/> free/busy only<br/>
+          <input type="radio" value="R" name="how" checked="checked"/> read<br/>
+          <input type="radio" value="Rc" name="how"/> read/write<br/>
+          <input type="radio" value="f" name="how"/> read free/busy only<br/>
           <input type="radio" value="d" name="how"/> default (reset access)
         </p>
         <input type="submit" name="submit" value="Submit"/>
@@ -2095,7 +2095,7 @@
         </tr>
       </table>
       <form name="calendarShareForm" action="{$freeBusy-setAccess}" id="shareForm">
-        <xsl:variable name="calPath" select="/bedework/myCalendars/calendars/calendar/encodedPath"/>
+        <xsl:variable name="calPath" select="/bedework/myCalendars/calendars/calendar/path"/>
         <input type="hidden" name="calPath" value="{$calPath}"/>
         <p>
           Share my free/busy with:<br/>
@@ -2439,7 +2439,7 @@
         <h3>Modify Folder</h3>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:variable name="calPath" select="encodedPath"/>
+    <xsl:variable name="calPath" select="path"/>
     <form name="modCalForm" action="{$calendar-update}">
       <table class="common">
         <tr>
@@ -2555,9 +2555,9 @@
         </p>
         <p>
           Access rights:<br/>
-          <input type="radio" value="r" name="how" checked="checked"/> read<br/>
-          <input type="radio" value="Rc" name="how"/> write<br/>
-          <input type="radio" value="f" name="how"/> free/busy only<br/>
+          <input type="radio" value="R" name="how" checked="checked"/> read<br/>
+          <input type="radio" value="Rc" name="how"/> read/write<br/>
+          <input type="radio" value="f" name="how"/> read free/busy only<br/>
           <input type="radio" value="d" name="how"/> default (reset access)
         </p>
         <input type="submit" name="submit" value="Submit"/>

Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl	2006-05-02 17:00:49 UTC (rev 437)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl	2006-05-02 18:08:37 UTC (rev 438)
@@ -20,6 +20,9 @@
       <xsl:when test="id='org.bedework.client.error.noaccess'">
           <p>You have insufficient access <xsl:value-of select="param"/>.</p>
       </xsl:when>
+      <xsl:when test="id='org.bedework.client.error.badhow'">
+          <p>Incorrect access controls.</p>
+      </xsl:when>
       <xsl:when test="id='org.bedework.validation.error.notitle'">
           <p>Please supply a title for your event (required).</p>
       </xsl:when>