projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
User add and edit now assign role ids to users.
[timetracker.git]
/
WEB-INF
/
templates
/
users.tpl
diff --git
a/WEB-INF/templates/users.tpl
b/WEB-INF/templates/users.tpl
index
d537dda
..
09a99bd
100644
(file)
--- a/
WEB-INF/templates/users.tpl
+++ b/
WEB-INF/templates/users.tpl
@@
-19,14
+19,14
@@
</tr>
{if $active_users}
{foreach $active_users as $u}
</tr>
{if $active_users}
{foreach $active_users as $u}
- <tr bgcolor="{cycle values="#f5f5f5,#
dedee5
"}">
+ <tr bgcolor="{cycle values="#f5f5f5,#
ffffff
"}">
<td>
<td>
- {if $
smarty.const.ENTRIES_USERS_PAGE == $user->uncompleted_entrie
s}
+ {if $
user->uncompleted_indicator
s}
<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}
<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
:'html'
}
+ {$u.name|escape}
</td>
</td>
- <td>{$u.login|escape
:'html'
}</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}
{if $smarty.const.ROLE_MANAGER == $u.role}
<td>{$i18n.form.users.manager}</td>
{elseif $smarty.const.ROLE_COMANAGER == $u.role}
@@
-53,7
+53,7
@@
<table width="100%">
<tr>
<td align="center"><br>
<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>
</td>
</tr>
</table>
@@
-69,9
+69,9
@@
<td width="10%" class="tableHeader">{$i18n.label.delete}</td>
</tr>
{foreach $inactive_users as $u}
<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>{$u.login|escape
:'html'
}</td>
+ <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}
{if $smarty.const.ROLE_MANAGER == $u.role}
<td>{$i18n.form.users.manager}</td>
{elseif $smarty.const.ROLE_COMANAGER == $u.role}
@@
-98,7
+98,7
@@
<table width="100%">
<tr>
<td align="center" height="50">
<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>
</td>
</tr>
</table>
@@
-111,9
+111,9
@@
<td class="tableHeader">{$i18n.form.users.role}</td>
</tr>
{foreach $active_users as $u}
<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>
+ <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}
{if $smarty.const.ROLE_MANAGER == $u.role}
<td>{$i18n.form.users.manager}</td>
{elseif $smarty.const.ROLE_COMANAGER == $u.role}