Changeset 3558

Show
Ignore:
Timestamp:
05/29/12 16:21:49
Author:
johnsa
Message:

admin client:
- make "default view mode" option more understandable
- carry over recent updates to Spanish language version

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.8/deployment/webadmin/webapp/resources/default/default/default.xsl

    r3549 r3558  
    65386538                <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeList"/> 
    65396539              </option> 
     6540              <!-- GRID is not yet available - needs to be restored in public client --> 
     6541              <!--  
    65406542              <option value="grid"> 
    65416543                <xsl:if test="/bedework/prefs/defaultViewMode = 'grid'"> 
    …… 
    65446546                <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeGrid"/> 
    65456547              </option> 
     6548              --> 
    65466549            </select> 
    65476550          </td> 

  • releases/bedework-3.8/deployment/webadmin/webapp/resources/default/default/strings.xsl

    r3534 r3558  
    791791  <xsl:variable name="bwStr-CSPf-CalSuite">Calendar Suite:</xsl:variable> 
    792792  <xsl:variable name="bwStr-CSPf-PreferredView">Preferred view:</xsl:variable> 
    793   <xsl:variable name="bwStr-CSPf-DefaultViewMode">Preferred view mode:</xsl:variable> 
    794   <xsl:variable name="bwStr-CSPf-DefaultViewModeList">LIST (a list of discrete events from now into the future)</xsl:variable> 
    795   <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAILY (a list of events grouped by date showing entire view period)</xsl:variable> 
    796   <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID (calendar grid - in week and month view periods)</xsl:variable> 
     793  <xsl:variable name="bwStr-CSPf-DefaultViewMode">Default view mode:</xsl:variable> 
     794  <xsl:variable name="bwStr-CSPf-DefaultViewModeList">UPCOMING - a list of discrete events from now into the future</xsl:variable> 
     795  <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAY, WEEK, MONTH - a list of events showing entire view period</xsl:variable> 
     796  <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID - calendar grid for week and month view periods</xsl:variable> 
    797797  <xsl:variable name="bwStr-CSPf-PreferredViewPeriod">Preferred view period:</xsl:variable> 
    798798  <xsl:variable name="bwStr-CSPf-Day">day</xsl:variable> 

  • releases/bedework-3.8/deployment/webadmin/webapp/resources/es_ES/default/default.xsl

    r3549 r3558  
    11091109          <option value="catFilter(none)"><xsl:copy-of select="$bwStr-EvLs-SelectCategory"/></option> 
    11101110          <xsl:for-each select="/bedework/events//event/categories//category[generate-id() = generate-id(key('catUid',uid)[1])]"> 
     1111            <xsl:sort order="ascending" select="value"/> 
    11111112            <xsl:variable name="uid" select="uid"/> 
    11121113            <option value="catFilter({$uid})"> 
    …… 
    13671368            </a><xsl:text> </xsl:text> 
    13681369            (<a href="mailto:{$submitterEmail}?subject=[Event%20Submission] {$eventTitle}" title="Email {$submitterEmail}"> 
    1369               <img src="{$resourcesRoot}/resources/email.gif" border="0"/> 
     1370              <img src="{$resourcesRoot}/resources/email.gif" border="0" alt="*"/> 
    13701371              <xsl:copy-of select="$bwStr-AEEF-SendMsg"/> 
    13711372            </a>) 
    …… 
    16551656                  </xsl:if> 
    16561657                  <xsl:text> </xsl:text> 
    1657                   <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock"/> 
     1658                  <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock" alt="*"/> 
    16581659 
    16591660                  <select name="eventStartDate.tzid" id="startTzid" class="timezones"> 
    …… 
    16761677              <xsl:choose> 
    16771678                <xsl:when test="form/end/type='E'"> 
    1678                   <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" checked="checked" onClick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/> 
     1679                  <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" checked="checked" onclick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/> 
    16791680                </xsl:when> 
    16801681                <xsl:otherwise> 
    1681                   <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" onClick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/> 
     1682                  <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" onclick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/> 
    16821683                </xsl:otherwise> 
    16831684              </xsl:choose> 
    …… 
    17451746                    </xsl:if> 
    17461747                    <xsl:text> </xsl:text> 
    1747                     <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock"/> 
     1748                    <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock" alt="*"/> 
    17481749 
    17491750                    <select name="eventEndDate.tzid" id="endTzid" class="timezones"> 
    …… 
    17691770                <xsl:choose> 
    17701771                  <xsl:when test="form/end/type='D'"> 
    1771                     <input type="radio" name="eventEndType" value="D" checked="checked" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/> 
     1772                    <input type="radio" name="eventEndType" value="D" checked="checked" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/> 
    17721773                  </xsl:when> 
    17731774                  <xsl:otherwise> 
    1774                     <input type="radio" name="eventEndType" value="D" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/> 
     1775                    <input type="radio" name="eventEndType" value="D" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/> 
    17751776                  </xsl:otherwise> 
    17761777                </xsl:choose> 
    …… 
    18431844                <xsl:choose> 
    18441845                  <xsl:when test="form/end/type='N'"> 
    1845                     <input type="radio" name="eventEndType" value="N" checked="checked" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/> 
     1846                    <input type="radio" name="eventEndType" value="N" checked="checked" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/> 
    18461847                  </xsl:when> 
    18471848                  <xsl:otherwise> 
    1848                     <input type="radio" name="eventEndType" value="N" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/> 
     1849                    <input type="radio" name="eventEndType" value="N" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/> 
    18491850                  </xsl:otherwise> 
    18501851                </xsl:choose> 
    …… 
    22182219                            <xsl:copy-of select="$bwStr-AEEF-WeekOn"/> 
    22192220                          </p> 
    2220                           <p> 
    2221                             <div id="weekRecurFields"> 
    2222                               <xsl:call-template name="byDayChkBoxList"> 
    2223                                 <xsl:with-param name="name">byDayWeek</xsl:with-param> 
    2224                               </xsl:call-template> 
    2225                             </div> 
    2226                           </p> 
     2221                          <div id="weekRecurFields"> 
     2222                            <xsl:call-template name="byDayChkBoxList"> 
     2223                              <xsl:with-param name="name">byDayWeek</xsl:with-param> 
     2224                            </xsl:call-template> 
     2225                          </div> 
    22272226                          <p class="weekRecurLinks"> 
    22282227                            <a href="javascript:recurSelectWeekdays('weekRecurFields')"><xsl:copy-of select="$bwStr-AEEF-SelectWeekdays"/></a> | 
    …… 
    22572256                            <div id="monthRecurFields1"> 
    22582257                              <xsl:copy-of select="$bwStr-AEEF-On"/> 
    2259                               <select name="bymonthposPos1" width="7em" onchange="changeClass('monthRecurFields2','shown')"> 
     2258                              <select name="bymonthposPos1" onchange="changeClass('monthRecurFields2','shown')"> 
    22602259                                <xsl:call-template name="recurrenceDayPosOptions"/> 
    22612260                              </select> 
    …… 
    22952294                            <div id="yearRecurFields1"> 
    22962295                              <xsl:copy-of select="$bwStr-AEEF-On"/> 
    2297                               <select name="byyearposPos1" width="7em" onchange="changeClass('yearRecurFields2','shown')"> 
     2296                              <select name="byyearposPos1" onchange="changeClass('yearRecurFields2','shown')"> 
    22982297                                <xsl:call-template name="recurrenceDayPosOptions"/> 
    22992298                              </select> 
    …… 
    24472446                          </select> 
    24482447                         <xsl:text> </xsl:text> 
    2449                          <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwRecExcClock"/> 
     2448                         <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwRecExcClock" alt="*"/> 
    24502449 
    24512450                        <select name="tzid" id="rdateTzid" class="timezones"> 
    …… 
    26882687              <xsl:if test="form/location/preferred/select/option"> 
    26892688                <select name="prefLocationId" id="bwPreferredLocationList"> 
     2689                  <xsl:if test="form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected)"> 
     2690                    <xsl:attribute name="class">invisible</xsl:attribute> 
     2691                  </xsl:if> 
    26902692                  <option value=""> 
    26912693                    <xsl:copy-of select="$bwStr-AEEF-SelectColon"/> 
    …… 
    26952697              </xsl:if> 
    26962698              <select name="allLocationId" id="bwAllLocationList"> 
    2697                 <xsl:if test="form/location/preferred/select/option"> 
     2699                <xsl:if test="form/location/preferred/select/option and not(form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected))"> 
    26982700                  <xsl:attribute name="class">invisible</xsl:attribute> 
    26992701                </xsl:if> 
    …… 
    27072709                   locations exist --> 
    27082710              <xsl:if test="form/location/preferred/select/option"> 
    2709                 <input type="radio" name="toggleLocationLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');"/> 
     2711                <input type="radio" name="toggleLocationLists" value="preferred" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');"> 
     2712                  <xsl:if test="form/location/preferred/select/option and not(form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected))"> 
     2713                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2714                  </xsl:if> 
     2715                </input> 
    27102716                <xsl:copy-of select="$bwStr-AEEF-Preferred"/> 
    2711                 <input type="radio" name="toggleLocationLists" value="all" onclick="changeClass('bwPreferredLocationList','invisible');changeClass('bwAllLocationList','shown');"/> 
     2717                <input type="radio" name="toggleLocationLists" value="all" onclick="changeClass('bwPreferredLocationList','invisible');changeClass('bwAllLocationList','shown');"> 
     2718                  <xsl:if test="form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected)"> 
     2719                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2720                  </xsl:if> 
     2721                </input> 
    27122722                <xsl:copy-of select="$bwStr-AEEF-All"/> 
    27132723              </xsl:if> 
    …… 
    27642774              <xsl:if test="form/contact/preferred/select/option"> 
    27652775                <select name="prefContactId" id="bwPreferredContactList"> 
     2776                  <xsl:if test="form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected)"> 
     2777                    <xsl:attribute name="class">invisible</xsl:attribute> 
     2778                  </xsl:if> 
    27662779                  <option value=""> 
    27672780                    <xsl:copy-of select="$bwStr-AEEF-SelectColon"/> 
    …… 
    27712784              </xsl:if> 
    27722785              <select name="allContactId" id="bwAllContactList"> 
    2773                 <xsl:if test="form/contact/preferred/select/option"> 
     2786                <xsl:if test="form/contact/preferred/select/option and not(form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected))"> 
    27742787                  <xsl:attribute name="class">invisible</xsl:attribute> 
    27752788                </xsl:if> 
    …… 
    27832796                   contacts exist --> 
    27842797              <xsl:if test="form/contact/preferred/select/option"> 
    2785                 <input type="radio" name="toggleContactLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');"/> 
     2798                <input type="radio" name="toggleContactLists" value="preferred" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');"> 
     2799                  <xsl:if test="form/contact/preferred/select/option and not(form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected))"> 
     2800                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2801                  </xsl:if> 
     2802                </input> 
    27862803                <xsl:copy-of select="$bwStr-AEEF-Preferred"/> 
    2787                 <input type="radio" name="toggleContactLists" value="all" onclick="changeClass('bwPreferredContactList','invisible');changeClass('bwAllContactList','shown');"/> 
     2804                <input type="radio" name="toggleContactLists" value="all" onclick="changeClass('bwPreferredContactList','invisible');changeClass('bwAllContactList','shown');"> 
     2805                  <xsl:if test="form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected)"> 
     2806                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2807                  </xsl:if> 
     2808                </input> 
    27882809                <xsl:copy-of select="$bwStr-AEEF-All"/> 
    27892810              </xsl:if> 
    …… 
    30673088    <xsl:param name="eventUrlPrefix"/> 
    30683089    <xsl:param name="canEdit"/> 
     3090     
     3091    <xsl:variable name="escapedTitle"><xsl:call-template name="escapeJson"><xsl:with-param name="string" select="eventTitle"/></xsl:call-template></xsl:variable> 
    30693092    <div class="submitBox"> 
    30703093      <xsl:choose> 
    …… 
    31063129                </select> 
    31073130                <input type="submit" name="publishEvent" value="{$bwStr-SEBu-PublishEvent}"> 
    3108                   <xsl:attribute name="onclick">doPublishEvent(this.form.newCalPath.value,'<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrlPrefix"/>',this.form);changeClass('publishBox','invisible');</xsl:attribute> 
     3131                  <xsl:attribute name="onclick">doPublishEvent(this.form.newCalPath.value,"<xsl:value-of select="$escapedTitle"/>","<xsl:value-of select="$eventUrlPrefix"/>",this.form);changeClass('publishBox','invisible');</xsl:attribute> 
    31093132                </input> 
    31103133                <xsl:if test="$portalFriendly = 'false'"> 
    …… 
    31233146              <input type="submit" name="updateSubmitEvent" value="{$bwStr-SEBu-UpdateEvent}"/> 
    31243147              <input type="submit" name="publishEvent" value="{$bwStr-SEBu-PublishEvent}"> 
    3125                 <xsl:attribute name="onclick">doPublishEvent('<xsl:value-of select="form/calendar/all/select/option/@value"/>','<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrlPrefix"/>',this.form);</xsl:attribute> 
     3148                <xsl:attribute name="onclick">doPublishEvent("<xsl:value-of select="form/calendar/all/select/option/@value"/>","<xsl:value-of select="$escapedTitle"/>","<xsl:value-of select="$eventUrlPrefix"/>",this.form);</xsl:attribute> 
    31263149              </input> 
    31273150              <input type="submit" name="cancelled" value="{$bwStr-SEBu-Cancel}"/> 
    …… 
    32333256      <xsl:attribute name="id"><xsl:value-of select="$name"/>RecurFields<xsl:value-of select="$current"/></xsl:attribute> 
    32343257      <xsl:copy-of select="$bwStr-BuRF-And"/> 
    3235       <select width="12em"> 
     3258      <select> 
    32363259        <xsl:attribute name="name">by<xsl:value-of select="$name"/>posPos<xsl:value-of select="$current"/></xsl:attribute> 
    32373260        <xsl:if test="$current != $total"> 
    …… 
    65166539                <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeList"/> 
    65176540              </option> 
     6541              <!-- GRID is not yet available - needs to be restored in public client --> 
     6542              <!--  
    65186543              <option value="grid"> 
    65196544                <xsl:if test="/bedework/prefs/defaultViewMode = 'grid'"> 
    …… 
    65226547                <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeGrid"/> 
    65236548              </option> 
     6549              --> 
    65246550            </select> 
    65256551          </td> 

  • releases/bedework-3.8/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl

    r3534 r3558  
    791791  <xsl:variable name="bwStr-CSPf-CalSuite">Calendar Suite:</xsl:variable> 
    792792  <xsl:variable name="bwStr-CSPf-PreferredView">Vista preferida:</xsl:variable> 
    793   <xsl:variable name="bwStr-CSPf-DefaultViewMode">Modo de vista preferida:</xsl:variable> 
    794   <xsl:variable name="bwStr-CSPf-DefaultViewModeList">LIST (a list of discrete events from now into the future)</xsl:variable> 
    795   <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAILY (a list of events grouped by date showing entire view period)</xsl:variable> 
    796   <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID (calendar grid - in week and month view periods)</xsl:variable> 
     793  <xsl:variable name="bwStr-CSPf-DefaultViewMode">Modo de vista por defecto:</xsl:variable> 
     794  <xsl:variable name="bwStr-CSPf-DefaultViewModeList">UPCOMING - a list of discrete events from now into the future</xsl:variable> 
     795  <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAY, WEEK, MONTH - a list of events showing entire view period</xsl:variable> 
     796  <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID - calendar grid for week and month view periods</xsl:variable> 
    797797  <xsl:variable name="bwStr-CSPf-PreferredViewPeriod">Periodo de vista preferida:</xsl:variable> 
    798798  <xsl:variable name="bwStr-CSPf-Day">día</xsl:variable> 

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

    r3550 r3558  
    65386538                <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeList"/> 
    65396539              </option> 
     6540              <!-- GRID is not yet available - needs to be restored in public client --> 
     6541              <!--  
    65406542              <option value="grid"> 
    65416543                <xsl:if test="/bedework/prefs/defaultViewMode = 'grid'"> 
    …… 
    65446546                <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeGrid"/> 
    65456547              </option> 
     6548              --> 
    65466549            </select> 
    65476550          </td> 

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

    r3535 r3558  
    791791  <xsl:variable name="bwStr-CSPf-CalSuite">Calendar Suite:</xsl:variable> 
    792792  <xsl:variable name="bwStr-CSPf-PreferredView">Preferred view:</xsl:variable> 
    793   <xsl:variable name="bwStr-CSPf-DefaultViewMode">Preferred view mode:</xsl:variable> 
    794   <xsl:variable name="bwStr-CSPf-DefaultViewModeList">LIST (a list of discrete events from now into the future)</xsl:variable> 
    795   <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAILY (a list of events grouped by date showing entire view period)</xsl:variable> 
    796   <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID (calendar grid - in week and month view periods)</xsl:variable> 
     793  <xsl:variable name="bwStr-CSPf-DefaultViewMode">Default view mode:</xsl:variable> 
     794  <xsl:variable name="bwStr-CSPf-DefaultViewModeList">UPCOMING - a list of discrete events from now into the future</xsl:variable> 
     795  <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAY, WEEK, MONTH - a list of events showing entire view period</xsl:variable> 
     796  <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID - calendar grid for week and month view periods</xsl:variable> 
    797797  <xsl:variable name="bwStr-CSPf-PreferredViewPeriod">Preferred view period:</xsl:variable> 
    798798  <xsl:variable name="bwStr-CSPf-Day">day</xsl:variable> 

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

    r3550 r3558  
    11091109          <option value="catFilter(none)"><xsl:copy-of select="$bwStr-EvLs-SelectCategory"/></option> 
    11101110          <xsl:for-each select="/bedework/events//event/categories//category[generate-id() = generate-id(key('catUid',uid)[1])]"> 
     1111            <xsl:sort order="ascending" select="value"/> 
    11111112            <xsl:variable name="uid" select="uid"/> 
    11121113            <option value="catFilter({$uid})"> 
    …… 
    13671368            </a><xsl:text> </xsl:text> 
    13681369            (<a href="mailto:{$submitterEmail}?subject=[Event%20Submission] {$eventTitle}" title="Email {$submitterEmail}"> 
    1369               <img src="{$resourcesRoot}/resources/email.gif" border="0"/> 
     1370              <img src="{$resourcesRoot}/resources/email.gif" border="0" alt="*"/> 
    13701371              <xsl:copy-of select="$bwStr-AEEF-SendMsg"/> 
    13711372            </a>) 
    …… 
    16551656                  </xsl:if> 
    16561657                  <xsl:text> </xsl:text> 
    1657                   <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock"/> 
     1658                  <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock" alt="*"/> 
    16581659 
    16591660                  <select name="eventStartDate.tzid" id="startTzid" class="timezones"> 
    …… 
    16761677              <xsl:choose> 
    16771678                <xsl:when test="form/end/type='E'"> 
    1678                   <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" checked="checked" onClick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/> 
     1679                  <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" checked="checked" onclick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/> 
    16791680                </xsl:when> 
    16801681                <xsl:otherwise> 
    1681                   <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" onClick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/> 
     1682                  <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" onclick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/> 
    16821683                </xsl:otherwise> 
    16831684              </xsl:choose> 
    …… 
    17451746                    </xsl:if> 
    17461747                    <xsl:text> </xsl:text> 
    1747                     <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock"/> 
     1748                    <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock" alt="*"/> 
    17481749 
    17491750                    <select name="eventEndDate.tzid" id="endTzid" class="timezones"> 
    …… 
    17691770                <xsl:choose> 
    17701771                  <xsl:when test="form/end/type='D'"> 
    1771                     <input type="radio" name="eventEndType" value="D" checked="checked" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/> 
     1772                    <input type="radio" name="eventEndType" value="D" checked="checked" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/> 
    17721773                  </xsl:when> 
    17731774                  <xsl:otherwise> 
    1774                     <input type="radio" name="eventEndType" value="D" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/> 
     1775                    <input type="radio" name="eventEndType" value="D" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/> 
    17751776                  </xsl:otherwise> 
    17761777                </xsl:choose> 
    …… 
    18431844                <xsl:choose> 
    18441845                  <xsl:when test="form/end/type='N'"> 
    1845                     <input type="radio" name="eventEndType" value="N" checked="checked" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/> 
     1846                    <input type="radio" name="eventEndType" value="N" checked="checked" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/> 
    18461847                  </xsl:when> 
    18471848                  <xsl:otherwise> 
    1848                     <input type="radio" name="eventEndType" value="N" onClick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/> 
     1849                    <input type="radio" name="eventEndType" value="N" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/> 
    18491850                  </xsl:otherwise> 
    18501851                </xsl:choose> 
    …… 
    22182219                            <xsl:copy-of select="$bwStr-AEEF-WeekOn"/> 
    22192220                          </p> 
    2220                           <p> 
    2221                             <div id="weekRecurFields"> 
    2222                               <xsl:call-template name="byDayChkBoxList"> 
    2223                                 <xsl:with-param name="name">byDayWeek</xsl:with-param> 
    2224                               </xsl:call-template> 
    2225                             </div> 
    2226                           </p> 
     2221                          <div id="weekRecurFields"> 
     2222                            <xsl:call-template name="byDayChkBoxList"> 
     2223                              <xsl:with-param name="name">byDayWeek</xsl:with-param> 
     2224                            </xsl:call-template> 
     2225                          </div> 
    22272226                          <p class="weekRecurLinks"> 
    22282227                            <a href="javascript:recurSelectWeekdays('weekRecurFields')"><xsl:copy-of select="$bwStr-AEEF-SelectWeekdays"/></a> | 
    …… 
    22572256                            <div id="monthRecurFields1"> 
    22582257                              <xsl:copy-of select="$bwStr-AEEF-On"/> 
    2259                               <select name="bymonthposPos1" width="7em" onchange="changeClass('monthRecurFields2','shown')"> 
     2258                              <select name="bymonthposPos1" onchange="changeClass('monthRecurFields2','shown')"> 
    22602259                                <xsl:call-template name="recurrenceDayPosOptions"/> 
    22612260                              </select> 
    …… 
    22952294                            <div id="yearRecurFields1"> 
    22962295                              <xsl:copy-of select="$bwStr-AEEF-On"/> 
    2297                               <select name="byyearposPos1" width="7em" onchange="changeClass('yearRecurFields2','shown')"> 
     2296                              <select name="byyearposPos1" onchange="changeClass('yearRecurFields2','shown')"> 
    22982297                                <xsl:call-template name="recurrenceDayPosOptions"/> 
    22992298                              </select> 
    …… 
    24472446                          </select> 
    24482447                         <xsl:text> </xsl:text> 
    2449                          <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwRecExcClock"/> 
     2448                         <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwRecExcClock" alt="*"/> 
    24502449 
    24512450                        <select name="tzid" id="rdateTzid" class="timezones"> 
    …… 
    26882687              <xsl:if test="form/location/preferred/select/option"> 
    26892688                <select name="prefLocationId" id="bwPreferredLocationList"> 
     2689                  <xsl:if test="form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected)"> 
     2690                    <xsl:attribute name="class">invisible</xsl:attribute> 
     2691                  </xsl:if> 
    26902692                  <option value=""> 
    26912693                    <xsl:copy-of select="$bwStr-AEEF-SelectColon"/> 
    …… 
    26952697              </xsl:if> 
    26962698              <select name="allLocationId" id="bwAllLocationList"> 
    2697                 <xsl:if test="form/location/preferred/select/option"> 
     2699                <xsl:if test="form/location/preferred/select/option and not(form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected))"> 
    26982700                  <xsl:attribute name="class">invisible</xsl:attribute> 
    26992701                </xsl:if> 
    …… 
    27072709                   locations exist --> 
    27082710              <xsl:if test="form/location/preferred/select/option"> 
    2709                 <input type="radio" name="toggleLocationLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');"/> 
     2711                <input type="radio" name="toggleLocationLists" value="preferred" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');"> 
     2712                  <xsl:if test="form/location/preferred/select/option and not(form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected))"> 
     2713                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2714                  </xsl:if> 
     2715                </input> 
    27102716                <xsl:copy-of select="$bwStr-AEEF-Preferred"/> 
    2711                 <input type="radio" name="toggleLocationLists" value="all" onclick="changeClass('bwPreferredLocationList','invisible');changeClass('bwAllLocationList','shown');"/> 
     2717                <input type="radio" name="toggleLocationLists" value="all" onclick="changeClass('bwPreferredLocationList','invisible');changeClass('bwAllLocationList','shown');"> 
     2718                  <xsl:if test="form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected)"> 
     2719                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2720                  </xsl:if> 
     2721                </input> 
    27122722                <xsl:copy-of select="$bwStr-AEEF-All"/> 
    27132723              </xsl:if> 
    …… 
    27642774              <xsl:if test="form/contact/preferred/select/option"> 
    27652775                <select name="prefContactId" id="bwPreferredContactList"> 
     2776                  <xsl:if test="form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected)"> 
     2777                    <xsl:attribute name="class">invisible</xsl:attribute> 
     2778                  </xsl:if> 
    27662779                  <option value=""> 
    27672780                    <xsl:copy-of select="$bwStr-AEEF-SelectColon"/> 
    …… 
    27712784              </xsl:if> 
    27722785              <select name="allContactId" id="bwAllContactList"> 
    2773                 <xsl:if test="form/contact/preferred/select/option"> 
     2786                <xsl:if test="form/contact/preferred/select/option and not(form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected))"> 
    27742787                  <xsl:attribute name="class">invisible</xsl:attribute> 
    27752788                </xsl:if> 
    …… 
    27832796                   contacts exist --> 
    27842797              <xsl:if test="form/contact/preferred/select/option"> 
    2785                 <input type="radio" name="toggleContactLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');"/> 
     2798                <input type="radio" name="toggleContactLists" value="preferred" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');"> 
     2799                  <xsl:if test="form/contact/preferred/select/option and not(form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected))"> 
     2800                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2801                  </xsl:if> 
     2802                </input> 
    27862803                <xsl:copy-of select="$bwStr-AEEF-Preferred"/> 
    2787                 <input type="radio" name="toggleContactLists" value="all" onclick="changeClass('bwPreferredContactList','invisible');changeClass('bwAllContactList','shown');"/> 
     2804                <input type="radio" name="toggleContactLists" value="all" onclick="changeClass('bwPreferredContactList','invisible');changeClass('bwAllContactList','shown');"> 
     2805                  <xsl:if test="form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected)"> 
     2806                    <xsl:attribute name="checked">checked</xsl:attribute> 
     2807                  </xsl:if> 
     2808                </input> 
    27882809                <xsl:copy-of select="$bwStr-AEEF-All"/> 
    27892810              </xsl:if> 
    …… 
    30673088    <xsl:param name="eventUrlPrefix"/> 
    30683089    <xsl:param name="canEdit"/> 
     3090     
     3091    <xsl:variable name="escapedTitle"><xsl:call-template name="escapeJson"><xsl:with-param name="string" select="eventTitle"/></xsl:call-template></xsl:variable> 
    30693092    <div class="submitBox"> 
    30703093      <xsl:choose> 
    …… 
    31063129                </select> 
    31073130                <input type="submit" name="publishEvent" value="{$bwStr-SEBu-PublishEvent}"> 
    3108                   <xsl:attribute name="onclick">doPublishEvent(this.form.newCalPath.value,'<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrlPrefix"/>',this.form);changeClass('publishBox','invisible');</xsl:attribute> 
     3131                  <xsl:attribute name="onclick">doPublishEvent(this.form.newCalPath.value,"<xsl:value-of select="$escapedTitle"/>","<xsl:value-of select="$eventUrlPrefix"/>",this.form);changeClass('publishBox','invisible');</xsl:attribute> 
    31093132                </input> 
    31103133                <xsl:if test="$portalFriendly = 'false'"> 
    …… 
    31233146              <input type="submit" name="updateSubmitEvent" value="{$bwStr-SEBu-UpdateEvent}"/> 
    31243147              <input type="submit" name="publishEvent" value="{$bwStr-SEBu-PublishEvent}"> 
    3125                 <xsl:attribute name="onclick">doPublishEvent('<xsl:value-of select="form/calendar/all/select/option/@value"/>','<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrlPrefix"/>',this.form);</xsl:attribute> 
     3148                <xsl:attribute name="onclick">doPublishEvent("<xsl:value-of select="form/calendar/all/select/option/@value"/>","<xsl:value-of select="$escapedTitle"/>","<xsl:value-of select="$eventUrlPrefix"/>",this.form);</xsl:attribute> 
    31263149              </input> 
    31273150              <input type="submit" name="cancelled" value="{$bwStr-SEBu-Cancel}"/> 
    …… 
    32333256      <xsl:attribute name="id"><xsl:value-of select="$name"/>RecurFields<xsl:value-of select="$current"/></xsl:attribute> 
    32343257      <xsl:copy-of select="$bwStr-BuRF-And"/> 
    3235       <select width="12em"> 
     3258      <select> 
    32363259        <xsl:attribute name="name">by<xsl:value-of select="$name"/>posPos<xsl:value-of select="$current"/></xsl:attribute> 
    32373260        <xsl:if test="$current != $total"> 
    …… 
    65166539                <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeList"/> 
    65176540              </option> 
     6541              <!-- GRID is not yet available - needs to be restored in public client --> 
     6542              <!--  
    65186543              <option value="grid"> 
    65196544                <xsl:if test="/bedework/prefs/defaultViewMode = 'grid'"> 
    …… 
    65226547                <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeGrid"/> 
    65236548              </option> 
     6549              --> 
    65246550            </select> 
    65256551          </td> 

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

    r3535 r3558  
    791791  <xsl:variable name="bwStr-CSPf-CalSuite">Calendar Suite:</xsl:variable> 
    792792  <xsl:variable name="bwStr-CSPf-PreferredView">Vista preferida:</xsl:variable> 
    793   <xsl:variable name="bwStr-CSPf-DefaultViewMode">Modo de vista preferida:</xsl:variable> 
    794   <xsl:variable name="bwStr-CSPf-DefaultViewModeList">LIST (a list of discrete events from now into the future)</xsl:variable> 
    795   <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAILY (a list of events grouped by date showing entire view period)</xsl:variable> 
    796   <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID (calendar grid - in week and month view periods)</xsl:variable> 
     793  <xsl:variable name="bwStr-CSPf-DefaultViewMode">Modo de vista por defecto:</xsl:variable> 
     794  <xsl:variable name="bwStr-CSPf-DefaultViewModeList">UPCOMING - a list of discrete events from now into the future</xsl:variable> 
     795  <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAY, WEEK, MONTH - a list of events showing entire view period</xsl:variable> 
     796  <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID - calendar grid for week and month view periods</xsl:variable> 
    797797  <xsl:variable name="bwStr-CSPf-PreferredViewPeriod">Periodo de vista preferida:</xsl:variable> 
    798798  <xsl:variable name="bwStr-CSPf-Day">día</xsl:variable>