continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r406895 [6/7] - in /maven/continuum/trunk: ./ continuum-api/src/main/java/org/apache/maven/continuum/ continuum-api/src/main/java/org/apache/maven/continuum/configuration/ continuum-api/src/main/java/org/apache/maven/continuum/execution/ co...
Date Tue, 16 May 2006 10:27:16 GMT
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Default.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Default.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Default.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Default.vm Tue May 16 03:26:59 2006
@@ -9,18 +9,20 @@
     <script src="$data.getLink("scripts/tigris.js")" type="text/javascript"></script>
   </head>
 
-  <body onload="focus()" marginwidth="0" marginheight="0" class="composite">
+  <body onload="focus()" class="composite" marginwidth="0" marginheight="0">
 
     #parse("navigations/DefaultTop.vm")
 
-    <table id="main" border="0" cellpadding="4" cellspacing="0" width="100%">
+    <table border="0" cellpadding="4" cellspacing="0" width="100%" id="main">
       <tbody>
         <tr valign="top">
-          <td id="leftcol" width="30%">
+          <td width="180" id="leftcol">
+            <br /> <br />
             #parse("navigations/Menu.vm")
           </td>
-          <td>
+          <td width="86%">
             <div id="bodycol">
+              <br />
               $screenViewContent
             </div>
           </td>
@@ -28,6 +30,7 @@
       </tbody>
     </table>
 
+    <br />
     #parse("navigations/DefaultBottom.vm")
 
   </body>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Index.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Index.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Index.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Index.vm Tue May 16 03:26:59 2006
@@ -9,26 +9,29 @@
     <script src="$data.getLink("scripts/tigris.js")" type="text/javascript"></script>
   </head>
 
-  <body onload="focus()" marginwidth="0" marginheight="0" class="composite">
+  <body onload="focus()" class="composite" marginwidth="0" marginheight="0">
 
     #parse("navigations/DefaultTop.vm")
 
-    <table id="main" border="0" cellpadding="4" cellspacing="0" width="100%">
+    <table border="0" cellpadding="4" cellspacing="0" width="100%" id="main">
       <tbody>
         <tr valign="top">
-          <td id="leftcol" width="20%">
+          <td width="180" id="leftcol">
+            <br /> <br />
             #parse("navigations/Menu.vm")
           </td>
-          <td>
+          <td width="86%">
             <div id="bodycol">
+              <br />
               $screenViewContent
             </div>
-           </td>
+          </td>
         </tr>
       </tbody>
-   </table>
+    </table>
 
-   #parse("navigations/DefaultBottom.vm")
+    <br />
+    #parse("navigations/DefaultBottom.vm")
 
   </body>
 </html>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultTop.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultTop.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultTop.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultTop.vm Tue May 16 03:26:59 2006
@@ -1,34 +1,34 @@
 <div id="banner">
-  <table border="1" cellspacing="0" cellpadding="8" width="100%">
+  <table border="1" cellpadding="8" cellspacing="0" width="100%">
     <tbody>
       <tr>
         <td>
+          <a href="http://maven.apache.org/continuum">
+            <img src="$data.getLink("images/continuum_logo_75.gif")" alt="Continuum" title="Continuum" border="0">
+          </a>
+        </td>
+        <td>
           #if ( $continuum.getConfiguration().getCompanyLogo() )
             #if ( $continuum.getConfiguration().getCompanyUrl() )
               <a href="$continuum.getConfiguration().getCompanyUrl()">
             #end
-                <img src="$continuum.getConfiguration().getCompanyLogo()" #if ( $continuum.getConfiguration().getCompanyName() ) alt="$continuum.getConfiguration().getCompanyName()" title="$continuum.getConfiguration().getCompanyName()" #end border="0">
+                <img src="$continuum.getConfiguration().getCompanyLogo()" #if ( $continuum.getConfiguration().getCompanyName() ) alt="$continuum.getConfiguration().getCompanyName()" title="$continuum.getConfiguration().getCompanyName()" #end align="right" border="0">
             #if ( $continuum.getConfiguration().getCompanyUrl() )
               </a>
             #end
           #else
-            <a href="http://maven.apache.org/continuum/">
-              [Your company logo here]
-            </a>
+            <div align="right">
+              <a href="http://maven.apache.org/continuum/">[Your company logo here]</a>
+            </div>
           #end
         </td>
-        <td>
-          <a href="http://maven.apache.org/continuum">
-            <img src="$data.getLink("images/continuum_logo_75.gif")" alt="Continuum" title="Continuum" align="right" border="0">
-          </a>
-        </td>
       </tr>
     </tbody>
   </table>
 </div>
 
 <div id="breadcrumbs">
-  <div style="float: right">
+  <div style="float: right;">
     <a href="http://maven.apache.org/continuum">Continuum</a> |
     <a href="http://maven.apache.org/">Maven</a> |
     <a href="http://www.apache.org/">Apache</a>
@@ -36,7 +36,7 @@
 
   <div>
     #if ( $data.getUser() )
-      Welcome, <b>$data.user.fullName</b> - <a href="$link?action=logout">Log out</a>
+      Welcome, <b>$data.user.fullName</b> - <a href="$link?action=logout">Disconnect</a>
     #else
       Welcome, <b>Guest</b> - <a href="$link.setPage('Login.vm')">Login</a>
     #end

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm Tue May 16 03:26:59 2006
@@ -7,66 +7,81 @@
 <div id="navcolum">
   <div id="projectmenu" class="toolgroup">
     <div class="label">Continuum</div>
-    <div class="body">
-      <div>
-        <a href="$link.setPage('About.vm')">About</a>
-      </div>
+    <div>
+      <div class="body"><a href="$link.setPage('About.vm')">About</a></div>
 
       #if ( $continuum.security.isAuthorized( $c1user, "showProject" ) )
-      <div>
-        <a href="$link.setPage('Summary.vm').addPathInfo( 'fid', 'continuumProject')">Show Projects</a>
-      </div>
+      <div class="body"><a href="$link.setPage('Summary.vm').addPathInfo( 'fid', 'continuumProject')">Show Projects</a></div>
       #end
     </div>
   </div>
+</div>
 
   #if ( $continuum.security.isAuthorized( $c1user, "addProject" ) )
