Author: brett
Date: Tue Sep 5 18:37:10 2006
New Revision: 440554
URL: http://svn.apache.org/viewvc?view=rev&rev=440554
Log:
some more style tweaks ad add download URL
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/css/maven-theme.css
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp?view=diff&rev=440554&r1=440553&r2=440554
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
Tue Sep 5 18:37:10 2006
@@ -28,7 +28,13 @@
<h1>Administration</h1>
<div id="contentArea">
-<h2>Configuration</h2>
+<div>
+ <div style="float: right">
+ <%-- TODO replace with icons --%>
+ <a href="<ww:url action="configure" />">Edit Configuration</a>
+ </div>
+ <h2>Configuration</h2>
+</div>
<table class="infoTable">
<tr>
@@ -75,11 +81,12 @@
</table>
</c:if>
-<p>
- <a href="<ww:url action="configure" />">Edit Configuration</a>
-</p>
-
-<h2>Managed Repositories</h2>
+<div>
+ <div style="float: right">
+ <%-- TODO replace with icons --%>
+ <a href="<ww:url action="addRepository" method="input" />">Add
Repository</a></div>
+ <h2>Managed Repositories</h2>
+</div>
<ww:set name="repositories" value="repositories"/>
<c:if test="${empty(repositories)}">
@@ -131,10 +138,6 @@
</table>
</div>
</c:forEach>
-
-<p>
- <a href="<ww:url action="addRepository" method="input" />">Add Repository</a>
-</p>
</div>
</body>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp?view=diff&rev=440554&r1=440553&r2=440554
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
Tue Sep 5 18:37:10 2006
@@ -29,7 +29,13 @@
<h1>Administration</h1>
<div id="contentArea">
- <h2>Proxied Repositories</h2>
+ <div>
+ <%-- TODO replace with icons --%>
+ <div style="float: right">
+ <a href="<ww:url action="addProxiedRepository" method="input" />">Add
Repository</a>
+ </div>
+ <h2>Proxied Repositories</h2>
+ </div>
<ww:set name="proxiedRepositories" value="proxiedRepositories"/>
<c:if test="${empty(proxiedRepositories)}">
@@ -105,10 +111,6 @@
</table>
</div>
</c:forEach>
-
- <p>
- <a href="<ww:url action="addProxiedRepository" method="input" />">Add
Repository</a>
- </p>
</div>
</body>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp?view=diff&rev=440554&r1=440553&r2=440554
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
Tue Sep 5 18:37:10 2006
@@ -28,7 +28,13 @@
<h1>Administration</h1>
<div id="contentArea">
-<h2>Synced Repositories</h2>
+<div>
+ <%-- TODO replace with icons --%>
+ <div style="float: right">
+ <a href="<ww:url action="addSyncedRepository" method="input" />">Add
Repository</a>
+ </div>
+ <h2>Synced Repositories</h2>
+</div>
<ww:set name="syncedRepositories" value="syncedRepositories"/>
<c:if test="${empty(syncedRepositories)}">
@@ -135,10 +141,6 @@
</table>
</div>
</c:forEach>
-
-<p>
- <a href="<ww:url action="addSyncedRepository" method="input" />">Add
Repository</a>
-</p>
</div>
</body>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp?view=diff&rev=440554&r1=440553&r2=440554
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
Tue Sep 5 18:37:10 2006
@@ -69,9 +69,18 @@
</h1>
<div class="sidebar3">
- <%-- TODO! download URL
- <div id="download"><a href="#">Download</a></div>
- --%>
+ <div id="download">
+ <c:set var="url">
+ <ww:url action="proxy">
+ <%-- TODO! create a tag for this, include classifier for javadoc,
sources below --%>
+ <%-- TODO: what about other repositories? --%>
+ <%-- TODO! extension probably doesn't match type --%>
+ <ww:param name="path"
+
value="%{'${model.groupId}/${model.artifactId}/${model.version}/${model.artifactId}-${model.version}.${model.packaging}'}"/>
+ </ww:url>
+ </c:set>
+ <a href="${url}">Download</a>
+ </div>
</div>
<div id="contentArea">
Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/css/maven-theme.css
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/css/maven-theme.css?view=diff&rev=440554&r1=440553&r2=440554
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/css/maven-theme.css
(original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/css/maven-theme.css Tue
Sep 5 18:37:10 2006
@@ -30,6 +30,7 @@
th {
text-align: right;
padding-right: 1em;
+ font-size: x-small;
}
.infoTable th {
@@ -42,16 +43,16 @@
background-position: left bottom;
border-bottom: 1px solid #DFDEDE;
padding: 0 0 1px 23px;
- margin-bottom: 7px;
+ margin-bottom: 0.5em;
color: #333;
voice-family: inherit;
- font-size: small !important;
+ font-size: medium !important;
}
#contentBox h2 {
border-bottom: 1px solid #DFDEDE;
padding: 0 0 1px 0;
- margin-bottom: 7px;
+ margin-bottom: 0.5em;
color: #333;
voice-family: inherit;
font-size: small !important;
@@ -60,10 +61,11 @@
#contentBox h3 {
border-bottom: 1px solid #DFDEDE;
padding: 0 0 1px 0;
- margin-bottom: 7px;
+ margin-bottom: 0.5em;
color: #333;
voice-family: inherit;
font-size: small !important;
+ margin-left: 2em;
}
table {
