From: James William Dumay Date: Sat, 5 Jul 2008 05:08:16 +0000 (+0000) Subject: Committing current work X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9bbde149601ebf2c694bcab383a002b2d2055acb;p=archiva.git Committing current work git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-829@674152 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml index 3dda8324c..7abfee65b 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml @@ -432,8 +432,6 @@ - - /WEB-INF/jsp/admin/appearance.jsp diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp index d1e15602c..9468ffcd2 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp @@ -19,6 +19,8 @@ <%@ taglib prefix="ww" uri="/webwork" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + Configure Appearance @@ -31,12 +33,31 @@

Edit

Organisation Details

Organization Details

The logo in the top right of the screen is controlled by the following settings. Change your appearence

Organization Information

+ + + + + + + + + + + + + +

Name	${organisationName}
URL	+ `${organisationUrl}` +
Logo URL	+ `${organisationLogo}` +

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp index 23ac0ae9a..f651c6b09 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp @@ -27,18 +27,18 @@

Appearance

Organisation Details

Organization Details

- 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.

+ - - - - + + + + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp index 41b188038..308104272 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp @@ -20,16 +20,16 @@ <%@ taglib uri="/webwork" prefix="ww" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - - + + - + -