Changeset 1084

Show
Ignore:
Timestamp:
11/12/06 23:09:26
Author:
douglm
Message:

Two major sets of changes going on here

Continuation of adding language properties to appropriate strings. Location is doen with this set.
Sponsors are probably broken but will be fixed soon.

Other major change is to merge admin adn webclient code into the common code.
The current set of changes address events and locations - sponsors still need to be done and there
are still problems with events.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1083 r1084  
    935935              or Location (all): 
    936936            </xsl:if> 
    937             <select name="locationId" id="eventFormLocationList"> 
     937            <select name="allLocationId" id="eventFormLocationList"> 
    938938              <option value="-1"> 
    939939                Select: 
    …… 
    994994              or Contact (all): 
    995995            </xsl:if> 
    996             <select name="sponsorId" id="eventFormPrefSponsorList"> 
     996            <select name="allSponsorId" id="eventFormPrefSponsorList"> 
    997997              <option value="-1"> 
    998998                Select: 

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

    r1079 r1084  
    7878  <xsl:variable name="event-showAttendeesForEvent" select="/bedework/urlPrefixes/event/showAttendeesForEvent/a/@href"/> 
    7979  <xsl:variable name="editEvent" select="/bedework/urlPrefixes/editEvent"/> 
     80  <xsl:variable name="updateEvent" select="/bedework/urlPrefixes/updateEvent"/> 
    8081  <xsl:variable name="delEvent" select="/bedework/urlPrefixes/delEvent"/> 
    8182  <xsl:variable name="addEventRef" select="/bedework/urlPrefixes/addEventRef"/> 
    …… 
    8687  <xsl:variable name="showPage" select="/bedework/urlPrefixes/showPage"/> 
    8788  <xsl:variable name="manageLocations" select="/bedework/urlPrefixes/manageLocations"/> 
    88   <xsl:variable name="addLocation" select="/bedework/urlPrefixes/addLocation"/> 
    89   <xsl:variable name="editLocation" select="/bedework/urlPrefixes/editLocation"/> 
     89  <xsl:variable name="fetchLocationForUpdate" select="/bedework/urlPrefixes/fetchLocationForUpdate"/> 
     90  <xsl:variable name="updateLocation" select="/bedework/urlPrefixes/updateLocation"/> 
    9091  <xsl:variable name="delLocation" select="/bedework/urlPrefixes/delLocation"/> 
    9192  <xsl:variable name="initEventAlarm" select="/bedework/urlPrefixes/initEventAlarm"/> 
    …… 
    18491850            <span class="std-text">choose: </span> 
    18501851            <span id="eventFormLocationList"> 
    1851               <select name="locationId"> 
     1852              <select name="locationUid"> 
    18521853                <option value="-1">select...</option> 
    18531854                <xsl:copy-of select="/bedework/formElements/form/location/locationmenu/select/*"/> 
    …… 
    18551856            </span> 
    18561857            <span class="std-text"> or add new: </span> 
    1857             <input type="text" name="newLocation.address" value="" /> 
     1858            <input type="text" name="locationAddress.value" value="" /> 
    18581859          </td> 
    18591860        </tr> 
    …… 
    20492050    <!-- The name "eventForm" is referenced by several javascript functions. Do not 
    20502051    change it without modifying includes.js --> 
    2051     <form name="eventForm" method="post" action="{$editEvent}" id="standardForm"> 
    2052       <input type="hidden" name="updateEvent" value="true"/> 
     2052    <form name="eventForm" method="post" action="{$updateEvent}" id="standardForm"> 
    20532053      <input type="hidden" name="confirmationid" value="{$confId}"/> 
    20542054      <input type="hidden" name="endType" value="date"/> 
    …… 
    23042304            <xsl:choose> 
    23052305              <xsl:when test="form/status = 'TENTATIVE'"> 
    2306                 <input type="radio" name="editEvent.status" value="CONFIRMED"/>confirmed <input type="radio" name="editEvent.status" value="TENTATIVE" checked="checked"/>tentative <input type="radio" name="editEvent.status" value="CANCELLED"/>cancelled 
     2306                <input type="radio" name="event.status" value="CONFIRMED"/>confirmed <input type="radio" name="edvent.status" value="TENTATIVE" checked="checked"/>tentative <input type="radio" name="event.status" value="CANCELLED"/>cancelled 
    23072307              </xsl:when> 
    23082308              <xsl:when test="form/status = 'CANCELLED'"> 
    2309                 <input type="radio" name="editEvent.status" value="CONFIRMED"/>confirmed <input type="radio" name="editEvent.status" value="TENTATIVE"/>tentative <input type="radio" name="editEvent.status" value="CANCELLED" checked="checked"/>cancelled 
     2309                <input type="radio" name="event.status" value="CONFIRMED"/>confirmed <input type="radio" name="event.status" value="TENTATIVE"/>tentative <input type="radio" name="event.status" value="CANCELLED" checked="checked"/>cancelled 
    23102310              </xsl:when> 
    23112311              <xsl:otherwise> 
    2312                 <input type="radio" name="editEvent.status" value="CONFIRMED" checked="checked"/>confirmed <input type="radio" name="editEvent.status" value="TENTATIVE"/>tentative <input type="radio" name="editEvent.status" value="CANCELLED"/>cancelled 
     2312                <input type="radio" name="event.status" value="CONFIRMED" checked="checked"/>confirmed <input type="radio" name="event.status" value="TENTATIVE"/>tentative <input type="radio" name="event.status" value="CANCELLED"/>cancelled 
    23132313              </xsl:otherwise> 
    23142314            </xsl:choose> 
    …… 
    23232323            <xsl:choose> 
    23242324              <xsl:when test="form/transparency = 'TRANSPARENT'"> 
    2325                 <input type="radio" name="editEvent.transparency" value="OPAQUE"/>yes <span class="note">(opaque: event status affects your free/busy)</span><br/> 
    2326                 <input type="radio" name="editEvent.transparency" value="TRANSPARENT" checked="checked"/>no <span class="note">(transparent: event status does not affect your free/busy)</span> 
     2325                <input type="radio" name="event.transparency" value="OPAQUE"/>yes <span class="note">(opaque: event status affects your free/busy)</span><br/> 
     2326                <input type="radio" name="event.transparency" value="TRANSPARENT" checked="checked"/>no <span class="note">(transparent: event status does not affect your free/busy)</span> 
    23272327              </xsl:when> 
    23282328              <xsl:otherwise> 
    2329                 <input type="radio" name="editEvent.transparency" value="OPAQUE" checked="checked"/>yes <span class="note">(opaque: event status affects your free/busy)</span><br/> 
    2330                 <input type="radio" name="editEvent.transparency" value="TRANSPARENT"/>no <span class="note">(transparent: event status does not affect your free/busy)</span> 
     2329                <input type="radio" name="event.transparency" value="OPAQUE" checked="checked"/>yes <span class="note">(opaque: event status affects your free/busy)</span><br/> 
     2330                <input type="radio" name="event.transparency" value="TRANSPARENT"/>no <span class="note">(transparent: event status does not affect your free/busy)</span> 
    23312331              </xsl:otherwise> 
    23322332            </xsl:choose> 
    …… 
    23472347            <span class="std-text">choose: </span> 
    23482348            <span id="eventFormLocationList"> 
    2349               <select name="eventLocationId"> 
     2349              <select name="eventLocationUid"> 
    23502350                <option value="-1">select...</option> 
    23512351                <xsl:copy-of select="/bedework/formElements/form/location/locationmenu/select/*"/> 
    …… 
    23532353            </span> 
    23542354            <span class="std-text"> or add new: </span> 
    2355             <input type="text" name="laddress" value="" /> 
     2355            <input type="text" name="locationAddress.value" value="" /> 
    23562356          </td> 
    23572357        </tr> 
    …… 
    23602360          <td class="fieldval"> 
    23612361            <xsl:variable name="link" select="form/link/input/@value"/> 
    2362             <input type="text" name="editEvent.link" size="80" value="{$link}"/> 
     2362            <input type="text" name="event.link" size="80" value="{$link}"/> 
    23632363          </td> 
    23642364        </tr> 
    …… 
    41154115  <!--==== MANAGE LOCATIONS ====--> 
    41164116  <xsl:template name="manageLocations"> 
    4117     <form name="addLocationForm" method="post" action="{$addLocation}" id="standardForm"> 
     4117    <form name="addLocationForm" method="post" action="{$updateLocation}" id="standardForm"> 
    41184118      <input type="hidden" name="confirmationid" value="{$confId}"/> 
    41194119      <h2>Manage Locations</h2> 
    …… 
    41274127          </td> 
    41284128          <td> 
    4129             <input size="60" name="newLocation.address" type="text"/> 
     4129            <input size="60" name="locationAddress.value" type="text"/> 
    41304130          </td> 
    41314131        </tr> 
    …… 
    41354135          </td> 
    41364136          <td> 
    4137             <input size="60" name="newLocation.subaddress" type="text"/> 
     4137            <input size="60" name="locationSubaddress.value" type="text"/> 
    41384138          </td> 
    41394139        </tr> 
    …… 
    41434143          </td> 
    41444144          <td> 
    4145             <input size="60" name="newLocation.link" type="text"/> 
     4145            <input size="60" name="location.link" type="text"/> 
    41464146          </td> 
    41474147        </tr> 
    …… 
    41624162  <!--==== EDIT LOCATION ====--> 
    41634163  <xsl:template match="formElements" mode="editLocation"> 
    4164     <form name="editLocationForm" method="post" action="{$editLocation}" id="standardForm"> 
     4164    <form name="editLocationForm" method="post" action="{$updateLocation}" id="standardForm"> 
    41654165      <input type="hidden" name="updateLocation" value="true"/> 
    41664166      <input type="hidden" name="confirmationid" value="{$confId}"/> 
    …… 
    41784178          <td align="left"> 
    41794179            <xsl:variable name="addr" select="form/address/input/@value"/> 
    4180             <input size="60" name="editLocation.address" value="{$addr}" type="text"/> 
     4180            <input size="60" name="locationAddress.value" value="{$addr}" type="text"/> 
    41814181          </td> 
    41824182        </tr> 
    …… 
    41874187          <td align="left"> 
    41884188            <xsl:variable name="subaddr" select="form/subaddress/textarea"/> 
    4189             <input size="60" name="editLocation.subaddress" value="{$subaddr}" type="text"/> 
     4189            <input size="60" name="locationSubaddress.value" value="{$subaddr}" type="text"/> 
    41904190          </td> 
    41914191        </tr> 
    …… 
    41964196          <td> 
    41974197            <xsl:variable name="link" select="form/link/input/@value"/> 
    4198             <input size="60" name="editLocation.link" value="{$link}" type="text"/> 
     4198            <input size="60" name="location.link" value="{$link}" type="text"/> 
    41994199          </td> 
    42004200        </tr> 
    …… 
    42084208          </td> 
    42094209          <td align="right"> 
    4210             <xsl:variable name="locId" select="form/id"/> 
    4211             <a href="{$delLocation}&amp;locationId={$locId}"> 
     4210            <xsl:variable name="uid" select="form/uid"/> 
     4211            <a href="{$delLocation}&amp;uid={$uid}"> 
    42124212              <input type="button" name="delete" value="Delete Location"/> 
    42134213            </a> 
    …… 
    42274227      <td colspan="2" class="plain"> 
    42284228        <ul> 
    4229           <xsl:for-each select="/bedework/formElements/form/locationmenu/select/option[@value>'3']"> 
     4229          <xsl:for-each select="/bedework/formElements/form/locations/location"> 
    42304230            <xsl:sort select="."/> 
    42314231            <li> 
    4232               <xsl:variable name="locationId" select="@value"/> 
    4233               <a href="{$editLocation}&amp;locationId={$locationId}"><xsl:value-of select="."/></a> 
     4232              <xsl:variable name="uid" select="uid"/> 
     4233              <a href="{$fetchLocationForUpdate}&amp;uid={$uid}"><xsl:value-of select="address"/></a> 
    42344234            </li> 
    42354235          </xsl:for-each> 
    …… 
    46104610              <span class="std-text">choose: </span> 
    46114611              <span id="eventFormLocationList"> 
    4612                 <select name="eventLocationId"> 
     4612                <select name="eventLocationUid"> 
    46134613                  <option value="-1">select...</option> 
    46144614                  <xsl:copy-of select="/bedework/formElements/form/location/locationmenu/select/*"/> 
    …… 
    46164616              </span> 
    46174617              <span class="std-text"> or add new: </span> 
    4618               <input type="text" name="laddress" value="" /> 
     4618              <input type="text" name="locationAddress.value" value="" /> 
    46194619            </div> 
    46204620          </td>