Version	${project.version}

		$i18n.getString( "message.or" )

Username :	Username
Password :	Password
Re-enter Password :	Re-enter Password
Full Name :	Full Name
Email :	Email

Working Directory :	Working Directory	If you define a relative path, it will be relative to $continuum.configuration.applicationHome
Build Output Directory :	Build Output Directory	If you define a relative path, it will be relative to $continuum.configuration.applicationHome
Deployment Repository Directory	Optional. If you define a relative path, it will be relative to $continuum.configuration.applicationHome

Base URL :	Base URL

Name :	Name
Logo :	Logo
URL :	URL

Allow Guest :	Allow Guest

Guests	@@ -33,6 +33,16 @@	$continuum.configuration.buildOutputDirectory
Deployment Repository Directory	+ #if ($continuum.configuration.deploymentRepositoryDirectory ) + $continuum.configuration.deploymentRepositoryDirectory + #else + - + #end +
Base URL	$continuum.configuration.url
Company URL	#if ( $continuum.configuration.companyUrl ) $continuum.configuration.companyUrl #end

Guests	@@ -26,6 +27,14 @@	If you define a relative path, it will be relative to $continuum.configuration.applicationHome
Deployment Repository Directory	Optional. If you define a relative path, it will be relative to $continuum.configuration.applicationHome
Base URL
Company URL

Guests

@@ -26,6 +27,14 @@

If you define a relative path, it will be relative to $continuum.configuration.applicationHome

Deployment Repository Directory

Optional. If you define a relative path, it will be relative to $continuum.configuration.applicationHome

Base URL

Company URL

IRC Host	@@ -74,6 +75,7 @@

Jabber Host	@@ -86,6 +87,7 @@

Mail Address	@@ -44,6 +45,7 @@

MSN Login	@@ -56,6 +57,7 @@

$i18n.getString( "user.groupName.label" )

$i18n.getString( "user.groupName.label" )

- +

+ #if ( $loginMessage ) #end - + - + +

$loginMessage
Username :	Username
Password :	Password

#submitBar( "Submit" ) Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm Tue May 16 03:26:59 2006 @@ -1,4 +1,4 @@ -$page.setTitle( "Continuum - ${project.name} Build at $date.format('medium',$build.startTime)" ) +$page.setTitle( "Continuum - Continuum Web Build at $date.format('medium',$build.startTime)" ) #if ( $data.user ) #set ( $c1user = $continuum.getUser( $data.user.userId ) ) @@ -10,36 +10,57 @@ #if ( $continuum.security.isAuthorized( $c1user, "showProject" ) )

#set ( $infoLink = $link.setPage('View.vm').addPathInfo('fid', "$!{project.executorId}Project").addPathInfo('id', $project.id) ) - Info - Builds - #set ( $workingCopy = $link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id', $project.id) ) - Working Copy + Info + #set ( $buildsLink = $link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id', $project.id) ) + Builds + #if ( $project.state == 10 || $project.state == 2 || $project.state == 3 || $project.state == 4 || $project.state == 6 ) + #set ( $workingCopy = $link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id', $project.id) ) + Working Copy + #end

#end +

Build result for $project.name

- - + +
+
+ + - + - + - + - + + + + + - + - + +
Start Time $date.format('medium',$build.startTime) $!{date.format('medium',$build.startTime)}
End Time $date.format('medium',$build.endTime) $!{date.format('medium',$build.endTime)}
Duration + #if ( $build.endTime ) + #set ( $endTime = $build.endTime ) + #else + #set ( $endTime = 0 ); + #end + #if ( $endTime.toString() != "0" ) + $!{date.getTimeDifference($build.startTime, $build.endTime)} + #else + Started since : $!{date.getElapsedTime($build.startTime)} + #end +
Build Trigger $trigger.generate($build)
State $state.generate($build)
Build# #if ( $build.buildNumber != 0 ) @@ -49,21 +70,23 @@ #end

-

#if ( $build.scmResult ) -

Changes

#if ( $build.scmResult.changes.size() == 0 ) No files changed #else - +

+ #foreach ( $changeSet in $build.scmResult.changes ) - #if ($changeSet.author) #end - #if ($changeSet.date > 0) #end - #if ($changeSet.comment) #end + + + #end +

$changeSet.author $date.format('medium',$changeSet.date) $changeSet.comment #if ($changeSet.author) $changeSet.author #end #if ($changeSet.dateAsDate) $date.format('medium',$changeSet.dateAsDate) #end #if ($changeSet.comment) $changeSet.comment #end #foreach ( $file in $changeSet.files ) $!file.name
@@ -71,21 +94,23 @@

#end -

#end #set ( $changeSets = $continuum.getChangesSinceLastSuccess( $id, $build.id ) ) #if ( $changeSets ) -

Other Changes Since Last Success

