You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by lt...@apache.org on 2005/09/07 19:45:09 UTC
svn commit: r279382 - in /maven/maven-1/plugins/trunk/xdoc:
src/plugin-resources/css/maven-base.css src/plugin-resources/site.jsl
xdocs/changes.xml
Author: ltheussl
Date: Wed Sep 7 10:45:06 2005
New Revision: 279382
URL: http://svn.apache.org/viewcvs?rev=279382&view=rev
Log:
MPXDOC-127 : Show organization in header even if logo not set.
Patch submitted by : Shinobu Kawai Yoshida
Patch reviewed by : Lukas Theussl
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/css/maven-base.css
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/css/maven-base.css
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/css/maven-base.css?rev=279382&r1=279381&r2=279382&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/css/maven-base.css (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/css/maven-base.css Wed Sep 7 10:45:06 2005
@@ -26,14 +26,14 @@
div.clear hr{
display: none;
}
-#projectLogo {
+#organizationLogo, #projectLogo {
font-size: xx-large;
font-weight: bold;
}
-#organizationLogo img, #projectLogo img, #projectLogo span{
+#organizationLogo img, #projectLogo img, #organizationLogo span, #projectLogo span{
margin: 8px;
}
-#projectLogo span{
+#organizationLogo span, #projectLogo span{
border: 1px solid;
padding: 4px 10px 4px 10px;
background-color: #eee;
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl?rev=279382&r1=279381&r2=279382&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl Wed Sep 7 10:45:06 2005
@@ -168,22 +168,22 @@
</j:whitespace>
<div id="banner">
+ <!-- set url to org or project url -->
+ <j:set var="url" value="${pom.organization.url}"/>
+ <j:if test="${!empty(url)}">
+ <j:set var="home" value="${pom.organization.url}"/>
+ </j:if>
+ <j:if test="${empty(url)}">
+ <j:set var="home" value="${pom.url}"/>
+ </j:if>
+ <!-- set home to relative or complete -->
+ <j:if test="${!home.startsWith('http://') and !home.startsWith('https://')}">
+ <j:set var="home" value="${relativePathForLocale}${home}"/>
+ </j:if>
+
<!-- organization logo -->
<j:set var="logo" value="${pom.organization.logo}"/>
<j:if test="${!empty(logo)}">
- <!-- set url to org or project url -->
- <j:set var="url" value="${pom.organization.url}"/>
- <j:if test="${!empty(url)}">
- <j:set var="home" value="${pom.organization.url}"/>
- </j:if>
- <j:if test="${empty(url)}">
- <j:set var="home" value="${pom.url}"/>
- </j:if>
- <!-- set home to relative or complete -->
- <j:if test="${!home.startsWith('http://') and !home.startsWith('https://')}">
- <j:set var="home" value="${relativePath}${home}"/>
- </j:if>
-
<!-- set image to relative or complete -->
<j:set var="image" value="${pom.organization.logo}"/>
<j:if test="${!image.startsWith('http://') and !image.startsWith('https://')}">
@@ -198,11 +198,16 @@
<img src="${image}" alt="${pom.organization.name}" />
</a>
</j:if>
+ <j:if test="${empty(logo)}">
+ <a href="${home}" id="organizationLogo">
+ <span class="xleft">${pom.organization.name}</span>
+ </a>
+ </j:if>
<!-- set project to relative or complete -->
<j:set var="home" value="${pom.url}"/>
<j:if test="${!home.startsWith('http://') and !home.startsWith('https://')}">
- <j:set var="home" value="${relativePath}${home}"/>
+ <j:set var="home" value="${relativePathForLocale}${home}"/>
</j:if>
<!-- project logo and link -->
@@ -225,7 +230,7 @@
</j:if>
<j:if test="${logo == null or logo == ''}">
<a href="${home}" id="projectLogo">
- <span>${pom.name}</span>
+ <span class="xright">${pom.name}</span>
</a>
</j:if>
<div class="clear"><hr /></div>
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?rev=279382&r1=279381&r2=279382&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Wed Sep 7 10:45:06 2005
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.10" date="in SVN">
+ <action dev="ltheussl" type="add" issue="MPXDOC-127" due-to="Shinobu Kawai Yoshida">Show organization in header even if logo not set.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-47">Ampersands in navigation.xml being escaped twice.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-133">Ampersand in section/subsection not correct.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-104" due-to="Rafal Krzewski">Downloads report cannot be disabled for child projects.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org