Changeset 229

Show
Ignore:
Timestamp:
02/28/06 13:35:47
Author:
johnsa
Message:

changed contact forward to go to init contact list when cancelled; returned mod contact forward to the mod form ... need to set "creating" to false on update. Same for locations. Added some spaces to "optional" markers.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r227 r229  
    12471247          <td> 
    12481248            <xsl:copy-of select="/bedeworkadmin/formElements/form/phone/*"/> 
    1249             <span class="fieldInfo">(optional)</span> 
     1249            <span class="fieldInfo"> (optional)</span> 
    12501250          </td> 
    12511251        </tr> 
    …… 
    12561256          <td> 
    12571257            <xsl:copy-of select="/bedeworkadmin/formElements/form/link/*"/> 
    1258             <span class="fieldInfo">(optional)</span> 
     1258            <span class="fieldInfo"> (optional)</span> 
    12591259          </td> 
    12601260        </tr> 
    …… 
    12651265          <td> 
    12661266            <xsl:copy-of select="/bedeworkadmin/formElements/form/email/*"/> 
    1267             <span class="fieldInfo">(optional)</span> 
     1267            <span class="fieldInfo"> (optional)</span> 
    12681268          </td> 
    12691269        </tr> 
    …… 
    13831383          <td> 
    13841384            <xsl:copy-of select="/bedeworkadmin/formElements/form/subaddress/*"/> 
    1385             <span class="fieldInfo">(optional)</span> 
     1385            <span class="fieldInfo"> (optional)</span> 
    13861386          </td> 
    13871387        </tr> 
    …… 
    13921392          <td> 
    13931393            <xsl:copy-of select="/bedeworkadmin/formElements/form/link/*"/> 
    1394             <span class="fieldInfo">(optional)</span> 
     1394            <span class="fieldInfo"> (optional)</span> 
    13951395          </td> 
    13961396        </tr> 

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

    r228 r229  
    564564               scope="session" 
    565565               validate="false"> 
    566       <forward name="continue" path="/sponsor/initUpdate.do" redirect="true" /> 
     566      <forward name="continue" path="/sponsor/showModForm.rdo" redirect="true" /> 
    567567      <forward name="retry" path="/sponsor/showModForm.rdo" redirect="true" /> 
    568568      <forward name="cancelled" path="/sponsor/initUpdate.do" redirect="true" /> 
    …… 
    664664               scope="session" 
    665665               validate="false"> 
    666       <forward name="cancelled" path="/location/showUpdateList.rdo" redirect="true" /> 
     666      <forward name="cancelled" path="/location/initUpdate.do" redirect="true" /> 
    667667      <forward name="continue" path="/location/showModForm.rdo" redirect="true" /> 
    668668      <forward name="retry" path="/location/showModForm.rdo" redirect="true" />