+<br>
+<div id="navcolum">
   <div id="projecttools" class="toolgroup">
     <div class="label">Add Project</div>
 
-    <div class="body">
-      <div>
-        <a href="$link.setPage('AddMavenProject.vm').addPathInfo( 'fid', 'addMavenTwoProject')">Maven 2.0+ Project</a>
-      </div>
-      <div>
-        <a href="$link.setPage('AddMavenProject.vm').addPathInfo( 'fid', 'addMavenOneProject')">Maven 1.x Project</a>
-      </div>
-      <div>
-        <a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'antProject')">Ant Project</a>
-      </div>
-      <div>
-        <a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'shellProject')">Shell Project</a>
-      </div>
+    <div>
+      <div class="body"><a href="$link.setPage('AddMavenProject.vm').addPathInfo( 'fid', 'addMavenTwoProject')">Maven 2.0+ Project</a></div>
+      <div class="body"><a href="$link.setPage('AddMavenProject.vm').addPathInfo( 'fid', 'addMavenOneProject')">Maven 1.x Project</a></div>
+      <div class="body"><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'antProject')">Ant Project</a></div>
+      <div class="body"><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'shellProject')">Shell Project</a></div>
     </div>
   </div>
+</div>
   #end
 
   <!--
+<br>
+<div id="navcolum">
   <div id="projecttools" class="toolgroup">
    <div class="label">Import Project</div>
-   <div class="body">
-     <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'importCruiseControlProject')">CC Project</a></div>
-     <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'uploadCruiseControlProject')">Upload CC Project</a></div>
+   <div>
+     <div class="body"><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'importCruiseControlProject')">CC Project</a></div>
+     <div class="body"><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'uploadCruiseControlProject')">Upload CC Project</a></div>
    </div>
   </div>
+</div>
   -->
 
   #if ( $continuum.security.isAuthorized( $c1user, "manageSchedule" ) || $continuum.security.isAuthorized( $c1user, "manageUsers" ) )
+<br>
+<div id="navcolum">
   <div id="projecttools" class="toolgroup">
    <div class="label">Administration</div>
-   <div class="body">
+   <div>
      #if ( $continuum.security.isAuthorized( $c1user, "manageSchedule" ) )
-     <div><a href="$link.setPage('Schedules.vm').addPathInfo( 'fid', 'schedules')">Schedules</a></div>
+     <div class="body"><a href="$link.setPage('Schedules.vm').addPathInfo( 'fid', 'schedules')">Schedules</a></div>
      #end
      #if ( $continuum.security.isAuthorized( $c1user, "manageConfiguration" ) )
-     <div><a href="$link.setPage('ConfigureContinuum.vm')">Configuration</a></div>
+     <div class="body"><a href="$link.setPage('ConfigureContinuum.vm')">Configuration</a></div>
      #end
      #if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) )
-     <div><a href="$link.setPage('UserGroups.vm')">User Groups Management</a></div>
-     <div><a href="$link.setPage('Users.vm')">Users Management</a></div>
+     <div class="body"><a href="$link.setPage('UserGroups.vm')">User Groups Management</a></div>
+     <div class="body"><a href="$link.setPage('Users.vm')">Users Management</a></div>
      #end
    </div>
   </div>
+</div>
   #end
 
+<br>
+<div id="navcolum">
+  <div id="projecttools" class="toolgroup">
+    <div class="label">Legend</div>
+    <div id="legend">
+      <div id="litem1" class="body">Build Now</div>
+      <div id="litem2" class="body">Build History</div>
+      <div id="litem3" class="body">Build In Progess</div>
+      <div id="litem4" class="body">Checking Out Build</div>
+      <div id="litem5" class="body">Queued Build</div>
+      <div id="litem6" class="body">Delete</div>
+      <div id="litem7" class="body">Edit</div>
+      <div id="litem8" class="body">Build in Success</div>
+      <div id="litem9" class="body">Build in Failure</div>
+      <div id="litem10" class="body">Build in Error</div>
+    </div>
+  </div>
 </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/About.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/About.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/About.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/About.vm Tue May 16 03:26:59 2006
@@ -1,10 +1,18 @@
 $page.setTitle( "Continuum - About" )
 
 <div class="app">
-
   <div id="axial" class="h3">
     <h3>About Continuum</h3>
-    <p> Version: ${project.version}
+    <div class="axial">
+      <table border="1" cellpadding="3" cellspacing="2" width="100%">
+        <tbody>
+          <tr>
+            <th>Version</th>
+            <td>${project.version}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
   </div>
 </div>
 

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Add.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Add.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Add.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Add.vm Tue May 16 03:26:59 2006
@@ -11,7 +11,7 @@
       #hidden ( "id" $id )
       #end
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
           #foreach ( $element in $form.elements )
           #if ( !$element.immutable )
           <tr>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm Tue May 16 03:26:59 2006
@@ -12,7 +12,8 @@
       <input type="hidden" name="fid" value="${executorId}Project"/>
       #hidden ( "id" $id )
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           #foreach ( $element in $form.elements )
           #if($executorId == "ant" && $element.id == "buildFile")
           <tr>
@@ -67,6 +68,7 @@
               </select>
             </td>
           </tr>
+          </tbody>
         </table>
         #submitBar( "Submit" )
       </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddMavenProject.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddMavenProject.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddMavenProject.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddMavenProject.vm Tue May 16 03:26:59 2006
@@ -9,12 +9,13 @@
       #hidden ( "view" $form.add.view )
 
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           <tr>
             #field( $i18n $data $form.elements.get(0) $item $formtool )
           </tr>
           <tr>
-            <td>&nbsp;</td>
+            <th>&nbsp;</th>
             <td>
               <strong>$i18n.getString( "message.or" )</strong>
             </td>
@@ -22,6 +23,7 @@
           <tr>
             #field( $i18n $data $form.elements.get(1) $item $formtool )
           </tr>
+          </tbody>
         </table>
 
         #submitBar( "Submit" )

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddUser.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddUser.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddUser.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddUser.vm Tue May 16 03:26:59 2006
@@ -9,7 +9,8 @@
       #hidden ( "view" "$form.add.view" )
       #hidden ( "id" $id )
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           #foreach ( $element in $form.elements )
             #if ( !$element.immutable )
             <tr>
