Changeset 2522

Show
Ignore:
Timestamp:
12/21/09 13:07:51
Author:
johnsa
Message:

webclients: allow deletion of non-empty collections

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r2521 r2522  
    44714471 
    44724472    <form name="delCalForm" action="{$calendar-delete}" method="post"> 
     4473      <input type="hidden" name="deleteContent" value="true"/> 
    44734474      <table class="eventFormTable"> 
    44744475        <tr> 
  • trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl

    r2518 r2522  
    473473  <xsl:variable name="bwStr-CuCa-FollowingFolderDeleted">The following folder <em>and all its contents</em> will be deleted.  Continue?</xsl:variable> 
    474474  <xsl:variable name="bwStr-CuCa-DeleteCalendar">Delete Calendar</xsl:variable> 
    475   <xsl:variable name="bwStr-CuCa-FollowingCalendarDeleted">The following calendar will be deleted.  Continue?</xsl:variable> 
     475  <xsl:variable name="bwStr-CuCa-FollowingCalendarDeleted">The following calendar <em>and all its contents</em> will be deleted.  Continue?</xsl:variable> 
    476476  <xsl:variable name="bwStr-CuCa-Path">Path:</xsl:variable> 
    477477 
  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r2520 r2522  
    56475647 
    56485648    <form name="delCalForm" method="post" action="{$calendar-delete}"> 
     5649      <input type="hidden" name="deleteContent" value="true"/> 
    56495650      <table class="common"> 
    56505651        <tr> 
  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/strings.xsl

    r2521 r2522  
    604604 
    605605  <!--  xsl:template match="currentCalendar" mode="deleteCalendarConfirm"  --> 
    606   <xsl:variable name="bwStr-CuCa-YesDeleteFolder">Yes: Delete Folder!"</xsl:variable> 
    607   <xsl:variable name="bwStr-CuCa-YesDeleteCalendar">Yes: Delete Calendar!"</xsl:variable> 
     606  <xsl:variable name="bwStr-CuCa-YesDeleteFolder">Yes: Delete Folder!</xsl:variable> 
     607  <xsl:variable name="bwStr-CuCa-YesDeleteCalendar">Yes: Delete Calendar!</xsl:variable> 
    608608  <xsl:variable name="bwStr-CuCa-TheFollowingFolder">The following folder <em>and all its contents</em> will be deleted.  Continue?</xsl:variable> 
    609   <xsl:variable name="bwStr-CuCa-TheFollowingCalendar">The following calendar will be deleted.  Continue?</xsl:variable> 
     609  <xsl:variable name="bwStr-CuCa-TheFollowingCalendar">The following calendar <em>and all its contents</em> will be deleted.  Continue?</xsl:variable> 
    610610  <!-- The rest found above --> 
    611611