]> source.dussan.org Git - archiva.git/commitdiff
apply a new stylesheet
authorBrett Porter <brett@apache.org>
Tue, 5 Sep 2006 14:53:29 +0000 (14:53 +0000)
committerBrett Porter <brett@apache.org>
Tue, 5 Sep 2006 14:53:29 +0000 (14:53 +0000)
Submitted by: Joel Sudiacal (CSS and icons)

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@440363 13f79535-47bb-0310-9956-ffa450edef68

15 files changed:
archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
archiva-webapp/src/main/webapp/css/maven-theme.css
archiva-webapp/src/main/webapp/css/site.css
archiva-webapp/src/main/webapp/images/archetype.gif [new file with mode: 0755]
archiva-webapp/src/main/webapp/images/arrow.gif [new file with mode: 0755]
archiva-webapp/src/main/webapp/images/dl.gif [new file with mode: 0755]
archiva-webapp/src/main/webapp/images/jar.gif [new file with mode: 0755]
archiva-webapp/src/main/webapp/images/mavenplugin.gif [new file with mode: 0755]
archiva-webapp/src/main/webapp/images/other.gif [new file with mode: 0755]
archiva-webapp/src/main/webapp/images/pom.gif [new file with mode: 0755]
archiva-webapp/src/main/webapp/images/skin.gif [new file with mode: 0755]
archiva-webapp/src/main/webapp/images/super_hl_sub.gif [new file with mode: 0755]
archiva-webapp/src/main/webapp/images/supersub.gif [new file with mode: 0755]
design/white-site/src/site/resources/css/site.css

index 556c9142475012b1ceb8e57df069086e547aa026..8e7ba5f8ae6bc328a8c13fa8d815cee6bca4a2bf 100644 (file)
 
 <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)}">
   </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}"/>
       <%-- TODO:
           <a href="TODO">Mailing Lists</a>
       --%>
-    </p>
+    </span>
   </div>
 
   <%-- TODO: perhaps using ajax? --%>
index 98b5303f7c097aa3303cc2fb770fd8b520a66e65..b43205abbae1f4b9f0437136b096dec83fead81c 100644 (file)
     <ww:url action="${action}" namespace="${namespace}"/>\r
   </c:set>\r
 </c:if>\r
+<c:set var="text">\r
+  <jsp:doBody/>\r
+</c:set>\r
 <c:choose>\r
   <c:when test="${currentUrl == url}">\r
-    <strong>\r
-      <jsp:doBody/>\r
-    </strong>\r
+    <b>${text}</b>\r
   </c:when>\r
   <c:otherwise>\r
-    <a href="${url}">\r
-      <jsp:doBody/>\r
-    </a>\r
+    <a href="${url}">${text}</a>\r
   </c:otherwise>\r
 </c:choose>\r
index e035dce77f57792000d78d20f1caed037de18f34..cb6ad3b9c360effbeeea3fc5605e8833ca28d2ea 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 body {
-    padding: 0px 0px 10px 0px;
+    padding: 0 0 10px 0;
 }
 
 body, td, select, input, li {
@@ -27,6 +27,36 @@ select, input {
     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 @@ code {
     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 @@ p {
     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 @@ dt {
     color: white
 }
 
-a:link {
-    color: #333;
-}
-
 .errormark, .warningmark, .donemark, .infomark {
     background: url( ../images/icon_error_sml.gif ) no-repeat;
 }
@@ -195,6 +198,10 @@ a:link {
     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 @@ a:link {
     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;
+}
index 99059b193bcfdf52f1358b0f58b3f101e2c5fa04..80a0a9a7c19c0899dcf75688be47c1174e0bf9c3 100644 (file)
  * 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;
 .actionMessage {
     font-weight: bold;
 }
-
-sWarn {
-    color: orange;
-    font-weight: bold;
-}
-
-/* WebWork validation failures */
-.errorMessage {
-    color: red;
-    font-weight: bold;
-}
-
-.actionMessage {
-    font-weight: bold;
-}
diff --git a/archiva-webapp/src/main/webapp/images/archetype.gif b/archiva-webapp/src/main/webapp/images/archetype.gif
new file mode 100755 (executable)
index 0000000..40958a5
Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/archetype.gif differ
diff --git a/archiva-webapp/src/main/webapp/images/arrow.gif b/archiva-webapp/src/main/webapp/images/arrow.gif
new file mode 100755 (executable)
index 0000000..ce00e3d
Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/arrow.gif differ
diff --git a/archiva-webapp/src/main/webapp/images/dl.gif b/archiva-webapp/src/main/webapp/images/dl.gif
new file mode 100755 (executable)
index 0000000..710e7b8
Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/dl.gif differ
diff --git a/archiva-webapp/src/main/webapp/images/jar.gif b/archiva-webapp/src/main/webapp/images/jar.gif
new file mode 100755 (executable)
index 0000000..63dcb61
Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/jar.gif differ
diff --git a/archiva-webapp/src/main/webapp/images/mavenplugin.gif b/archiva-webapp/src/main/webapp/images/mavenplugin.gif
new file mode 100755 (executable)
index 0000000..04430cc
Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/mavenplugin.gif differ
diff --git a/archiva-webapp/src/main/webapp/images/other.gif b/archiva-webapp/src/main/webapp/images/other.gif
new file mode 100755 (executable)
index 0000000..23c84b7
Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/other.gif differ
diff --git a/archiva-webapp/src/main/webapp/images/pom.gif b/archiva-webapp/src/main/webapp/images/pom.gif
new file mode 100755 (executable)
index 0000000..1ce952f
Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/pom.gif differ
diff --git a/archiva-webapp/src/main/webapp/images/skin.gif b/archiva-webapp/src/main/webapp/images/skin.gif
new file mode 100755 (executable)
index 0000000..d59ff62
Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/skin.gif differ
diff --git a/archiva-webapp/src/main/webapp/images/super_hl_sub.gif b/archiva-webapp/src/main/webapp/images/super_hl_sub.gif
new file mode 100755 (executable)
index 0000000..0b35f7a
Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/super_hl_sub.gif differ
diff --git a/archiva-webapp/src/main/webapp/images/supersub.gif b/archiva-webapp/src/main/webapp/images/supersub.gif
new file mode 100755 (executable)
index 0000000..3f28dbc
Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/supersub.gif differ
index 13fa49ebb695a5be89eb217e7fc38b719858b987..80a0a9a7c19c0899dcf75688be47c1174e0bf9c3 100644 (file)
 .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;
 }
 
 #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;
 }