Changeset 328

Show
Ignore:
Timestamp:
04/04/06 14:50:32
Author:
johnsa
Message:

Personal web client updates:

Corrected description field in add and edit event form.

Updated errors and messages a bit.

Corrected a textarea size typo in admin web client.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl

    r286 r328  
    15881588          <th>Description:</th> 
    15891589          <td> 
    1590             <textarea name="calendar.description" width="60" height="20"> 
     1590            <textarea name="calendar.description" cols="40" rows="4"> 
    15911591              <xsl:value-of select="desc"/> 
    15921592            </textarea> 

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r327 r328  
    8686        <xsl:if test="/bedework/message"> 
    8787          <div id="messages"> 
    88             <p><xsl:apply-templates select="/bedework/message"/></p> 
     88            <xsl:apply-templates select="/bedework/message"/> 
    8989          </div> 
    9090        </xsl:if> 
    9191        <xsl:if test="/bedework/error"> 
    9292          <div id="errors"> 
    93             <p><xsl:apply-templates select="/bedework/error"/></p> 
     93            <xsl:apply-templates select="/bedework/error"/> 
    9494          </div> 
    9595        </xsl:if> 
    …… 
    220220          <a href="{$publicCal}">Public Calendar</a> | 
    221221          <a href="http://www.yourschoolhere.edu">School Home</a> | 
    222           <a href="http://www.washington.edu/ucal/">Other Link</a> | 
     222          <a href="http://www.bedework.org/">Other Link</a> | 
    223223          <a href="http://helpdesk.rpi.edu/update.do?catcenterkey=51"> 
    224224            Example Calendar Help 
    …… 
    14031403          <td class="fieldname">Description:</td> 
    14041404          <td class="fieldval"> 
    1405             <xsl:copy-of select="/bedeworkadmin/formElements/form/desc/*"/> 
     1405            <textarea name="newEvent.description" cols="60" rows="4"> 
     1406              <xsl:value-of select="/bedework/formElements/form/desc/textarea"/> 
     1407            </textarea> 
    14061408          </td> 
    14071409        </tr> 
    …… 
    17531755          <td class="fieldname">Description:</td> 
    17541756          <td class="fieldval"> 
    1755             <xsl:copy-of select="/bedeworkadmin/formElements/form/desc/*"/> 
     1757            <textarea name="editEvent.description" cols="60" rows="4"> 
     1758              <xsl:value-of select="/bedework/formElements/form/desc/textarea"/> 
     1759            </textarea> 
    17561760          </td> 
    17571761        </tr> 
    …… 
    19871991        <th>Style</th> 
    19881992        <th>Display</th> 
    1989         <th>Unremovable</th> 
     1993        <!--<th>Unremovable</th> 
    19901994        <th>External</th> 
    1991         <th>Deleted?</th> 
     1995        <th>Deleted?</th>--> 
    19921996      </tr> 
    19931997      <xsl:for-each select="subscription"> 
    …… 
    20112015            </xsl:if> 
    20122016          </td> 
    2013           <td class="center"> 
     2017          <!--<td class="center"> 
    20142018            <xsl:if test="unremoveable='true'"> 
    20152019              <img src="{$resourcesRoot}/resources/redCheckIcon.gif" width="13" height="13" alt="true" border="0"/> 
    …… 
    20252029              <img src="{$resourcesRoot}/resources/redCheckIcon.gif" width="13" height="13" alt="true" border="0"/> 
    20262030            </xsl:if> 
    2027           </td> 
     2031          </td>--> 
    20282032        </tr> 
    20292033      </xsl:for-each> 
    …… 
    23372341        <td class="leftCell"> 
    23382342          <a href="http://www.bedework.org/">Bedework Calendar</a> | 
    2339           <a href="/ucal/showMain.rdo?refreshXslt=yes">refresh XSLT</a> 
     2343          <a href="?refreshXslt=yes">refresh XSLT</a> 
    23402344        </td> 
    23412345        <td class="rightCell"> 

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl

    r327 r328  
    44    <xsl:choose> 
    55      <xsl:when test="id='edu.rpi.sss.util.error.exc'"> 
    6           An exception occurred: <xsl:value-of select="param"/> 
     6          <p>An exception occurred: <em><xsl:value-of select="param"/></em></p> 
    77      </xsl:when> 
    88      <xsl:when test="id='org.bedework.client.error.exc'"> 
    9           An exception occurred: <xsl:value-of select="param"/> 
     9          <p>An exception occurred: <em><xsl:value-of select="param"/></em></p> 
    1010      </xsl:when> 
    1111      <xsl:when test="id='org.bedework.client.error.nosuchevent'"> 
    12           Event <xsl:value-of select="param"/> does not exist. 
     12          <p>Event <xsl:value-of select="param"/> does not exist.</p> 
    1313      </xsl:when> 
    1414      <xsl:when test="id='org.bedework.client.error.baddates'"> 
    15           Improperly formatted date(s): <xsl:value-of select="param"/> 
     15          <p>Improperly formatted date(s): <em><xsl:value-of select="param"/></em></p> 
     16      </xsl:when> 
     17      <xsl:when test="id='org.bedework.validation.error.event.startafterend'"> 
     18          <p>Please correct your dates: the end date/time is before the start date/time.</p> 
    1619      </xsl:when> 
    1720      <xsl:when test="id='org.bedework.client.error.noaccess'"> 
    18           You have insufficient access <xsl:value-of select="param"/> 
     21          <p>You have insufficient access <em><xsl:value-of select="param"/></em></p> 
    1922      </xsl:when> 
    2023      <xsl:when test="id='org.bedework.validation.error.notitle'"> 
    21           Please supply a title for your event (required). 
     24          <p>Please supply a title for your event (required).</p> 
    2225      </xsl:when> 
    2326      <xsl:when test="id='org.bedework.client.error.missingcalendarid'"> 
    24           Missing event's calendar id (required). 
     27          <p>Missing event's calendar id (required).</p> 
    2528      </xsl:when> 
    2629      <xsl:when test="id='org.bedework.client.error.location.referenced'"> 
    27           Location is in use.  It cannot be deleted while referenced by an event. 
     30          <p>Location is in use.  It cannot be deleted while referenced by an event.</p> 
    2831      </xsl:when> 
    2932      <xsl:when test="id='org.bedework.client.error.mail.norecipient'"> 
    30           You must supply a recipient. 
     33          <p>You must supply a recipient.</p> 
    3134      </xsl:when> 
    3235      <xsl:when test="id='org.bedework.client.error.unknown.timezone'"> 
    33           Unknown timezone <xsl:value-of select="param"/> 
     36          <p>Unknown timezone <em><xsl:value-of select="param"/></em></p> 
    3437      </xsl:when> 
    3538      <xsl:when test="id='org.bedework.client.error.subscription.reffed'"> 
    36           Cannot remove: the subscription is referenced by View "<xsl:value-of select="param"/>" 
     39          <p>Cannot remove: the subscription is referenced by View "<em><xsl:value-of select="param"/></em>"</p> 
    3740      </xsl:when> 
    3841      <xsl:otherwise> 
    39         <xsl:value-of select="id"/> = <xsl:value-of select="param"/> 
     42        <p><xsl:value-of select="id"/> = <xsl:value-of select="param"/></p> 
    4043      </xsl:otherwise> 
    4144    </xsl:choose> 

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/messages.xsl

    r317 r328  
    44    <xsl:choose> 
    55      <xsl:when test="id='org.bedework.client.message.cancelled'"> 
    6           Action cancelled. 
     6          <p>Action cancelled.</p> 
    77      </xsl:when> 
    88      <xsl:when test="id='org.bedework.client.message.locations.added'"> 
    99        <xsl:choose> 
    1010          <xsl:when test="param='1'"> 
    11             1 location added. 
     11            <p>1 location added.</p> 
    1212          </xsl:when> 
    1313          <xsl:otherwise> 
    14             <xsl:value-of select="param"/> locations added. 
     14            <p><xsl:value-of select="param"/> locations added.</p> 
    1515          </xsl:otherwise> 
    1616        </xsl:choose> 
    …… 
    1919        <xsl:choose> 
    2020          <xsl:when test="param='1'"> 
    21             1 event added. 
     21            <p>1 event added.</p> 
    2222          </xsl:when> 
    2323          <xsl:otherwise> 
    24             <xsl:value-of select="param"/> events added. 
     24            <p><xsl:value-of select="param"/> events added.</p> 
    2525          </xsl:otherwise> 
    2626        </xsl:choose> 
    …… 
    2929        <xsl:choose> 
    3030          <xsl:when test="param='1'"> 
    31             1 public event reference added. 
     31            <p>1 public event reference added.</p> 
    3232          </xsl:when> 
    3333          <xsl:otherwise> 
    34             <xsl:value-of select="param"/> public event references added. 
     34            <p><xsl:value-of select="param"/> public event references added.</p> 
    3535          </xsl:otherwise> 
    3636        </xsl:choose> 
    …… 
    3939        <xsl:choose> 
    4040          <xsl:when test="param='1'"> 
    41             1 subscription added. 
     41            <p>1 subscription added.</p> 
    4242          </xsl:when> 
    4343          <xsl:otherwise> 
    44             <xsl:value-of select="param"/> subscriptions added. 
     44            <p><xsl:value-of select="param"/> subscriptions added.</p> 
    4545          </xsl:otherwise> 
    4646        </xsl:choose> 
    …… 
    4949        <xsl:choose> 
    5050          <xsl:when test="param='1'"> 
    51             1 event deleted. 
     51            <p>1 event deleted.</p> 
    5252          </xsl:when> 
    5353          <xsl:otherwise> 
    54             <xsl:value-of select="param"/> events deleted. 
     54            <p><xsl:value-of select="param"/> events deleted.</p> 
    5555          </xsl:otherwise> 
    5656        </xsl:choose> 
    …… 
    5959        <xsl:choose> 
    6060          <xsl:when test="param='1'"> 
    61             1 event removed. 
     61            <p>1 event removed.</p> 
    6262          </xsl:when> 
    6363          <xsl:otherwise> 
    64             <xsl:value-of select="param"/> events removed. 
     64            <p><xsl:value-of select="param"/> events removed.</p> 
    6565          </xsl:otherwise> 
    6666        </xsl:choose> 
    …… 
    6969        <xsl:choose> 
    7070          <xsl:when test="param='1'"> 
    71             1 location removed. 
     71            <p>1 location removed.</p> 
    7272          </xsl:when> 
    7373          <xsl:otherwise> 
    74             <xsl:value-of select="param"/> locations removed. 
     74            <p><xsl:value-of select="param"/> locations removed.</p> 
    7575          </xsl:otherwise> 
    7676        </xsl:choose> 
    …… 
    7979        <xsl:choose> 
    8080          <xsl:when test="param='1'"> 
    81             1 subscription removed. 
     81            <p>1 subscription removed.</p> 
    8282          </xsl:when> 
    8383          <xsl:otherwise> 
    84             <xsl:value-of select="param"/> subscriptions removed. 
     84            <p><xsl:value-of select="param"/> subscriptions removed.</p> 
    8585          </xsl:otherwise> 
    8686        </xsl:choose> 
    8787      </xsl:when> 
    8888      <xsl:when test="id='org.bedework.client.message.nosuchevent'"> 
    89           Event <xsl:value-of select="param"/> does not exist. 
     89          <p>Event <em><xsl:value-of select="param"/></em> does not exist.</p> 
    9090      </xsl:when> 
    9191      <xsl:otherwise> 
    92         <xsl:value-of select="id"/> = <xsl:value-of select="param"/> 
     92        <p><xsl:value-of select="id"/> = <xsl:value-of select="param"/></p> 
    9393      </xsl:otherwise> 
    9494    </xsl:choose>