merge recent changes into HEAD

4 files changed, 22 insertions, 13 deletions

diff --git a/templates/assignuser.tpl b/templates/assignuser.tpl
index 6367c9e..a14e18f 100644
--- a/templates/assignuser.tpl
+++ b/templates/assignuser.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_users/templates/Attic/assignuser.tpl,v 1.4 2005/10/12 15:14:09 spiderr Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_users/templates/Attic/assignuser.tpl,v 1.5 2005/11/22 07:28:24 squareing Exp $ *}
 {strip}
 <div class="floaticon">{bithelp}</div>
 <div class="floaticon"><a href="{$smarty.const.USERS_PKG_URL}admin/index.php">{biticon ipackage=liberty iname=back iexplain="back to users"}</a></div>
@@ -16,7 +16,7 @@
 			<div class="row">
 				{formlabel label="Username"}
 				{forminput}
-					{$assignUser->mInfo.login}
+					{$assignUser->getDisplayName(TRUE)}
 				{/forminput}
 			</div>
 
@@ -28,6 +28,13 @@
 			</div>
 
 			<div class="row">
+				{formlabel label="User ID"}
+				{forminput}
+					{$assignUser->mUserId}
+				{/forminput}
+			</div>
+
+			<div class="row">
 				{formlabel label="Groups"}
 				{forminput}
 					{foreach from=$assignUser->mGroups key=groupId item=group}
diff --git a/templates/center_user_wiki_page.tpl b/templates/center_user_wiki_page.tpl
index 0e57bc2..9bdfc6b 100644
--- a/templates/center_user_wiki_page.tpl
+++ b/templates/center_user_wiki_page.tpl
@@ -9,13 +9,17 @@
 <div class="display wiki user">
 	{if $gBitUser->hasPermission( 'bit_p_admin_users' ) || $gBitUser->mUserId eq $gQueryUser->mUserId}
 		<div class="floaticon">
-			{if $gBitUser->mUserId ne $gQueryUser->mUserId}
+			{if $gBitUser->hasPermission( 'bit_p_admin_users' )}
 				{smartlink ipackage=users ifile="admin/index.php" assume_user=$userInfo.user_id ititle="Assume user identity" ibiticon="users/assume_user"}
-			{else}
-				{smartlink ipackage=users ifile="preferences.php" ititle="Edit personal profile and images" ibiticon="liberty/config"}
+				{smartlink ipackage=users ifile="admin/preferences.php" view_user=$userInfo.user_id ititle="Edit User Information" ibiticon="liberty/edit" iforce="icon"}
+				{smartlink ipackage=users ifile="admin/assign_user.php" assign_user=$userInfo.user_id ititle="Assign Group" ibiticon="liberty/permissions" iforce="icon"}
+				{if $users[user].user_id != -1}{* TODO: evil hardcoding *}
+					{smartlink ipackage=users ifile="admin/index.php" action=delete user_id=$userInfo.user_id ititle="Remove" ibiticon="liberty/delete" iforce="icon"}
+				{/if}
 			{/if}
 
 			{if $gBitUser->mUserId eq $gQueryUser->mUserId}
+				{smartlink ipackage=users ifile="preferences.php" ititle="Edit personal profile and images" ibiticon="liberty/config"}
 				{smartlink ipackage=users ifile="edit_personal_page.php" ititle="Edit personal wiki page" ibiticon="liberty/edit"}
 			{/if}
 		</div>
diff --git a/templates/user_bookmarks.tpl b/templates/user_bookmarks.tpl
index 21fc4f3..30bce63 100644
--- a/templates/user_bookmarks.tpl
+++ b/templates/user_bookmarks.tpl
@@ -67,7 +67,7 @@
       <input type="hidden" name="parent_id" value="{$parent_id|escape}" />
       <tr><th colspan="2">{tr}Add or edit a folder{/tr}</th></tr>
       <tr><td>{tr}Name{/tr}:</td>
