X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Fmobile%2Fusers.tpl;h=e2b815f1b35f2dc82cd3b8202cb3c16dbcf8ff4f;hb=7916f561fed6b50348f144fc411ca82ee9bd5ebb;hp=fedfa804825cdae22328fedce4a7ad816dfc4be5;hpb=278a83090d6bf9d6351a449ba045323088f678aa;p=timetracker.git

diff --git a/WEB-INF/templates/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl
index fedfa804..e2b815f1 100644
--- a/WEB-INF/templates/mobile/users.tpl
+++ b/WEB-INF/templates/mobile/users.tpl
@@ -5,7 +5,7 @@
 <table class="mobile-table">
   <tr>
     <td valign="top">
-{if $user->canManageTeam()}
+{if $user->can('manage_users')}
       <table class="mobile-table-details">
   {if $inactive_users}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.active_users}</td></tr>
@@ -17,29 +17,19 @@
         </tr>
   {if $active_users}
     {foreach $active_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>
-            <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 $user->isManager()}
-              <a href="user_edit.php?id={$u.id}">{$u.name|escape:'html'}</a>
+            {if $user->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}
+            {if $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
+              <a href="user_edit.php?id={$u.id}">{$u.name|escape}</a>
             {else}
-              {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}">{$u.name|escape:'html'}</a>
-              {else}
-                {$u.name|escape:'html'}
-              {/if}
+              {$u.name|escape}
             {/if}
           </td>
-          <td>{$u.login|escape:'html'}</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.login|escape}</td>
+          <td>{$u.role_name|escape}</td>
         </tr>
     {/foreach}
   {/if}
@@ -48,55 +38,38 @@
       <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>
 
   {if $inactive_users}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+      <table class="mobile-table-details">
         <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="10%" class="tableHeader">{$i18n.label.edit}</td>
         </tr>
     {foreach $inactive_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>
-            {if $user->isManager()}
-              <a href="user_edit.php?id={$u.id}">{$u.name|escape:'html'}</a>
+            {if $u.rank < $user->rank}
+              <a href="user_edit.php?id={$u.id}">{$u.name|escape}</a>
             {else}
-              {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}">{$u.name|escape:'html'}</a>{/if}
+              {$u.name|escape}
             {/if}
           </td>
-          <td>{$u.login|escape:'html'}</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><a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</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>
-      {/if}
+          <td>{$u.login|escape}</td>
+          <td>{$u.role_name|escape}</td>
         </tr>
     {/foreach}
-
       </table>
 
       <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>
@@ -109,18 +82,10 @@
           <td class="tableHeader">{$i18n.form.users.role}</td>
         </tr>
   {foreach $active_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
-          <td>{$u.name|escape:'html'}</td>
-          <td>{$u.login|escape:'html'}</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}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$u.name|escape}</td>
+          <td>{$u.login|escape}</td>
+          <td>{$u.role_name|escape}</td>
         </tr>
   {/foreach}
       </table>