You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jd...@apache.org on 2008/07/05 07:08:17 UTC
svn commit: r674152 - in
/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main:
resources/ webapp/WEB-INF/jsp/admin/ webapp/WEB-INF/jsp/components/
Author: jdumay
Date: Fri Jul 4 22:08:16 2008
New Revision: 674152
URL: http://svn.apache.org/viewvc?rev=674152&view=rev
Log:
Committing current work
Modified:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
Modified: archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml?rev=674152&r1=674151&r2=674152&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml (original)
+++ archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml Fri Jul 4 22:08:16 2008
@@ -432,8 +432,6 @@
<!-- .\ CONFIGURATION \.___________________________________________ -->
- <!-- The following are needed by the maven-app-configuration-web artifact -->
-
<action name="configureAppearance" class="organisationInfo" method="input">
<result name="input">/WEB-INF/jsp/admin/appearance.jsp</result>
</action>
Modified: archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=674152&r1=674151&r2=674152&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Fri Jul 4 22:08:16 2008
@@ -19,6 +19,8 @@
<%@ taglib prefix="ww" uri="/webwork" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<ww:set name="organisationInfo" value="organisationInfo"/>
+
<html>
<head>
<title>Configure Appearance</title>
@@ -31,12 +33,31 @@
<div style="float: right">
<a href="<ww:url action='editAppearance' />">Edit</a>
</div>
-<h2>Organisation Details</h2>
+<h2>Organization Details</h2>
<p>
The logo in the top right of the screen is controlled by the following settings.
<a href="<ww:url action='editAppearance' />">Change your appearence</a>
</p>
+<h3>Organization Information</h3>
+ <table>
+ <tr>
+ <th>Name</th>
+ <td>${organisationName}</td>
+ </tr>
+ <tr>
+ <th>URL</th>
+ <td><a href="${organisationUrl}">
+ <code>${organisationUrl}</code>
+ </a></td>
+ </tr>
+ <tr>
+ <th>Logo URL</th>
+ <td>
+ <code>${organisationLogo}</code>
+ </td>
+ </tr>
+ </table>
</body>
</html>
Modified: archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?rev=674152&r1=674151&r2=674152&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp (original)
+++ archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp Fri Jul 4 22:08:16 2008
@@ -27,18 +27,18 @@
<body>
<h1>Appearance</h1>
-<h2>Organisation Details</h2>
+<h2>Organization Details</h2>
<p>
- Enter the details of the company super POM below. If it exists, the organization name, URL and logo will be read
- from it.
+ Enter the details of your organization below.
</p>
+<ww:set name="editOrganisationInfo" value="editOrganisationInfo"/>
<ww:actionmessage/>
-<ww:form method="post" action="editAppearance" namespace="/admin" validate="true" theme="xhtml">
- <ww:textfield name="editAppearance.organisationName" label="Organisation Name"/>
- <ww:textfield name="editAppearance.organisationUrl" label="Organisation Url"/>
- <ww:textfield name="editAppearance.organisationLogo" label="Orgnaisation Logo"/>
+<ww:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
+ <ww:textfield name="organisationName" value="${organisationName}" label="Name"/>
+ <ww:textfield name="organisationUrl" value="${organisationUrl}" label="URL"/>
+ <ww:textfield name="organisationLogo" value="${organisationLogo}" label="Logo URL"/>
<ww:submit value="Save"/>
</ww:form>
</body>
Modified: archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?rev=674152&r1=674151&r2=674152&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp (original)
+++ archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp Fri Jul 4 22:08:16 2008
@@ -20,16 +20,16 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<ww:set name="organisationInfo" value="organisationInfo"/>
-<c:if test="${!empty(companyLogo)}">
- <ww:set name="companyUrl" value="companyUrl"/>
+<c:if test="${!empty(organisationLogo)}">
+ <ww:set name="organisationUrl" value="organisationUrl"/>
<c:choose>
- <c:when test="${!empty(companyUrl)}">
+ <c:when test="${!empty(organisationUrl)}">
<a href="${companyUrl}">
- <img src="${companyLogo}" title="${companyName}" border="0" alt=""/>
+ <img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/>
</a>
</c:when>
<c:otherwise>
- <img src="${companyLogo}" title="${companyName}" border="0" alt=""/>
+ <img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/>
</c:otherwise>
</c:choose>
</c:if>