Changeset 316

Show
Ignore:
Timestamp:
03/31/06 14:06:08
Author:
johnsa
Message:

first pass to match errors correctly for display in personal stylesheet;

change an example link in the header of the public stylesheet;

added an action to display messages and errors in the body of the page rather than in the header.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r281 r316  
    173173          <a href="{$privateCal}">Personal Calendar</a> | 
    174174          <a href="http://www.yourschoolhere.edu">School Home</a> | 
    175           <a href="http://www.washington.edu/ucal/">Other Link</a> | 
     175          <a href="http://www.bedework.org/">Other Link</a> | 
    176176          <a href="http://helpdesk.rpi.edu/update.do?catcenterkey=51"> 
    177177            Example Calendar Help 

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

    r298 r316  
    66          An exception occurred: <xsl:value-of select="param"/> 
    77      </xsl:when> 
    8       <xsl:when test="id='org.bedework.error.exc'"> 
     8      <xsl:when test="id='org.bedework.client.error.exc'"> 
    99          An exception occurred: <xsl:value-of select="param"/> 
    1010      </xsl:when> 
    11       <xsl:when test="id='org.bedework.error.nosuchevent'"> 
     11      <xsl:when test="id='org.bedework.client.error.nosuchevent'"> 
    1212          Event <xsl:value-of select="param"/> does not exist. 
    1313      </xsl:when> 
    14       <xsl:when test="id='org.bedework.error.baddates'"> 
     14      <xsl:when test="id='org.bedework.client.error.baddates'"> 
    1515          Improperly formatted date(s): <xsl:value-of select="param"/> 
    1616      </xsl:when> 
    17       <xsl:when test="id='org.bedework.error.noaccess'"> 
     17      <xsl:when test="id='org.bedework.client.error.noaccess'"> 
    1818          You have insufficient access <xsl:value-of select="param"/> 
    1919      </xsl:when> 
    20       <xsl:when test="id='org.bedework.error.notitle'"> 
     20      <xsl:when test="id='org.bedework.validation.error.notitle'"> 
    2121          Please supply a title for your event (required). 
    2222      </xsl:when> 
    23       <xsl:when test="id='org.bedework.error.location.referenced'"> 
     23      <xsl:when test="id='org.bedework.client.error.location.referenced'"> 
    2424          Location is in use.  It cannot be deleted while referenced by an event. 
    2525      </xsl:when> 
    26       <xsl:when test="id='org.bedework.error.mail.norecipient'"> 
     26      <xsl:when test="id='org.bedework.client.error.mail.norecipient'"> 
    2727          You must supply a recipient. 
    2828      </xsl:when> 
    29       <xsl:when test="id='org.bedework.error.unknown.timezone'"> 
     29      <xsl:when test="id='org.bedework.client.error.unknown.timezone'"> 
    3030          Unknown timezone <xsl:value-of select="param"/> 
    3131      </xsl:when> 

  • trunk/calendar3/webclient/war/WEB-INF/struts-config.xml

    r312 r316  
    2626    <forward name="eventMore" path="/showEventMore.rdo"/> 
    2727    <forward name="initUpload" path="/initUpload.rdo"/> 
     28    <forward name="showMsgErr" path="/showMsgErr.rdo"/> 
    2829 
    2930    <!-- Forward for a new session from some bookmarked link? --> 
    …… 
    166167    </action> 
    167168 
     169    <action    path="/showMsgErr" 
     170               type="org.bedework.webclient.BwRenderAction" 
     171               name="calForm" 
     172               scope="session" 
     173               validate="false"> 
     174      <forward name="success" path="/docs/showMsgErr.jsp"/> 
     175    </action> 
     176 
    168177    <!-- =============================================================== 
    169178         These actions do not render - these should be referenced by the do