Changeset 479

Show
Ignore:
Timestamp:
05/15/06 04:06:24
Author:
johnsa
Message:

personal client updates to location management

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r478 r479  
    158158                    </xsl:when> 
    159159                    <xsl:when test="/bedework/page='editLocation'"> 
    160                       <!-- edit an event --> 
    161160                      <xsl:apply-templates select="/bedework/formElements" mode="editLocation"/> 
    162161                    </xsl:when> 
    …… 
    31393138      <xsl:choose> 
    31403139        <xsl:when test="/bedework/selectionState/selectionType = 'calendar' 
    3141                         and name = /bedework/selectionState/subscriptions/subscription/calendar/name">selected</xsl:when> 
     3140                        and calendars/calendar/path = /bedework/selectionState/subscriptions/subscription/calendar/path">selected</xsl:when> 
    31423141        <xsl:otherwise>calendar</xsl:otherwise> 
    31433142      </xsl:choose> 
    …… 
    33423341          </td> 
    33433342        </tr> 
    3344         <tr> 
    3345           <td></td> 
    3346           <td class="padMe"> 
    3347             <input name="submit" type="submit" value="Submit Location"/>&#160; 
     3343      </table> 
     3344      <table border="0" id="submitTable"> 
     3345        <tr> 
     3346          <td> 
     3347            <input name="submit" type="submit" value="Submit Location"/> 
    33483348            <input name="cancelled" type="submit" value="Cancel"/> 
    33493349          </td> 
    33503350        </tr> 
    3351         <tr> 
    3352           <th class="commonHeader" colspan="2">Edit/Delete Locations</th> 
    3353         </tr> 
    3354         <td colspan="2" class="plain"> 
    3355           <ul> 
    3356             <xsl:for-each select="/bedework/formElements/form/location/locationmenu/select/option[@value>'3']"> 
    3357               <xsl:sort select="."/> 
    3358               <li> 
    3359                 <xsl:variable name="locationId" select="@value"/> 
    3360                 <a href="{$editLocation}?locationId={$locationId}"><xsl:value-of select="."/></a> 
    3361               </li> 
    3362             </xsl:for-each> 
    3363           </ul> 
    3364         </td> 
    33653351      </table> 
    33663352    </form> 
     3353    <div style="margin-bottom: 1em;">&#160;</div> 
     3354    <xsl:call-template name="editLocationList"/> 
    33673355  </xsl:template> 
    33683356 
    …… 
    33763364        <tr> 
    33773365          <th colspan="2" class="commonHeader"> 
    3378             <!--<xsl:variable name="locId" select="form/id"/> 
    3379             <div id="eventActions"> 
    3380               <a href="{$delLocation}?locationId={$locId}">Delete Location</a> 
    3381             </div>--> 
    33823366            Edit Location 
    33833367          </th> 
    …… 
    33853369        <tr> 
    33863370          <td class="fieldname"> 
    3387             Address: 
     3371            Main Address: 
    33883372          </td> 
    33893373          <td align="left"> 
    3390             <xsl:copy-of select="form/address/*"/> 
     3374            <xsl:variable name="addr" select="form/address/input/@value"/> 
     3375            <input size="60" name="editLocation.address" value="{$addr}" type="text"/> 
    33913376          </td> 
    33923377        </tr> 
    …… 
    33963381          </td> 
    33973382          <td align="left"> 
    3398             <xsl:copy-of select="form/subaddress/*"/> 
     3383            <xsl:variable name="subaddr" select="form/subaddress/textarea"/> 
     3384            <input size="60" name="editLocation.subaddress" value="{$subaddr}" type="text"/> 
    33993385          </td> 
    34003386        </tr> 
    34013387        <tr> 
    34023388          <td class="fieldname"> 
    3403             Location's URL: 
    3404           </td> 
    3405           <td> 
    3406             <xsl:copy-of select="form/link/*"/> 
     3389            Location Link: 
     3390          </td> 
     3391          <td> 
     3392            <xsl:variable name="link" select="form/link/input/@value"/> 
     3393            <input size="60" name="editLocation.link" value="{$link}" type="text"/> 
    34073394          </td> 
    34083395        </tr> 
    …… 
    34243411      </table> 
    34253412    </form> 
     3413    <div style="margin-bottom: 1em;">&#160;</div> 
     3414    <xsl:call-template name="editLocationList"/> 
     3415  </xsl:template> 
     3416   
     3417  <xsl:template name="editLocationList"> 
     3418    <table class="common" cellspacing="0"> 
     3419      <tr> 
     3420        <th class="commonHeader" colspan="2">Edit/Delete Locations</th> 
     3421      </tr> 
     3422      <td colspan="2" class="plain"> 
     3423        <ul> 
     3424          <xsl:for-each select="/bedework/formElements/form/locationmenu/select/option[@value>'3']"> 
     3425            <xsl:sort select="."/> 
     3426            <li> 
     3427              <xsl:variable name="locationId" select="@value"/> 
     3428              <a href="{$editLocation}?locationId={$locationId}"><xsl:value-of select="."/></a> 
     3429            </li> 
     3430          </xsl:for-each> 
     3431        </ul> 
     3432      </td> 
     3433    </table> 
    34263434  </xsl:template> 
    34273435 

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

    r470 r479  
    375375      <forward name="edit" path="/showEditLocation.rdo" redirect="true" /> 
    376376      <forward name="success" path="/showManageLocations.rdo" redirect="true" /> 
     377      <forward name="cancelled" path="/showManageLocations.rdo" redirect="true" /> 
    377378    </action> 
    378379 
    …… 
    384385      <forward name="referenced" path="/showManageLocations.rdo" redirect="true" /> 
    385386      <forward name="success" path="/showManageLocations.rdo" redirect="true" /> 
     387      <forward name="cancelled" path="/showManageLocations.rdo" redirect="true" /> 
    386388    </action> 
    387389 

  • trunk/calendar3/webclient/war/docs/location/editLocation.jsp

    r378 r479  
    1818    <link><html:text property="editLocation.link" /></link> 
    1919    <id><bean:write name="calForm" property="editLocation.id"/></id> 
     20    <locationmenu> 
     21      <html:select property="locationId"> 
     22        <html:optionsCollection property="locations" 
     23                                label="address" 
     24                                value="id"/> 
     25      </html:select> 
     26    </locationmenu> 
    2027  </genurl:form> 
    2128</formElements> 

  • trunk/calendar3/webclient/war/docs/location/manageLocations.jsp

    r378 r479  
    1414<formElements> 
    1515  <genurl:form action="addLocation"> 
    16     <location> 
    17       <locationmenu> 
    18         <html:select property="locationId"> 
    19           <html:optionsCollection property="locations" 
    20                                   label="address" 
    21                                   value="id"/> 
    22         </html:select> 
    23       </locationmenu> 
    24     </location> 
     16    <locationmenu> 
     17      <html:select property="locationId"> 
     18        <html:optionsCollection property="locations" 
     19                                label="address" 
     20                                value="id"/> 
     21      </html:select> 
     22    </locationmenu> 
    2523  </genurl:form> 
    2624</formElements>