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 2005/08/24 20:00:51 UTC
svn commit: r239720 - in
/maven/continuum/trunk/continuum-web/src/main/resources:
localization/Continuum.properties templates/screens/ProjectBuild.vm
templates/screens/ProjectBuilds.vm templates/screens/Summary.vm
templates/screens/View.vm
Author: evenisse
Date: Wed Aug 24 11:00:46 2005
New Revision: 239720
URL: http://svn.apache.org/viewcvs?rev=239720&view=rev
Log:
[CONTINUUM-287]Use updated design for project summary
Modified:
maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm
Modified: maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties?rev=239720&r1=239719&r2=239720&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties Wed Aug 24 11:00:46 2005
@@ -27,7 +27,6 @@
// ----------------------------------------------------------------------
project.title = Continuum Project
-project.title.add = Add Continuum Project
project.title.update = Update Continuum Project
project.title.delete = Delete Continuum Project
@@ -43,6 +42,17 @@
projectScmUrl.error = You must provide an scm url
projectScmUrl.message = Enter the <a href="http://maven.apache.org/reference/plugins/scm/scmurl.html">Maven SCM URL</a>
+project.version.label = Version
+project.version.error = You must provide a version
+project.version.message = Enter the version of the project
+
+project.group.label = Group
+project.notifiers.label = Notifiers
+project.buildDefinitions.label = Build Definitions
+project.dependencies.label = Dependencies
+project.usedBy.label = Used By
+project.developers.label = Developers
+
// ----------------------------------------------------------------------
// Delete
// ----------------------------------------------------------------------
@@ -85,7 +95,7 @@
// Shell project
// ----------------------------------------------------------------------
-project.title.m1.add = Add Shell Project
+project.title.shell.add = Add Shell Project
project.arguments.label = Arguments
project.arguments.message = Enter shell script arguments, if any
@@ -97,7 +107,7 @@
// Ant Project
// ----------------------------------------------------------------------
-project.title.m1.add = Add Ant Project
+project.title.ant.add = Add Ant Project
project.targets.label = Targets
project.targets.error = You must provide at least one target
@@ -111,10 +121,6 @@
project.nagEmailAddress.error = You must provide a nag email address
project.nagEmailAddress.message = Enter a notifaction email address
-project.version.label = Version
-project.version.error = You must provide a version
-project.version.message = Enter the version of the project
-
// ----------------------------------------------------------------------
// General errors
// ----------------------------------------------------------------------
@@ -128,6 +134,7 @@
// ----------------------------------------------------------------------
message.or = OR
+message.note = Note:
// ----------------------------------------------------------------------
// Exceptions
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=239720&r1=239719&r2=239720&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 Wed Aug 24 11:00:46 2005
@@ -1,6 +1,17 @@
$page.setTitle( "Continuum - ${project.name} Build at $date.format('medium',$build.startTime)" )
<div class="app">
+
+ <div>
+ <p style="border-top: 1px solid transparent; border-bottom: 1px solid black;">
+ #set ( $infoLink = $link.setPage('View.vm').addPathInfo('fid', "$!{project.executorId}Project").addPathInfo('id', $project.id) )
+ <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="$infoLink">Info</a>
+ <b style="border: 1px solid black; padding-left: 1em; padding-right: 1em;">Builds</b>
+ <!-- a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;"
+ href="workingCopy.html">Working Copy</a -->
+ </p>
+ </div>
+
<h3>Build result for $project.name</h3>
<p>
<table border="1" cellspacing="2" cellpadding="3" width="100%">
@@ -13,8 +24,16 @@
<td>$date.format('medium',$build.endTime)</td>
</tr>
<tr class="a">
- <th>Triggered By</th>
+ <th>Build Trigger</th>
<td>$trigger.generate($build)</td>
+ </tr>
+ <tr class="a">
+ <th>State</th>
+ <td>$state.generate($build)</td>
+ </tr>
+ <tr class="a">
+ <th>Build#</th>
+ <td>$build.buildNumber</td>
</tr>
</table>
</p>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm?rev=239720&r1=239719&r2=239720&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm Wed Aug 24 11:00:46 2005
@@ -1,10 +1,22 @@
$page.setTitle( "Continuum - ${project.name} Builds" )
<div class="app">
+
+ <div>
+ <p style="border-top: 1px solid transparent; border-bottom: 1px solid black;">
+ #set ( $infoLink = $link.setPage('View.vm').addPathInfo('fid', "$!{project.executorId}Project").addPathInfo('id', $project.id) )
+ <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="$infoLink">Info</a>
+ <b style="border: 1px solid black; padding-left: 1em; padding-right: 1em;">Builds</b>
+ <!-- a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;"
+ href="workingCopy.html">Working Copy</a -->
+ </p>
+ </div>
+
<h3>Build results for $project.name</h3>
<p>
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<tr>
+ <th>Build #</th>
<th>Start Time</th>
<th>End Time</th>
<th>State</th>
@@ -12,6 +24,7 @@
</tr>
#foreach ( $build in $builds )
<tr class="$css.nextClass">
+ <td>$build.buildNumber</td>
<td>$date.format('medium',$build.startTime)</td>
<td>$date.format('medium',$build.endTime)</td>
<td>$state.generate($build)</td>
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=239720&r1=239719&r2=239720&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 Wed Aug 24 11:00:46 2005
@@ -19,11 +19,12 @@
<table border="1" cellspacing="2" cellpadding="3" width="100%" id="projectSummaryTable">
<!-- i18n -->
- <tr>
- <th>Status</th>
- <th>Name</th>
+ <tbody><tr>
+ <th> </th>
+ <th width="100%">Name</th>
<th>Version</th>
<th>Build</th>
+ <th>Group</th>
<th colspan="7"></th>
</tr>
@@ -39,53 +40,62 @@
#end
<tr class="$css.nextClass">
- <td>$state.generate( $item )</td>
- <td>$!item.name</td>
+ <td>
+ #if ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 )
+ $state.generate( $item )
+ #else
+
+ #end
+ </td>
+ <td><a href="$link.setPage('View.vm').addPathInfo('fid', "$!{item.executorId}Project").addPathInfo('id', $item.id)">$!item.name</a></td>
<td>$!item.version</td>
- <td>$item.buildNumber</td>
- <td><a href="$link.setPage('View.vm').addPathInfo('fid', "$!{item.executorId}Project").addPathInfo('id', $item.id)">View</a></td>
+ <td>
+ #if ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 )
+ $item.buildNumber
+ #else
+ <b>In progress</b>
+ #end
+ </td>
+ <td> </td>
## Operations
- <td><a href="$link.setPage('Edit.vm').addPathInfo('fid', "$!{item.executorId}Project").addPathInfo('id', $item.id)">Edit</a></td>
-
#if ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 )
- <td><a href="$link.setPage('Delete.vm').addPathInfo('fid', "$!{item.executorId}Project").addPathInfo('id', $item.id)">Delete</a></td>
+ <td><a href="$link.addPathInfo('action', 'cam').addPathInfo('cid','buildProject').addPathInfo('id', $item.id)">Build Now</a></td>
#else
- <td>Delete</td>
+ <td>Build</td>
#end
#if ( $item.latestBuildId > 0 )
- ## TODO: get rid of this call back to $continuum
- #set ( $build = $continuum.getLatestBuildResultForProject($item.id) )
- <td><a href="$link.setPage('ProjectBuild.vm').addPathInfo('view', "ProjectBuild").addPathInfo('id', $item.id).addPathInfo('buildId', $build.id)">Last Result</a></td>
+ <td><a href="$link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id', $item.id)">Build History</a></td>
#else
- <td>Last Result</td>
+ <td>All Results</td>
#end
- #if ( $item.latestBuildId > 0 )
- <td><a href="$link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id', $item.id)">All Results</a></td>
- #else
- <td>All Results</td>
+ #if ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 )
+ <!-- td>Working Copy</td -->
#end
#if ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 )
- <td><a href="$link.addPathInfo('action', 'cam').addPathInfo('cid','buildProject').addPathInfo('id', $item.id)">Build</a></td>
+ <td><a href="$link.setPage('Delete.vm').addPathInfo('fid', "$!{item.executorId}Project").addPathInfo('id', $item.id)">Delete</a></td>
#else
- <td>Build</td>
+ <td>Delete</td>
#end
- <td><a href="$link.setPage('ProjectNotifiers.vm').addPathInfo('view', "ProjectNotifiers").addPathInfo('id', $item.id )">Notifiers</a></td>
-
</tr>
#end
+ </tbody>
</table>
<div class="functnbar3">
<form method="post" action="$link">
+ <img src="/continuum/images/icon_success_sml.gif" alt="Success"/> $success
+ <img src="/continuum/images/icon_error_sml.gif" alt="Failed"/> $failures
+ <img src="/continuum/images/icon_warning_sml.gif" alt="Error"/> $errors
#if ( $items && $items.size() > 0 )
#hidden ( "action" "cam" )
#hidden ( "cid" "buildAllProjects" )
+ <!-- input type="submit" name="build-broken" value="Build All In Error" -->
<input type="submit" name="build-all" value="Build All"/>
#end
</form>
@@ -96,9 +106,6 @@
<table>
<tr>
<td align="right">
- <img src="/continuum/images/icon_success_sml.gif" alt="Success"/> $success
- <img src="/continuum/images/icon_error_sml.gif" alt="Failed"/> $failures
- <img src="/continuum/images/icon_warning_sml.gif" alt="Error"/> $errors
</td>
</tr>
</table>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm?rev=239720&r1=239719&r2=239720&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm Wed Aug 24 11:00:46 2005
@@ -1,84 +1,212 @@
$page.setTitle( "Continuum - Project View: ${item.name}" )
<div class="app">
+
+ <div>
+ <p style="border-top: 1px solid transparent; border-bottom: 1px solid black;">
+ #set ( $buildsLink = $link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id', $item.id) )
+ <b style="border: 1px solid black; padding-left: 1em; padding-right: 1em;">Info</b>
+ <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="$buildsLink">Builds</a>
+ <!-- a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;"
+ href="workingCopy.html">Working Copy</a -->
+ </p>
+ </div>
+
<div id="axial" class="h3">
<h3>$i18n.getString( $form.view.titleKey )</h3>
+
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- #foreach ( $element in $form.elements )
- #if ( !$element.immutable )
<tr class="b">
- <th>$i18n.getString( $element.labelKey )</th>
- <td>$formtool.getItem( $form, $element, $item )</td>
+ <th>$i18n.getString( "project.name.label" )</th>
+ <td>$item.name</td>
+ </tr>
+ <tr class="b">
+ <th>$i18n.getString( "projectScmUrl.label" )</th>
+ <td>$item.scmUrl</td>
+ </tr>
+ <tr class="b">
+ <th>$i18n.getString( "project.version.label" )</th>
+ <td>$item.version</td>
</tr>
- #end
- #end
+ <tr class="b">
+ <th>$i18n.getString( "project.group.label" )</th>
+ <td> </td>
+ </tr>
+ </table>
+ <div class="functnbar3">
+ <table>
+ <tr>
+ <td>
+ <form method="post" action="$link.setPage('Edit.vm').addPathInfo('fid', "$!{item.executorId}Project").addPathInfo('id', $item.id)">
+ <input type="submit" name="edit-project" value="Edit"/>
+ <b style="color: red;">$i18n.getString( "message.note" ) </b> Project details are out of sync with Maven POM
+ </form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+
+ <!--
+ <h3>$i18n.getString( "project.buildDefinitions.label" )</h3>
+ <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <tr>
+ <th>Goals</th>
+ <th>Arguments</th>
+ <th>POM File</th>
+ <th>Profile</th>
+ <th>Schedule</th>
+ <th>From</th>
+ <th width="10%"> </th>
+ </tr>
+ #foreach ( $buildDefinition in $project.buildDefinitions )
+ <tr class="b">
+ <td>$buildDefinition.goals</td>
+ <td>$buildDefinition.arguments</td>
+ <td>$buildDefinition.buildFile</td>
+ <td>$buildDefinition.profile.name</td>
+ <td>$buildDefinition.schedule.name</td>
+ <td>Project</td>
+ <td><a href="#">Edit</a> | <a href="#">Delete</a></td>
+ </tr>
+ #end
</table>
<div class="functnbar3">
<table>
<tr>
<td>
<form method="post" action="$link">
- #hidden ( "action" "cam" )
- #hidden ( "cid" "checkoutProject" )
- #hidden ( "id" "$item.id" )
- <input type="submit" name="checkout-project" value="Checkout"/>
+ <input type="submit" name="add-build-def" value="Add"/>
</form>
</td>
+ </tr>
+ </table>
+ </div>
+ -->
- #if ( $item.lastBuildId )
- #set ( $build = $continuum.getLatestBuildForProject($item.id) )
- <td><a href="$link.setPage('ProjectBuild.vm').addPathInfo('view', "ProjectBuild").addPathInfo('id', $item.id).addPathInfo('buildId', $build.id)">Last Result</a></td>
+ #if ( $project.notifier )
+ <h3>$i18n.getString( "project.notifiers.label" )</h3>
+ <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <tr>
+ <th>Type</th>
+ <th>Recipient</th>
+ <th>Events</th>
+ <th>From</th>
+ <th width="10%"> </th>
+ </tr>
+ #foreach ( $notifier in $project.notifiers )
+ <tr class="b">
+ #if ( $notifier.type == "irc" )
+ <td>IRC</td>
+ #elseif ( $notifier.type == "mail" )
+ <td>Mail</td>
+ #elseif ( $notifier.type == "msn" )
+ <td>MSN</td>
+ #elseif ( $notifier.type == "jabber" )
+ <td>Jabber</td>
#end
-
- #if ( $item.lastBuildId )
- <td><a href="$link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id', $item.id)">All Results</a></td>
+ <td>$notifier.configuration.address</td>
+ <td>Success, Failures</td>
+ <td>Project</td>
+ #set ( $deleteNotifierLink = $link.setPage('ProjectNotifiers.vm').addPathInfo('notifierType', $notifier.type).addPathInfo('action','cam').addPathInfo('cid','deleteNotifier').addPathInfo('id', $item.id) )
+ #if ( $notifier.type == "irc" )
+ <td>
+ #set ( $editNotifierLink = $link.setPage('EditIrcNotifier.vm').addPathInfo('view','EditIrcNotifier').addPathInfo('notifierType', $notifier.type).addPathInfo('id', $item.id) )
+ <a href="$editNotifierLink">Edit</a> | <a href="$deleteNotifierLink">Delete</a>
+ </td>
+ #elseif ( $notifier.type == "mail" )
+ <td>
+ #set ( $editNotifierLink = $link.setPage('EditMailNotifier.vm').addPathInfo('view','EditMailNotifier').addPathInfo('notifierType', $notifier.type).addPathInfo('id', $item.id) )
+ <a href="$editNotifierLink">Edit</a> | <a href="$deleteNotifierLink">Delete</a>
+ </td>
+ #elseif ( $notifier.type == "msn" )
+ <td>
+ #set ( $editNotifierLink = $link.setPage('EditMsnNotifier.vm').addPathInfo('view','EditMsnNotifier').addPathInfo('notifierType', $notifier.type).addPathInfo('id', $item.id) )
+ <a href="$editNotifierLink">Edit</a> | <a href="$deleteNotifierLink">Delete</a>
+ </td>
+ #elseif ( $notifier.type == "jabber" )
+ <td>
+ #set ( $editNotifierLink = $link.setPage('EditJabberNotifier.vm').addPathInfo('view','EditJabberNotifier').addPathInfo('notifierType', $notifier.type).addPathInfo('id', $item.id) )
+ <a href="$editNotifierLink">Edit</a> | <a href="$deleteNotifierLink">Delete</a>
+ </td>
#end
-
+ </tr>
+ #end
+ </table>
+ <!--
+ <div class="functnbar3">
+ <table>
+ <tr>
+ <td>
+ <form method="post" action="$link.setPage('SelectNotifier.vm').addPathInfo('id', $project.id )">
+ <input type="submit" name="add-notifier" value="Add"/>
+ <b style="color: red;">$i18n.getString( "message.note" ) </b> Notifiers are out of sync with Maven POM
+ </form>
+ </td>
</tr>
</table>
</div>
- </div>
+ -->
+ #end
+
+ #if ( $project.dependencies )
+ <h3>$i18n.getString( "project.dependencies.label" )</h3>
+ <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <tr>
+ <th>Name</th>
+ </tr>
+ #foreach ( $dependency in $project.dependencies )
+ <tr class="b">
+ <td>$dependency.name</td>
+ </tr>
+ #end
+ </table>
+ #end
- ## This is an extension which could be done by a parse or include
- ## TODO: internationalize and use forms instead of this hardcoded layout - tryg
+ <!--
+ <h3>$i18n.getString( "project.usedBy.label" )</h3>
+ <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <tr>
+ <th>Name</th>
+ </tr>
+ <tr class="b">
+ <td> </td>
+ </tr>
+ </table>
+ -->
- #if ( $item.developers.size() > 0 )
- <div id="h3">
- <h3>Developers</h3>
+ #if ( $project.developers )
+ <h3>$i18n.getString( "project.developers.label" )</h3>
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<tr>
<th>Name</th>
<th>Email</th>
+ <th width="10%"> </th>
</tr>
- #foreach ( $developer in $item.developers )
- <tr class="$css.nextClass">
- <td>${developer.name}</th>
- <td><a href="mailto:${developer.email}">${developer.email}</a></td>
+ #foreach ( $developer in $project.developers )
+ <tr class="b">
+ <td>$developer.name</td>
+ <td>$developer.email</td>
+ <td> </td>
</tr>
#end
</table>
- #bar()
- </div>
- #end
-
- #if ( ( $item.checkOutException && $item.checkOutException != "" ) || ( $item.checkOutErrorMessage && $item.checkOutErrorMessage != "" ) )
- <div id="h3">
- <h3>Checkout Error</h3>
- <p>
- There was a error while checking out the project.
- </p>
- #if ( $item.checkOutErrorMessage && $item.checkOutErrorMessage != "" )
- <p>
- <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px"><code><pre>$item.checkOutErrorMessage</pre></code></div>
- </p>
+ <!--
+ <div class="functnbar3">
+ <table>
+ <tr>
+ <td>
+ <form method="post" action="$link">
+ <input type="submit" name="add-developer" value="Add"/>
+ <b style="color: red;">$i18n.getString( "message.note" ) </b> Developers are out of sync with Maven POM
+ </form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ -->
#end
- #if ( $item.checkOutErrorException && $item.checkOutErrorException != "" )
- <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px"><code><pre>$item.checkOutErrorException</pre></code></div>
- #end
- </p>
</div>
- #end
-
</div>