]> 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: a6c9464)
MRM-975 - update of archiva css so that it matches the site doc look and feel
authorJames William Dumay <jdumay@apache.org>
Sun, 19 Oct 2008 01:39:32 +0000 (01:39 +0000)
committerJames William Dumay <jdumay@apache.org>
Sun, 19 Oct 2008 01:39:32 +0000 (01:39 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@705949 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp patch | blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp patch | blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp patch | blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css patch | blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css patch | blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css patch | blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/breadcrumbs.jpg [new file with mode: 0644] patch | blob

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
index bb517451012906ec1a7ea6dd78baca9668eba81f..a96419de2d1442dc2947e973188a62fb88d3d6bb 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
@@ -45,32 +45,10 @@
 </head>
 
 <body onload="<decorator:getProperty property="body.onload" />" class="composite">
-<div id="banner">
-  <span id="bannerLeft">
-    <my:currentWWUrl action="index" namespace="/">
-      <img src="<c:url value='/images/archiva.png' />" alt="" width="188" height="69"/>
-    </my:currentWWUrl>
-  </span>
-  <span id="bannerRight">
-    <ww:action namespace="/components" name="companyInfo" executeResult="true"/>
-  </span>
-
-  <div class="clear">
-    <hr/>
-  </div>
-</div>
-
 <div id="breadcrumbs">
-  <div class="xleft">
-    <%@ include file="/WEB-INF/jsp/redback/include/securityLinks.jsp" %>
-  </div>
-
   <div class="xright">
-    <a href="http://archiva.apache.org">Archiva</a> |
-    <a href="http://maven.apache.org/">Maven</a> |
-    <a href="http://www.apache.org/">Apache</a>
+    <%@ include file="/WEB-INF/jsp/redback/include/securityLinks.jsp" %>
   </div>
-
   <div class="clear">
     <hr/>
   </div>
@@ -79,7 +57,9 @@
 <div id="leftColumn">
 
   <div id="navcolumn">
-
+    <my:currentWWUrl action="index" namespace="/">
+      <img src="<c:url value='/images/archiva.png' />" alt="" width="155" height="55"/>
+    </my:currentWWUrl>
     <h5>Find</h5>
     <ul>
       <li class="none">
@@ -190,10 +170,10 @@
 %>
 <div id="footer">
   <div class="xleft">
-    Apache Archiva <%= ArchivaVersion.getVersion() %>
+    <a href="http://archiva.apache.org/">Apache Archiva <%= ArchivaVersion.getVersion()%></a>
   </div>
   <div class="xright">
-    Copyright &#169; <%= copyrightRange %> The Apache Software Foundation
+    <a href="http://www.apache.org/">Copyright &#169; <%= copyrightRange%> The Apache Software Foundation</a>
   </div>
 
   <div class="clear">
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
index 45a435e75b897eaf07a0406c4ff6488adfae4975..6edf39a732c5c3a166d584853437a73b4a9cac04 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
@@ -30,14 +30,12 @@
 
 <body>
 
-<h1>Search</h1>
-
 <div id="contentArea">
 <div id="searchBox">
   <ww:form method="get" action="quickSearch" validate="true">
     <ww:textfield label="Search for" size="50" name="q"/>
     <ww:hidden name="completeQueryString" value="${completeQueryString}"/>        
-    <ww:submit label="Go!"/>
+    <ww:submit value="Go!"/>
   </ww:form>
 
   <script type="text/javascript">
@@ -53,7 +51,7 @@
     <ww:actionerror/>
   </p>
 </div>
-
+<div id="searchHint">
   <p>
     Enter your search terms. A variety of data will be searched for your keywords.<br/>
     To search for Java classes, packages or methods, use the keyword <code>bytecode:</code>
@@ -62,5 +60,6 @@
     <code>bytecode:myMethod</code>
   </p>
 </div>
+</div>
 </body>
 </html>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
index 9df361cd17a9ea3c63dde1db81986fe3b8d77084..159c203ecb7d220f6518a40be3ceee784e1b229c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
@@ -43,7 +43,7 @@
 <c:url var="imgNextPageDisabledUrl" value="/images/icon_next_page_disabled.gif"/>
 
 <div id="contentArea">
-  <div id="searchBox">
+  <div id="searchBoxResults">
 
     <c:if test="${fromFilterSearch == true}">
       <ww:form method="get" action="filteredSearch" validate="true">
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
index ca951f8d0cda6e5dab415aa3396361b29e2a5097..b799c25b3831290ec53ab92622605f0924f1bad5 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
@@ -69,6 +69,11 @@ div.clear hr {
     float: right;
 }
 
+.composite {
+       margin-left: 10%;
+       margin-right: 10%;
+}
+
 #banner {
     padding: 0px;
 }
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css
index 46856bafdb09532df06f5115ece9cc8e8441805f..e86aba3a2b70e8540b2cd3808f0b77a0cd67c2a7 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css
@@ -23,7 +23,7 @@ body {
 
 body, td, th, select, input, li {
     font-family: Verdana, Helvetica, Arial, sans-serif;
-    font-size: 11pt;
+    font-size: 9pt;
 }
 
 select, input {
@@ -123,9 +123,7 @@ p {
 }
 
 #breadcrumbs {
-    border-top: 1px solid #fff;
-    border-bottom: 1px solid #999;
-    background-color: #F3B455;
+    background-image: url(../images/breadcrumbs.jpg);
     padding: 2px 8px;
 }
 
@@ -298,8 +296,9 @@ pre.pom code {
 }
 
 #footer {
-    background: url( ../images/footerborder.gif ) 0 5px repeat-x;
+    border-top: 1px solid #CCCCCC;
     padding: 14px 4px 12px 4px;
+       color: #333333;
     margin-top: 2em;
 }
 
@@ -329,3 +328,11 @@ blockquote {
        margin-right: 20px;
        
 }
+
+#searchBox {
+       margin: 5%;
+}
+
+#searchHint {
+       margin: 5%;
+}
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
index 114580c0fef289ef68a2c7a6a16399bd58ba170a..c9399557f1049ec4c50f9e098699db6bc6d36f12 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
@@ -214,7 +214,9 @@ ul.dependencyTree span.artifact-link {
 }
 
 .eXtremeTable .tableRegion .tableHeader {
-       background-color: #F3B455;
+       background-color: None;
+       background-image: url(../images/breadcrumbs.jpg);
+       color: gray;
 }
 
 .eXtremeTable .tableRegion .tableHeaderSort {
@@ -229,11 +231,17 @@ ul.dependencyTree span.artifact-link {
        border-color: gray !important;  
 }
 
+table.tools th.toolHeading
+{
+       color: gray;
+}
+
 .tools .toolHeading {
        padding: 0px 3px 0px 3px;
        margin: 0px !important;
        font-size: 11px !important;
-       background-color: #F3B455 !important;
+       background-color: red;
+       background-image: url(../images/breadcrumbs.jpg);
 }
 
 div.repository h3 {
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/breadcrumbs.jpg b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/breadcrumbs.jpg
new file mode 100644 (file)
index 0000000..1385fa0
Binary files /dev/null and b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/breadcrumbs.jpg differ
Apache Archiva Repository: https://github.com/apache/archiva