From bd85b3725fcfdcc90efbd2d1485b5c940bb49d57 Mon Sep 17 00:00:00 2001
From: root <root@teicee.com>
Date: Fri, 4 May 2018 14:25:27 +0200
Subject: [PATCH] Bootstrap TPL for user interface

---
 templates/bootstrap/password.tpl         | 73 ++++++++++-----------
 templates/bootstrap/users_edit-alias.tpl | 82 +++++++++++++-----------
 templates/bootstrap/users_main.tpl       | 12 ++--
 templates/bootstrap/users_menu.tpl       | 40 ++++++++----
 4 files changed, 112 insertions(+), 95 deletions(-)

diff --git a/templates/bootstrap/password.tpl b/templates/bootstrap/password.tpl
index 8c815c95..0ba02c14 100644
--- a/templates/bootstrap/password.tpl
+++ b/templates/bootstrap/password.tpl
@@ -1,39 +1,36 @@
-<div id="edit_form">
-<form name="password" method="post" action="">
-<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
-<table>
-	<tr>
-		<th colspan="3">{$PALANG.pPassword_welcome}</th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pPassword_admin}:</label></td>
-		<td><em>{$SESSID_USERNAME}</em></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pPassword_password_current}:</label></td>
-		<td><input class="flat" type="password" name="fPassword_current" /></td>
-		<td class="error_msg">{$pPassword_password_current_text}</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pPassword_password}:</label></td>
-		<td><input class="flat" type="password" name="fPassword" /></td>
-		<td class="error_msg">{$pPassword_password_text}</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pPassword_password2}:</label></td>
-		<td><input class="flat" type="password" name="fPassword2" /></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label">&nbsp;</td>
-		<td>
-			<input class="button" type="submit" name="submit" value="{$PALANG.change_password}" />
-			{if $authentication_has_role.user}
-				<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
-			{/if}
-		<td>&nbsp;</td>
-	</tr>
-</table>
-</form>
+<form name="password" method="post" action="" class="form-horizontal">
+<div id="edit_form" class="panel panel-default">
+<div class="panel-heading"><h4>{$PALANG.pPassword_welcome}</h4></div>
+<div class="panel-body enable-asterisk">
+	<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
+	<div class="form-group">
+		<label class="col-md-4 col-sm-4 control-label">{$PALANG.pLogin_username}:</label>
+		<div class="col-md-6 col-sm-8"><p class="form-control-static"><em>{$SESSID_USERNAME}</em></p></div>
+	</div>
+	<div class="form-group {if $pPassword_password_current_text}has-error{/if}">
+		<label class="col-md-4 col-sm-4 control-label" for="fPassword_current">{$PALANG.pPassword_password_current}:</label>
+		<div class="col-md-6 col-sm-8"><input class="form-control" type="password" name="fPassword_current" id="fPassword_current" /></div>
+		<span class="help-block">{$pPassword_password_current_text}</span>
+	</div>
+	<div class="form-group {if $pPassword_password_text}has-error{/if}">
+		<label class="col-md-4 col-sm-4 control-label" for="fPassword">{$PALANG.pPassword_password}:</label>
+		<div class="col-md-6 col-sm-8"><input class="form-control" type="password" name="fPassword" id="fPassword" /></div>
+		<span class="help-block">{$pPassword_password_text}</span>
+	</div>
+	<div class="form-group">
+		<label class="col-md-4 col-sm-4 control-label" for="fPassword2">{$PALANG.pPassword_password2}:</label>
+		<div class="col-md-6 col-sm-8"><input class="form-control" type="password" name="fPassword2" id="fPassword2" /></div>
+	</div>
+</div>
+<div class="panel-footer">
+        <div class="btn-toolbar" role="toolbar">
+                <div class="btn-group pull-right">
+		<input class="btn btn-primary" type="submit" name="submit" value="{$PALANG.change_password}" />
+		{if $authentication_has_role.user}
+			<input class="btn btn-primary" type="submit" name="fCancel" value="{$PALANG.exit}" />
+		{/if}
+                </div>
+        </div>
 </div>
