You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/05/12 22:37:20 UTC
svn commit: r1679065 -
/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
Author: batkinson
Date: Tue May 12 20:37:20 2015
New Revision: 1679065
URL: http://svn.apache.org/r1679065
Log:
Migrated appearance page from jstl to struts tags.
Modified:
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=1679065&r1=1679064&r2=1679065&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Tue May 12 20:37:20 2015
@@ -18,7 +18,6 @@
--%>
<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -29,6 +28,18 @@
<div class="h3">
<h3><s:text name="appearance.companyDetails"/></h3>
+
+ <s:if test="hasActionErrors()">
+ <div class="errormessage">
+ <s:actionerror/>
+ </div>
+ </s:if>
+ <s:if test="hasActionMessages()">
+ <div class="warningmessage">
+ <s:actionmessage/>
+ </div>
+ </s:if>
+
<div style="float: right">
<a href="<s:url action='editAppearance' />"><s:text name="edit"/></a>
</div>
@@ -39,13 +50,8 @@
<s:set name="companyPom" value="companyPom"/>
-<c:if test="${empty (companyPom.groupId) || empty (companyPom.artifactId)}">
- <p>
- <s:text name="appearance.noCompanyPom"/> <a href="<s:url action='editAppearance' />"><s:text name="appearance.selectCompanyPom"/></a>
- </p>
-</c:if>
+<s:if test="companyPom.groupId.length() > 0 && companyPom.artifactId.length() > 0">
-<c:if test="${!empty (companyPom.groupId) && !empty (companyPom.artifactId)}">
<p>
<s:text name="appearance.detailsIntroduction"/> <s:text name="appearance.maybeChange"/>
<a href="<s:url action='editCompanyPom'/>"><s:text name="appearance.editThePomLink"/></a>.
@@ -55,9 +61,9 @@
<table>
<s:label name="companyPom.groupId" label="%{getText('appearance.companyPom.groupId')}"/>
<s:label name="companyPom.artifactId" label="%{getText('appearance.companyPom.artifactId')}"/>
- <c:if test="${companyModel != null}">
+ <s:if test="companyModel != null">
<s:label name="companyModel.version" label="%{getText('appearance.companyPom.version')}"/>
- </c:if>
+ </s:if>
</table>
<div style="float: right">
@@ -65,41 +71,43 @@
</div>
<h3><s:text name="appearance.companyPom.section.title"/></h3>
- <c:choose>
- <c:when test="${companyModel != null}">
+ <s:if test="companyModel != null">
<table>
<tr>
<th><s:text name="appearance.companyPom.organizationName.label"/></th>
- <td><c:out value="${companyModel.organization.name}"/></td>
+ <td><s:property value="companyModel.organization.name"/></td>
</tr>
<tr>
<th><s:text name="appearance.companyPom.organizationUrl.label"/></th>
- <c:set var="companyOrgUrl"><c:out value="${companyModel.organization.url}"/></c:set>
- <td><a href="${companyOrgUrl}" target="_blank">
- <code><c:out value="${companyModel.organization.url}"/></code>
- </a></td>
+ <s:set var="companyOrgUrl" value="companyModel.organization.url" />
+ <td><s:a href="%{#companyOrgUrl}" target="_blank">
+ <code><s:property value="#companyOrgUrl"/></code>
+ </s:a></td>
</tr>
<tr>
<th><s:text name="appearance.companyPom.organizationLogoUrl.label"/></th>
<td>
- <code><c:out value="${companyModel.properties['organization.logo']}"/></code>
+ <code><s:property value="companyModel.properties['organization.logo']"/></code>
</td>
</tr>
</table>
- </c:when>
- <c:otherwise>
+ </s:if>
+ <s:else>
<s:text name="appearance.companyPomDoesNotExist">
<s:param>
- <c:out value="${companyPom.groupId}"/>:<c:out value="${companyPom.artifactId}"/>
+ <s:property value="companyPom.groupId + ':' + companyPom.artifactId"/>
</s:param>
</s:text>
<a href="<s:url action='editCompanyPom' />"><s:text name="appearance.createCompanyPom"/></a>
- </c:otherwise>
- </c:choose>
-</c:if>
+ </s:else>
+</s:if>
+<s:else>
+ <p>
+ <s:text name="appearance.noCompanyPom"/> <a href="<s:url action='editAppearance' />"><s:text name="appearance.selectCompanyPom"/></a>
+ </p>
+</s:else>
</div>
-<s:actionmessage/>
<s:form action="saveFooter" method="post" namespace="/admin">
<s:token/>
<div id="axial" class="h3">