@@ -31,6 +32,7 @@
               </select>
             </td>
           </tr>
+          </tbody>
         </table>
         #submitBar( "Submit" )
       </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddUserGroup.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddUserGroup.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddUserGroup.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddUserGroup.vm Tue May 16 03:26:59 2006
@@ -8,7 +8,8 @@
       #hidden ( "cid" "addUserGroup" )
       #hidden ( "view" "$form.add.view" )
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           #foreach ( $element in $form.elements )
             #if ( !$element.immutable )
             <tr>
@@ -146,6 +147,7 @@
             </p>
           </td>
         </tr>
+        </tbody>
         </table>
 
         #submitBar( "Submit" )

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm Tue May 16 03:26:59 2006
@@ -11,7 +11,8 @@
       #hidden ( "id" $project.id )
       #hidden ( "buildDefinitionId" $buildDefinition.id )
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           #if (${project.executorId} == "ant" )
           <tr>
             <th>$i18n.getString( "buildDefinition.antBuildXmlFile.label" )</th>
@@ -93,6 +94,7 @@
               </select>
             </td>
           </tr>
+          </tbody>
         </table>
         #submitBar( "Submit" )
       </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Configure.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Configure.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Configure.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Configure.vm Tue May 16 03:26:59 2006
@@ -7,73 +7,95 @@
 
       <h3>Admin account</h3>
       <div class="axial">
-        <table cellspacing="2" cellpadding="3" width="900">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           <tr>
-            <td width="20%">Username :</td>
+            <th>Username</th>
             <td><input type="text" name="username" size="100"></td>
           </tr>
           <tr>
-            <td>Password :</td>
+            <th>Password</th>
             <td><input type="password" name="password" size="100"></td>
           </tr>
           <tr>
-            <td>Re-enter Password :</td>
+            <th>Re-enter Password</th>
             <td><input type="password" name="password.two" size="100"></td>
           </tr>
           <tr>
-            <td>Full Name :</td>
+            <th>Full Name</th>
             <td><input type="text" name="fullName" size="100"></td>
           </tr>
           <tr>
-            <td>Email :</td>
+            <th>Email</th>
             <td><input type="text" name="email" size="100"></td>
           </tr>
+          </tbody>
         </table>
       </div>
 
       <h3>Directories</h3>
-      <table cellspacing="2" cellpadding="3" width="900">
+      <div class="axial">
+      <table border="1" cellpadding="3" cellspacing="2" width="100%">
+        <tbody>
         <tr>
-          <td width="20%">Working Directory :</td>
+          <th>Working Directory</th>
           <td><input type="text" name="workingDirectory" value="working-directory" size="100"><br>If you define a relative path, it will be relative to $continuum.configuration.applicationHome</td>
         </tr>
         <tr>
-          <td>Build Output Directory :</td>
+          <th>Build Output Directory</th>
           <td><input type="text" name="buildOutputDirectory" value="build-output-directory" size="100"><br>If you define a relative path, it will be relative to $continuum.configuration.applicationHome</td>
         </tr>
+        <tr>
+          <th>Deployment Repository Directory</th>
+          <td><input type="text" name="deploymentRepositoryDirectory" size="100"><br><strong>Optional.</strong> If you define a relative path, it will be relative to $continuum.configuration.applicationHome</td>
+        </tr>
+        </tbody>
       </table>
+      </div>
 
       <h3>Base URL</h3>
-      <table cellspacing="2" cellpadding="3" width="900">
+      <div class="axial">
+      <table border="1" cellpadding="3" cellspacing="2" width="100%">
+        <tbody>
         <tr>
-          <td width="20%">Base URL :</td>
+          <th>Base URL</th>
           <td><input type="text" name="baseUrl" value="http://localhost:8080/continuum/servlet/continuum" size="100"></td>
         </tr>
+        </tbody>
       </table>
+      </div>
 
       <h3>Company Informations</h3>
-      <table cellspacing="2" cellpadding="3" width="900">
+      <div class="axial">
+      <table border="1" cellpadding="3" cellspacing="2" width="100%">
+        <tbody>
         <tr>
-          <td width="20%">Name :</td>
+          <th>Name</th>
           <td><input type="text" name="companyName" size="100"></td>
         </tr>
         <tr>
-          <td>Logo :</td>
+          <th>Logo</th>
           <td><input type="text" name="companyLogo" size="100"></td>
         </tr>
         <tr>
-          <td>URL :</td>
+          <th>URL</th>
           <td><input type="text" name="companyUrl" size="100"></td>
         </tr>
+        </tbody>
       </table>
+      </div>
 
       <h3>Guest access</h3>
-      <table cellspacing="2" cellpadding="3" width="900">
+      <div class="axial">
+      <table border="1" cellpadding="3" cellspacing="2" width="100%">
+        <tbody>
         <tr>
-          <td width="20%">Allow Guest :</td>
+          <th>Allow Guest</th>
           <td><input type="checkbox" name="guestAccountEnabled" checked="checked"></td>
         </tr>
+        </tbody>
       </table>
+      </div>
 
       #submitBar( "Submit" )
     </form>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ConfigureContinuum.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ConfigureContinuum.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ConfigureContinuum.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ConfigureContinuum.vm Tue May 16 03:26:59 2006
@@ -11,8 +11,8 @@
     <h3>General Configuration</h3>
 
     <div class="axial">
-      <table border="1" cellspacing="2" cellpadding="3" width="100%">
-
+      <table border="1" cellpadding="3" cellspacing="2" width="100%">
+        <tbody>
         <tr class="b">
           <th>Guests</th>
           <td>
@@ -33,6 +33,16 @@
           <td>$continuum.configuration.buildOutputDirectory</td>
         </tr>
         <tr class="b">
+          <th>Deployment Repository Directory</th>
+          <td>
+          #if ($continuum.configuration.deploymentRepositoryDirectory )
+           $continuum.configuration.deploymentRepositoryDirectory
+          #else
+           -
+          #end
+          </td>
+        </tr>
+        <tr class="b">
           <th>Base URL</th>
           <td>$continuum.configuration.url</td>
         </tr>
@@ -48,6 +58,7 @@
           <th>Company URL</th>
           <td>#if ( $continuum.configuration.companyUrl ) $continuum.configuration.companyUrl #end</td>
         </tr>
