Peter M. Groen / knowledgetree

Commit 8424994e5308fc2cfc1e02479d69b72ca4f828c3

Authored by michael
1 parent c39954e2

(#2976) changed the text to reflect that archiving happens from document creation date. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2679 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 12 additions and 10 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc
  View file @8424994
... ... @@ -123,14 +123,16 @@ function getUtilisationArchivingJavascript() {
123 123 return $sToRender;
124 124 }
125 125  
126   -function renderTimePeriod($sHeading, $oTimePeriod = null) {
  126 +function renderTimePeriod($sHeading, $sFooter = "", $oTimePeriod = null) {
127 127 global $default;
  128 + $sToRender .= "<tr valign=\"middle\">";
128 129 if (strlen($sHeading) > 0) {
129   - $sToRender .= "<tr><td colspan=\"3\">$sHeading:</td></tr>";
  130 + $sToRender .= "<td>$sHeading:</td>";
130 131 }
131   - $sToRender .= "<tr valign=\"middle\"><td><input type=\"text\" size=\"11\" name=\"fUnits\" value=\"" . ($oTimePeriod ? $oTimePeriod->getUnits() : "") . "\">";
132   - $sToRender .= "&nbsp;&nbsp;" . renderTimeUnitsListBox( ($oTimePeriod ? $oTimePeriod->getTimeUnitID() : null) );
133   - $sToRender .= "&nbsp;&nbsp;<a href=\"javascript:void();\" onclick=\"document.MainForm.fUnits.value='';document.MainForm.fTimeUnitID.value='';\"><img src=\"$default->graphicsUrl/widgets/reset.gif\" border=\"0\"></a></td></tr>";
  132 + $sToRender .= "<td><input type=\"text\" size=\"11\" name=\"fUnits\" value=\"" . ($oTimePeriod ? $oTimePeriod->getUnits() : "") . "\">";
  133 + $sToRender .= "&nbsp;&nbsp;" . renderTimeUnitsListBox( ($oTimePeriod ? $oTimePeriod->getTimeUnitID() : null) ) . $sFooter;
  134 + $sToRender .= "&nbsp;&nbsp;<a href=\"javascript:void();\" onclick=\"document.MainForm.fUnits.value='';document.MainForm.fTimeUnitID.value='';\"><img src=\"$default->graphicsUrl/widgets/reset.gif\" border=\"0\"></a></td>";
  135 + $sToRender .= "</tr>";
134 136 return $sToRender;
135 137 }
136 138  
... ... @@ -155,17 +157,17 @@ function renderArchiveSettingsForm($iDocumentID, $oArchiveSettings, $iArchivingT
155 157 case "Date" :
156 158  
157 159 $sToRender .= "<tr><th align=\"left\" colspan=\"2\">Archive By Date</th></tr>";
158   - $sToRender .= "<tr><td>Expiration Date:</td></tr>";
159   - $sToRender .= "<tr><td valign=bottom><input type=\"text\" name=\"fExpirationDate\" size=\"10\" maxlength=\"10\" " . ($oArchiveSettings ? "value=\"" . ($oArchiveSettings->getExpirationDate() == "0000-00-00" ? "" : $oArchiveSettings->getExpirationDate()) . "\"" : "") . ">";
  160 + $sToRender .= "<tr><td>Expiration Date:</td>";
  161 + $sToRender .= "<td valign=bottom><input type=\"text\" name=\"fExpirationDate\" size=\"10\" maxlength=\"10\" " . ($oArchiveSettings ? "value=\"" . ($oArchiveSettings->getExpirationDate() == "0000-00-00" ? "" : $oArchiveSettings->getExpirationDate()) . "\"" : "") . ">";
160 162 $sToRender .= "&nbsp;&nbsp;<a href=\"javascript:show_calendar('MainForm.fExpirationDate',null,null,'YYYY-MM-DD');\" onmouseover=\"window.status='Date Picker';return true;\" onmouseout=\"window.status='';return true;\"><img src=\"$default->graphicsUrl/calendar/calendar.gif\" name=\"imgCalendar\" width=\"34\" height=\"21\" border=\"0\" alt=\"\"></a>";
161 163 $sToRender .= "&nbsp;&nbsp;<a href=\"javascript:void();\" onclick=\"document.MainForm.fExpirationDate.value=''\"><img src=\"$default->graphicsUrl/widgets/reset.gif\" border=\"0\"></a></td></tr>";
162 164  
163 165 if ($oArchiveSettings) {
164 166 $oTimePeriod = TimePeriod::get($oArchiveSettings->getTimePeriodID());
165   - $sToRender .= renderTimePeriod("Expires after", $oTimePeriod);
  167 + $sToRender .= renderTimePeriod("Expires after", "from document creation date", $oTimePeriod);
166 168 } else {
167   - $sToRender .= renderTimePeriod("Expires after");
168   - }
  169 + $sToRender .= renderTimePeriod("Expires after", "from document creation date");
  170 + }
169 171 $sToRender .= getDateArchivingJavascript();
170 172 break;
171 173 case "Utilisation" :
... ...