-          <td><input type="text" name="foldername" value="{$foldername|escape}" /></td>
+          <td width="100%" align="right"><input type="text" name="foldername" value="{$foldername|escape}" /></td>
       </tr>
       <tr class="panelsubmitrow">
           <td colspan="2"><input type="submit" name="addfolder" value="{tr}add{/tr}" /> <a href="{$smarty.const.USERS_PKG_URL}bookmarks.php?parent_id={$parent_id}&amp;editfolder=0">{tr}new{/tr}</a></td>
@@ -81,10 +81,10 @@
       <input type="hidden" name="parent_id" value="{$parent_id|escape}" />
       <tr><th colspan="2">{tr}Add or edit a URL{/tr}</th></tr>
       <tr><td>{tr}Name{/tr}:</td>
-          <td><input type="text" name="urlname" value="{$urlname|escape}" /></td>
+          <td width="100%" align="right"><input type="text" name="urlname" value="{$urlname|escape}" /></td>
       </tr>
       <tr><td>{tr}URL{/tr}:</td>
-          <td><input type="text" name="urlurl" value="{$urlurl|escape}" /></td>
+          <td width="100%" align="right"><input type="text" name="urlurl" value="{$urlurl|escape}" /></td>
       </tr>
       <tr class="panelsubmitrow">
           <td colspan="2"><input type="submit" name="addurl" value="{tr}add{/tr}" /> <a href="{$smarty.const.USERS_PKG_URL}bookmarks.php?parent_id={$parent_id}&amp;editurl=0">{tr}new{/tr}</a></td>
diff --git a/templates/users_list.tpl b/templates/users_list.tpl
index a7b94db..982a805 100644
--- a/templates/users_list.tpl
+++ b/templates/users_list.tpl
@@ -21,11 +21,9 @@
 				<div class="floaticon">
 					<a href="{$smarty.const.USERS_PKG_URL}admin/index.php?assume_user={$users[user].user_id}" title="{tr}Assume User Identity{/tr}">{biticon ipackage=users iname="assume_user" iexplain="assume user identity" iforce="icon"}</a>
 					<a href="{$smarty.const.USERS_PKG_URL}preferences.php?view_user={$users[user].user_id}" title="{tr}Edit User Information{/tr}">{biticon ipackage=liberty iname="edit" iexplain="Edit User Information" iforce="icon"}</a>
-					{if $gBitUser->hasPermission( 'bit_p_admin_users' )}
-						<a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?assign_user={$users[user].user_id}" title="{tr}Assign Group{/tr}">{biticon ipackage=liberty iname="permissions" iexplain="assign group" iforce="icon"}</a>
-						{if $users[user].user_id != -1}{* TODO: evil hardcoding *}
-							<a href="{$smarty.const.USERS_PKG_URL}admin/index.php?offset={$control.offset}&amp;numrows={$control.numrows}&amp;sort_mode={$control.sort_mode}&amp;action=delete&amp;user_id={$users[user].user_id}"  title="{tr}Remove{/tr}">{biticon ipackage=liberty iname="delete" iexplain="remove user" iforce="icon"}</a>
-						{/if}
+					<a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?assign_user={$users[user].user_id}" title="{tr}Assign Group{/tr}">{biticon ipackage=liberty iname="permissions" iexplain="assign group" iforce="icon"}</a>
+					{if $users[user].user_id != -1}{* TODO: evil hardcoding *}
+						<a href="{$smarty.const.USERS_PKG_URL}admin/index.php?offset={$control.offset}&amp;numrows={$control.numrows}&amp;sort_mode={$control.sort_mode}&amp;action=delete&amp;user_id={$users[user].user_id}"  title="{tr}Remove{/tr}">{biticon ipackage=liberty iname="delete" iexplain="remove user" iforce="icon"}</a>
 					{/if}
 				</div>
 			{/if}