+        </tbody>
       </table>
       #if ( $continuum.security.isAuthorized( $c1user, "manageConfiguration" ) )
       <div class="functnbar3">

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ConfigureEnd.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ConfigureEnd.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ConfigureEnd.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ConfigureEnd.vm Tue May 16 03:26:59 2006
@@ -5,9 +5,9 @@
     <h3>End of configuration</h3>
     <p>
     Continuum is configured.
-    <p>
+    </p>
     <p>
     You can now add users/groups after log in.
-    <p>
+    </p>
   </div>
 </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Delete.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Delete.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Delete.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Delete.vm Tue May 16 03:26:59 2006
@@ -15,10 +15,7 @@
       #hidden ( "action" $form.delete.action )
       #hidden ( "view" $form.delete.view )
       #hidden ( "id" $id )
-      <div class="functnbar3">
-        <input type="submit" name="deleteEntry" value="Delete"/>
-        <input type="submit" name="cancel" value="Cancel"/>
-      </div>
+      #submitBar( "Delete" )
   </form>
   </div>
 </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm Tue May 16 03:26:59 2006
@@ -17,10 +17,7 @@
       #hidden ( "id" $data.getParameters().getString( "id" ) )
       #hidden ( "fid" "${executorId}Project" )
       #hidden ( "buildDefinitionId" $data.getParameters().getString( "buildDefinitionId" ) )
-      <div class="functnbar3">
-        <input type="submit" name="deleteEntry" value="Delete"/>
-        <input type="submit" name="cancel" value="Cancel"/>
-      </div>
+      #submitBar( "Delete" )
   </form>
   </div>
 </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm Tue May 16 03:26:59 2006
@@ -17,10 +17,7 @@
       #hidden ( "id" $data.getParameters().getString( "id" ) )
       #hidden ( "fid" "${executorId}Project" )
       #hidden ( "notifierId" $data.getParameters().getString( "notifierId" ) )
-      <div class="functnbar3">
-        <input type="submit" name="deleteEntry" value="Delete"/>
-        <input type="submit" name="cancel" value="Cancel"/>
-      </div>
+      #submitBar( "Delete" )
   </form>
   </div>
 </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteSchedule.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteSchedule.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteSchedule.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteSchedule.vm Tue May 16 03:26:59 2006
@@ -13,10 +13,7 @@
       #hidden ( "action" $form.delete.action )
       #hidden ( "view" $form.delete.view )
       #hidden ( "id" $id )
-      <div class="functnbar3">
-        <input type="submit" name="deleteEntry" value="Delete"/>
-        <input type="submit" name="cancel" value="Cancel"/>
-      </div>
+      #submitBar( "Delete" )
   </form>
   </div>
 </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteUser.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteUser.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteUser.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteUser.vm Tue May 16 03:26:59 2006
@@ -13,10 +13,7 @@
       #hidden ( "action" $form.delete.action )
       #hidden ( "view" $form.delete.view )
       #hidden ( "id" $id )
-      <div class="functnbar3">
-        <input type="submit" name="deleteEntry" value="Delete"/>
-        <input type="submit" name="cancel" value="Cancel"/>
-      </div>
+      #submitBar( "Delete" )
   </form>
   </div>
 </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteUserGroup.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteUserGroup.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteUserGroup.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteUserGroup.vm Tue May 16 03:26:59 2006
@@ -13,10 +13,7 @@
       #hidden ( "action" $form.delete.action )
       #hidden ( "view" $form.delete.view )
       #hidden ( "id" $id )
-      <div class="functnbar3">
-        <input type="submit" name="deleteEntry" value="Delete"/>
-        <input type="submit" name="cancel" value="Cancel"/>
-      </div>
+      #submitBar( "Delete" )
   </form>
   </div>
 </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Edit.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Edit.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Edit.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Edit.vm Tue May 16 03:26:59 2006
@@ -9,14 +9,16 @@
       #hidden ( "view" $form.update.view )
       #hidden ( "id" $id )
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           #foreach ( $element in $form.elements )
-          #if ( !$element.immutable )
-          <tr>
-            #field( $i18n $data $element $item $formtool )
-          </tr>
-          #end
+            #if ( !$element.immutable )
+            <tr>
+              #field( $i18n $data $element $item $formtool )
+            </tr>
+            #end
           #end
+          </tbody>
         </table>
         #submitBar( "Submit" )
       </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditContinuumConfiguration.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditContinuumConfiguration.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditContinuumConfiguration.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditContinuumConfiguration.vm Tue May 16 03:26:59 2006
@@ -10,7 +10,8 @@
       #hidden ( "cid" "updateConfiguration" )
       #hidden ( "view" "ConfigureContinuum.vm" )
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+        <tbody>
         <tr class="b">
           <th>Guests</th>
           <td>
@@ -26,6 +27,14 @@
           <td><input type="text" name="conf.buildOutputDirectory" value="$continuum.configuration.buildOutputDirectory" size="100"/> If you define a relative path, it will be relative to $continuum.configuration.applicationHome</td>
         </tr>
         <tr class="b">
+          <th>Deployment Repository Directory</th>
+          <td><input type="text" name="conf.deploymentRepositoryDirectory"
+           #if ( $continuum.configuration.deploymentRepositoryDirectory )
+            value="$continuum.configuration.deploymentRepositoryDirectory"
+           #end
+          size="100"/> <strong>Optional</strong>. If you define a relative path, it will be relative to $continuum.configuration.applicationHome</td>
+        </tr>
+        <tr class="b">
           <th>Base URL</th>
           <td><input type="text" name="conf.url" value="$continuum.configuration.url" size="100"/></td>
         </tr>
@@ -41,6 +50,7 @@
           <th>Company URL</th>
           <td><input type="text" name="conf.companyUrl" #if ( $continuum.configuration.companyUrl ) value="$continuum.configuration.companyUrl" #end size="100"/></td>
         </tr>
+        </tbody>
         </table>
         #submitBar( "Submit" )
       </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm Tue May 16 03:26:59 2006
@@ -13,7 +13,8 @@
       #hidden ( "fid" "${executorId}Project" )
       #hidden ( "notifierId" $notifier.id )
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           <tr>
             <th>IRC Host</th>
             <td>
