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 @@ #if ( $continuum.security.isAuthorized( $c1user, "manageSchedule" ) ) Edit + #else + Edit #end #if ( $continuum.security.isAuthorized( $c1user, "manageSchedule" ) ) #if ( $schedule.name != "DEFAULT_SCHEDULE" ) Delete + #else + Delete #end + #else + Delete #end 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" ) ) #if ( $continuum.isInBuildingQueue( $item.id ) || $continuum.isInCheckoutQueue( $item.id ) ) -   + Build Now #elseif ( $item.state == 1 || $item.state == 10 || $item.state == 2 || $item.state == 3 || $item.state == 4 ) Build Now #else -   + Build Now #end #end @@ -107,7 +107,7 @@ #if ( $item.latestBuildId > 0 ) Build History #else -   + Build History #end @@ -115,7 +115,7 @@ #if ( $item.state == 10 || $item.state == 2 || $item.state == 3 || $item.state == 4 || $item.state == 6 ) Working Copy #else -   + Working Copy #end @@ -124,7 +124,7 @@ #if ( $item.state == 1 || $item.state == 10 || $item.state == 2 || $item.state == 3 || $item.state == 4 ) Delete #else -   + Delete #end #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 @@ #if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) ) - Edit + Edit + #else + Edit #end #if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) ) - Delete + Delete + #else + Delete #end 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 @@ #if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) ) #if ( "guest" != $user.username ) - Edit + Edit + #else + Edit #end + #else + Edit #end #if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) ) #if ( "guest" != $user.username ) - Delete + Delete + #else + Delete #end + #else + Delete #end 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 Project - #if ( $continuum.security.isAuthorized( $c1user, "buildProject" ) ) - + + #if ( $continuum.security.isAuthorized( $c1user, "buildProject" ) ) #set ( $buildNowLink = $link.addPathInfo('action', 'cam').addPathInfo('cid','buildProjectWithBuildDefinition').addPathInfo('id', $item.id).addPathInfo('buildDefinitionId', $buildDefinition.id) ) Build Now - - #end - #if ( $continuum.security.isAuthorized( $c1user, "editBuildDefinition" ) ) - + #else + Build Now + #end + + + #if ( $continuum.security.isAuthorized( $c1user, "editBuildDefinition" ) ) #set ( $buildDefinitionLink = $link.setPage('BuildDefinition.vm').addPathInfo('view','BuildDefinition').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id) ) Edit - - #end - #if ( $continuum.security.isAuthorized( $c1user, "deleteBuildDefinition" ) ) - + #else + Edit + #end + + + #if ( $continuum.security.isAuthorized( $c1user, "deleteBuildDefinition" ) ) #set ( $deleteBuildDefinitionLink = $link.setPage('DeleteBuildDefinition.vm').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) ) Delete - - #end + #else + Delete + #end + #end @@ -192,8 +198,8 @@ #end #if ( $notifier.isFromUser() ) - #if ( $continuum.security.isAuthorized( $c1user, "editNotifier" ) ) - + + #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) ) Edit @@ -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) ) Edit #end - - #end - #if ( $continuum.security.isAuthorized( $c1user, "deleteNotifier" ) ) - + #else + Edit + #end + + + #if ( $continuum.security.isAuthorized( $c1user, "deleteNotifier" ) ) #set ( $deleteNotifierLink = $link.setPage('DeleteNotifier.vm').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) ) Delete - - #end + #else + Delete + #end + #else   #end