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 2006/01/02 18:50:10 UTC
svn commit: r365383 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/view/ resources/localization/ webapp/

Author: evenisse
Date: Mon Jan  2 09:50:03 2006
New Revision: 365383

URL: http://svn.apache.org/viewcvs?rev=365383&view=rev
Log:
o Complete links on summary page
o Add more internationalization

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResults.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?rev=365383&r1=365382&r2=365383&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java Mon Jan  2 09:50:03 2006
@@ -23,6 +23,10 @@
 import org.extremecomponents.table.cell.DisplayCell;
 import org.extremecomponents.table.core.BaseModel;
 
+import com.opensymphony.webwork.ServletActionContext;
+import com.opensymphony.webwork.views.util.UrlHelper;
+
+import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -50,7 +54,18 @@
         {
             if ( latestBuildId != -1 && !StateGenerator.NEW.equals( state ) )
             {
-                column.setValue( "<a href=\"TO_BE_DEFINE\">" + state + "</a>" );
+                HashMap params = new HashMap();
+
+                params.put( "projectId", new Integer( project.getId() ) );
+
+                params.put( "projectName", project.getName() );
+
+                params.put( "buildId", new Integer( latestBuildId ) );
+
+                String url = UrlHelper.buildUrl( "/buildResult.action", ServletActionContext.getRequest(),
+                                                 ServletActionContext.getResponse(), params );
+
+                column.setValue( "<a href=\"" + url + "\">" + state + "</a>" );
             }
             else
             {

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=365383&r1=365382&r2=365383&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Mon Jan  2 09:50:03 2006
@@ -12,6 +12,9 @@
 delete = Delete
 save = Save
 add = Add
+workingCopy = Working&nbsp;Copy
+builds = Builds
+info = Info
 
 // ----------------------------------------------------------------------
 // Page: Top
@@ -58,6 +61,7 @@
 summary.projectTable.build = Build
 summary.projectTable.group = Group
 summary.buildAll = Build All
+summary.buildHistory = Build&nbsp;History
 
 // ----------------------------------------------------------------------
 // Page: Configuration

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp?rev=365383&r1=365382&r2=365383&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp Mon Jan  2 09:50:03 2006
@@ -10,9 +10,9 @@
       <div id="h3">
         <div>
           <p style="border-top: 1px solid transparent; border-bottom: 1px solid black;">
-            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/projectView.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>">Info</a>
-            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/buildResults.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>">Builds</a>
-            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/workingCopy.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>">Working&nbsp;Copy</a>
+            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/projectView.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text name="info"/></a>
+            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/buildResults.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text name="builds"/></a>
+            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/workingCopy.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text name="workingCopy"/></a>
           </p>
         </div>
 

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResults.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResults.jsp?rev=365383&r1=365382&r2=365383&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResults.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResults.jsp Mon Jan  2 09:50:03 2006
@@ -10,9 +10,9 @@
       <div id="h3">
         <div>
           <p style="border-top: 1px solid transparent; border-bottom: 1px solid black;">
-            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/projectView.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>">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="<ww:url value="/workingCopy.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>">Working&nbsp;Copy</a>
+            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/projectView.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text name="info"/></a>
+            <b style="border: 1px solid black; padding-left: 1em; padding-right: 1em;"><ww:text name="builds"/></b>
+            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/workingCopy.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text name="workingCopy"/></a>
           </p>
         </div>
 

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp?rev=365383&r1=365382&r2=365383&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp Mon Jan  2 09:50:03 2006
@@ -10,9 +10,9 @@
       <div id="h3">
         <div>
           <p style="border-top: 1px solid transparent; border-bottom: 1px solid black;">
-            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em;">Info</a>
-            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/buildResults.action?projectId="/><ww:property value="project.id"/>&projectName=<ww:property value="project.name"/>">Builds</a>
-            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/workingCopy.action?projectId="/><ww:property value="project.id"/>&projectName=<ww:property value="project.name"/>">Working&nbsp;Copy</a>
+            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em;"><ww:text name="info"/></a>
+            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/buildResults.action?projectId="/><ww:property value="project.id"/>&projectName=<ww:property value="project.name"/>"><ww:text name="builds"/></a>
+            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/workingCopy.action?projectId="/><ww:property value="project.id"/>&projectName=<ww:property value="project.name"/>"><ww:text name="workingCopy"/></a>
           </p>
         </div>
 

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp?rev=365383&r1=365382&r2=365383&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp Mon Jan  2 09:50:03 2006
@@ -25,10 +25,10 @@
             <ec:column property="projectGroupName" title="summary.projectTable.group"/>
             <ec:column property="buildNowAction" title="&nbsp;" cell="org.apache.maven.continuum.web.view.BuildNowCell"/>
             <ec:column property="buildHistoryAction" title="&nbsp;">
-                TODO
+                <a href="<ww:url value="/buildResults.action?projectId="/>${pageScope.project.id}&projectName=${pageScope.project.name}"><ww:text name="summary.buildHistory"/></a>
             </ec:column>
             <ec:column property="workingCopyAction" title="&nbsp;">
-                TODO
+                <a href="<ww:url value="/workingCopy.action?projectId="/>${pageScope.project.id}&projectName=${pageScope.project.name}"><ww:text name="workingCopy"/></a>
             </ec:column>
             <ec:column property="deleteAction" title="&nbsp;">
                 <a href="${pageContext.request.contextPath}/deleteProject!default.action?projectId=${pageScope.project.id}&projectName=${pageScope.project.name}"><ww:text name="delete"/></a>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp?rev=365383&r1=365382&r2=365383&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/workingCopy.jsp Mon Jan  2 09:50:03 2006
@@ -8,9 +8,9 @@
       <div id="h3">
         <div>
           <p style="border-top: 1px solid transparent; border-bottom: 1px solid black;">
-            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/projectView.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>">Info</a>
-            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/buildResults.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>">Builds</a>
-            <b style="border: 1px solid black; padding-left: 1em; padding-right: 1em;">Working&nbsp;Copy</b>
+            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/projectView.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text name="info"/></a>
+            <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="<ww:url value="/buildResults.action?projectId="/><ww:property value="projectId"/>&projectName=<ww:property value="projectName"/>"><ww:text name="builds"/></a>
+            <b style="border: 1px solid black; padding-left: 1em; padding-right: 1em;"><ww:text name="workingCopy"/></b>
           </p>
         </div>