- +
Other Changes Since Last Success
+
+
+ #foreach ( $changeSet in $changeSets ) - #if ($changeSet.author) #end - #if ($changeSet.date > 0) #end - #if ($changeSet.comment) #end + + + #end +
$changeSet.author $date.format('medium',$changeSet.date) $changeSet.comment #if ($changeSet.author) $changeSet.author #end #if ($changeSet.date > 0) $date.format('medium',$changeSet.date) #end #if ($changeSet.comment) $changeSet.comment> #end #foreach ( $file in $changeSet.files ) $!file.name
@@ -93,28 +118,32 @@

-

Build Error

Output

Build results for $project.name

- +

+ - - - - - + + + + + + #foreach ( $build in $builds ) + #end +

Build #	Start Time	End Time	State		Build #	Start Time	End Time		State
#if ( $build.state == 2 ) $build.buildNumber #end	$!{date.format('medium',$build.startTime)}	$!{date.format('medium',$build.endTime)}	+ #if ( $build.endTime ) + #set ( $endTime = $build.endTime ) + #else + #set ( $endTime = 0 ); + #end + #if ( $endTime.toString() != "0" ) + Duration : $!{date.getTimeDifference($build.startTime, $build.endTime)} + #else + Started since : $!{date.getElapsedTime($build.startTime)} + #end +	$state.generate($build)	Result

${project.name} Notifiers

- +

+ - - + + #foreach ( $notifier in $project.notifiers ) @@ -44,6 +45,7 @@ #end +

Notifier Type				Notifier Type
Delete

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Schedules.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Schedules.vm?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Schedules.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Schedules.vm Tue May 16 03:26:59 2006 @@ -11,13 +11,14 @@

Schedules

- +

+ - - - - - + + + + + #foreach ( $schedule in $items ) @@ -28,15 +29,27 @@ #end - + +

+ #else +

#end + #else +

#end + #end +

Name	Description	Cron	Quiet Period (seconds)		Name	Description	Cron	Quiet Period (seconds)
$schedule.cronExpression	$schedule.delay	+	+ #if ( $continuum.security.isAuthorized( $c1user, "manageSchedule" ) ) + + #else + + #end +	#if ( $continuum.security.isAuthorized( $c1user, "manageSchedule" ) ) - Edit #if ( $schedule.name != "DEFAULT_SCHEDULE" ) - \| Delete

#if ( $continuum.security.isAuthorized( $c1user, "manageSchedule" ) )

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm Tue May 16 03:26:59 2006 @@ -22,15 +22,15 @@

Continuum Projects

- +

- - - - - + + + + + @@ -48,67 +48,97 @@ #end - #else $generatedState #end + #elseif ( $continuum.isInBuildingQueue( $item.id ) ) + #if ( $buildResults.get( $item.id ) ) + #set ( $latestBuild = $buildResults.get( $item.id ) ) + #end + #if ( $latestBuild ) + #set ( $generatedState = $state.generate( $latestBuild ) ) + $generatedState + #else + + #end #else #end + ## Operations #if ( $continuum.security.isAuthorized( $c1user, "buildProject" ) ) + - #elseif ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 ) - +

+ #elseif ( $item.state == 1 || $item.state == 10 || $item.state == 2 || $item.state == 3 || $item.state == 4 ) +

#else - +

#end + #end + +

#else - +

#end + - #if ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 || $item.state == 6 ) - + +

#end + #if ( $continuum.security.isAuthorized( $c1user, "deleteProject" ) ) - #if ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 ) - + +

#end + #end @@ -119,15 +149,22 @@ #if ( $continuum.security.isAuthorized( $c1user, "buildProject" ) )

$success - Failed

$failures - Error

$errors +

$success + Failed

$failures + Error

$errors #if ( $items && $items.size() > 0 ) #hidden ( "action" "cam" ) #hidden ( "cid" "buildAllProjects" ) #end + +

+ #else +

$success + Failed

$failures + Error

$errors

#end Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/UserGroups.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/UserGroups.vm?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/UserGroups.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/UserGroups.vm Tue May 16 03:26:59 2006 @@ -11,134 +11,144 @@

$i18n.getString( "group.management.label" )

	Name	Version	Build	Group		Name	Version	Build	Group
