]> source.dussan.org Git - archiva.git/commitdiff
projects / archiva.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 75dc098)
Committing current work
authorJames William Dumay <jdumay@apache.org>
Sat, 5 Jul 2008 05:08:16 +0000 (05:08 +0000)
committerJames William Dumay <jdumay@apache.org>
Sat, 5 Jul 2008 05:08:16 +0000 (05:08 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-829@674152 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml patch | blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp patch | blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp patch | blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp patch | blob | history

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 3dda8324c7cf41a7ee46aaec665c4c5e0000818a..7abfee65b7c61ca919974a02be975fc13ef72557 100644 (file)
--- 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 @@
 
     <!-- .\ 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>
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 d1e15602c2cb44cee63976b4c2e4c42047c591eb..9468ffcd2d809485bb554c4bf49aa2719d86fa9e 100644 (file)
--- 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" %>
+<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>
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 23ac0ae9a9aa8c8b52684c0cab9e2e88dffc52b6..f651c6b094019e7ff23dc29e3bea3dea3f978874 100644 (file)
--- 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 @@
 <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>
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 41b188038b9da604482577ce2526ca98c8ff7db6..30810427233e81c1544fa709dc240f8f8c080557 100644 (file)
--- 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" %>
 <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>
Apache Archiva Repository: https://github.com/apache/archiva