Changeset 2521

Show
Ignore:
Timestamp:
12/21/09 01:46:21
Author:
johnsa
Message:

admin client: fix timezones link restored
user client: fix typo in strings

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2520 r2521  
    924924          </a> 
    925925        </li> 
     926      </ul> 
     927      <ul class="adminMenu"> 
     928        <li> 
     929          <a href="{$filter-showAddForm}"> 
     930            <xsl:copy-of select="$bwStr-TaSy-ManageCalDAVFilters"/> 
     931          </a> 
     932        </li> 
    926933        <li class="timezones"> 
    927           <a href="{$timezones-initUpload}"> 
    928             <xsl:copy-of select="$bwStr-TaSy-ManageSysTZs"/> 
     934          <a href="{$timezones-fix}"> 
     935            <xsl:attribute name="title"><xsl:copy-of select="$bwStr-UpTZ-FixTZNote"/></xsl:attribute> 
     936            <xsl:copy-of select="$bwStr-UpTZ-FixTZ"/> 
    929937          </a> 
     938          <xsl:text> </xsl:text><xsl:copy-of select="$bwStr-UpTZ-RecalcUTC"/><br/> 
    930939        </li> 
    931940      </ul> 
    …… 
    945954            </li> 
    946955          </ul> 
    947         </li> 
    948       </ul> 
    949       <ul class="adminMenu"> 
    950         <li> 
    951           <a href="{$filter-showAddForm}"> 
    952             <xsl:copy-of select="$bwStr-TaSy-ManageCalDAVFilters"/> 
    953           </a> 
    954956        </li> 
    955957      </ul> 
    …… 
    58705872            <xsl:value-of select="$calSuiteName"/> 
    58715873          </td> 
    5872           <td> 
    5873             <xsl:copy-of select="$bwStr-CalS-NameOfCalendarSuite"/> 
    5874           </td> 
     5874          <!-- 
     5875          <td> 
     5876            <p class="note"> 
     5877              <xsl:copy-of select="$bwStr-CalS-NameOfCalendarSuite"/> 
     5878            </p> 
     5879          </td> 
     5880          --> 
    58755881        </tr> 
    58765882        <tr> 
    …… 
    58795885            <xsl:value-of select="group"/> 
    58805886          </td> 
    5881           <td> 
    5882             <xsl:copy-of select="$bwStr-CalS-NameOfAdminGroup"/> 
    5883           </td> 
     5887          <!-- 
     5888          <td> 
     5889            <p class="note"> 
     5890              <xsl:copy-of select="$bwStr-CalS-NameOfAdminGroup"/> 
     5891            </p> 
     5892          </td> 
     5893          --> 
    58845894        </tr> 
    58855895      </table> 

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

    r2434 r2521  
    575575  <xsl:variable name="bwStr-CuCa-FilterExpression">Filter Expression:</xsl:variable> 
    576576  <xsl:variable name="bwStr-CuCa-CurrentAccess">Current Access:</xsl:variable> 
    577   <xsl:variable name="bwStr-CuCa-AccessNote"><p><strong>00Note:</strong> If you grant write access to another user, and you wish to see events added by that user in your calendar, <strong>you must explicitly grant yourself access to the same calendar.</strong>  Enter your UserID as a user in the "Who" box with "All" set in the "Rights" box.</p> <p>This is standard access control; the reason you will not see the other user's events without doing this is that the default access is grant:all to "owner" - and you don't own the other user's events.</p></xsl:variable> 
     577  <xsl:variable name="bwStr-CuCa-AccessNote"><p><strong>Note:</strong> If you grant write access to another user, and you wish to see events added by that user in your calendar, <strong>you must explicitly grant yourself access to the same calendar.</strong>  Enter your UserID as a user in the "Who" box with "All" set in the "Rights" box.</p> <p>This is standard access control; the reason you will not see the other user's events without doing this is that the default access is grant:all to "owner" - and you don't own the other user's events.</p></xsl:variable> 
    578578 
    579579  <!--  xsl:template name="colorPicker"  -->