continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r386293 - in /maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources: images/ templates/screens/
Date Thu, 16 Mar 2006 09:16:46 GMT
Author: evenisse
Date: Thu Mar 16 01:16:44 2006
New Revision: 386293

URL: http://svn.apache.org/viewcvs?rev=386293&view=rev
Log:
[CONTINUUM-629] disable icons instead of hiding them

Added:
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/images/edit_disabled.gif
  (with props)
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/Summary.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
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/View.vm

Added: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/images/edit_disabled.gif
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/images/edit_disabled.gif?rev=386293&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/images/edit_disabled.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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=386293&r1=386292&r2=386293&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
Thu Mar 16 01:16:44 2006
@@ -32,13 +32,19 @@
           <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>
+            #else
+              <img src="$requestUtil.getContextPath()/images/edit_disabled.gif" alt="Edit"
title="Edit" width="16" height="16" border="0">
             #end
           </td>
           <td width="1%">
             #if ( $continuum.security.isAuthorized( $c1user, "manageSchedule" ) )
               #if ( $schedule.name != "DEFAULT_SCHEDULE" )
                 <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>
+              #else
+                <img src="$requestUtil.getContextPath()/images/delete_disabled.gif" alt="Delete"
title="Delete" width="16" height="16" border="0">
               #end
+            #else
+              <img src="$requestUtil.getContextPath()/images/delete_disabled.gif" alt="Delete"
title="Delete" width="16" height="16" border="0">
             #end
           </td>
         </tr>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Summary.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Summary.vm?rev=386293&r1=386292&r2=386293&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Summary.vm
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/Summary.vm
Thu Mar 16 01:16:44 2006
@@ -94,11 +94,11 @@
         #if ( $continuum.security.isAuthorized( $c1user, "buildProject" ) )
           <td width="1%">
           #if ( $continuum.isInBuildingQueue( $item.id ) || $continuum.isInCheckoutQueue(
$item.id ) )
-            &nbsp;
+            <img src="$requestUtil.getContextPath()/images/buildnow_disabled.gif" alt="Build
Now" title="Build Now" width="16" height="16" border="0">
           #elseif ( $item.state == 1 || $item.state == 10 || $item.state == 2 || $item.state
== 3 || $item.state == 4 )
             <a href="$link.addPathInfo('action', 'cam').addPathInfo('cid','buildProject').addPathInfo('id',
$item.id)"><img src="$requestUtil.getContextPath()/images/buildnow.gif" alt="Build Now"
title="Build Now" width="16" height="16" border="0"></a>
           #else
-            &nbsp;
+            <img src="$requestUtil.getContextPath()/images/buildnow_disabled.gif" alt="Build
Now" title="Build Now" width="16" height="16" border="0">
           #end
           </td>
         #end
@@ -107,7 +107,7 @@
         #if ( $item.latestBuildId > 0 )
           <a href="$link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id',
$item.id)"><img src="$requestUtil.getContextPath()/images/buildhistory.gif" alt="Build
History" title="Build History" width="16" height="16" border="0"></a>
         #else
-          &nbsp;
+          <img src="$requestUtil.getContextPath()/images/buildhistory_disabled.gif" alt="Build
History" title="Build History" width="16" height="16" border="0">
         #end
         </td>
 
@@ -115,7 +115,7 @@
         #if ( $item.state == 10 || $item.state == 2 || $item.state == 3 || $item.state ==
4 || $item.state == 6 )
           <a href="$link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id',
$item.id)"><img src="$requestUtil.getContextPath()/images/workingcopy.gif" alt="Working
Copy" title="Working Copy" width="16" height="16" border="0"></a>
         #else
-          &nbsp;
+          <img src="$requestUtil.getContextPath()/images/workingcopy_disabled.gif" alt="Working
Copy" title="Working Copy" width="16" height="16" border="0">
         #end
         </td>
 
@@ -124,7 +124,7 @@
           #if ( $item.state == 1 || $item.state == 10 || $item.state == 2 || $item.state
== 3 || $item.state == 4 )
           <a href="$link.setPage('Delete.vm').addPathInfo('fid', "$!{item.executorId}Project").addPathInfo('id',
$item.id)"><img src="$requestUtil.getContextPath()/images/delete.gif" alt="Delete" title="Delete"
width="16" height="16" border="0"></a>
           #else
-          &nbsp;
+          <img src="$requestUtil.getContextPath()/images/delete_disabled.gif" alt="Delete"
title="Delete" width="16" height="16" border="0">
           #end
           </td>
         #end

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=386293&r1=386292&r2=386293&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
Thu Mar 16 01:16:44 2006
@@ -134,12 +134,16 @@
         </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>
+            <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>
+          #else
+            <img src="$requestUtil.getContextPath()/images/edit_disabled.gif" alt="Edit"
title="Edit" width="16" height="16" border="0">
           #end
         </td>
         <td width="1%">
           #if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) )
-          <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>
+            <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>
+          #else
+            <img src="$requestUtil.getContextPath()/images/delete_disabled.gif" alt="Delete"
title="Delete" width="16" height="16" border="0">
           #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=386293&r1=386292&r2=386293&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
Thu Mar 16 01:16:44 2006
@@ -29,15 +29,23 @@
         <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)"><img src="$requestUtil.getContextPath()/images/edit.gif" alt="Edit"
title="Edit" width="16" height="16" border="0"></a>
+              <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>
+            #else
+              <img src="$requestUtil.getContextPath()/images/edit_disabled.gif" alt="Edit"
title="Edit" width="16" height="16" border="0">
             #end
