users_edit-alias.tpl, users_password.tpl, users_vacation.tpl:

- replaced <h3> with <th>
- marked labels as <label>
- mark non-editable fields with <em>
- removed tMessage
- aligned buttons with input fields

users_password.tpl:
- put class=error_msg in template (will be removed from $PALANG strings)
  - change compared to Dale's patch: use <td class="error_msg"> instead of
    <td><span class="error_msg">

users_vacation.tpl:
- added class="flat" to fActiveFrom and fActiveUntil
- added language="JavaScript" to <script>
- removed reference to calendar.css (now included via default.css)

default.css
- added @import calendar.css

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1090 a1433add-5e2c-0410-b055-b7f2511e0802

css/default.css

@@ -1,3 +1,4 @@
+@import url(calendar.css);
 body {
 	background: #ffffff;
 	color: #000000;

templates/users_edit-alias.tpl

@@ -2,15 +2,15 @@
 <form name="alias" method="post" action="">
 <table>
 	<tr>
-		<td colspan="3"><h3>{$PALANG.pEdit_alias_welcome}<br />{$PALANG.pEdit_alias_help}</h3></td>
+		<th colspan="3">{$PALANG.pEdit_alias_welcome}<br /><em>{$PALANG.pEdit_alias_help}</em></th>
 	</tr>
 	<tr>
-		<td>{$PALANG.pEdit_alias_address}:</td>
-		<td>{$USERID_USERNAME}</td>
+		<td class="label"><label>{$PALANG.pEdit_alias_address}:</label></td>
+		<td><em>{$USERID_USERNAME}</em></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pEdit_alias_goto}:</td>
+		<td class="label"><label>{$PALANG.pEdit_alias_goto}:</label></td>
 		<td><textarea class="flat" rows="4" cols="50" name="fGoto">
 {foreach from=$tGotoArray item=address}
 {$address}
@@ -29,13 +29,12 @@
 		</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center">
+		<td>&nbsp;</td>
+		<td>
 			<input class="button" type="submit" name="submit" value="{$PALANG.save}" />
 			<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
 		</td>
-	</tr>
-	<tr>
-		<td colspan="3" class="standout">{$tMessage}</td>
+		<td>&nbsp;</td>
 	</tr>
 </table>
 </form>

templates/users_password.tpl

@@ -2,36 +2,35 @@
 <form name="alias" method="post" action="">
 <table>
 	<tr>
-		<td colspan="3"><h3>{$PALANG.pPassword_welcome}</h3></td>
+		<th colspan="3">{$PALANG.pPassword_welcome}</th>
 	</tr>
 	<tr>
-		<td>{$PALANG.pPassword_admin}:</td>
-		<td>{$USERID_USERNAME}</td>
+		<td class="label"><label>{$PALANG.pPassword_admin}:</label></td>
+		<td><em>{$USERID_USERNAME}</em></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pPassword_password_current}:</td>
+		<td class="label"><label>{$PALANG.pPassword_password_current}:</label></td>
 		<td><input class="flat" type="password" name="fPassword_current" /></td>
-		<td>{$pPassword_password_current_text}</td>
+		<td class="error_msg">{$pPassword_password_current_text}</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pPassword_password}:</td>
+		<td class="label"><label>{$PALANG.pPassword_password}:</label></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
-		<td>{$pPassword_password_text}</td>
+		<td class="error_msg">{$pPassword_password_text}</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pPassword_password2}:</td>
+		<td class="label"><label>{$PALANG.pPassword_password2}:</label></td>
 		<td><input class="flat" type="password" name="fPassword2" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center">
+		<td>&nbsp;</td>
+		<td>
 		<input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" />
 		<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
 		</td>
-	</tr>
-	<tr>
-		<td colspan="3" class="standout">{$tMessage}</td>
+		<td>&nbsp;</td>
 	</tr>
 </table>
 </form>

templates/users_vacation.tpl

@@ -1,23 +1,22 @@
 {literal}
-	<script type="text/javascript">
+	<script language="JavaScript" type="text/javascript">
 	function newLocation() {
 		window.location="{/literal}{$fCanceltarget}{literal}"
 	}
 	</script>
-	<script language="JavaScript" src="calendar.js"></script>
-	<link rel="stylesheet" href="css/calendar.css">
+	<script language="JavaScript" src="calendar.js" type="text/javascript"></script>
 {/literal}
 <div id="edit_form">
 <form name="vacation" method="post" action=''>
 <table>
 	<tr>
-		<td colspan="3"><h3>{$PALANG.pUsersVacation_welcome}</h3></td>
+		<th colspan="3">{$PALANG.pUsersVacation_welcome}</th>
 	</tr>
 	<tr>
-		<td>{$PALANG.pUsersVacation_activefrom}:</td>
-		<td><input name="fActiveFrom" value="{$tActiveFrom}" readonly="readonly" style="background:#eee;"/>
+		<td class="label"><label>{$PALANG.pUsersVacation_activefrom}:</label></td>
+		<td><input class="flat" name="fActiveFrom" value="{$tActiveFrom}" readonly="readonly" style="background:#eee;" />
 {literal}
-<script language="JavaScript">
+<script language="JavaScript" type="text/javascript">
 	new tcal ({
 		'formname': 'vacation',
 		'controlname': 'fActiveFrom'
@@ -28,10 +27,10 @@
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pUsersVacation_activeuntil}:</td>
-		<td><input name="fActiveUntil" value="{$tActiveUntil}" readonly="readonly" style="background:#eee;"/>
+		<td class="label"><label>{$PALANG.pUsersVacation_activeuntil}:</label></td>
+		<td><input class="flat" name="fActiveUntil" value="{$tActiveUntil}" readonly="readonly" style="background:#eee;" />
 {literal}
-<script language="JavaScript">
+<script language="JavaScript" type="text/javascript">
 	new tcal ({
 		'formname': 'vacation',
 		'controlname': 'fActiveUntil'
@@ -42,25 +41,23 @@
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pUsersVacation_subject}:</td>
+		<td class="label"><label>{$PALANG.pUsersVacation_subject}:</label></td>
 		<td><textarea class="flat" rows="3" cols="60" name="fSubject" >{$tSubject}</textarea></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pUsersVacation_body}:</td>
+		<td class="label"><label>{$PALANG.pUsersVacation_body}:</label></td>
 		<td><textarea class="flat" rows="10" cols="60" name="fBody" >{$tBody}</textarea></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center">
+		<td>&nbsp;</td>
+		<td colspan="2">
 			<input class="button" type="submit" name="fAway" value="{$PALANG.pUsersVacation_button_away}" />
 			<input class="button" type="submit" name="fBack" value="{$PALANG.pUsersVacation_button_back}" />
 			<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
 		</td>
 	</tr>
-	<tr>
-		<td colspan="3" class="standout">{$tMessage}</td>
-	</tr>
 </table>
 </form>
 </div>