X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Fusers.tpl;h=6067ce6f8f1d02ea28ed672048ed502ce38091a9;hb=13cfff28242767287408e8fd13d992bc6c6e2086;hp=d729c41c94201bbf52f308a3b02781f50a18445a;hpb=39bde74f3805057f70c81494e04e460f9b3b59dd;p=timetracker.git

diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index d729c41c..6067ce6f 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -6,41 +6,37 @@
   <tr>
     <td valign="top">
 {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>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.label.active_users}</td></tr>
   {/if}
         <tr>
           <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>
+  {if $show_quota}
+          <td class="tableHeader">{$i18n.label.quota}</td>
+  {/if}
+          <td></td>
+          <td></td>
         </tr>
   {if $active_users}
     {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>
-          {if $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>
           <td>{$u.role_name|escape}</td>
-      {if $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>
-         {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a></td>{else}<td></td>{/if}
+      {if $show_quota}
+          <td class="cellRightAligned">{$u.quota_percent}</td>
+      {/if}
+      {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}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+         {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>{else}<td></td>{/if}
       {else}
           <td></td>
           <td></td>
@@ -60,22 +56,28 @@
 
   {if $inactive_users}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.inactive_users}</td></tr>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.label.inactive_users}</td></tr>
         <tr>
           <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>
+    {if $show_quota}
+          <td class="tableHeader">{$i18n.label.quota}</td>
+    {/if}
+          <td></td>
+          <td></td>
         </tr>
     {foreach $inactive_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$u.name|escape}</td>
           <td>{$u.login|escape}</td>
           <td>{$u.role_name|escape}</td>
-      {if $u.rank < $user->rank}
-          <td><a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</a></td>
-          <td><a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a></td>
+      {if $show_quota}
+          <td class="cellRightAligned">{$u.quota_percent}</td>
+      {/if}
+      {if $u.group_id != $user->group_id || $u.rank < $user->rank}
+          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
       {else}
           <td></td>
           <td></td>