@@ -74,6 +75,7 @@
               <input type="checkbox" name="sendOnWarning" #if( $notifier.sendOnWarning ) checked="checked" #end/>
             </td>
           </tr>
+          </tbody>
         </table>
         #submitBar( "Submit" )
       </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditJabberNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditJabberNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditJabberNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditJabberNotifier.vm Tue May 16 03:26:59 2006
@@ -13,7 +13,8 @@
       #hidden ( "fid" "${executorId}Project" )
       #hidden ( "notifierId" $notifier.id )
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           <tr>
             <th>Jabber Host</th>
             <td>
@@ -86,6 +87,7 @@
               <input type="checkbox" name="sendOnWarning" #if( $notifier.sendOnWarning ) checked="checked" #end/>
             </td>
           </tr>
+          </tbody>
         </table>
         #submitBar( "Submit" )
       </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMailNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMailNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMailNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMailNotifier.vm Tue May 16 03:26:59 2006
@@ -13,7 +13,8 @@
       #hidden ( "fid" "${executorId}Project" )
       #hidden ( "notifierId" $notifier.id )
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           <tr>
             <th>Mail Address</th>
             <td>
@@ -44,6 +45,7 @@
               <input type="checkbox" name="sendOnWarning" #if( $notifier.sendOnWarning ) checked="checked" #end/>
             </td>
           </tr>
+          </tbody>
         </table>
         #submitBar( "Submit" )
       </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMsnNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMsnNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMsnNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMsnNotifier.vm Tue May 16 03:26:59 2006
@@ -13,7 +13,8 @@
       #hidden ( "fid" "${executorId}Project" )
       #hidden ( "notifierId" $notifier.id )
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           <tr>
             <th>MSN Login</th>
             <td>
@@ -56,6 +57,7 @@
               <input type="checkbox" name="sendOnWarning" #if( $notifier.sendOnWarning ) checked="checked" #end/>
             </td>
           </tr>
+          </tbody>
         </table>
         #submitBar( "Submit" )
       </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditUser.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditUser.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditUser.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditUser.vm Tue May 16 03:26:59 2006
@@ -9,13 +9,14 @@
       #hidden ( "view" "$form.update.view" )
       #hidden ( "id" $item.accountId )
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           #foreach ( $element in $form.elements )
-          #if ( !$element.immutable )
-          <tr>
-            #field( $i18n $data $element $item $formtool )
-          </tr>
-          #end
+            #if ( !$element.immutable )
+            <tr>
+              #field( $i18n $data $element $item $formtool )
+            </tr>
+            #end
           #end
           <tr>
             <th>$i18n.getString( "user.groupName.label" )</th>
@@ -27,6 +28,7 @@
               </select>
             </td>
           </tr>
+          </tbody>
         </table>
         #submitBar( "Submit" )
       </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditUserGroup.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditUserGroup.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditUserGroup.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditUserGroup.vm Tue May 16 03:26:59 2006
@@ -9,7 +9,8 @@
       #hidden ( "view" "$form.add.view" )
       #hidden ( "id" $id )
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
           #foreach ( $element in $form.elements )
             #if ( !$element.immutable )
             <tr>
@@ -147,6 +148,7 @@
             </p>
           </td>
         </tr>
+        </tbody>
         </table>
         #submitBar( "Submit" )
       </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Login.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Login.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Login.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Login.vm Tue May 16 03:26:59 2006
@@ -7,20 +7,22 @@
 
       <h3>Authentication</h3>
       <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3">
+        <table border="1" cellpadding="3" cellspacing="2" width="100%">
+          <tbody>
 #if ( $loginMessage )
           <tr>
             <td colspan="2"><font color="red">$loginMessage</font></td>
           </tr>
 #end
           <tr>
-            <td>Username :</td>
+            <th>Username</th>
             <td><input type="text" name="login.username" size="100"></td>
           </tr>
           <tr>
-            <td>Password :</td>
+            <th>Password</th>
             <td><input type="password" name="login.password" size="100"></td>
           </tr>
+          </tbody>
         </table>
 
         #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" ) )
   <div>
-    <p style="border-top: 1px solid transparent; border-bottom: 1px solid black;">
+    <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
       #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>
-      #set ( $workingCopy = $link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id', $project.id) )
-      <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="$workingCopy">Working&nbsp;Copy</a>
+      <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="$infoLink">Info</a>
+      #set ( $buildsLink = $link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id', $project.id) )
+      <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="$buildsLink">Builds</a>
+        #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) )
+        <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="$workingCopy">Working&nbsp;Copy</a>
+      #end
     </p>
   </div>
   #end
 
+  <div id="axial" class="h3">
   <h3>Build result for $project.name</h3>
-  <p>
-    <table border="1" cellspacing="2" cellpadding="3" width="100%">
-      <tr class="a">
+
+  <div class="axial">
+    <table border="1" cellpadding="3" cellspacing="2" width="100%">
+      <tbody>
+      <tr class="b">
         <th>Start Time</th>
-        <td>$date.format('medium',$build.startTime)</td>
+        <td>$!{date.format('medium',$build.startTime)}</td>
       </tr>
-      <tr class="a">
+      <tr class="b">
         <th>End Time</th>
-        <td>$date.format('medium',$build.endTime)</td>
+        <td>$!{date.format('medium',$build.endTime)}</td>
       </tr>
-      <tr class="a">
+      <tr class="b">
+        <th>Duration</th>
+        <td>
+          #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
+        </td>
+      </tr>
+      <tr class="b">
         <th>Build Trigger</th>
         <td>$trigger.generate($build)</td>
       </tr>
-      <tr class="a">
+      <tr class="b">
         <th>State</th>
         <td>$state.generate($build)</td>
       </tr>
-      <tr class="a">
+      <tr class="b">
         <th>Build#</th>
         <td>
         #if ( $build.buildNumber != 0 )
@@ -49,21 +70,23 @@
         #end
         </td>
       </tr>
+      </tbody>
     </table>
-  </p>
+  </div>
 
   #if ( $build.scmResult )
-  <h4>Changes</h4>
-  <p>
+  <h3>Changes</h3>
+  <div class="axial">
     #if ( $build.scmResult.changes.size() == 0 )
     <b>No files changed</b>
     #else