+          #else
+            <img src="$requestUtil.getContextPath()/images/edit_disabled.gif" alt="Edit"
title="Edit" width="16" height="16" border="0">
           #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>
+              <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>
+            #else
+              <img src="$requestUtil.getContextPath()/images/delete_disabled.gif" alt="Delete"
title="Delete" width="16" height="16" border="0">
             #end
+          #else
+            <img src="$requestUtil.getContextPath()/images/delete_disabled.gif" alt="Delete"
title="Delete" width="16" height="16" border="0">
           #end
         </td>
       </tr>

Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/View.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/View.vm?rev=386293&r1=386292&r2=386293&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/View.vm
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/View.vm
Thu Mar 16 01:16:44 2006
@@ -100,24 +100,30 @@
           #end
         </td>
         <td>Project</td>
-        #if ( $continuum.security.isAuthorized( $c1user, "buildProject" ) )
-          <td width="1%">
+        <td width="1%">
+          #if ( $continuum.security.isAuthorized( $c1user, "buildProject" ) )
             #set ( $buildNowLink = $link.addPathInfo('action', 'cam').addPathInfo('cid','buildProjectWithBuildDefinition').addPathInfo('id',
$item.id).addPathInfo('buildDefinitionId', $buildDefinition.id) )
             <a href="$buildNowLink"><img src="$requestUtil.getContextPath()/images/buildnow.gif"
alt="Build Now" title="Build Now" width="16" height="16" border="0"></a>
-          </td>
-        #end
-        #if ( $continuum.security.isAuthorized( $c1user, "editBuildDefinition" ) )
-          <td width="1%">
+          #else
+            <img src="$requestUtil.getContextPath()/images/buildnow_disabled.gif" alt="Build
Now" title="Build Now" width="16" height="16" border="0">
+          #end
+        </td>
+        <td width="1%">
+          #if ( $continuum.security.isAuthorized( $c1user, "editBuildDefinition" ) )
             #set ( $buildDefinitionLink = $link.setPage('BuildDefinition.vm').addPathInfo('view','BuildDefinition').addPathInfo('buildDefinitionId',
$buildDefinition.id).addPathInfo('id', $item.id) )
             <a href="$buildDefinitionLink"><img src="$requestUtil.getContextPath()/images/edit.gif"
alt="Edit" title="Edit" width="16" height="16" border="0"></a>
-          </td>
-        #end
-        #if ( $continuum.security.isAuthorized( $c1user, "deleteBuildDefinition" ) )
-          <td width="1%">
+          #else
+            <img src="$requestUtil.getContextPath()/images/edit_disabled.gif" alt="Edit"
title="Edit" width="16" height="16" border="0">
+          #end
+        </td>
+        <td width="1%">
+          #if ( $continuum.security.isAuthorized( $c1user, "deleteBuildDefinition" ) )
             #set ( $deleteBuildDefinitionLink = $link.setPage('DeleteBuildDefinition.vm').addPathInfo('buildDefinitionId',
$buildDefinition.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId)
)
             <a href="$deleteBuildDefinitionLink"><img src="$requestUtil.getContextPath()/images/delete.gif"
alt="Delete" title="Delete" width="16" height="16" border="0"></a>
-          </td>
-        #end
+          #else
+            <img src="$requestUtil.getContextPath()/images/delete_disabled.gif" alt="Delete"
title="Delete" width="16" height="16" border="0">
+          #end
+        </td>
       </tr>
       #end
       </tbody>
@@ -192,8 +198,8 @@
             #end
           </td>
           #if ( $notifier.isFromUser() )
-            #if ( $continuum.security.isAuthorized( $c1user, "editNotifier" ) )
-              <td width="1%">
+            <td width="1%">
+              #if ( $continuum.security.isAuthorized( $c1user, "editNotifier" ) )
                 #if ( $notifier.type == "irc" )
                   #set ( $editNotifierLink = $link.setPage('EditIrcNotifier.vm').addPathInfo('view','EditIrcNotifier').addPathInfo('notifierId',
$notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
                   <a href="$editNotifierLink"><img src="$requestUtil.getContextPath()/images/edit.gif"
alt="Edit" title="Edit" width="16" height="16" border="0"></a>
@@ -207,14 +213,18 @@
                   #set ( $editNotifierLink = $link.setPage('EditJabberNotifier.vm').addPathInfo('view','EditJabberNotifier').addPathInfo('notifierId',
$notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
                   <a href="$editNotifierLink"><img src="$requestUtil.getContextPath()/images/edit.gif"
alt="Edit" title="Edit" width="16" height="16" border="0"></a>
                 #end
-              </td>
-            #end
-            #if ( $continuum.security.isAuthorized( $c1user, "deleteNotifier" ) )
-              <td width="1%">
+              #else
+                <img src="$requestUtil.getContextPath()/images/edit_disabled.gif" alt="Edit"
title="Edit" width="16" height="16" border="0">
+              #end
+            </td>
+            <td width="1%">
+              #if ( $continuum.security.isAuthorized( $c1user, "deleteNotifier" ) )
                 #set ( $deleteNotifierLink = $link.setPage('DeleteNotifier.vm').addPathInfo('notifierId',
$notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
                 <a href="$deleteNotifierLink"><img src="$requestUtil.getContextPath()/images/delete.gif"
alt="Delete" title="Delete" width="16" height="16" border="0"></a>
-              </td>
-            #end
+              #else
+                <img src="$requestUtil.getContextPath()/images/delete_disabled.gif" alt="Delete"
title="Delete" width="16" height="16" border="0">
+              #end
+            </td>
           #else
             <td width="2%" colspan="2">&nbsp;</td>
           #end



Mime
View raw message