continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1660262 - in /continuum/trunk/continuum-webapp/src/main: resources/localization/ webapp/WEB-INF/jsp/
Date Tue, 17 Feb 2015 00:43:46 GMT
Author: batkinson
Date: Tue Feb 17 00:43:46 2015
New Revision: 1660262

URL: http://svn.apache.org/r1660262
Log:
[CONTINUUM-2430] Visual improvements to build results (list) page.

Modified:
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_zh_CN.properties
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=1660262&r1=1660261&r2=1660262&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Tue Feb 17 00:43:46 2015
@@ -568,6 +568,7 @@ buildResult.startedSince = Started since
 buildResult.trigger = Build Trigger
 buildResult.state = State
 buildResult.buildNumber = Build#
+buildResult.buildId = Build Id
 buildResult.username = Triggered by
 buildResult.buildError = Build Error
 buildResult.buildOutput = Output

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties?rev=1660262&r1=1660261&r2=1660262&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties
Tue Feb 17 00:43:46 2015
@@ -510,6 +510,7 @@ buildResult.startedSince = L\u00E4uft se
 buildResult.trigger = Ausl\u00F6sung
 buildResult.state = Status
 buildResult.buildNumber = Vorgang#
+buildResult.buildId = Vorgang Id
 buildResult.buildError = Vorgangsfehler
 buildResult.buildOutput = Ergebnis
 buildResult.noOutput = Keine Ausgabe.

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties?rev=1660262&r1=1660261&r2=1660262&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
Tue Feb 17 00:43:46 2015
@@ -544,6 +544,7 @@ buildResult.startedSince = D\u00e9marr\u
 buildResult.trigger = D\u00e9clencheur de la construction
 buildResult.state = \u00c9tat
 buildResult.buildNumber = Construction #
+buildResult.buildId = Construction Id
 buildResult.buildError = Erreur de construction
 buildResult.buildOutput = Sortie
 buildResult.noOutput = Aucune Sortie.

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties?rev=1660262&r1=1660261&r2=1660262&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties
Tue Feb 17 00:43:46 2015
@@ -171,6 +171,7 @@ buildResult.buildDefinition.schedule
 buildResult.buildDefinition.shell.label       = Execut\u00E1vel de Linha de Comando
 buildResult.buildError                        = Erro de Build
 buildResult.buildNumber                       = Build#
+buildResult.buildId                           = Build Id
 buildResult.buildOutput                       = Sa\u00EDda
 buildResult.buildOutput.text                  = Download como Texto
 buildResult.cannot.delete                     = N\u00E3o \u00E9 poss\u00EDvel excluir um
resultado de build que est\u00E1 executando '{0}'

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_zh_CN.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_zh_CN.properties?rev=1660262&r1=1660261&r2=1660262&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_zh_CN.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_zh_CN.properties
Tue Feb 17 00:43:46 2015
@@ -514,6 +514,7 @@ buildResult.startedSince = \u5f00\u59cb\
 buildResult.trigger = \u6784\u5efa\u89e6\u53d1\u5668
 buildResult.state = \u72b6\u6001
 buildResult.buildNumber = \u6784\u5efa#
+buildResult.buildId = \u6784\u5efa Id
 buildResult.buildError = \u6784\u5efa\u9519\u8bef
 buildResult.buildOutput = \u8f93\u51fa
 buildResult.noOutput = \u6ca1\u6709\u8f93\u51fa\u3002

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp?rev=1660262&r1=1660261&r2=1660262&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp Tue Feb
17 00:43:46 2015
@@ -73,12 +73,12 @@
                     <c:out value="${pageScope.buildResult.buildNumber}"/>
                   </c:if>
               </ec:column>
-              <ec:column property="startTime" title="buildResults.startTime" cell="date"/>
-              <ec:column property="endTime" title="buildResults.endTime" cell="date"/>
-              <ec:column property="duration" title="&nbsp;">
+              <ec:column property="startTime" title="buildResults.startTime" cell="date"
format="yyyy-MM-dd HH:mm z"/>
+              <ec:column property="endTime" title="buildResults.endTime" cell="date" format="yyyy-MM-dd
HH:mm z"/>
+              <ec:column property="duration" title="buildResults.duration">
                 <c:choose>
                   <c:when test="${buildResult.endTime gt 0}">
-                    <s:text name="buildResults.duration"/> : <c:out value="${buildResult.durationTime}"/>
+                    ${buildResult.durationTime}
                   </c:when>
                   <c:otherwise>
                     <s:text name="buildResults.startedSince"/> : <c:out value="${buildResult.elapsedTime}"/>
@@ -86,15 +86,25 @@
                 </c:choose>
               </ec:column>
               <ec:column property="state" title="buildResults.state" cell="org.apache.maven.continuum.web.view.buildresults.StateCell"/>
+              <ec:column property="trigger" title="buildResult.trigger">
+                <c:choose>
+                  <c:when test="${pageScope.buildResult.trigger == 1}">
+                    <s:text name="buildResult.trigger.1"/>
+                  </c:when>
+                  <c:otherwise>
+                    <s:text name="buildResult.trigger.0"/>
+                  </c:otherwise>
+                </c:choose>
+              </ec:column>
               <ec:column property="buildDefinition.description" title="buildResults.buildDefinition.description"
/>
-              <ec:column property="actions" title="&nbsp;">
+              <ec:column property="actions" title="buildResult.buildId">
                 <s:url id="buildResultUrl" action="buildResult">
                   <s:param name="projectId"><c:out value="${projectId}"/></s:param>
                   <s:param name="projectName"><c:out value="${projectName}"/></s:param>
                   <s:param name="buildId"><c:out value="${buildResult.id}"/></s:param>
                   <s:param name="projectGroupId"><c:out value="${projectGroupId}"/></s:param>
                 </s:url>
-                <s:a href="%{buildResultUrl}"><s:text name="buildResults.result"/></s:a>
+                <s:a href="%{buildResultUrl}">${buildResult.id}</s:a>
               </ec:column>
             </ec:row>
           </ec:table>



Mime
View raw message