Changeset 2207

Show
Ignore:
Timestamp:
05/28/09 16:55:02
Author:
johnsa
Message:

personal client: disable de-selection of root calendar (for viewing)
admin client: update some basic text

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2206 r2207  
    56865686            <input value="{$localeList}" name="localeList" class="wide"/> 
    56875687            <div class="desc"> 
    5688               List of supported locales. The format is rigid, comma separated list of 2 letter language, underscore, 2 letter country. No spaces. 
     5688              List of supported locales. The format is a rigid, comma separated list of 2 letter language, underscore, 2 letter country. No spaces. Example: en_US,fr_CA 
    56895689            </div> 
    56905690          </td> 

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

    r2206 r2207  
    45524552      </xsl:attribute> 
    45534553      <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-content"> 
     4554        <xsl:variable name="userRootCalendar">/user/<xsl:value-of select="/bedework/userid"/></xsl:variable> 
    45544555        <form name="bwHideDisplayCal" class="bwHideDisplayCal" method="post"> 
    45554556          <xsl:attribute name="action"> 
    …… 
    45674568              <input type="hidden" name="display" value="false"/> 
    45684569              <input type="checkbox" name="bwDisplaySetter" checked="checked"  onclick="this.form.submit()"> 
    4569                 <xsl:if test="/bedework/page != 'eventscalendar' and /bedework/page != 'eventList'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if> 
     4570                <xsl:if test="(/bedework/page != 'eventscalendar' and 
     4571                               /bedework/page != 'eventList') or 
     4572                               $userRootCalendar = path"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if> 
    45704573              </input> 
    45714574            </xsl:when> 
    …… 
    45744577              <input type="hidden" name="display" value="true"/> 
    45754578              <input type="checkbox" name="bwDisplaySetter" onclick="this.form.submit()"> 
    4576                 <xsl:if test="/bedework/page != 'eventscalendar' and /bedework/page != 'eventList'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if> 
     4579                <xsl:if test="(/bedework/page != 'eventscalendar' and 
     4580                               /bedework/page != 'eventList') or 
     4581                               $userRootCalendar = path"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if> 
    45774582              </input> 
    45784583            </xsl:otherwise>