Changeset 2016

Show
Ignore:
Timestamp:
01/09/09 04:28:15
Author:
johnsa
Message:

admin client:
- fix up selection of calendars in event form.
- make toggling between preferred and "all" lists more graceful - still needs work

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2015 r2016  
    212212  <!-- the following variable can be set to "true" or "false"; 
    213213       to use jQuery widgets and fancier UI features, set to false - these are 
    214        not guaranteed to work in portals. Setting to true will make the 
    215        add/edit event form much faster, but will not support internationalization. --> 
     214       not guaranteed to work in portals.  --> 
    216215  <xsl:variable name="portalFriendly">false</xsl:variable> 
    217216 
    …… 
    10871086          <tr> 
    10881087            <td class="fieldName"> 
    1089               Calendar:** 
     1088              Calendar: 
     1089              <input type="hidden" name="newCalPath" value=""> 
     1090                <xsl:attribute name="value"><xsl:value-of select="form/calendar/all/select/option[@selected]/@value"/></xsl:attribute> 
     1091              </input> 
    10901092            </td> 
    10911093            <td> 
    10921094              <xsl:if test="form/calendar/preferred/select/option"> 
    1093                 <select name="prefCalendarId"> 
    1094                   <option> 
    1095                     <xsl:attribute name="value"><xsl:value-of select="form/calendar/path"/></xsl:attribute> 
    1096                     Select preferred: 
     1095                <!-- Display the preferred calendars by default if they exist --> 
     1096                <select name="bwPreferredCalendars" id="bwPreferredCalendars" onchange="this.form.newCalPath.value = this.value"> 
     1097                  <option value=""> 
     1098                    Select: 
    10971099                  </option> 
    10981100                  <xsl:for-each select="form/calendar/preferred/select/option"> 
    …… 
    11111113                    </option> 
    11121114                  </xsl:for-each> 
    1113                 </select><br/> 
    1114                 or Calendar (all): 
     1115                </select> 
    11151116              </xsl:if> 
    1116               <select name="calendarId"> 
    1117                 <option> 
    1118                   <xsl:attribute name="value"><xsl:value-of select="form/calendar/path"/></xsl:attribute> 
     1117              <!-- hide the listing of all calendars if preferred calendars exist, otherwise show them --> 
     1118              <select name="bwAllCalendars" id="bwAllCalendars" onchange="this.form.newCalPath.value = this.value;"> 
     1119                <xsl:if test="form/calendar/preferred/select/option"> 
     1120                  <xsl:attribute name="class">invisible</xsl:attribute> 
     1121                </xsl:if> 
     1122                <option value=""> 
    11191123                  Select: 
    11201124                </option> 
    …… 
    11361140              </select> 
    11371141              <xsl:text> </xsl:text> 
     1142              <!-- allow for toggling between the preferred and all calendars listings if preferred 
     1143                   calendars exist --> 
     1144              <xsl:if test="form/calendar/preferred/select/option"> 
     1145                <input type="radio" name="toggleCalendarLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredCalendars','shown');changeClass('bwAllCalendars','invisible');this.form.newCalPath.value = this.form.bwPreferredCalendars.value;"/> 
     1146                preferred 
     1147                <input type="radio" name="toggleCalendarLists" value="all" onclick="changeClass('bwPreferredCalendars','invisible');changeClass('bwAllCalendars','shown');this.form.newCalPath.value = this.form.bwAllCalendars.value;"/> 
     1148                all 
     1149              </xsl:if> 
     1150              <br/> 
    11381151              <span id="calDescriptionsLink"> 
    11391152                <a href="javascript:launchSimpleWindow('{$calendar-fetchDescriptions}')">calendar descriptions</a> 
    …… 
    21402153        <tr> 
    21412154          <td class="fieldName"> 
    2142             Location:** 
     2155            Location: 
    21432156          </td> 
    21442157          <td> 
    21452158            <xsl:if test="form/location/preferred/select/option"> 
    2146               <select name="prefLocationId" id="eventFormPrefLocationList"> 
     2159              <select name="prefLocationId" id="bwPreferredLocationList"> 
    21472160                <option value=""> 
    2148                   Select preferred: 
     2161                  Select: 
    21492162                </option> 
    21502163                <xsl:copy-of select="form/location/preferred/select/*"/> 
    21512164              </select> 
    2152               or Location (all): 
    21532165            </xsl:if> 
    2154             <select name="allLocationId" id="eventFormLocationList"> 
     2166            <select name="allLocationId" id="bwAllLocationList"> 
     2167              <xsl:if test="form/location/preferred/select/option"> 
     2168                <xsl:attribute name="class">invisible</xsl:attribute> 
     2169              </xsl:if> 
    21552170              <option value=""> 
    21562171                Select: 
    …… 
    21582173              <xsl:copy-of select="form/location/all/select/*"/> 
    21592174            </select> 
     2175            <xsl:text> </xsl:text> 
     2176            <!-- allow for toggling between the preferred and all location listings if preferred 
     2177                 locations exist --> 
     2178            <xsl:if test="form/location/preferred/select/option"> 
     2179              <input type="radio" name="toggleLocationLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');"/> 
     2180              preferred 
     2181              <input type="radio" name="toggleLocationLists" value="all" onclick="changeClass('bwPreferredLocationList','invisible');changeClass('bwAllLocationList','shown');"/> 
     2182              all 
     2183            </xsl:if> 
    21602184          </td> 
    21612185        </tr> 
    …… 
    21992223        <tr> 
    22002224          <td class="fieldName"> 
    2201             Contact:** 
     2225            Contact: 
    22022226          </td> 
    22032227          <td> 
    22042228            <xsl:if test="form/contact/preferred/select/option"> 
    2205               <select name="prefContactId" id="eventFormContactList"> 
     2229              <select name="prefContactId" id="bwPreferredContactList"> 
    22062230                <option value=""> 
    2207                   Select preferred: 
     2231                  Select: 
    22082232                </option>option> 
    22092233                <xsl:copy-of select="form/contact/preferred/select/*"/> 
    22102234              </select> 
    2211               or Contact (all): 
    22122235            </xsl:if> 
    2213             <select name="allContactId" id="eventFormPrefContactList"> 
     2236            <select name="allContactId" id="bwAllContactList"> 
     2237              <xsl:if test="form/contact/preferred/select/option"> 
     2238                <xsl:attribute name="class">invisible</xsl:attribute> 
     2239              </xsl:if> 
    22142240              <option value=""> 
    22152241                Select: 
    …… 
    22172243              <xsl:copy-of select="form/contact/all/select/*"/> 
    22182244            </select> 
     2245            <xsl:text> </xsl:text> 
     2246            <!-- allow for toggling between the preferred and all contacts listings if preferred 
     2247                 contacts exist --> 
     2248            <xsl:if test="form/contact/preferred/select/option"> 
     2249              <input type="radio" name="toggleContactLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');"/> 
     2250              preferred 
     2251              <input type="radio" name="toggleContactLists" value="all" onclick="changeClass('bwPreferredContactList','invisible');changeClass('bwAllContactList','shown');"/> 
     2252              all 
     2253            </xsl:if> 
    22192254          </td> 
    22202255        </tr> 
    …… 
    22242259        <tr> 
    22252260          <td class="fieldName"> 
    2226             Categories:** 
     2261            Categories: 
    22272262          </td> 
    22282263          <td> 
    22292264            <xsl:if test="form/categories/preferred/category and /bedework/creating='true'"> 
    2230               <input type="radio" name="categoryCheckboxes" value="preferred" checked="checked" onclick="changeClass('preferredCategoryCheckboxes','shown');changeClass('allCategoryCheckboxes','invisible');"/>show preferred 
    2231               <input type="radio" name="categoryCheckboxes" value="all" onclick="changeClass('preferredCategoryCheckboxes','invisible');changeClass('allCategoryCheckboxes','shown')"/>show all<br/> 
     2265              <input type="radio" name="categoryCheckboxes" value="preferred" checked="checked" onclick="changeClass('preferredCategoryCheckboxes','shown');changeClass('allCategoryCheckboxes','invisible');"/>preferred 
     2266              <input type="radio" name="categoryCheckboxes" value="all" onclick="changeClass('preferredCategoryCheckboxes','invisible');changeClass('allCategoryCheckboxes','shown')"/>all<br/> 
    22322267              <table cellpadding="0" id="preferredCategoryCheckboxes"> 
    22332268                <tr> 
    …… 
    23042339          <td colspan="2" style="padding-top: 1em;"> 
    23052340            <span class="fieldInfo"> 
    2306               **<strong>If "preferred values" are enabled</strong> 
    2307               by your administrator, the category, location, and contact lists will 
     2341              <strong>If "preferred values" are enabled</strong> 
     2342              by your administrator, the calendar, category, location, and contact lists will 
    23082343              contain only those value you've used previously.  If you don't find the value 
    23092344              you need in one of these lists, use the "all" list adjacent to each