mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-20 03:36:20 +02:00
9bee8d89c1
vacation.php
- result of merging edit-vacation.php and users/vacation.php
- vacation.php comes with the svn history of edit-vacation.php
- display "vacation already active" (only) in user mode if vacation is active
(would be useful in admin mode too, but needs a text change)
- various comment updates
- add username in $PALANG[pVacation_result_removed] and
$PALANG[pVacation_result_added] using sprintf
- change compared to Jan Kruis' patch:
- set return url for users to main.php instead of users/main.php
- set return url for admins after setting $fDomain. Otherwise the return url
does not contain the domain.
- removed unused variable $tDomain
users/vacation.php:
- require(../vacation.php)
- remove everything else
- whitespace changes in the license header
- note: this is completely different from Jan Kruis' patch - his intention was
to remove this file and use ../vacation.php. However, with his way all links
in the users menu would point to the wrong place/directory
edit-vacation.php:
- deleted
templates/vacation.tpl
- display username only in admin mode
templates/list-virtual_mailbox.tpl
- link changed to merged vacation.php
languages/en.lang
- add username in $PALANG[pVacation_result_removed] and
$PALANG[pVacation_result_added] as sprintf variable
- (comments added by Jan Kruis' patch are not part of this commit)
languages/nl.lang
- translation updates
- already contains the sprintf variable in $PALANG[pVacation_result_removed]
and $PALANG[pVacation_result_added]
(updates for other *.lang files follow in another commit)
The following parts of Jan Kruis' patch are not part of this commit:
- rejected:
- variables.inc.php: don't add $Admin_role and $Return_url
If we initialize them, it should be done directly in (edit-)vacation.php,
but the current code always sets them already in all cases.
- templates/users_main.tpl: do not change url for vacation.php
- postponed:
- added comments in en.lang about obsolete texts
Most parts of this commit (see exceptions above) were provided as patch
by Jan Kruis (jan-kruis@SF), see
https://sourceforge.net/tracker/?func=detail&aid=3383236&group_id=191583&atid=937966
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1169 a1433add-5e2c-0410-b055-b7f2511e0802
66 lines
1.9 KiB
Smarty
66 lines
1.9 KiB
Smarty
{literal}
|
|
<script language="JavaScript" src="calendar.js" type="text/javascript"></script>
|
|
{/literal}
|
|
<div id="edit_form">
|
|
<form name="edit-vacation" method="post" action=''>
|
|
<table>
|
|
<tr>
|
|
<th colspan="3">{$PALANG.pUsersVacation_welcome}</th>
|
|
</tr>
|
|
{if !$authentication_has_role.user}
|
|
<tr>
|
|
<td class="label"><label>{$PALANG.pUsersLogin_username}:</label></td>
|
|
<td><em>{$tUseremail}</em></td>
|
|
<td> </td>
|
|
</tr>
|
|
{/if}
|
|
<tr>
|
|
<td class="label"><label>{$PALANG.pUsersVacation_activefrom}:</label></td>
|
|
<td><input class="flat readonly" name="fActiveFrom" value="{$tActiveFrom}" readonly="readonly" />
|
|
{literal}
|
|
<script language="JavaScript" type="text/javascript">
|
|
new tcal ({
|
|
'formname': 'edit-vacation',
|
|
'controlname': 'fActiveFrom'
|
|
});
|
|
</script>
|
|
{/literal}
|
|
</td>
|
|
<td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="label"><label>{$PALANG.pUsersVacation_activeuntil}:</label></td>
|
|
<td><input class="flat readonly" name="fActiveUntil" value="{$tActiveUntil}" readonly="readonly" />
|
|
{literal}
|
|
<script language="JavaScript" type="text/javascript">
|
|
new tcal ({
|
|
'formname': 'edit-vacation',
|
|
'controlname': 'fActiveUntil'
|
|
});
|
|
</script>
|
|
{/literal}
|
|
</td>
|
|
<td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="label"><label>{$PALANG.pUsersVacation_subject}:</label></td>
|
|
<td><textarea class="flat" rows="3" cols="60" name="fSubject" >{$tSubject}</textarea></td>
|
|
<td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="label"><label>{$PALANG.pUsersVacation_body}:</label></td>
|
|
<td><textarea class="flat" rows="10" cols="60" name="fBody" >{$tBody}</textarea></td>
|
|
<td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td> </td>
|
|
<td colspan="2">
|
|
<input class="button" type="submit" name="fChange" value="{$PALANG.pEdit_vacation_set}" />
|
|
<input class="button" type="submit" name="fBack" value="{$PALANG.pEdit_vacation_remove}" />
|
|
<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
</form>
|
|
</div>
|