-    <table border="1" cellspacing="2" cellpadding="3" width="100%">
+    <table border="1" cellpadding="3" cellspacing="2" width="100%">
+      <tbody>
       #foreach ( $changeSet in $build.scmResult.changes )
       <tr class="a">
-        #if ($changeSet.author) <td>$changeSet.author</td> #end
-        #if ($changeSet.date > 0) <td>$date.format('medium',$changeSet.date)</td> #end
-        #if ($changeSet.comment) <td>$changeSet.comment</td> #end
+        <td>#if ($changeSet.author) $changeSet.author #end</td>
+        <td>#if ($changeSet.dateAsDate) $date.format('medium',$changeSet.dateAsDate) #end</td>
+        <td>#if ($changeSet.comment) $changeSet.comment #end</td>
         <td>
           #foreach ( $file in $changeSet.files )
             <code>$!file.name</code><br/>
@@ -71,21 +94,23 @@
         </td>
       </tr>
       #end
+      </tbody>
     </table>
     #end
-  </p>
+  </div>
   #end
 
   #set ( $changeSets = $continuum.getChangesSinceLastSuccess( $id, $build.id ) )
   #if ( $changeSets )
-  <h4>Other Changes Since Last Success</h4>
-  <p>
-    <table border="1" cellspacing="2" cellpadding="3" width="100%">
+  <h3>Other Changes Since Last Success</h3>
+  <div class="axial">
+    <table border="1" cellpadding="3" cellspacing="2" width="100%">
+      <tbody>
       #foreach ( $changeSet in $changeSets )
       <tr class="a">
-        #if ($changeSet.author) <td>$changeSet.author</td> #end
-        #if ($changeSet.date > 0) <td>$date.format('medium',$changeSet.date)</td> #end
-        #if ($changeSet.comment) <td>$changeSet.comment</td> #end
+        <td>#if ($changeSet.author) $changeSet.author #end</td>
+        <td>#if ($changeSet.date > 0) $date.format('medium',$changeSet.date) #end</td>
+        <td>#if ($changeSet.comment) $changeSet.comment> #end</td>
         <td>
           #foreach ( $file in $changeSet.files )
             <code>$!file.name</code><br/>
@@ -93,28 +118,32 @@
         </td>
       </tr>
       #end
+      </tbody>
     </table>
-  </p>
+  </div>
   #end
 
 #if ( $build.state == 4 )
-  <h4>Build Error</h4>
-  <p>
+  <h3>Build Error</h3>
+  <div class="axial">
     <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px">
     <code><pre>$build.error</pre></code>
     </div>
-  </p>
+  </div>
 #else
-  <h4>Output</h4>
-  <p>
-#if ( $output && $output != "" )
+  <h3>Output</h3>
+  <div class="axial">
+  #if ( $output && $output != "" )
+    <a href="$requestUtil.getContextPath()/servlet/browse?file=$requestUtil.getParameter('id')/${requestUtil.getParameter('buildId')}.log.txt">Download as text</a>
+    <br><br>
     <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px">
-    <code><pre>$output</pre></code>
+      <code><pre>$output</pre></code>
     </div>
-#else
-No output.
-#end
-  </p>
+  #else
+    No output.
+  #end
+  </div>
 #end
 
+  </div>
 </div>

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=406895&r1=406894&r2=406895&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 Tue May 16 03:26:59 2006
@@ -1,4 +1,4 @@
-$page.setTitle( "Continuum - ${project.name} Builds" )
+$page.setTitle( "Continuum - Continuum Web Builds" )
 
 #if ( $data.user )
   #set ( $c1user = $continuum.getUser( $data.user.userId ) )
@@ -10,35 +10,52 @@
 
   #if ( $continuum.security.isAuthorized( $c1user, "showProject" ) )
   <div>
-    <p style="border-top: 1px solid transparent; border-bottom: 1px solid black;">
+    <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
       #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>
-      #set ( $workingCopy = $link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id', $project.id) )
-      <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="$workingCopy">Working&nbsp;Copy</a>
+      <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="$infoLink">Info</a>
+      <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;">Builds</b>
+      #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) )
+        <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="$workingCopy">Working&nbsp;Copy</a>
+      #end
     </p>
   </div>
   #end
 
   <h3>Build results for $project.name</h3>
   <p>
-    <table border="1" cellspacing="2" cellpadding="3" width="100%">
+    <table border="1" cellpadding="3" cellspacing="2" width="100%">
+      <tbody>
       <tr>
-        <th>Build #</th>
-        <th>Start Time</th>
-        <th>End Time</th>
-        <th>State</th>
-        <th></th>
+        <th class="tablehead">Build #</th>
+        <th class="tablehead">Start Time</th>
+        <th class="tablehead">End Time</th>
+        <th class="tablehead">&nbsp;</th>
+        <th class="tablehead">State</th>
+        <th class="tablehead">&nbsp;</th>
       </tr>
       #foreach ( $build in $builds )
       <tr class="$css.nextClass">
         <td>#if ( $build.state == 2 ) $build.buildNumber #end</td>
         <td>$!{date.format('medium',$build.startTime)}</td>
         <td>$!{date.format('medium',$build.endTime)}</td>
+        <td>
+          #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
+        </td>
         <td>$state.generate($build)</td>
         <td><a href="$link.setPage('ProjectBuild.vm').addQueryData('view','ProjectBuild').addQueryData('buildId',$build.id).addQueryData('id',$project.id)">Result</a></td>
       </tr>
       #end
+      </tbody>
     </table>
   </p>
 </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectNotifiers.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectNotifiers.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectNotifiers.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectNotifiers.vm Tue May 16 03:26:59 2006
@@ -3,10 +3,11 @@
 <div class="app">
   <div id="h3">
     <h3>${project.name} Notifiers</h3>
-    <table border="1" cellspacing="2" cellpadding="3" width="100%">
+    <table border="1" cellpadding="3" cellspacing="2" width="100%">
+      <tbody>
       <tr>
-        <th>Notifier Type</th>
-        <th colspan="3"></th>
+        <th class="tablehead">Notifier Type</th>
+        <th colspan="3" class="tablehead"></th>
       </tr>
       #foreach ( $notifier in $project.notifiers )
       <tr class="$css.nextClass">
