projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved .gitignore.
[timetracker.git]
/
WEB-INF
/
templates
/
header.tpl
diff --git
a/WEB-INF/templates/header.tpl
b/WEB-INF/templates/header.tpl
index
2752dc4
..
8555447
100644
(file)
--- a/
WEB-INF/templates/header.tpl
+++ b/
WEB-INF/templates/header.tpl
@@
-83,11
+83,17
@@
<tr>
<td class="systemMenu" height="17" align="center">
<a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a> ·
<tr>
<td class="systemMenu" height="17" align="center">
<a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a> ·
- {if $user->can('manage_own_settings')}
+ {if $user->
exists() && $user->
can('manage_own_settings')}
<a class="systemMenu" href="profile_edit.php">{$i18n.menu.profile}</a> ·
{/if}
{if $user->can('manage_basic_settings')}
<a class="systemMenu" href="group_edit.php">{$i18n.menu.group}</a> ·
<a class="systemMenu" href="profile_edit.php">{$i18n.menu.profile}</a> ·
{/if}
{if $user->can('manage_basic_settings')}
<a class="systemMenu" href="group_edit.php">{$i18n.menu.group}</a> ·
+ {/if}
+ {if $user->can('manage_subgroups')}
+ <a class="systemMenu" href="groups.php">{$i18n.menu.subgroups}</a> ·
+ {/if}
+ {if $user->can('manage_features')}
+ <a class="systemMenu" href="plugins.php">{$i18n.menu.plugins}</a> ·
{/if}
<a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a> ·
<a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
{/if}
<a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a> ·
<a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
@@
-100,26
+106,27
@@
<table cellspacing="0" cellpadding="3" width="100%" border="0">
<tr>
<td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">
<table cellspacing="0" cellpadding="3" width="100%" border="0">
<tr>
<td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">
- {if $user->
can('track_own_time') || $user->can('track_time'
)}
+ {if $user->
exists() && ($user->can('track_own_time') || $user->can('track_time')
)}
<a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
{/if}
<a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
{/if}
- {if $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
+ {if $user->
exists() && $user->
isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
· <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
{/if}
· <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
{/if}
- {if $user->
can('view_own_reports') || $user->can('view_reports'
)}
+ {if $user->
exists() && ($user->can('view_own_reports') || $user->can('view_reports')
)}
· <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a>
{/if}
· <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a>
{/if}
- {if $user->isPluginEnabled('iv') && ($user->can('view_own_invoices') || $user->can('manage_invoices'))}
+ {if $user->
exists() && $user->
isPluginEnabled('iv') && ($user->can('view_own_invoices') || $user->can('manage_invoices'))}
· <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
{/if}
· <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
{/if}
- {if ($user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode
- || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode || $user->isPluginEnabled('cl'))}
+ {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
+ ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() ||
+ $user->isPluginEnabled('cl'))}
· <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
{/if}
· <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
{/if}
- {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->
tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode
)}
+ {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->
getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()
)}
· <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
{/if}
· <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
{/if}
- {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->
tracking_mode
&& ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
+ {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->
getTrackingMode()
&& ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
· <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
{/if}
{if $user->can('view_users') || $user->can('manage_users')}
· <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
{/if}
{if $user->can('view_users') || $user->can('manage_users')}
@@
-157,11
+164,7
@@
{if $title}
<table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
<tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
{if $title}
<table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
<tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
- {if $user->name}
- <tr><td>{$user->name|escape} - {$user->role_name|escape}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->team}, {$user->team|escape}{/if}</td></tr>
- {else}
- <tr><td> </td></tr>
- {/if}
+ <tr><td>{$user->getUserPartForHeader()}</td></tr> {* No need to escape as it is done in the class. *}
</table>
{/if}
<!-- end of page title and user details -->
</table>
{/if}
<!-- end of page title and user details -->