X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Fusers.tpl;h=4faf1249d469b4da8cfe539ef82294165a07b69e;hb=aeb30899d6ec142220d83b34fd8f6c68c05e8e90;hp=390320a59bd0954dd8a039c89b3822f605f44390;hpb=2130fc223b47abdbf6533fb4cf3a4ad3b6c2c300;p=timetracker.git

diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index 390320a5..4faf1249 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -5,45 +5,45 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->canManageTeam()}
+{if $user->can('manage_users')}
+  {if $group_dropdown}
+{$forms.usersForm.open} {* usersForm consists only of one dropdown group control *}
+      <table width="100%">
+        <tr>
+          <td align="center">{$i18n.label.group}: {$forms.usersForm.group.control}</td>
+        </tr>
+      </table>
+{$forms.usersForm.close}
+  {/if}
+
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_users}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.active_users}</td></tr>
   {/if}
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.login}</td>
-          <td width="10%" class="tableHeader">{$i18n.form.users.role}</td>
+          <td width="30%" class="tableHeader">{$i18n.label.person_name}</td>
+          <td width="30%" class="tableHeader">{$i18n.label.login}</td>
+          <td width="20%" class="tableHeader">{$i18n.form.users.role}</td>
           <td width="10%" class="tableHeader">{$i18n.label.edit}</td>
           <td width="10%" class="tableHeader">{$i18n.label.delete}</td>
         </tr>
   {if $active_users}
     {foreach $active_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>
-          {if $smarty.const.UNCOMPLETED_INDICATORS == $user->uncompleted_indicators}
+          {if $uncompleted_indicators}
             <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
           {/if}
             {$u.name|escape}
           </td>
           <td>{$u.login|escape}</td>
-      {if $smarty.const.ROLE_MANAGER == $u.role}
-            <td>{$i18n.form.users.manager}</td>
-      {elseif $smarty.const.ROLE_COMANAGER == $u.role}
-            <td>{$i18n.form.users.comanager}</td>
-      {elseif $smarty.const.ROLE_CLIENT == $u.role}
-            <td>{$i18n.label.client}</td>
-      {elseif $smarty.const.ROLE_USER == $u.role}
-            <td>{$i18n.label.user}</td>
-      {/if}
-      {if $user->isManager()}
-          <!-- Manager can edit everybody. -->
+          <td>{$u.role_name|escape}</td>
+      {if $u.group_id != $user->group_id || $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
           <td><a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</a></td>
-          <td>{if $smarty.const.ROLE_MANAGER != $u.role || $can_delete_manager}<a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a>{/if}</td>
+         {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a></td>{else}<td></td>{/if}
       {else}
-          <!--  Comanager can edit self and clients or users but not manager and other comanagers. -->
-          <td>{if ($user->id == $u.id) || ($smarty.const.ROLE_CLIENT == $u.role) || ($smarty.const.ROLE_USER == $u.role)}<a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</a>{/if}</td>
-          <td>{if ($user->id == $u.id) || ($smarty.const.ROLE_CLIENT == $u.role) || ($smarty.const.ROLE_USER == $u.role)}<a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a>{/if}</td>
+          <td></td>
+          <td></td>
       {/if}
         </tr>
     {/foreach}
@@ -53,7 +53,7 @@
       <table width="100%">
         <tr>
           <td align="center"><br>
-            <form><input type="button" onclick="chLocation('user_add.php');" value="{$i18n.button.add_user}"></form>
+            <form><input type="button" onclick="chLocation('user_add.php');" value="{$i18n.button.add}"></form>
           </td>
         </tr>
       </table>
@@ -62,9 +62,9 @@
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.inactive_users}</td></tr>
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.login}</td>
-          <td width="10%" class="tableHeader">{$i18n.form.users.role}</td>
+          <td width="30%" class="tableHeader">{$i18n.label.person_name}</td>
+          <td width="30%" class="tableHeader">{$i18n.label.login}</td>
+          <td width="20%" class="tableHeader">{$i18n.form.users.role}</td>
           <td width="10%" class="tableHeader">{$i18n.label.edit}</td>
           <td width="10%" class="tableHeader">{$i18n.label.delete}</td>
         </tr>
@@ -72,23 +72,13 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$u.name|escape}</td>
           <td>{$u.login|escape}</td>
-      {if $smarty.const.ROLE_MANAGER == $u.role}
-            <td>{$i18n.form.users.manager}</td>
-      {elseif $smarty.const.ROLE_COMANAGER == $u.role}
-            <td>{$i18n.form.users.comanager}</td>
-      {elseif $smarty.const.ROLE_CLIENT == $u.role}
-            <td>{$i18n.label.client}</td>
-      {elseif $smarty.const.ROLE_USER == $u.role}
-            <td>{$i18n.label.user}</td>
-      {/if}
-      {if $user->isManager()}
-          <!-- Manager can edit everybody. -->
+          <td>{$u.role_name|escape}</td>
+      {if $u.group_id != $user->group_id || $u.rank < $user->rank}
           <td><a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</a></td>
-          <td>{if $smarty.const.ROLE_MANAGER != $u.role || $can_delete_manager}<a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a>{/if}</td>
+          <td><a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a></td>
       {else}
-          <!--  Comanager can edit self and clients or users but not manager and other comanagers. -->
-          <td>{if ($user->id == $u.id) || ($smarty.const.ROLE_CLIENT == $u.role) || ($smarty.const.ROLE_USER == $u.role)}<a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</a>{/if}</td>
-          <td>{if ($user->id == $u.id) || ($smarty.const.ROLE_CLIENT == $u.role) || ($smarty.const.ROLE_USER == $u.role)}<a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a>{/if}</td>
+          <td></td>
+          <td></td>
       {/if}
         </tr>
     {/foreach}
@@ -98,7 +88,7 @@
       <table width="100%">
         <tr>
           <td align="center" height="50">
-            <form><input type="button" onclick="chLocation('user_add.php');" value="{$i18n.button.add_user}"></form>
+            <form><input type="button" onclick="chLocation('user_add.php');" value="{$i18n.button.add}"></form>
           </td>
         </tr>
       </table>
@@ -114,15 +104,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$u.name|escape}</td>
           <td>{$u.login|escape}</td>
-    {if $smarty.const.ROLE_MANAGER == $u.role}
-            <td>{$i18n.form.users.manager}</td>
-    {elseif $smarty.const.ROLE_COMANAGER == $u.role}
-            <td>{$i18n.form.users.comanager}</td>
-    {elseif $smarty.const.ROLE_CLIENT == $u.role}
-            <td>{$i18n.label.client}</td>
-    {elseif $smarty.const.ROLE_USER == $u.role}
-            <td>{$i18n.label.user}</td>
-    {/if}
+          <td>{$u.role_name|escape}</td>
         </tr>
   {/foreach}
       </table>