+</div>
+</form>
diff --git a/templates/bootstrap/users_edit-alias.tpl b/templates/bootstrap/users_edit-alias.tpl
index c6b5b1fb..fa07e309 100644
--- a/templates/bootstrap/users_edit-alias.tpl
+++ b/templates/bootstrap/users_edit-alias.tpl
@@ -1,42 +1,48 @@
-<div id="edit_form">
-<form name="alias" method="post" action="">
-<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
-<table>
-	<tr>
-		<th colspan="3">{$PALANG.pEdit_alias_welcome}<br /><em>{$PALANG.pEdit_alias_help}</em></th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.alias}:</label></td>
-		<td><em>{$USERID_USERNAME}</em></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.to}:</label></td>
-		<td><textarea class="flat" rows="4" cols="50" name="fGoto">
+<form name="alias" method="post" action="" class="form-horizontal">
+<div id="edit_form" class="panel panel-default">
+<div class="panel-heading"><h4>{$PALANG.pEdit_alias_welcome}</h4></div>
+<div class="panel-body enable-asterisk">
+	<input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}" />
+	<p class="text-center"><em>{$PALANG.pEdit_alias_help}</em></p>
+	<div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label">{$PALANG.alias}:</label>
+                <div class="col-md-6 col-sm-8"><p class="form-control-static"><em>{$USERID_USERNAME}</em></p></div>
+        </div>
+	<div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label" for="fGoto">{$PALANG.to}:</label>
+                <div class="col-md-6 col-sm-8">
+			<textarea class="form-control" rows="4" cols="50" name="fGoto" id="fGoto">
 {foreach from=$tGotoArray item=address}
 {$address}
 {/foreach}
-</textarea>
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td colspan="2">
-		<input class="flat" type="radio" name="fForward_and_store" value="1"{$forward_and_store}/>
-		{$PALANG.pEdit_alias_forward_and_store}<br />
-		<input class="flat" type="radio" name="fForward_and_store" value="0" {$forward_only}/>
-		{$PALANG.pEdit_alias_forward_only}
-		</td>
-	</tr>
-	<tr>
-		<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>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-</form>
+			</textarea>
+		</div>
+        </div>
+	<div class="form-group">
+                <label class="col-md-4 col-sm-4 control-label"></label>
+                <div class="col-md-6 col-sm-8">
+			<div class="radio">
+				<label>
+				<input type="radio" name="fForward_and_store" id="fForward_and_store1" value="1"{$forward_and_store}/>
+				{$PALANG.pEdit_alias_forward_and_store}
+				</label>
+			</div>
+			<div class="radio">
+				<label>
+				<input type="radio" name="fForward_and_store" id="fForward_and_store0" value="0" {$forward_only}/>
+				{$PALANG.pEdit_alias_forward_only}
+				</label>
+			</div>
+		</div>
+        </div>
+</div>
+<div class="panel-footer">
+        <div class="btn-toolbar" role="toolbar">
+                <div class="btn-group pull-right">
+		<input class="btn btn-primary" type="submit" name="submit" value="{$PALANG.save}" />
+		<input class="btn btn-primary" type="submit" name="fCancel" value="{$PALANG.exit}" />
+                </div>
+        </div>
 </div>
+</div>
+</form>
diff --git a/templates/bootstrap/users_main.tpl b/templates/bootstrap/users_main.tpl
index 339dbdbd..a4310aa8 100644
--- a/templates/bootstrap/users_main.tpl
+++ b/templates/bootstrap/users_main.tpl
@@ -1,23 +1,23 @@
-<div id="main_menu">
-<table>
+<div class="panel panel-default" id="main_menu">
+<table class="table">
 {if $CONF.vacation===YES}
 	<tr>
