You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2006/09/05 16:53:30 UTC
svn commit: r440363 - in /maven/archiva/trunk:
archiva-webapp/src/main/webapp/WEB-INF/jsp/
archiva-webapp/src/main/webapp/WEB-INF/tags/
archiva-webapp/src/main/webapp/css/ archiva-webapp/src/main/webapp/images/
design/white-site/src/site/resources/css/
Author: brett
Date: Tue Sep 5 07:53:29 2006
New Revision: 440363
URL: http://svn.apache.org/viewvc?view=rev&rev=440363
Log:
apply a new stylesheet
Submitted by: Joel Sudiacal (CSS and icons)
Added:
maven/archiva/trunk/archiva-webapp/src/main/webapp/images/archetype.gif (with props)
maven/archiva/trunk/archiva-webapp/src/main/webapp/images/arrow.gif (with props)
maven/archiva/trunk/archiva-webapp/src/main/webapp/images/dl.gif (with props)
maven/archiva/trunk/archiva-webapp/src/main/webapp/images/jar.gif (with props)
maven/archiva/trunk/archiva-webapp/src/main/webapp/images/mavenplugin.gif (with props)
maven/archiva/trunk/archiva-webapp/src/main/webapp/images/other.gif (with props)
maven/archiva/trunk/archiva-webapp/src/main/webapp/images/pom.gif (with props)
maven/archiva/trunk/archiva-webapp/src/main/webapp/images/skin.gif (with props)
maven/archiva/trunk/archiva-webapp/src/main/webapp/images/super_hl_sub.gif (with props)
maven/archiva/trunk/archiva-webapp/src/main/webapp/images/supersub.gif (with props)
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
maven/archiva/trunk/archiva-webapp/src/main/webapp/css/maven-theme.css
maven/archiva/trunk/archiva-webapp/src/main/webapp/css/site.css
maven/archiva/trunk/design/white-site/src/site/resources/css/site.css
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=440363&r1=440362&r2=440363
==============================================================================
--- 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 07:53:29 2006
@@ -26,17 +26,37 @@
<body>
-<%-- TODO: image by type
-<img src="images/jar.png" width="100" height="100" alt="jar" style="float: left" />
---%>
-
-<%-- TODO: download link
-<div class="downloadButton">
- <a href="#">Download</a>
-</div>
---%>
-
<ww:set name="model" value="model"/>
+<c:choose>
+ <c:when test="${model.packaging == 'maven-plugin'}">
+ <c:url var="imageUrl" value="/images/mavenplugin.gif"/>
+ <c:set var="packageName">Maven Plugin</c:set>
+ </c:when>
+ <c:when test="${model.packaging == 'pom'}">
+ <c:url var="imageUrl" value="/images/pom.gif"/>
+ <c:set var="packageName">POM</c:set>
+ </c:when>
+ <%-- These types aren't usually set in the POM yet, so we fudge them for the well known ones --%>
+ <c:when test="${model.packaging == 'maven-archetype' or model.groupId == 'org.apache.maven.archetypes'}">
+ <c:url var="imageUrl" value="/images/archetype.gif"/>
+ <c:set var="packageName">Maven Archetype</c:set>
+ </c:when>
+ <c:when test="${model.packaging == 'maven-skin' or model.groupId == 'org.apache.maven.skins'}">
+ <c:url var="imageUrl" value="/images/skin.gif"/>
+ <c:set var="packageName">Maven Skin</c:set>
+ </c:when>
+ <%-- Must be last so that the above get picked up if possible --%>
+ <c:when test="${model.packaging == 'jar'}">
+ <c:url var="imageUrl" value="/images/jar.gif"/>
+ <c:set var="packageName">JAR</c:set>
+ </c:when>
+ <c:otherwise>
+ <c:url var="imageUrl" value="/images/other.gif"/>
+ <c:set var="packageName"></c:set>
+ </c:otherwise>
+</c:choose>
+<img src="${imageUrl}" width="66" height="66" alt="${packageName}" title="${packageName}" style="float: left"/>
+
<h1>
<c:choose>
<c:when test="${empty(model.name)}">
@@ -48,9 +68,15 @@
</c:choose>
</h1>
+<div class="sidebar3">
+ <%-- TODO! download URL
+ <div id="download"><a href="#">Download</a></div>
+ --%>
+</div>
+
<div id="contentArea">
<div id="tabs">
- <p>
+ <span>
<c:set var="url">
<ww:url action="showArtifact">
<ww:param name="groupId" value="%{groupId}"/>
@@ -78,7 +104,7 @@
<%-- TODO:
<a href="TODO">Mailing Lists</a>
--%>
- </p>
+ </span>
</div>
<%-- TODO: perhaps using ajax? --%>
Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag?view=diff&rev=440363&r1=440362&r2=440363
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag Tue Sep 5 07:53:29 2006
@@ -28,15 +28,14 @@
<ww:url action="${action}" namespace="${namespace}"/>
</c:set>
</c:if>
+<c:set var="text">
+ <jsp:doBody/>
+</c:set>
<c:choose>
<c:when test="${currentUrl == url}">
- <strong>
- <jsp:doBody/>
- </strong>
+ <b>${text}</b>
</c:when>
<c:otherwise>
- <a href="${url}">
- <jsp:doBody/>
- </a>
+ <a href="${url}">${text}</a>
</c:otherwise>
</c:choose>
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=440363&r1=440362&r2=440363
==============================================================================
--- 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 07:53:29 2006
@@ -15,7 +15,7 @@
*/
body {
- padding: 0px 0px 10px 0px;
+ padding: 0 0 10px 0;
}
body, td, select, input, li {
@@ -27,6 +27,36 @@
font-size: x-small;
}
+#contentBox h1 {
+ background-image: url( ../images/arrow.gif );
+ background-repeat: no-repeat;
+ background-position: left bottom;
+ border-bottom: 1px solid #DFDEDE;
+ padding: 0 0 1px 23px;
+ margin-bottom: 7px;
+ color: #333;
+ voice-family: inherit;
+ font-size: small !important;
+}
+
+#contentBox h2 {
+ border-bottom: 1px solid #DFDEDE;
+ padding: 0 0 1px 0;
+ margin-bottom: 7px;
+ color: #333;
+ voice-family: inherit;
+ font-size: small !important;
+}
+
+#contentBox h3 {
+ border-bottom: 1px solid #DFDEDE;
+ padding: 0 0 1px 0;
+ margin-bottom: 7px;
+ color: #333;
+ voice-family: inherit;
+ font-size: small !important;
+}
+
table {
width: auto;
}
@@ -36,10 +66,6 @@
font-size: 13px;
}
-a {
- text-decoration: none;
-}
-
#legend li.externalLink {
background: url( ../images/external.png ) left top no-repeat;
padding-left: 18px;
@@ -76,26 +102,7 @@
color: gray;
font-weight: bold;
font-size: 11px;
- padding: 10px 0px 1px 19px;
-}
-
-table.bodyTable th {
- color: white;
- background-color: #bbb;
- text-align: left;
- font-weight: bold;
-}
-
-table.bodyTable th, table.bodyTable td {
- font-size: 1em;
-}
-
-table.bodyTable tr.a {
- background-color: #ddd;
-}
-
-table.bodyTable tr.b {
- background-color: #eee;
+ padding: 10px 0 1px 19px;
}
.source {
@@ -135,10 +142,6 @@
color: white
}
-a:link {
- color: #333;
-}
-
.errormark, .warningmark, .donemark, .infomark {
background: url( ../images/icon_error_sml.gif ) no-repeat;
}
@@ -195,6 +198,10 @@
display: block;
}
+#navcolumn li.collapsed {
+ background-image: url( ../images/super.gif );
+}
+
#navcolumn li.expanded {
background-image: url( ../images/super.gif );
height: inherit;
@@ -222,9 +229,41 @@
display: block;
}
+#navcolumn li ul li {
+ color: #333 !important;
+ text-indent: 30px !important;
+ line-height: 20px !important;
+ height: 20px !important;
+ background-image: url( ../images/supersub.gif ) !important;
+ font-size: 9px;
+ width: 161px;
+ background-repeat: no-repeat;
+ display: block;
+ padding-left: 0;
+}
+
+#navcolumn li ul li a:hover {
+ color: #fff !important;
+ background: url( ../images/super_hl_sub.gif ) 0 -20px no-repeat;
+ background-position: right;
+ width: 161px;
+ display: block;
+}
+
#footer {
background: url( ../images/footerborder.gif ) 0 5px repeat-x;
padding: 14px 4px 12px 4px;
margin-top: 2em;
}
+a:link, a:visited {
+ color: #333;
+}
+
+#navcolumn a {
+ text-decoration: none;
+}
+
+a:active, a:hover {
+ color: #f30;
+}
Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/css/site.css
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/css/site.css?view=diff&rev=440363&r1=440362&r2=440363
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/css/site.css (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/css/site.css Tue Sep 5 07:53:29 2006
@@ -14,80 +14,74 @@
* limitations under the License.
*/
+.sidebar3 {
+ width: 10em;
+ float: right;
+ text-align: center;
+}
+
+#sidebarb {
+ font-size: small;
+ text-align: center;
+ padding: 10px 10px 10px 10px;
+ border: 1px #DFDEDE solid;
+ width: 10em;
+}
+
#sidebar {
float: right;
font-size: small;
margin: 10px;
padding: 10px;
- border: 1px black solid;
+ border: 1px #DFDEDE solid;
width: 10em;
}
+#download {
+ background-image: url( ../images/dl.gif );
+ background-repeat: no-repeat;
+ float: right;
+ font-size: small;
+ font-weight: bold;
+ margin: 10px;
+ padding: 10px;
+ height: auto;
+ width: 10em;
+ display: block;
+}
+
+#download a {
+ text-decoration: none;
+}
+
#contentArea {
- border: 1px solid black;
margin-right: 15em;
padding: 1em;
}
-#tabs strong {
- border: 1px solid black;
+#tabs b {
+ border: 1px #DFDEDE solid;
padding-left: 1em;
padding-right: 1em;
}
#tabs a {
- border: 1px solid black;
+ border: 1px #DFDEDE solid;
padding-left: 1em;
padding-right: 1em;
text-decoration: none;
}
#tabArea {
- border: 1px solid black;
+ border-top: 1px solid #DFDEDE;
padding: 1em;
}
-#searchBox p {
- font-size: x-small;
- text-align: center;
- color: gray;
-}
-
#searchTypes {
text-align: right;
font-size: xx-small;
}
-/* TODO: remove if they aren't used
-#feed {
- float: right;
-}
-
-.downloadButton {
- background-color: green;
- border: double white;
- float: right;
- padding: 5px;
-}
-
-.downloadButton a {
- font-size: large;
- color: white;
- font-weight: bold;
- text-decoration: none;
-}
-
-#labels {
- background-color: #f2f2f2;
- padding: 0.5em 1em 0.5em 1em;
-}
-
-.statusWarn {
- color: orange;
- font-weight: bold;
-}
-*/
-
.statusOk {
color: green;
font-weight: bold;
@@ -95,21 +89,6 @@
.statusFailed {
color: red;
- font-weight: bold;
-}
-
-/* WebWork validation failures */
-.errorMessage {
- color: red;
- font-weight: bold;
-}
-
-.actionMessage {
- font-weight: bold;
-}
-
-sWarn {
- color: orange;
font-weight: bold;
}
Added: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/archetype.gif
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/images/archetype.gif?view=auto&rev=440363
==============================================================================
Binary file - no diff available.
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/archetype.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/archetype.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/arrow.gif
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/images/arrow.gif?view=auto&rev=440363
==============================================================================
Binary file - no diff available.
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/arrow.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/arrow.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/dl.gif
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/images/dl.gif?view=auto&rev=440363
==============================================================================
Binary file - no diff available.
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/dl.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/dl.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/jar.gif
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/images/jar.gif?view=auto&rev=440363
==============================================================================
Binary file - no diff available.
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/jar.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/jar.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/mavenplugin.gif
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/images/mavenplugin.gif?view=auto&rev=440363
==============================================================================
Binary file - no diff available.
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/mavenplugin.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/mavenplugin.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/other.gif
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/images/other.gif?view=auto&rev=440363
==============================================================================
Binary file - no diff available.
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/other.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/other.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/pom.gif
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/images/pom.gif?view=auto&rev=440363
==============================================================================
Binary file - no diff available.
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/pom.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/pom.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/skin.gif
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/images/skin.gif?view=auto&rev=440363
==============================================================================
Binary file - no diff available.
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/skin.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/skin.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/super_hl_sub.gif
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/images/super_hl_sub.gif?view=auto&rev=440363
==============================================================================
Binary file - no diff available.
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/super_hl_sub.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/super_hl_sub.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/supersub.gif
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/images/supersub.gif?view=auto&rev=440363
==============================================================================
Binary file - no diff available.
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/supersub.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/archiva/trunk/archiva-webapp/src/main/webapp/images/supersub.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: maven/archiva/trunk/design/white-site/src/site/resources/css/site.css
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/design/white-site/src/site/resources/css/site.css?view=diff&rev=440363&r1=440362&r2=440363
==============================================================================
--- maven/archiva/trunk/design/white-site/src/site/resources/css/site.css (original)
+++ maven/archiva/trunk/design/white-site/src/site/resources/css/site.css Tue Sep 5 07:53:29 2006
@@ -17,12 +17,12 @@
.sidebar3 {
width: 10em;
float: right;
- text-align:center;
+ text-align: center;
}
#sidebarb {
font-size: small;
- text-align:center;
+ text-align: center;
padding: 10px 10px 10px 10px;
border: 1px #DFDEDE solid;
width: 10em;
@@ -38,20 +38,19 @@
}
#download {
- font-size: 11px;
background-image: url( ../images/dl.gif );
- background-repeat:no-repeat;
+ background-repeat: no-repeat;
float: right;
font-size: small;
- font-weight:bold;
+ font-weight: bold;
margin: 10px;
padding: 10px;
- height:auto;
+ height: auto;
width: 10em;
display: block;
}
-#download a:link, a:visited {
+#download a {
text-decoration: none;
}