From b67cf2fa64a74397c967aa6d39bef08f8d7e2cba Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 29 May 2016 12:09:40 +0200
Subject: [PATCH] Fixed page references when Users menu is under Settings

---
 plugins/dynamix/UserAdd.page  |  2 +-
 plugins/dynamix/UserEdit.page |  4 ++--
 plugins/dynamix/UserList.page | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/dynamix/UserAdd.page b/plugins/dynamix/UserAdd.page
index 223be087d..54e52a722 100644
--- a/plugins/dynamix/UserAdd.page
+++ b/plugins/dynamix/UserAdd.page
@@ -139,5 +139,5 @@ Retype password:
 : <input type="password" name="userPasswordConf" maxlength="40" onKeyUp="this.form.cmdUserEdit.disabled=(this.form.userPassword.value!=this.form.userPasswordConf.value);">
 
 &nbsp;
-: <input type="submit" name="cmdUserEdit" value="Add"><input type="button" value="Done" onclick="done()">
+: <input type="submit" name="cmdUserEdit" value="Add"><input type="button" value="Done" onclick="done('UserAdd')">
 </form>
diff --git a/plugins/dynamix/UserEdit.page b/plugins/dynamix/UserEdit.page
index 504968c17..6e00f50c1 100644
--- a/plugins/dynamix/UserEdit.page
+++ b/plugins/dynamix/UserEdit.page
@@ -132,7 +132,7 @@ Custom image:
 <?else:?>
 Delete<input type="checkbox" name="confirmDelete" onChange="chkDelete(this.form, this.form.cmdUserEdit)">
 <?endif;?>
-: <input type="submit" name="cmdUserEdit" value="Apply"><input type="button" value="Done" onclick="done()">
+: <input type="submit" name="cmdUserEdit" value="Apply"><input type="button" value="Done" onclick="done('UserEdit')">
 </form>
 <br><br>
 <form markdown="1" method="POST" action="/update.htm" target="progressFrame">
@@ -144,5 +144,5 @@ Retype password:
 : <input type="password" name="userPasswordConf" maxlength="40" onKeyUp="this.form.cmdUserEdit.disabled = (this.form.userPassword.value != this.form.userPasswordConf.value);">
 
 &nbsp;
-: <input type="submit" name="cmdUserEdit" value="Change"><input type="button" value="Done" onclick="done()">
+: <input type="submit" name="cmdUserEdit" value="Change"><input type="button" value="Done" onclick="done('UserEdit')">
 </form>
diff --git a/plugins/dynamix/UserList.page b/plugins/dynamix/UserList.page
index 49d432d9d..6f2fe8b8c 100644
--- a/plugins/dynamix/UserList.page
+++ b/plugins/dynamix/UserList.page
@@ -13,15 +13,15 @@ Title="Users"
  * all copies or substantial portions of the Software.
  */
 ?>
-
+<?
+$submenu = !empty($display['users']) && substr($display['users'],0,5)!='Tasks';
+if ($submenu) $path = '/Settings/Users';
+?>
 <?foreach ($users as $user):?>
 <?$img = "/boot/config/plugins/dynamix/users/{$user['name']}.png"?>
   <div class="user-list"><center><a class="<?=(!empty($user['desc']) ? 'info' : '')?>" href="<?=$path?>/UserEdit?name=<?=$user['name'];?>"><img src="<?=(file_exists($img) ? autov($img) : '/webGui/images/user.png')?>" class="picture" border="0" width="48" height="48"><br><?=$user['name']?><span><?=$user['desc']?></span></a></center></div>
 <?endforeach;?>
 <div style='clear:both'></div>
 <form method="GET" action="<?=$path?>/UserAdd">
-<input type="submit" value="Add User">
-<?if (!empty($display['users']) && substr($display['users'],0,5)!='Tasks'):?>
-<input type="button" value="Done" onclick="done()">
-<?endif;?>
+<input type="submit" value="Add User"><?if ($submenu):?><input type="button" value="Done" onclick="done()"><?endif;?>
 </form>