From: Taylor Hurt <taylor.a.hurt@gmail.com>
Date: Tue, 20 Sep 2016 20:32:28 +0000 (-0400)
Subject: move edit link to a different column in order to free up horizontal s… (#11)
X-Git-Tag: timetracker_1.19-1~1641
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=09bd3c14ba08e57c46fb53c66e9053d248682c06;p=timetracker.git

move edit link to a different column in order to free up horizontal s… (#11)

* move edit link to a different column in order to free up horizontal space on mobile

* fix missing manager name on mobile/users page when co-manager is logged in
---

diff --git a/WEB-INF/templates/mobile/clients.tpl b/WEB-INF/templates/mobile/clients.tpl
index ded17ba9..a6132011 100644
--- a/WEB-INF/templates/mobile/clients.tpl
+++ b/WEB-INF/templates/mobile/clients.tpl
@@ -13,13 +13,11 @@
         <tr>
           <td width="40%" class="tableHeader">{$i18n.label.person_name}</td>
           <td width="40%" class="tableHeader">{$i18n.label.address}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
         </tr>
   {foreach $active_clients as $client}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">
-          <td>{$client.name|escape:'html'}</td>
+          <td><a href="client_edit.php?id={$client.id}">{$client.name|escape:'html'}</a></td>
           <td>{$client.address|escape:'html'}</td>
-          <td><a href="client_edit.php?id={$client.id}">{$i18n.label.edit}</a></td>
         </tr>
   {/foreach}
       </table>
@@ -34,13 +32,11 @@
         <tr>
           <td width="40%" class="tableHeader">{$i18n.label.person_name}</td>
           <td width="40%" class="tableHeader">{$i18n.label.address}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
         </tr>
     {foreach $inactive_clients as $client}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">
-          <td>{$client.name|escape:'html'}</td>
+          <td><a href="client_edit.php?id={$client.id}">{$client.name|escape:'html'}</a></td>
           <td>{$client.address|escape:'html'}</td>
-          <td><a href="client_edit.php?id={$client.id}">{$i18n.label.edit}</a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/mobile/expenses.tpl b/WEB-INF/templates/mobile/expenses.tpl
index bf99d801..9aab9a85 100644
--- a/WEB-INF/templates/mobile/expenses.tpl
+++ b/WEB-INF/templates/mobile/expenses.tpl
@@ -140,7 +140,6 @@ function get_date() {
   {/if}
         <td class="tableHeader">{$i18n.label.item}</td>
         <td width="5%" class="tableHeaderCentered">{$i18n.label.cost}</td>
-        <td width="5%" class="tableHeader">{$i18n.label.edit}</td>
       </tr>
   {foreach $expense_items as $item}
       <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
@@ -150,9 +149,8 @@ function get_date() {
     {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
         <td valign='top'>{$item.project|escape:'html'}</td>
     {/if}
-        <td valign='top'>{$item.item|escape:'html'}</td>
+        <td valign='top'>{if $item.invoice_id} {$item.item|escape:'html'} {else}<a href='expense_edit.php?id={$item.id}'>{$item.item|escape:'html'}</a>{/if}</td>
         <td valign='top' align='right'>{$item.cost}</td>
-        <td valign='top' align='center'>{if $item.invoice_id}&nbsp;{else}<a href='expense_edit.php?id={$item.id}'>{$i18n.label.edit}</a>{/if}</td>
       </tr>
   {/foreach}
     </table>
diff --git a/WEB-INF/templates/mobile/projects.tpl b/WEB-INF/templates/mobile/projects.tpl
index 45cd184a..b371c803 100644
--- a/WEB-INF/templates/mobile/projects.tpl
+++ b/WEB-INF/templates/mobile/projects.tpl
@@ -13,14 +13,12 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
         </tr>
   {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
-          <td>{$project.name|escape:'html'}</td>
+          <td><a href="project_edit.php?id={$project.id}">{$project.name|escape:'html'}</a></td>
           <td>{$project.description|escape:'html'}</td>
-          <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
         </tr>
     {/foreach}
   {/if}
@@ -40,13 +38,11 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
         </tr>
     {foreach $inactive_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
-          <td>{$project.name|escape:'html'}</td>
+          <td><a href="project_edit.php?id={$project.id}">{$project.name|escape:'html'}</a></td>
           <td>{$project.description|escape:'html'}</td>
-          <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/mobile/tasks.tpl b/WEB-INF/templates/mobile/tasks.tpl
index 0a521073..c877e989 100644
--- a/WEB-INF/templates/mobile/tasks.tpl
+++ b/WEB-INF/templates/mobile/tasks.tpl
@@ -13,14 +13,12 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
         </tr>
   {if $active_tasks}
     {foreach $active_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
-          <td>{$task.name|escape:'html'}</td>
+          <td><a href="task_edit.php?id={$task.id}">{$task.name|escape:'html'}</a></td>
           <td>{$task.description|escape:'html'}</td>
-          <td><a href="task_edit.php?id={$task.id}">{$i18n.label.edit}</a></td>
         </tr>
     {/foreach}
   {/if}
@@ -40,13 +38,11 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
         </tr>
     {foreach $inactive_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
-          <td>{$task.name|escape:'html'}</td>
+          <td><a href="task_edit.php?id={$task.id}">{$task.name|escape:'html'}</a></td>
           <td>{$task.description|escape:'html'}</td>
-          <td><a href="task_edit.php?id={$task.id}">{$i18n.label.edit}</a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl
index aab86d82..38c96ae9 100644
--- a/WEB-INF/templates/mobile/users.tpl
+++ b/WEB-INF/templates/mobile/users.tpl
@@ -14,12 +14,21 @@
           <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>
   {if $active_users}
     {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
-          <td>{$u.name|escape:'html'}</td>
+          <td>
+            {if $user->isManager()}
+              <a href="user_edit.php?id={$u.id}">{$u.name|escape:'html'}</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}
+            {/if}
+          </td>
           <td>{$u.login|escape:'html'}</td>
       {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
@@ -29,13 +38,6 @@
             <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}
         </tr>
     {/foreach}
@@ -58,11 +60,16 @@
           <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>
-          <td width="10%" class="tableHeader">{$i18n.label.delete}</td>
         </tr>
     {foreach $inactive_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
-          <td>{$u.name|escape:'html'}</td>
+          <td>
+            {if $user->isManager()}
+              <a href="user_edit.php?id={$u.id}">{$u.name|escape:'html'}</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}
+            {/if}
+          </td>
           <td>{$u.login|escape:'html'}</td>
       {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
@@ -76,11 +83,9 @@
       {if $user->isManager()}
           <!-- Manager can edit everybody. -->
           <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>
       {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>
       {/if}
         </tr>
     {/foreach}