You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/05/09 03:47:54 UTC
svn commit: r536390 [2/2] - in /maven/archiva/trunk:
archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/
archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/
archiva-base/archiva-...
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp?view=diff&rev=536390&r1=536389&r2=536390
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp Tue May 8 18:47:52 2007
@@ -17,15 +17,16 @@
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="pss" uri="/plexusSecuritySystem" %>
-<%@ taglib prefix="archiva" uri="http://maven.apache.org/archiva" %>
+<%@ taglib prefix="ww" uri="/webwork"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="pss" uri="/plexusSecuritySystem"%>
+<%@ taglib prefix="archiva" uri="http://maven.apache.org/archiva"%>
<html>
<head>
- <title>Administration - Repository Scanning</title>
- <ww:head/>
+<title>Administration - Repository Scanning</title>
+<ww:head />
</head>
<body>
@@ -34,11 +35,40 @@
<div id="contentArea">
-<ww:actionerror />
-<ww:actionmessage />
+<ww:actionerror />
+<ww:actionmessage />
+
+<c:url var="iconDeleteUrl" value="/images/icons/delete.gif" />
+<c:url var="iconCreateUrl" value="/images/icons/create.png" />
+<ww:url id="removeFiletypePatternUrl" action="repositoryScanning" method="removeFiletypePattern" />
+<ww:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern" />
+
+<script type="text/javascript">
+<!--
+ function removeFiletypePattern(filetypeId, pattern)
+ {
+ var f = document.getElementById('filetypeForm');
+
+ f.action = "${removeFiletypePatternUrl}";
+ f['pattern'].value = pattern;
+ f['fileTypeId'].value = filetypeId;
+ f.submit();
+ }
+
+ function addFiletypePattern(filetypeId, newPatternId)
+ {
+ var f = document.getElementById('filetypeForm');
+
+ f.action = "${addFiletypePatternUrl}";
+ f['pattern'].value = document.getElementById(newPatternId).value;
+ f['fileTypeId'].value = filetypeId;
+ f.submit();
+ }
+//-->
+</script>
<div class="admin">
- <h2>Repository Scanning - File Types</h2>
+<h2>Repository Scanning - File Types</h2>
<c:choose>
<c:when test="${empty(fileTypeMap)}">
@@ -47,46 +77,75 @@
</c:when>
<c:otherwise>
<%-- Display the filetypes. --%>
-
- <c:forEach items="${fileTypeMap}" var="filetype" varStatus="i">
- <c:choose>
- <c:when test='${(i.index)%2 eq 0}'>
- <c:set var="rowColor" value="dark" scope="page" />
- </c:when>
- <c:otherwise>
- <c:set var="rowColor" value="lite" scope="page" />
- </c:otherwise>
- </c:choose>
- <div class="filetype ${rowColor}">
+ <ww:form method="post" action="repositoryScanning"
+ namespace="/admin" validate="false"
+ id="filetypeForm" theme="simple">
+ <input type="hidden" name="pattern" />
+ <input type="hidden" name="fileTypeId" />
+ </ww:form>
- <div class="controls">
- <%-- Does this even make sense for file types? --%>
- </div>
-
- <h3 class="filetype">${filetype.key}</h3>
+ <ww:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern" />
+
+ <c:forEach items="${fileTypeIds}" var="filetypeId">
+
+ <div class="filetype">
+
+ <div class="controls"><%-- Does this even make sense for file types? --%></div>
+
+ <h3 class="filetype">${filetypeId}</h3>
<table>
- <c:forEach items="${filetype.value.patterns}" var="pattern" varStatus="i">
+ <c:forEach items="${fileTypeMap[filetypeId].patterns}" var="pattern" varStatus="i">
+ <c:choose>
+ <c:when test='${(i.index)%2 eq 0}'>
+ <c:set var="bgcolor" value="even" scope="page" />
+ </c:when>
+ <c:otherwise>
+ <c:set var="bgcolor" value="odd" scope="page" />
+ </c:otherwise>
+ </c:choose>
+
+ <c:set var="escapedPattern" value="${fn:escapeXml(pattern)}" scope="page" />
+
+ <tr>
+ <td class="pattern ${bgcolor}">
+ <code>${escapedPattern}</code>
+ </td>
+ <td class="controls ${bgcolor}">
+ <ww:a href="#" title="Remove [${escapedPattern}] Pattern from [${filetypeId}]"
+ onclick="removeFiletypePattern( '${filetypeId}', '${escapedPattern}' )"
+ theme="simple">
+ <img src="${iconDeleteUrl}" />
+ </ww:a>
+ </td>
+ </tr>
+ </c:forEach>
<tr>
<td>
- <code>${pattern}</code>
+ <ww:textfield size="40"
+ id="newpattern_${i.index}"
+ theme="simple" />
</td>
<td>
- <img src="<c:url value="/images/icons/delete.gif" />" />
+ <ww:a href="#"
+ title="Add Pattern to [${filetypeId}]"
+ onclick="addFiletypePattern( '${filetypeId}', 'newpattern_${i.index}' )"
+ theme="simple">
+ <img src="${iconCreateUrl}" />
+ </ww:a>
</td>
</tr>
- </c:forEach>
</table>
-
- </div>
- </c:forEach>
-
+
+ </div>
+ </c:forEach>
+
</c:otherwise>
</c:choose>
- <h2>Repository Scanning - Consumers of Good Content</h2>
-
+<h2>Repository Scanning - Consumers of Good Content</h2>
+
<c:choose>
<c:when test="${empty(goodConsumers)}">
<%-- No Good Consumers. Eeek! --%>
@@ -94,33 +153,31 @@
</c:when>
<c:otherwise>
<%-- Display the consumers. --%>
-
- <table>
- <c:forEach items="${goodConsumers}" var="consumer" varStatus="i">
- <c:choose>
- <c:when test='${(i.index)%2 eq 0}'>
- <c:set var="rowColor" value="dark" scope="page" />
- </c:when>
- <c:otherwise>
- <c:set var="rowColor" value="lite" scope="page" />
- </c:otherwise>
- </c:choose>
-
- <tr>
- <td><code>${consumer}</code></td>
- <td>
- <img src="<c:url value="/images/icons/delete.gif" />" />
- </td>
- </tr>
- </c:forEach>
- </table>
-
+
+ <table>
+ <c:forEach items="${goodConsumers}" var="consumer" varStatus="i">
+ <c:choose>
+ <c:when test='${(i.index)%2 eq 0}'>
+ <c:set var="rowColor" value="dark" scope="page" />
+ </c:when>
+ <c:otherwise>
+ <c:set var="rowColor" value="lite" scope="page" />
+ </c:otherwise>
+ </c:choose>
+
+ <tr>
+ <td><code>${consumer}</code></td>
+ <td><img src="<c:url value="/images/icons/delete.gif" />" /></td>
+ </tr>
+ </c:forEach>
+ </table>
+
</c:otherwise>
</c:choose>
-
- <h2>Repository Scanning - Consumers of Bad Content</h2>
-
+
+<h2>Repository Scanning - Consumers of Bad Content</h2>
+
<c:choose>
<c:when test="${empty(badConsumers)}">
<%-- No Bad Consumers. Eeek! --%>
@@ -128,32 +185,26 @@
</c:when>
<c:otherwise>
<%-- Display the consumers. --%>
-
- <table>
- <c:forEach items="${badConsumers}" var="consumer" varStatus="i">
- <c:choose>
- <c:when test='${(i.index)%2 eq 0}'>
- <c:set var="rowColor" value="dark" scope="page" />
- </c:when>
- <c:otherwise>
- <c:set var="rowColor" value="lite" scope="page" />
- </c:otherwise>
- </c:choose>
-
- <tr>
- <td><code>${consumer}</code></td>
- <td>
- <img src="<c:url value="/images/icons/delete.gif" />" />
- </td>
- </tr>
- </c:forEach>
- </table>
-
- </c:otherwise>
-</c:choose>
-
-</div>
+ <table>
+ <c:forEach items="${badConsumers}" var="consumer" varStatus="i">
+ <c:choose>
+ <c:when test='${(i.index)%2 eq 0}'>
+ <c:set var="rowColor" value="dark" scope="page" />
+ </c:when>
+ <c:otherwise>
+ <c:set var="rowColor" value="lite" scope="page" />
+ </c:otherwise>
+ </c:choose>
+ <tr>
+ <td><code>${consumer}</code></td>
+ <td><img src="<c:url value="/images/icons/delete.gif" />" /></td>
+ </tr>
+ </c:forEach>
+ </table>
+
+ </c:otherwise>
+</c:choose></div>
</body>
</html>
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/css/site.css
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/css/site.css?view=diff&rev=536390&r1=536389&r2=536390
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/css/site.css (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/css/site.css Tue May 8 18:47:52 2007
@@ -307,4 +307,22 @@
div.admin div.controls {
float: right;
font-size: 8pt !important;
-}
\ No newline at end of file
+}
+
+div.admin div.filetype table {
+ margin-left: 25px;
+ border: 1px solid gray;
+}
+
+div.filetype table td.controls {
+ width: 5%;
+}
+
+div.filetype table td.odd {
+ background-color: #dddddd;
+}
+
+div.filetype table td.event {
+ background-color: white;
+}
+