-		<td nowrap="nowrap"><a target="_top" href="vacation.php">{$PALANG.pUsersMenu_vacation}</a></td>
+		<td nowrap="nowrap"><a class="btn btn-primary" href="vacation.php">{$PALANG.pUsersMenu_vacation}</a></td>
 		<td>{$tummVacationtext}</td>
 	</tr>
 {/if}
 {if $CONF.edit_alias===YES}
 	<tr>
-		<td nowrap="nowrap"><a target="_top" href="edit-alias.php">{$PALANG.pUsersMenu_edit_alias}</a></td>
+		<td nowrap="nowrap"><a class="btn btn-primary" href="edit-alias.php">{$PALANG.pUsersMenu_edit_alias}</a></td>
 		<td>{$PALANG.pUsersMain_edit_alias}</td>
 	</tr>
 {/if}
 	<tr>
-		<td nowrap="nowrap"><a target="_top" href="password.php">{$PALANG.change_password}</a></td>
+		<td nowrap="nowrap"><a class="btn btn-primary" href="password.php">{$PALANG.change_password}</a></td>
 		<td>{$PALANG.pUsersMain_password}</td>
 	</tr>
 	<tr>
-		<td nowrap="nowrap"><a target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></td>
+		<td nowrap="nowrap"><a class="btn btn-primary" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></td>
 		<td>{$PALANG.pMain_logout}</td>
 	</tr>
 </table>
diff --git a/templates/bootstrap/users_menu.tpl b/templates/bootstrap/users_menu.tpl
index ff14391d..06938601 100644
--- a/templates/bootstrap/users_menu.tpl
+++ b/templates/bootstrap/users_menu.tpl
@@ -1,13 +1,27 @@
-<div id="menu">
-<ul>
-	<li><a target="_top" href="{#url_user_main#}">{$PALANG.pMenu_main}</a></li>
-{if $CONF.vacation===YES}
-	<li><a target="_top" href="{#url_user_vacation#}">{$PALANG.pUsersMenu_vacation}</a></li>
-{/if}
-{if $CONF.edit_alias===YES}
-	<li><a target="_top" href="{#url_user_edit_alias#}">{$PALANG.pUsersMenu_edit_alias}</a></li>
-{/if}
-	<li><a target="_top" href="{#url_user_password#}">{$PALANG.change_password}</a></li>
-	<li class="logout"><a target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></li>
-</ul>
-</div>
+<nav class="navbar navbar-default navbar-fixed-top">
+        <div class="container-fluid">
+                <div class="navbar-header">
+                        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+                                <span class="sr-only">Toggle navigation</span>
+                                <span class="icon-bar"></span>
+                                <span class="icon-bar"></span>
+                                <span class="icon-bar"></span>
+                        </button>
+                        {*** <a class="navbar-brand" href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo}" alt="Logo" /></a> ***}
+                        <a class="navbar-brand" href="{#url_user_main#}{#url_user_main#}"><img id="login_header_logo" src="../images/postbox.png" alt="Logo" /></a>
+                </div>
+                <div id="navbar" class="collapse navbar-collapse">
+                        <ul class="nav navbar-nav">
+				<li><a target="_top" href="{#url_user_main#}">{$PALANG.pMenu_main}</a></li>
+			{if $CONF.vacation===YES}
+				<li><a target="_top" href="{#url_user_vacation#}">{$PALANG.pUsersMenu_vacation}</a></li>
+			{/if}
+			{if $CONF.edit_alias===YES}
+				<li><a target="_top" href="{#url_user_edit_alias#}">{$PALANG.pUsersMenu_edit_alias}</a></li>
+			{/if}
+				<li><a target="_top" href="{#url_user_password#}">{$PALANG.change_password}</a></li>
+				<li class="logout"><a target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></li>
+			</ul>
+		</div>
+	</div>
+</nav>