From 1309377eb1512df6d1568c479384b6a3e3366927 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Jul 2017 11:03:34 +0200
Subject: [PATCH 1/2] nicer layout

put all action buttons into one place, remove frame from selection box
---
 views/bootstrap/class.UsrMgr.php | 35 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index d31b4553b..79e98304b 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -146,8 +146,23 @@ $(document).ready( function() {
 			}
 			echo "</table>";
 
+		}
+	} /* }}} */
+
+	function actionmenu() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$seluser = $this->params['seluser'];
+		$quota = $this->params['quota'];
+		$workflowmode = $this->params['workflowmode'];
+		$undeluserids = $this->params['undeluserids'];
+
+		if($seluser) {
+			if(!in_array($seluser->getID(), $undeluserids)) {
+				echo '<a class="btn btn-danger" href="../out/out.RemoveUser.php?userid='.$seluser->getID().'"><i class="icon-remove"></i> '.getMLText("rm_user").'</a> ';
+			}
 			if($user->isAdmin() && $seluser->getID() != $user->getID())
-				echo "<a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."\" class=\"btn btn-primary\">".getMLText("substitute_user")."</a>\n";
+				echo "<a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\" class=\"btn btn-primary\">".getMLText("substitute_user")."</a>\n";
 		}
 	} /* }}} */
 
@@ -187,16 +202,6 @@ $(document).ready( function() {
 		}
 ?>
 	<table class="table-condensed">
-<?php
-	if($currUser && !in_array($currUser->getID(), $undeluserids)) {
-?>
-		<tr>
-			<td></td>
-			<td><a class="btn" href="../out/out.RemoveUser.php?userid=<?php print $currUser->getID();?>"><i class="icon-remove"></i> <?php printMLText("rm_user");?></a></td>
-		</tr>
-<?php
-	}
-?>
 		<tr>
 			<td><?php printMLText("user_login");?>:</td>
 			<td><input type="text" name="login" id="login" value="<?php print $currUser ? htmlspecialchars($currUser->getLogin()) : "";?>"></td>
@@ -478,11 +483,7 @@ $(document).ready( function() {
 ?>
 <div class="row-fluid">
 <div class="span4">
-<div class="well">
 <form class="form-horizontal">
-	<div class="control-group">
-		<label class="control-label" for="login"><?php printMLText("selection");?>:</label>
-		<div class="controls">
 <select class="chzn-select" id="selector">
 <option value="-1"><?php echo getMLText("choose_user")?></option>
 <option value="0"><?php echo getMLText("add_user")?></option>
@@ -492,10 +493,8 @@ $(document).ready( function() {
 		}
 ?>
 </select>
-		</div>
-	</div>
 </form>
-</div>
+	<div class="ajax" style="margin-bottom: 15px;" data-view="UsrMgr" data-action="actionmenu" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
 	<div class="ajax" data-view="UsrMgr" data-action="info" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
 </div>
 

From 096a119399474de7e4903ee3c554e70075f9a35a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Jul 2017 11:07:56 +0200
Subject: [PATCH 2/2] add icon to substitute button

---
 views/bootstrap/class.UsrMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 79e98304b..7e322c3e1 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -162,7 +162,7 @@ $(document).ready( function() {
 				echo '<a class="btn btn-danger" href="../out/out.RemoveUser.php?userid='.$seluser->getID().'"><i class="icon-remove"></i> '.getMLText("rm_user").'</a> ';
 			}
 			if($user->isAdmin() && $seluser->getID() != $user->getID())
-				echo "<a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\" class=\"btn btn-primary\">".getMLText("substitute_user")."</a>\n";
+				echo "<a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\" class=\"btn btn-primary\"><i class=\"icon-exchange\"></i> ".getMLText("substitute_user")."</a>\n";
 		}
 	} /* }}} */