Author: jdumay
Date: Sat Oct 18 18:39:32 2008
New Revision: 705949
URL: http://svn.apache.org/viewvc?rev=705949&view=rev
Log:
MRM-975 - update of archiva css so that it matches the site doc look and feel
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/breadcrumbs.jpg
(with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=705949&r1=705948&r2=705949&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Sat Oct 18 18:39:32 2008
@@ -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 © <%= copyrightRange %> The Apache Software Foundation
+ <a href="http://www.apache.org/";>Copyright © <%= copyrightRange%> The
Apache Software Foundation</a>
</div>
<div class="clear">
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp?rev=705949&r1=705948&r2=705949&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
Sat Oct 18 18:39:32 2008
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp?rev=705949&r1=705948&r2=705949&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
Sat Oct 18 18:39:32 2008
@@ -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">
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css?rev=705949&r1=705948&r2=705949&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
Sat Oct 18 18:39:32 2008
@@ -69,6 +69,11 @@
float: right;
}
+.composite {
+ margin-left: 10%;
+ margin-right: 10%;
+}
+
#banner {
padding: 0px;
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css?rev=705949&r1=705948&r2=705949&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css
Sat Oct 18 18:39:32 2008
@@ -23,7 +23,7 @@
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 @@
}
#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 @@
}
#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 @@
margin-right: 20px;
}
+
+#searchBox {
+ margin: 5%;
+}
+
+#searchHint {
+ margin: 5%;
+}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css?rev=705949&r1=705948&r2=705949&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
Sat Oct 18 18:39:32 2008
@@ -214,7 +214,9 @@
}
.eXtremeTable .tableRegion .tableHeader {
- background-color: #F3B455;
+ background-color: None;
+ background-image: url(../images/breadcrumbs.jpg);
+ color: gray;
}
.eXtremeTable .tableRegion .tableHeaderSort {
@@ -229,11 +231,17 @@
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 {
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/breadcrumbs.jpg
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/breadcrumbs.jpg?rev=705949&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/breadcrumbs.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
