You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2006/03/15 17:43:59 UTC
svn commit: r386109 - in
/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens:
Schedules.vm UserGroups.vm Users.vm
Author: evenisse
Date: Wed Mar 15 08:43:57 2006
New Revision: 386109
URL: http://svn.apache.org/viewcvs?rev=386109&view=rev
Log:
Use icons instead of text links
Modified:
maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Schedules.vm
maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/UserGroups.vm
maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Users.vm
Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Schedules.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Schedules.vm?rev=386109&r1=386108&r2=386109&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Schedules.vm (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Schedules.vm Wed Mar 15 08:43:57 2006
@@ -18,7 +18,7 @@
<th class="tablehead">Description</th>
<th class="tablehead">Cron</th>
<th class="tablehead">Quiet Period (seconds)</th>
- <th width="10%" class="tablehead"> </th>
+ <th colspan="2" class="tablehead"> </th>
</tr>
#foreach ( $schedule in $items )
<tr class="$css.nextClass" #if ( !$schedule.active ) style="color: silver;" #end>
@@ -29,13 +29,18 @@
#end</td>
<td>$schedule.cronExpression</td>
<td>$schedule.delay</td>
- <td width="10%">
+ <td width="1%">
+ #if ( $continuum.security.isAuthorized( $c1user, "manageSchedule" ) )
+ <a href="$link.setPage('Edit.vm').addPathInfo( 'fid', 'schedules').addPathInfo('id', $schedule.id)"><img src="$requestUtil.getContextPath()/images/edit.gif" alt="Edit" title="Edit" width="16" height="16" border="0"></a>
+ #end
+ </td>
+ <td width="1%">
#if ( $continuum.security.isAuthorized( $c1user, "manageSchedule" ) )
- <a href="$link.setPage('Edit.vm').addPathInfo( 'fid', 'schedules').addPathInfo('id', $schedule.id)">Edit</a>
#if ( $schedule.name != "DEFAULT_SCHEDULE" )
- | <a href="$link.setPage('DeleteSchedule.vm').addPathInfo('fid', "schedules").addPathInfo('id', $schedule.id)">Delete</a></td>
+ <a href="$link.setPage('DeleteSchedule.vm').addPathInfo('fid', "schedules").addPathInfo('id', $schedule.id)"><img src="$requestUtil.getContextPath()/images/delete.gif" alt="Delete" title="Delete" width="16" height="16" border="0"></a>
#end
#end
+ </td>
</tr>
#end
</tbody>
Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/UserGroups.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/UserGroups.vm?rev=386109&r1=386108&r2=386109&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/UserGroups.vm (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/UserGroups.vm Wed Mar 15 08:43:57 2006
@@ -29,7 +29,7 @@
<th class="tablehead">$i18n.getString( "group.permission.manageConfiguration.label" )</th>
<th class="tablehead">$i18n.getString( "group.permission.manageSchedule.label" )</th>
<th class="tablehead">$i18n.getString( "group.permission.manageUsers.label" )</th>
- <th width="10%" class="tablehead"> </th>
+ <th colspan="2" class="tablehead"> </th>
</tr>
#foreach ( $group in $items )
<tr class="$css.nextClass">
@@ -132,10 +132,14 @@
<img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
#end
</td>
- <td>
+ <td width="1%">
+ #if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) )
+ <a href="$link.setPage('EditUserGroup.vm').addPathInfo( 'fid', 'userGroups').addPathInfo('id', $group.id)"><img src="$requestUtil.getContextPath()/images/edit.gif" alt="Edit" title="Edit" width="16" height="16" border="0"></a>
+ #end
+ </td>
+ <td width="1%">
#if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) )
- <a href="$link.setPage('EditUserGroup.vm').addPathInfo( 'fid', 'userGroups').addPathInfo('id', $group.id)">Edit</a>
- | <a href="$link.setPage('DeleteUserGroup.vm').addPathInfo('fid', "userGroups").addPathInfo('id', $group.id)">Delete</a></td>
+ <a href="$link.setPage('DeleteUserGroup.vm').addPathInfo('fid', "userGroups").addPathInfo('id', $group.id)"><img src="$requestUtil.getContextPath()/images/delete.gif" alt="Delete" title="Delete" width="16" height="16" border="0"></a>
#end
</td>
</tr>
Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Users.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Users.vm?rev=386109&r1=386108&r2=386109&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Users.vm (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Users.vm Wed Mar 15 08:43:57 2006
@@ -14,11 +14,11 @@
<table border="1" cellpadding="3" cellspacing="2" width="100%">
<tbody>
<tr>
- <th width="10%" class="tablehead">$i18n.getString( "user.username.label" )</th>
- <th width="10%" class="tablehead">$i18n.getString( "user.fullName.label" )</th>
- <th width="10%" class="tablehead">$i18n.getString( "user.email.label" )</th>
- <th width="10%" class="tablehead">$i18n.getString( "user.groupName.label" )</th>
- <th width="10%" class="tablehead"> </th>
+ <th class="tablehead">$i18n.getString( "user.username.label" )</th>
+ <th class="tablehead">$i18n.getString( "user.fullName.label" )</th>
+ <th class="tablehead">$i18n.getString( "user.email.label" )</th>
+ <th class="tablehead">$i18n.getString( "user.groupName.label" )</th>
+ <th colspan="2" class="tablehead"> </th>
</tr>
#foreach ( $user in $items )
<tr class="$css.nextClass">
@@ -26,11 +26,17 @@
<td>$user.fullName</td>
<td>#if ( $user.email ) $user.email #end</td>
<td>$user.group.name</td>
- <td>
+ <td width="1%">
#if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) )
#if ( "guest" != $user.username )
- <a href="$link.setPage('EditUser.vm').addPathInfo( 'fid', 'users').addPathInfo('id', $user.accountId)">Edit</a>
- | <a href="$link.setPage('DeleteUser.vm').addPathInfo('fid', "users").addPathInfo('id', $user.accountId)">Delete</a></td>
+ <a href="$link.setPage('EditUser.vm').addPathInfo( 'fid', 'users').addPathInfo('id', $user.accountId)"><img src="$requestUtil.getContextPath()/images/edit.gif" alt="Edit" title="Edit" width="16" height="16" border="0"></a>
+ #end
+ #end
+ </td>
+ <td width="1%">
+ #if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) )
+ #if ( "guest" != $user.username )
+ <a href="$link.setPage('DeleteUser.vm').addPathInfo('fid', "users").addPathInfo('id', $user.accountId)"><img src="$requestUtil.getContextPath()/images/delete.gif" alt="Delete" title="Delete" width="16" height="16" border="0"></a>
#end
#end
</td>