@@ -44,6 +45,7 @@
         <td><a href="$link.setPage('ProjectNotifiers.vm').addPathInfo('notifierType', $notifier.type).addPathInfo('action','cam').addPathInfo('cid','deleteNotifier').addPathInfo('id', $project.id)">Delete</a></td>
       </tr>
       #end
+      </tbody>
     </table>
   </div>
   <div class="functnbar3">

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 @@
 <div class="app">
   <div id="h3">
     <h3>Schedules</h3>
-    <table border="1" cellspacing="2" cellpadding="3" width="100%">
+    <table border="1" cellpadding="3" cellspacing="2" width="100%">
+      <tbody>
       <tr>
-        <th>Name</th>
-        <th>Description</th>
-        <th>Cron</th>
-        <th>Quiet Period (seconds)</th>
-        <th width="10%">&nbsp;</th>
+        <th class="tablehead">Name</th>
+        <th class="tablehead">Description</th>
+        <th class="tablehead">Cron</th>
+        <th class="tablehead">Quiet Period (seconds)</th>
+        <th colspan="2" class="tablehead">&nbsp;</th>
       </tr>
       #foreach ( $schedule in $items )
         <tr class="$css.nextClass" #if ( !$schedule.active ) style="color: silver;" #end>
@@ -28,15 +29,27 @@
             #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>
+            #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" ) )
-              <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>
+              #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>
       #end
+      </tbody>
     </table>
     #if ( $continuum.security.isAuthorized( $c1user, "manageSchedule" ) )
     <div class="functnbar3">

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 @@
 <div class="app">
   <div id="h3">
     <h3>Continuum Projects</h3>
-    <table border="1" cellspacing="2" cellpadding="3" width="100%" id="projectSummaryTable">
+    <table border="1" cellspacing="1" cellpadding="0" width="100%" bordercolor="#666666" id="projectSummaryTable">
 
       <!-- i18n -->
       <tbody><tr>
-        <th>&nbsp;</th>
-        <th width="100%">Name</th>
-        <th>Version</th>
-        <th>Build</th>
-        <th>Group</th>
+        <th width="1%"><div align="center"></div></th>
+        <th width="48%" class="tablehead">Name</th>
+        <th width="13%" class="tablehead">Version</th>
+        <th width="5%"><div align="center" class="tablehead">Build</div></th>
+        <th width="13%"><div align="center" class="tablehead">Group</div></th>
         <th colspan="7"></th>
       </tr>
 
@@ -48,67 +48,97 @@
       #end
 
       <tr class="$css.nextClass">
-        <td>
-          #if ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 )
-            #set ( $latestBuild = $buildResults.get( $item.id ) )
+        <td bordercolor="#999999">
+          <div align="center">
+          #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" )
               <a href="$link.setPage('ProjectBuild.vm').addQueryData('view','ProjectBuild').addQueryData('buildId',$latestBuild.id).addQueryData('id',$item.id)">$generatedState</a></td>
             #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 ) )
+              <a href="$link.setPage('ProjectBuild.vm').addQueryData('view','ProjectBuild').addQueryData('buildId',$latestBuild.id).addQueryData('id',$item.id)">$generatedState</a></td>
+            #else
+              &nbsp;
+            #end
           #else
             &nbsp;
           #end
+          </div>
         </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>
+          <div align="center">
           #if ( $continuum.isInBuildingQueue( $item.id ) || $continuum.isInCheckoutQueue( $item.id ) )
-            <b>In&nbsp;queue</b>
-          #elseif ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 )
+            <b><img src="$requestUtil.getContextPath()/images/inqueue.gif" alt="In Queue" title="In Queue" width="16" height="16"></b>
+          #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 ) )
               <a href="$link.setPage('ProjectBuild.vm').addQueryData('view','ProjectBuild').addQueryData('buildId',$build.id).addQueryData('id',$item.id)">$item.buildNumber</a>
             #else
               $item.buildNumber
             #end
+          #elseif ( $item.state == 6 )
+            <b><img src="$requestUtil.getContextPath()/images/building.gif" alt="Building" title="Building" width="16" height="16"></b>
+          #elseif ( $item.state == 7 )
+            <b><img src="$requestUtil.getContextPath()/images/checkingout.gif" alt="Checking Out sources" title="Checking Out sources" width="16" height="16"></b>
+          #elseif ( $item.state == 8 )
+            <b><img src="$requestUtil.getContextPath()/images/checkingout.gif" alt="Updating sources" title="Updating sources" width="16" height="16"></b>
           #else
-            <b>In&nbsp;progress</b>
+            <b><img src="$requestUtil.getContextPath()/images/inqueue.gif" alt="In Queue" title="In Queue" width="16" height="16"></b>
           #end
+          </div>
         </td>
         <td>$item.projectGroup.name</td>
 
         ## Operations
 
         #if ( $continuum.security.isAuthorized( $c1user, "buildProject" ) )
+          <td width="1%">
           #if ( $continuum.isInBuildingQueue( $item.id ) || $continuum.isInCheckoutQueue( $item.id ) )
-          <td>Build</td>
-          #elseif ( $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&nbsp;Now</a></td>
+            <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
-          <td>Build</td>
+            <img src="$requestUtil.getContextPath()/images/buildnow_disabled.gif" alt="Build Now" title="Build Now" width="16" height="16" border="0">
           #end
+          </td>
         #end
 
+        <td width="1%">
         #if ( $item.latestBuildId > 0 )
-        <td><a href="$link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id', $item.id)">Build&nbsp;History</a></td>
+          <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
-        <td>All&nbsp;Results</td>
+          <img src="$requestUtil.getContextPath()/images/buildhistory_disabled.gif" alt="Build History" title="Build History" width="16" height="16" border="0">
         #end
+        </td>
 
-        #if ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 || $item.state == 6 )
-        <td><a href="$link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id', $item.id)">Working&nbsp;Copy</a></td>
+        <td width="1%">
+        #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
-        <td>Working&nbsp;Copy</td>
+          <img src="$requestUtil.getContextPath()/images/workingcopy_disabled.gif" alt="Working Copy" title="Working Copy" width="16" height="16" border="0">
         #end