- #if ( $item.state == 1 \|\| $item.state == 2 \|\| $item.state == 3 \|\| $item.state == 4 ) - #set ( $latestBuild = $buildResults.get( $item.id ) ) +	+ + #if ( $item.state == 1 \|\| $item.state == 10 \|\| $item.state == 2 \|\| $item.state == 3 \|\| $item.state == 4 ) + #if ( $buildResults.get( $item.id ) ) + #set ( $latestBuild = $buildResults.get( $item.id ) ) + #end #set ( $generatedState = $state.generate( $item ) ) #if ( $latestBuild && $generatedState != "New" ) $generatedState	$!item.name	$!item.version	+ #if ( $continuum.isInBuildingQueue( $item.id ) \|\| $continuum.isInCheckoutQueue( $item.id ) ) - In queue - #elseif ( $item.state == 1 \|\| $item.state == 2 \|\| $item.state == 3 \|\| $item.state == 4 ) + + #elseif ( $item.state == 1 \|\| $item.state == 10 \|\| $item.state == 2 \|\| $item.state == 3 \|\| $item.state == 4 ) #if ( $item.buildNumber != 0 ) #set ( $build = $buildResultsInSuccess.get( $item.id ) ) $item.buildNumber #else $item.buildNumber #end + #elseif ( $item.state == 6 ) + + #elseif ( $item.state == 7 ) + + #elseif ( $item.state == 8 ) + #else - In progress + #end +	$item.projectGroup.name	#if ( $continuum.isInBuildingQueue( $item.id ) \|\| $continuum.isInCheckoutQueue( $item.id ) ) -	Build	Build Now	Build	#if ( $item.latestBuildId > 0 ) -	Build History	All Results	Working Copy	+ #if ( $item.state == 10 \|\| $item.state == 2 \|\| $item.state == 3 \|\| $item.state == 4 \|\| $item.state == 6 ) + #else -	Working Copy	Delete	+ #if ( $item.state == 1 \|\| $item.state == 10 \|\| $item.state == 2 \|\| $item.state == 3 \|\| $item.state == 4 ) + #else -	Delete

+ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + #foreach ( $group in $items ) - + +

+ #else +

#end #end +

$i18n.getString( "group.name.label" )	$i18n.getString( "group.permission.addProject.label" )	$i18n.getString( "group.permission.editProject.label" )	$i18n.getString( "group.permission.deleteProject.label" )	$i18n.getString( "group.permission.buildProject.label" )	$i18n.getString( "group.permission.showProject.label" )	$i18n.getString( "group.permission.addBuildDefinition.label" )	$i18n.getString( "group.permission.editBuildDefinition.label" )	$i18n.getString( "group.permission.deleteBuildDefinition.label" )	$i18n.getString( "group.permission.addNotifier.label" )	$i18n.getString( "group.permission.editNotifier.label" )	$i18n.getString( "group.permission.deleteNotifier.label" )	$i18n.getString( "group.permission.manageConfiguration.label" )	$i18n.getString( "group.permission.manageSchedule.label" )	$i18n.getString( "group.permission.manageUsers.label" )		$i18n.getString( "group.name.label" )	$i18n.getString( "group.permission.addProject.label" )	$i18n.getString( "group.permission.editProject.label" )	$i18n.getString( "group.permission.deleteProject.label" )	$i18n.getString( "group.permission.buildProject.label" )	$i18n.getString( "group.permission.showProject.label" )	$i18n.getString( "group.permission.addBuildDefinition.label" )	$i18n.getString( "group.permission.editBuildDefinition.label" )	$i18n.getString( "group.permission.deleteBuildDefinition.label" )	$i18n.getString( "group.permission.addNotifier.label" )	$i18n.getString( "group.permission.editNotifier.label" )	$i18n.getString( "group.permission.deleteNotifier.label" )	$i18n.getString( "group.permission.manageConfiguration.label" )	$i18n.getString( "group.permission.manageSchedule.label" )	$i18n.getString( "group.permission.manageUsers.label" )
$group.name	#if ( $continuum.security.isAuthorized( $group, "addProject" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "editProject" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "deleteProject" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "buildProject" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "showProject" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "addBuildDefinition" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "editBuildDefinition" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "deleteBuildDefinition" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "addNotifier" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "editNotifier" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "deleteNotifier" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "manageConfiguration" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "manageSchedule" ) ) - + #else - + #end	#if ( $continuum.security.isAuthorized( $group, "manageUsers" ) ) - + #else - + #end	+	+ #if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) ) + + #else + + #end +	#if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) ) - Edit - \| Delete

#if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) )

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Users.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Users.vm?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Users.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Users.vm Tue May 16 03:26:59 2006 @@ -11,13 +11,14 @@

User Management

- +

+ - - - - - + + + + + #foreach ( $user in $items ) @@ -25,16 +26,31 @@ - +

+ #else +

#end + #else +

+ #end + + #end +

$i18n.getString( "user.username.label" )	$i18n.getString( "user.fullName.label" )	$i18n.getString( "user.email.label" )	$i18n.getString( "user.groupName.label" )		$i18n.getString( "user.username.label" )	$i18n.getString( "user.fullName.label" )	$i18n.getString( "user.email.label" )	$i18n.getString( "user.groupName.label" )
$user.fullName	#if ( $user.email ) $user.email #end	$user.group.name	+	#if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) ) #if ( "guest" != $user.username ) - Edit - \| Delete	+ #if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) ) + #if ( "guest" != $user.username ) + + #else + + #end + #else + #end

#if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) )

About Continuum

Admin account

Directories

Base URL

Company Informations

End of configuration