MPXDOC-127 : Show organization in header even if logo not set.

Patch submitted by : Shinobu Kawai Yoshida
Patch reviewed by : Lukas Theussl


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

xdoc/src/plugin-resources/css/maven-base.css

@@ -26,14 +26,14 @@ div.clear{
 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;

xdoc/src/plugin-resources/site.jsl

@@ -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>

xdoc/xdocs/changes.xml

@@ -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>