+        </td>
 
         #if ( $continuum.security.isAuthorized( $c1user, "deleteProject" ) )
-          #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 width="1%">
+          #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
-          <td>Delete</td>
+          <img src="$requestUtil.getContextPath()/images/delete_disabled.gif" alt="Delete" title="Delete" width="16" height="16" border="0">
           #end
+          </td>
         #end
 
       </tr>
@@ -119,15 +149,22 @@
     #if ( $continuum.security.isAuthorized( $c1user, "buildProject" ) )
     <div class="functnbar3">
       <form method="post" action="$link">
-        <img src="/continuum/images/icon_success_sml.gif" alt="Success" title="Success"/> $success
-        <img src="/continuum/images/icon_warning_sml.gif" alt="Failed" title="Failed"/> $failures
-        <img src="/continuum/images/icon_error_sml.gif" alt="Error" title="Error"/> $errors
+        <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Success" title="Success"/> $success
+        <img src="$requestUtil.getContextPath()/images/icon_warning_sml.gif" alt="Failed" title="Failed"/> $failures
+        <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Error" title="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>
+    </div>
+    #else
+    <div class="functnbar3">
+        <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Success" title="Success"/> $success
+        <img src="$requestUtil.getContextPath()/images/icon_warning_sml.gif" alt="Failed" title="Failed"/> $failures
+        <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Error" title="Error"/> $errors
       </form>
     </div>
     #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 @@
 <div class="app">
   <div id="h3">
     <h3>$i18n.getString( "group.management.label" )</h3>
-    <table border="1" cellspacing="2" cellpadding="3" width="100%">
+    <table border="1" cellpadding="3" cellspacing="2" width="100%">
+      <tbody>
       <tr>
-        <th width="10%">$i18n.getString( "group.name.label" )</th>
-        <th>$i18n.getString( "group.permission.addProject.label" )</th>
-        <th>$i18n.getString( "group.permission.editProject.label" )</th>
-        <th>$i18n.getString( "group.permission.deleteProject.label" )</th>
-        <th>$i18n.getString( "group.permission.buildProject.label" )</th>
-        <th>$i18n.getString( "group.permission.showProject.label" )</th>
-        <th>$i18n.getString( "group.permission.addBuildDefinition.label" )</th>
-        <th>$i18n.getString( "group.permission.editBuildDefinition.label" )</th>
-        <th>$i18n.getString( "group.permission.deleteBuildDefinition.label" )</th>
-        <th>$i18n.getString( "group.permission.addNotifier.label" )</th>
-        <th>$i18n.getString( "group.permission.editNotifier.label" )</th>
-        <th>$i18n.getString( "group.permission.deleteNotifier.label" )</th>
-        <th>$i18n.getString( "group.permission.manageConfiguration.label" )</th>
-        <th>$i18n.getString( "group.permission.manageSchedule.label" )</th>
-        <th>$i18n.getString( "group.permission.manageUsers.label" )</th>
-        <th width="10%">&nbsp;</th>
+        <th width="10%" class="tablehead">$i18n.getString( "group.name.label" )</th>
+        <th class="tablehead">$i18n.getString( "group.permission.addProject.label" )</th>
+        <th class="tablehead">$i18n.getString( "group.permission.editProject.label" )</th>
+        <th class="tablehead">$i18n.getString( "group.permission.deleteProject.label" )</th>
+        <th class="tablehead">$i18n.getString( "group.permission.buildProject.label" )</th>
+        <th class="tablehead">$i18n.getString( "group.permission.showProject.label" )</th>
+        <th class="tablehead">$i18n.getString( "group.permission.addBuildDefinition.label" )</th>
+        <th class="tablehead">$i18n.getString( "group.permission.editBuildDefinition.label" )</th>
+        <th class="tablehead">$i18n.getString( "group.permission.deleteBuildDefinition.label" )</th>
+        <th class="tablehead">$i18n.getString( "group.permission.addNotifier.label" )</th>
+        <th class="tablehead">$i18n.getString( "group.permission.editNotifier.label" )</th>
+        <th class="tablehead">$i18n.getString( "group.permission.deleteNotifier.label" )</th>
+        <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 colspan="2" class="tablehead">&nbsp;</th>
       </tr>
       #foreach ( $group in $items )
       <tr class="$css.nextClass">
         <td>$group.name</td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "addProject" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "editProject" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "deleteProject" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "buildProject" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "showProject" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "addBuildDefinition" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "editBuildDefinition" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "deleteBuildDefinition" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "addNotifier" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "editNotifier" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "deleteNotifier" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "manageConfiguration" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "manageSchedule" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
           #end
         </td>
         <td>
           #if ( $continuum.security.isAuthorized( $group, "manageUsers" ) )
-            <img src="/continuum/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
+            <img src="$requestUtil.getContextPath()/images/icon_success_sml.gif" alt="Authorized" title="Authorized"/>
           #else
-            <img src="/continuum/images/icon_error_sml.gif" alt="Unauthorized" title="Unauthorized"/>
+            <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>
+          #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('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>
+          #else
+            <img src="$requestUtil.getContextPath()/images/delete_disabled.gif" alt="Delete" title="Delete" width="16" height="16" border="0">
           #end
         </td>
       </tr>
       #end
+      </tbody>
     </table>
     #if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) )
     <div class="functnbar3">

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 @@
 <div class="app">
   <div id="h3">
     <h3>User Management</h3>
-    <table border="1" cellspacing="2" cellpadding="3" width="100%">
+    <table border="1" cellpadding="3" cellspacing="2" width="100%">
+      <tbody>
       <tr>
-        <th width="10%">$i18n.getString( "user.username.label" )</th>
-        <th width="10%">$i18n.getString( "user.fullName.label" )</th>
-        <th width="10%">$i18n.getString( "user.email.label" )</th>
-        <th width="10%">$i18n.getString( "user.groupName.label" )</th>
-        <th width="10%">&nbsp;</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">&nbsp;</th>
       </tr>
       #foreach ( $user in $items )
       <tr class="$css.nextClass">
@@ -25,16 +26,31 @@
         <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>
+            #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>
+            #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>
       #end
+      </tbody>
     </table>
     #if ( $continuum.security.isAuthorized( $c1user, "manageUsers" ) )
     <div class="functnbar3">



Mime
View raw message