You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2013/11/16 13:53:24 UTC
svn commit: r1542499 - in
/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/components/
java/org/apache/maven/continuum/web/view/jsp/ui/
resources/template/default/ webapp/WEB-INF/jsp/ webapp/WEB-INF/jsp/...
Author: brett
Date: Sat Nov 16 12:53:23 2013
New Revision: 1542499
URL: http://svn.apache.org/r1542499
Log:
[CONTINUUM-2713] remove data tag
These are not inside forms, so are relying on specific theme layout, when
they should just provide the HTML they expect
Removed:
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/Data.java
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/data.ftl
Modified:
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp?rev=1542499&r1=1542498&r2=1542499&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp Sat Nov 16 12:53:23 2013
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -29,12 +28,14 @@
<h3><s:text name="about.section.title"/></h3>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('about.version.label')}">
- <s:param name="after"><s:text name="about.version.number"/></s:param>
- </c1:data>
- <c1:data label="%{getText('about.buildnumber.label')}">
- <s:param name="after"><s:text name="about.buildnumber"/></s:param>
- </c1:data>
+ <tr class="b">
+ <th><label class="label"><s:text name='about.version.label'/>:</label></th>
+ <td><s:text name="about.version.number"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='about.buildnumber.label'/>:</label></th>
+ <td><s:text name="about.buildnumber"/></td>
+ </tr>
</table>
</div>
</div>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp?rev=1542499&r1=1542498&r2=1542499&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp Sat Nov 16 12:53:23 2013
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -34,14 +33,34 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"/>
- <c1:data label="%{getText('configuration.buildOutputDirectory.label')}" name="buildOutputDirectory"/>
- <c1:data label="%{getText('configuration.releaseOutputDirectory.label')}" name="releaseOutputDirectory"/>
- <c1:data label="%{getText('configuration.deploymentRepositoryDirectory.label')}"
- name="deploymentRepositoryDirectory"/>
- <c1:data label="%{getText('configuration.baseUrl.label')}" name="baseUrl"/>
- <c1:data label="%{getText('configuration.allowed.build.parallel')}" name="numberOfAllowedBuildsinParallel"/>
- <c1:data label="%{getText('configuration.distributedBuildEnabled.label')}" name="distributedBuildEnabled"/>
+ <tr class="b">
+ <th><label class="label"><s:text name='configuration.workingDirectory.label'/>:</label></th>
+ <td><s:property value="workingDirectory"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='configuration.buildOutputDirectory.label'/>:</label></th>
+ <td><s:property value="buildOutputDirectory"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='configuration.releaseOutputDirectory.label'/>:</label></th>
+ <td><s:property value="releaseOutputDirectory"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='configuration.deploymentRepositoryDirectory.label'/>:</label></th>
+ <td><s:property value="deploymentRepositoryDirectory"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='configuration.baseUrl.label'/>:</label></th>
+ <td><s:property value="baseUrl"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='configuration.allowed.build.parallel'/>:</label></th>
+ <td><s:property value="numberOfAllowedBuildsinParallel"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='configuration.distributedBuildEnabled.label'/>:</label></th>
+ <td><s:property value="distributedBuildEnabled"/></td>
+ </tr>
</table>
<div class="functnbar3">
<s:form action="configuration!input.action" method="post">
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp?rev=1542499&r1=1542498&r2=1542499&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp Sat Nov 16 12:53:23 2013
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
@@ -32,9 +31,18 @@
<h3><s:text name="viewBuildAgent.section.title"/></h3>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('buildAgent.url.label')}" name="buildAgent.url"/>
- <c1:data label="%{getText('buildAgent.description.label')}" name="buildAgent.description"/>
- <c1:data label="%{getText('buildAgent.enabled.label')}" name="buildAgent.enabled"/>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildAgent.url.label'/>:</label></th>
+ <td><s:property value="buildAgent.url"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildAgent.description.label'/>:</label></th>
+ <td><s:property value="buildAgent.description"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildAgent.enabled.label'/>:</label></th>
+ <td><s:property value="buildAgent.enabled"/></td>
+ </tr>
</table>
</div>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?rev=1542499&r1=1542498&r2=1542499&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Sat Nov 16 12:53:23 2013
@@ -41,39 +41,46 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('buildResult.startTime')}">
- <s:param name="after"><c1:date name="buildResult.startTime"/></s:param>
- </c1:data>
- <c1:data label="%{getText('buildResult.endTime')}">
- <s:param name="after"><c1:date name="buildResult.endTime"/></s:param>
- </c1:data>
- <c1:data label="%{getText('buildResult.duration')}">
- <s:param name="after">
- <s:if test="buildResult.endTime == 0"><s:text name="buildResult.startedSince"/></s:if> <s:property value="buildResult.durationTime"/></s:param>
- </c1:data>
- <c1:data label="%{getText('buildResult.trigger')}">
- <s:param name="after"><s:text name="buildResult.trigger.%{buildResult.trigger}"/></s:param>
- </c1:data>
- <c1:data label="%{getText('buildResult.state')}">
- <s:param name="after" value="state"/>
- </c1:data>
- <c1:data label="%{getText('buildResult.buildNumber')}">
- <s:param name="after">
- <s:if test="buildResult.buildNumber != 0">
- <s:property value="buildResult.buildNumber"/>
- </s:if>
- <s:else>
-
- </s:else>
- </s:param>
- </c1:data>
- <c1:data label="%{getText('buildResult.username')}">
- <s:param name="after"><s:property value="buildResult.username"/></s:param>
- </c1:data>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.startTime'/>:</label></th>
+ <td><c1:date name="buildResult.startTime"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.endTime'/>:</label></th>
+ <td><c1:date name="buildResult.endTime"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.duration'/>:</label></th>
+ <td><s:if test="buildResult.endTime == 0"><s:text name="buildResult.startedSince"/></s:if> <s:property value="buildResult.durationTime"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.trigger'/>:</label></th>
+ <td><s:text name="buildResult.trigger.%{buildResult.trigger}"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.state'/>:</label></th>
+ <td>${state}</td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.buildNumber'/>:</label></th>
+ <td>
+ <s:if test="buildResult.buildNumber != 0">
+ <s:property value="buildResult.buildNumber"/>
+ </s:if>
+ <s:else>
+
+ </s:else>
+ </td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.username'/>:</label></th>
+ <td><s:property value="buildResult.username"/></td>
+ </tr>
<c:if test="${!empty buildResult.buildUrl}">
- <c1:data label="%{getText('buildResult.buildUrl')}">
- <s:param name="after"><s:property value="buildResult.buildUrl"/></s:param>
- </c1:data>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.buildUrl'/>:</label></th>
+ <td><s:property value="buildResult.buildUrl"/></td>
+ </tr>
</c:if>
</table>
</div>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp?rev=1542499&r1=1542498&r2=1542499&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp Sat Nov 16 12:53:23 2013
@@ -19,7 +19,6 @@
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<html>
<s:i18n name="localization.Continuum">
@@ -35,7 +34,7 @@
<s:if test="projectInCOQueue">
<div class="label">
<p><s:text name="%{getText('project.in.checkout.queue.error')}"/></p>
- </div >
+ </div>
</s:if>
<c:if test="${!empty actionErrors}">
<div class="errormessage">
@@ -45,36 +44,33 @@
</div>
</c:if>
<table>
- <tbody>
- <s:hidden name="projectGroupId"/>
- <s:textfield label="%{getText('projectGroup.name.label')}" name="name" requiredLabel="true" disabled="%{projectInCOQueue}"/>
- <c1:data label="%{getText('projectGroup.groupId.label')}" name="projectGroup.groupId"/>
- <s:textfield label="%{getText('projectGroup.description.label')}" name="description" disabled="%{projectInCOQueue}"/>
- <s:select label="%{getText('projectGroup.repository.label')}" name="repositoryId" list="repositories"
- listKey="id" listValue="name" disabled="%{disabledRepositories}"/>
- <s:textfield label="%{getText('projectGroup.url.label')}" name="url" disabled="%{projectInCOQueue}"/>
- </tbody>
+ <s:hidden name="projectGroupId"/>
+ <s:textfield label="%{getText('projectGroup.name.label')}" name="name" requiredLabel="true" disabled="%{projectInCOQueue}"/>
+ <s:textfield label="%{getText('projectGroup.groupId.label')}" disabled="true" name="projectGroup.groupId" />
+ <s:textfield label="%{getText('projectGroup.description.label')}" name="description" disabled="%{projectInCOQueue}"/>
+ <s:select label="%{getText('projectGroup.repository.label')}" name="repositoryId" list="repositories"
+ listKey="id" listValue="name" disabled="%{disabledRepositories}"/>
+ <s:textfield label="%{getText('projectGroup.url.label')}" name="url" disabled="%{projectInCOQueue}"/>
</table>
-
<c:if test="${!empty projectList}">
- <h3><s:text name="projectGroup.edit.section.projects.title"/></h3>
- <div class="eXtremeTable">
- <table id="projects_table" border="1" cellspacing="2" cellpadding="3" class="tableRegion" width="100%">
- <thead>
- <tr>
- <td class="tableHeader"><s:text name="projectGroup.edit.project.name"/></td>
- <td class="tableHeader"><s:text name="projectGroup.edit.move.to.group"/></td>
- </tr>
- </thead>
- <tbody class="tableBody">
- <s:iterator value="projectList" status="rowCounter">
- <tr class="<s:if test="#rowCounter.odd == true">odd</s:if><s:else>even</s:else>">
- <td><s:select cssStyle="width:200px" label="%{name}" name="projects[%{id}]" list="projectGroups" value="%{projectGroup.id}" disabled="%{projectInCOQueue}"/></td>
+ <h3><s:text name="projectGroup.edit.section.projects.title"/></h3>
+ <div class="eXtremeTable">
+ <table id="projects_table" border="1" cellspacing="2" cellpadding="3" class="tableRegion" width="100%">
+ <thead>
+ <tr>
+ <td class="tableHeader"><s:text name="projectGroup.edit.project.name"/></td>
+ <td class="tableHeader"><s:text name="projectGroup.edit.move.to.group"/></td>
</tr>
- </s:iterator>
- </tbody>
- </table>
- </div>
+ </thead>
+ <tbody class="tableBody">
+ <s:iterator value="projectList" status="rowCounter">
+ <tr class="<s:if test="#rowCounter.odd == true">odd</s:if><s:else>even</s:else>">
+ <td><s:select cssStyle="width:200px" label="%{name}" name="projects[%{id}]" list="projectGroups" value="%{projectGroup.id}" disabled="%{projectInCOQueue}"/></td>
+ </tr>
+ </s:iterator>
+ </tbody>
+ </table>
+ </div>
</c:if>
<div class="functnbar3">
<c:choose>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=1542499&r1=1542498&r2=1542499&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp Sat Nov 16 12:53:23 2013
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<html>
@@ -85,13 +84,28 @@
<h3><s:text name="projectGroup.information.title"><s:param><c:out value="${projectGroup.name}"/></s:param></s:text></h3>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('projectGroup.name.label')}" name="projectGroup.name"/>
- <c1:data label="%{getText('projectGroup.groupId.label')}" name="projectGroup.groupId"/>
- <c1:data label="%{getText('projectGroup.description.label')}" name="projectGroup.description"/>
- <c1:data label="%{getText('projectGroup.repository.label')}" name="projectGroup.localRepository.name"/>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectGroup.name.label'/>:</label></th>
+ <td><s:property value="projectGroup.name"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectGroup.groupId.label'/>:</label></th>
+ <td><s:property value="projectGroup.groupId"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectGroup.description.label'/>:</label></th>
+ <td><s:property value="projectGroup.description"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectGroup.repository.label'/>:</label></th>
+ <td><s:property value="projectGroup.localRepository.name"/></td>
+ </tr>
<s:if test="url != null">
<s:url id="projectHomepageUrl" value="%{url}" includeContext="false" includeParams="none"/>
- <c1:data label="%{getText('projectGroup.url.label')}" name="url" valueLink="%{'${projectHomepageUrl}'}"/>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectGroup.url.label'/>:</label></th>
+ <td><a href="${projectHomepageUrl}"><s:property value="url"/></a></td>
+ </tr>
</s:if>
</table>
</div>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?rev=1542499&r1=1542498&r2=1542499&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Sat Nov 16 12:53:23 2013
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<html>
@@ -39,16 +38,37 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('projectView.project.name')}" name="project.name"/>
- <c1:data label="%{getText('projectView.project.description')}" name="project.description"/>
- <c1:data label="%{getText('projectView.project.version')}" name="project.version"/>
- <c1:data label="%{getText('projectView.project.scmUrl')}" name="project.scmUrl"/>
- <c1:data label="%{getText('projectView.project.scmTag')}" name="project.scmTag"/>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.name'/>:</label></th>
+ <td><s:property value="project.name"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.description'/>:</label></th>
+ <td><s:property value="project.description"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.version'/>:</label></th>
+ <td><s:property value="project.version"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.scmUrl'/>:</label></th>
+ <td><s:property value="project.scmUrl"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.scmTag'/>:</label></th>
+ <td><s:property value="project.scmTag"/></td>
+ </tr>
<s:url id="projectGroupSummaryUrl" value="/projectGroupSummary.action">
<s:param name="projectGroupId"><c:out value="${project.projectGroup.id}"/></s:param>
</s:url>
- <c1:data label="%{getText('projectView.project.group')}" name="project.projectGroup.name" valueLink="%{'${projectGroupSummaryUrl}'}"/>
- <c1:data label="%{getText('projectView.project.lastBuildDateTime')}" name="lastBuildDateTime" />
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.group'/>:</label></th>
+ <td><a href="${projectGroupSummaryUrl}"><s:property value="project.projectGroup.name"/></a></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='projectView.project.lastBuildDateTime'/>:</label></th>
+ <td><s:property value="lastBuildDateTime"/></td>
+ </tr>
</table>
<redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp?rev=1542499&r1=1542498&r2=1542499&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp Sat Nov 16 12:53:23 2013
@@ -30,31 +30,37 @@
<h4><s:text name="releaseViewResult.summary"/></h4>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('releaseViewResult.projectName')}">
- <s:param name="after"><s:property value="projectName"/></s:param>
- </c1:data>
- <c1:data label="%{getText('releaseViewResult.releaseGoal')}">
- <s:param name="after"><s:property value="releaseGoal"/></s:param>
- </c1:data>
- <c1:data label="%{getText('releaseViewResult.startTime')}">
- <s:param name="after"><c1:date name="result.startTime"/></s:param>
- </c1:data>
- <c1:data label="%{getText('releaseViewResult.endTime')}">
- <s:param name="after"><c1:date name="result.endTime"/></s:param>
- </c1:data>
- <c1:data label="%{getText('releaseViewResult.state')}">
- <s:param name="after">
+ <tr class="b">
+ <th><label class="label"><s:text name='releaseViewResult.projectName'/>:</label></th>
+ <td><s:property value="projectName"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='releaseViewResult.releaseGoal'/>:</label></th>
+ <td><s:property value="releaseGoal"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='releaseViewResult.startTime'/>:</label></th>
+ <td><c1:date name="result.startTime"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='releaseViewResult.endTime'/>:</label></th>
+ <td><c1:date name="result.endTime"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='releaseViewResult.state'/>:</label></th>
+ <td>
<s:if test="result.resultCode == 0">
<s:text name="releaseViewResult.success"/>
</s:if>
<s:else>
<s:text name="releaseViewResult.error"/>
</s:else>
- </s:param>
- </c1:data>
- <c1:data label="%{getText('releaseViewResult.username')}">
- <s:param name="after"><s:property value="username"/></s:param>
- </c1:data>
+ </td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='releaseViewResult.username'/>:</label></th>
+ <td><s:property value="username"/></td>
+ </tr>
</table>
</div>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp?rev=1542499&r1=1542498&r2=1542499&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp Sat Nov 16 12:53:23 2013
@@ -17,7 +17,6 @@
~ under the License.
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib prefix="c1" uri="continuum" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -31,9 +30,18 @@
</h3>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('scmResult.projectGroupName')}" name="projectGroupName"/>
- <c1:data label="%{getText('scmResult.scmRootAddress')}" name="projectScmRoot.scmRootAddress"/>
- <c1:data label="%{getText('scmResult.state')}" name="state"/>
+ <tr class="b">
+ <th><label class="label"><s:text name='scmResult.projectGroupName'/>:</label></th>
+ <td><s:property value="projectGroupName"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='scmResult.scmRootAddress'/>:</label></th>
+ <td><s:property value="projectScmRoot.scmRootAddress"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='scmResult.state'/>:</label></th>
+ <td>${state}</td>
+ </tr>
</table>
</div>