a...

vsiveton Fri, 28 Aug 2009 05:25:08 -0700

Author: vsiveton
Date: Fri Aug 28 12:23:56 2009
New Revision: 808861

URL: http://svn.apache.org/viewvc?rev=808861&view=rev
Log:
DOXIASITETOOLS-31: Allow images in the menu items of the site.xml


o added new img fields in the model
o update velocity site file

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml
    
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
    
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
    
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml?rev=808861&r1=808860&r2=808861&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml Fri Aug 28 
12:23:56 2009
@@ -60,7 +60,7 @@
               <models>
                 <model>src/main/mdo/decoration.mdo</model>
               </models>
-              <version>1.0.0</version>
+              <version>1.0.1</version>
             </configuration>
           </execution>
           <execution>
@@ -74,7 +74,7 @@
               <models>
                 <model>src/main/mdo/decoration.mdo</model>
               </models>
-              <version>1.0.0</version>
+              <version>1.0.1</version>
             </configuration>
           </execution>
         </executions>

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo?rev=808861&r1=808860&r2=808861&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
 Fri Aug 28 12:23:56 2009
@@ -30,7 +30,7 @@
     <ul>
       <li><a 
href="http://maven.apache.org/xsd/decoration-1.0.0.xsd";>http://maven.apache.org/xsd/decoration-1.0.0.xsd</a>
 for Maven 2.0.</li>
     </ul>
-  ]]></description>
+    ]]></description>
   <defaults>
     <default>
       <key>package</key>
@@ -44,14 +44,14 @@
          The <code>&lt;project&gt;</code> element is the root of the site 
decoration descriptor.
          The following table lists all of the possible child elements.
       ]]></description>
-      <version>1.0.0</version>
+      <version>1.0.0+</version>
       <fields>
         <field xml.attribute="true">
           <name>name</name>
           <description><![CDATA[
             The full name of the project.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
@@ -60,7 +60,7 @@
           <description><![CDATA[
             Banner logo on the masthead of the site to the left.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <association>
             <type>Banner</type>
           </association>
@@ -71,7 +71,7 @@
           <description><![CDATA[
             Banner logo on the masthead of the site to the right.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <association>
             <type>Banner</type>
           </association>
@@ -82,7 +82,7 @@
           <description><![CDATA[
             Modify the date published display properties.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <association>
             <type>PublishDate</type>
           </association>
@@ -93,7 +93,7 @@
           <description><![CDATA[
             Modify the version published display properties.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <association>
             <type>Version</type>
           </association>
@@ -104,7 +104,7 @@
           <description><![CDATA[
             Powered by logos list.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <association xml.tagName="logo">
             <type>Logo</type>
             <multiplicity>*</multiplicity>
@@ -116,7 +116,7 @@
           <description><![CDATA[
             The artifact containing the skin for the site.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <association>
             <type>Skin</type>
           </association>
@@ -127,7 +127,7 @@
           <description><![CDATA[
             The main site content decoration.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <association>
             <type>Body</type>
           </association>
@@ -138,14 +138,14 @@
           <description><![CDATA[
             Custom configuration for use with customised Velocity templates.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>DOM</type>
           <identifier>true</identifier>
         </field>
       </fields>
       <codeSegments>
         <codeSegment>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <code>
             <![CDATA[
     private java.util.Map menusByRef;
@@ -210,11 +210,12 @@
       <description><![CDATA[
         Banner logo on the masthead of the site.
       ]]></description>
-      <version>1.0.0</version>
+      <version>1.0.0+</version>
       <fields>
+        <!-- Ideally we want attributes DOXIA-335 -->
         <field>
           <name>name</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <description><![CDATA[
             The name of the banner.
           ]]></description>
@@ -223,16 +224,16 @@
         </field>
         <field>
           <name>src</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <description><![CDATA[
-            The location of an image for the banner.
+            The source location of an image for the banner.
           ]]></description>
           <type>String</type>
           <identifier>true</identifier>
         </field>
         <field>
           <name>alt</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <description><![CDATA[
             The alt description for the banner image.
           ]]></description>
@@ -241,13 +242,40 @@
         </field>
         <field>
           <name>href</name>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <description><![CDATA[
             The href of a link to be used for the banner image.
           ]]></description>
           <type>String</type>
           <identifier>true</identifier>
         </field>
+        <field>
+          <name>border</name>
+          <description><![CDATA[
+            The border to use for the banner image.
+          ]]></description>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>width</name>
+          <description><![CDATA[
+            The width to use for the banner image.
+          ]]></description>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>height</name>
+          <description><![CDATA[
+            The height to use for the banner image.
+          ]]></description>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
       </fields>
     </class>
     <class>
@@ -255,14 +283,14 @@
       <description><![CDATA[
         Modify display properties for date published.
       ]]></description>
-      <version>1.0.0</version>
+      <version>1.0.0+</version>
       <fields>
         <field xml.attribute="true">
           <name>position</name>
           <description><![CDATA[
             Where to place the date published (left, right, navigation-top, 
navigation-bottom, bottom).
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
@@ -271,7 +299,7 @@
           <description><![CDATA[
             Date format to use. The default is MM/dd/yyyy.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
@@ -282,14 +310,14 @@
       <description><![CDATA[
         Modify display properties for version published.
       ]]></description>
-      <version>1.0.0</version>
+      <version>1.0.0+</version>
       <fields>
         <field xml.attribute="true">
           <name>position</name>
           <description><![CDATA[
             Where to place the version published (left, right, navigation-top, 
navigation-bottom, bottom).
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
@@ -300,15 +328,51 @@
       <description><![CDATA[
         Power by logo on the navigation.
       ]]></description>
-      <version>1.0.0</version>
+      <version>1.0.0+</version>
       <superClass>LinkItem</superClass>
       <fields>
         <field xml.attribute="true">
           <name>img</name>
           <description><![CDATA[
-            The href of a link to be used for the power by image.
+            The source location of the powerBy image.
+          ]]></description>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>alt</name>
+          <description><![CDATA[
+            The alt description of the powerBy image.
+          ]]></description>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>border</name>
+          <description><![CDATA[
+            The border to use for the powerBy image.
+          ]]></description>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>width</name>
+          <description><![CDATA[
+            The width to use for the powerBy image.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>height</name>
+          <description><![CDATA[
+            The height to use for the powerBy image.
+          ]]></description>
+          <version>1.0.1+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
@@ -319,14 +383,14 @@
       <description><![CDATA[
         The main content decoration.
       ]]></description>
-      <version>1.0.0</version>
+      <version>1.0.0+</version>
       <fields>
         <field>
           <name>head</name>
           <description><![CDATA[
             Additional content (like Javascript) to include in the HEAD block 
of the generated pages.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>DOM</type>
           <identifier>true</identifier>
         </field>
@@ -335,7 +399,7 @@
           <description><![CDATA[
             A list of links to display in the navigation.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <association xml.tagName="item">
             <type>LinkItem</type>
             <multiplicity>*</multiplicity>
@@ -347,7 +411,7 @@
           <description><![CDATA[
             A list of breadcrumbs to display in the navigation.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <association xml.tagName="item">
             <type>LinkItem</type>
             <multiplicity>*</multiplicity>
@@ -359,7 +423,7 @@
           <description><![CDATA[
             A list of menus to include in the navigation.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <association xml.itemsStyle="flat">
             <type>Menu</type>
             <multiplicity>*</multiplicity>
@@ -373,14 +437,14 @@
       <description><![CDATA[
         A link in the navigation.
       ]]></description>
-      <version>1.0.0</version>
+      <version>1.0.0+</version>
       <fields>
         <field xml.attribute="true">
           <name>name</name>
           <description><![CDATA[
             The name to display for the link.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
@@ -389,7 +453,63 @@
           <description><![CDATA[
             The href to use for the link.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>img</name>
+          <description><![CDATA[
+            The source location of an image.
+          ]]></description>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>align</name>
+          <description><![CDATA[
+            The alignement of the image, left or right. Left will be display 
the image before the menu name, right after.
+          ]]></description>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+          <defaultValue>left</defaultValue>
+        </field>
+        <field xml.attribute="true">
+          <name>alt</name>
+          <description><![CDATA[
+            The alt to use for the image.
+          ]]></description>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+          <defaultValue>0</defaultValue>
+        </field>
+        <field xml.attribute="true">
+          <name>border</name>
+          <description><![CDATA[
+            The border to use for the image.
+          ]]></description>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>width</name>
+          <description><![CDATA[
+            The width to use for the image.
+          ]]></description>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>height</name>
+          <description><![CDATA[
+            The height to use for the image.
+          ]]></description>
+          <version>1.0.1+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
@@ -400,14 +520,14 @@
       <description><![CDATA[
         A menu in the navigation.
       ]]></description>
-      <version>1.0.0</version>
+      <version>1.0.0+</version>
       <fields>
         <field xml.attribute="true">
           <name>name</name>
           <description><![CDATA[
             The name to display for the menu.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
@@ -416,7 +536,7 @@
           <description><![CDATA[
             The way in which the menu is inherited. Can be one of : 
<code>top</code>, <code>bottom</code>.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
@@ -426,7 +546,7 @@
             If this is a reference, setting <inheritAsRef>true</inheritAsRef> 
means that it will be populated
             in the project, whereas if it is false, it is populated in the 
parent and then inherited.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>boolean</type>
         </field>
         <field xml.attribute="true">
@@ -435,16 +555,62 @@
             A reference to a pre-defined menu, such as a <code>reports</code>, 
<code>modules</code>
             or <code>parentProject</code>.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
         <field xml.attribute="true">
           <name>img</name>
           <description><![CDATA[
-            The location of an image.
+            The source location of an menu image.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>alt</name>
+          <version>1.0.1+</version>
+          <description><![CDATA[
+            The alt description for the image.
+          ]]></description>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>align</name>
+          <description><![CDATA[
+            The alignement of the image, left or right. Left will be display 
the image before the menu name, right after.
+          ]]></description>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+          <defaultValue>left</defaultValue>
+        </field>
+        <field xml.attribute="true">
+          <name>border</name>
+          <description><![CDATA[
+            The border to use for the menu image.
+          ]]></description>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>width</name>
+          <description><![CDATA[
+            The width to use for the menu image.
+          ]]></description>
+          <version>1.0.1+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>height</name>
+          <description><![CDATA[
+            The height to use for the menu image.
+          ]]></description>
+          <version>1.0.1+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
@@ -453,7 +619,7 @@
           <description><![CDATA[
             A list of menu item.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <association xml.itemsStyle="flat">
             <type>MenuItem</type>
             <multiplicity>*</multiplicity>
@@ -467,7 +633,7 @@
       <description><![CDATA[
         A menu item.
       ]]></description>
-      <version>1.0.0</version>
+      <version>1.0.0+</version>
       <superClass>LinkItem</superClass>
       <fields>
         <field>
@@ -475,7 +641,7 @@
           <description><![CDATA[
            A description of the menu item. This is used on any summary pages 
for a menu.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
@@ -484,7 +650,7 @@
           <description><![CDATA[
            Whether to collapse children elements of an item menu (by default).
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>boolean</type>
           <identifier>true</identifier>
         </field>
@@ -494,14 +660,16 @@
             A reference to a pre-defined menu item, such as a report 
(specified by the report goal
             name). Any elements explicitly given override those from the 
pre-defined reference.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
         <field>
           <name>items</name>
-          <description>Menu item.</description>
-          <version>1.0.0</version>
+          <description><![CDATA[
+            A list of menu item.
+          ]]></description>
+          <version>1.0.0+</version>
           <association xml.itemsStyle="flat">
             <type>MenuItem</type>
             <multiplicity>*</multiplicity>
@@ -515,14 +683,14 @@
       <description><![CDATA[
         An skin artifact declaration.
       ]]></description>
-      <version>1.0.0</version>
+      <version>1.0.0+</version>
       <fields>
         <field>
           <name>groupId</name>
           <description><![CDATA[
             The skin group ID.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <required>true</required>
           <identifier>true</identifier>
@@ -532,7 +700,7 @@
           <description><![CDATA[
             The skin artifact ID.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <required>true</required>
           <identifier>true</identifier>
@@ -542,14 +710,14 @@
           <description><![CDATA[
             The skin version.
           ]]></description>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
       </fields>
       <codeSegments>
         <codeSegment>
-          <version>1.0.0</version>
+          <version>1.0.0+</version>
           <code>
             <![CDATA[
     public static Skin getDefaultSkin()

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css?rev=808861&r1=808860&r2=808861&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
 Fri Aug 28 12:23:56 2009
@@ -141,3 +141,11 @@
   margin: 0px;
   padding: 0px;
 }
+#navcolumn img.imageLink, .imageLink {
+  padding-left: 0px;
+  padding-bottom: 0px;
+  padding-top: 0px;
+  padding-right: 2px;
+  border: 0px;
+  margin: 0px;
+}

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm?rev=808861&r1=808860&r2=808861&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
 Fri Aug 28 12:23:56 2009
@@ -8,6 +8,22 @@
   #end
 #end
 
+#macro ( linkWithImage $href $name $img $align )
+  #if ( ( $href.toLowerCase().startsWith("http") || 
$href.toLowerCase().startsWith("https") ) )
+    #if ( $align == "left" )
+    <a href="$href" class="externalLink">$img $name</a>
+    #else
+    <a href="$href" class="externalLink">$name $img</a>
+    #end
+  #else
+    #if ( $align == "left" )
+    <a href="$href">$img $name</a>
+    #else
+    <a href="$href">$name $img</a>
+    #end
+  #end
+#end
+
 #macro ( banner $banner $id )
   #if ( $banner )
     #if( $banner.href )
@@ -106,20 +122,66 @@
     #end
   #end
   <li class="$collapse">
-    #if ( $item.img )
-      #if ( ! ( $item.img.toLowerCase().startsWith("http") || 
$item.img.toLowerCase().startsWith("https") ) )
-        #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) )
-        #set ( $src = $src.replaceAll( "\\", "/" ) )
-        <img src="$src"/>
+  #if ( $item.img )
+    #if( $item.align )
+      #set ( $align = $item.align )
+    #else
+      #set ( $align = "left" )
+    #end
+
+    #if ( ! ( $item.img.toLowerCase().startsWith("http") || 
$item.img.toLowerCase().startsWith("https") ) )
+      #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) )
+      #set ( $src = $src.replaceAll( "\\", "/" ) )
+      #set ( $src = ' src="' + $src + '"' )
+    #else
+      #set ( $src = ' src="' + $item.img + '"' )
+    #end
+
+    #if( $item.alt )
+      #set ( $alt = ' alt="' + $item.alt + '"' )
+    #else
+      #set ( $alt = ' alt="' + $item.name + '"' )
+    #end
+
+    #if( $item.border )
+      #set ( $border = ' border="' + $item.border + '"' )
+    #else
+      #set ( $border = ' border="0"' )
+    #end
+
+    #if( $item.width )
+      #set ( $width = ' width="' + $item.width + '"' )
+    #else
+      #set ( $width = "" )
+    #end
+    #if( $item.height )
+      #set ( $height = ' height="' + $item.height + '"' )
+    #else
+      #set ( $height = "" )
+    #end
+
+    #set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width + 
$height + "/>" )
+
+    #if ( $align == "left" )
+      #if ( $alignedFileName == $currentItemHref )
+        <strong>$img $item.name</strong>
       #else
-        <img src="$item.img" align="absbottom" style="border-width: 0"/>
+        #linkWithImage( $currentItemHref $item.name $img $align )
+      #end
+    #else
+      #if ( $alignedFileName == $currentItemHref )
+        <strong>$item.name $img</strong>
+      #else
+        #linkWithImage( $currentItemHref $item.name $img $align )
       #end
     #end
+  #else
     #if ( $alignedFileName == $currentItemHref )
       <strong>$item.name</strong>
     #else
       #link( $currentItemHref $item.name )
     #end
+  #end
   #if ( $item && $item.items && $item.items.size() > 0 )
     #if ( $collapse == "expanded" )
       <ul>
@@ -135,7 +197,54 @@
 #macro ( mainMenu $menus )
   #foreach( $menu in $menus )
     #if ( $menu.name )
-    <h5>$menu.name</h5>
+      #if ( $menu.img )
+        #if( $menu.align )
+          #set ( $align = $menu.align )
+        #else
+          #set ( $align = "left" )
+        #end
+
+        #if ( ! ( $menu.img.toLowerCase().startsWith("http") || 
$menu.img.toLowerCase().startsWith("https") ) )
+          #set ( $src = $PathTool.calculateLink( $menu.img, $relativePath ) )
+          #set ( $src = $src.replaceAll( "\\", "/" ) )
+          #set ( $src = ' src="' + $src + '"' )
+        #else
+          #set ( $src = ' src="' + $menu.img + '"' )
+        #end
+
+        #if( $menu.alt )
+          #set ( $alt = ' alt="' + $menu.alt + '"' )
+        #else
+          #set ( $alt = ' alt="' + $menu.name + '"' )
+        #end
+
+        #if( $menu.border )
+          #set ( $border = ' border="' + $menu.border + '"' )
+        #else
+          #set ( $border = ' border="0"' )
+        #end
+
+        #if( $menu.width )
+          #set ( $width = ' width="' + $menu.width + '"' )
+        #else
+          #set ( $width = "" )
+        #end
+        #if( $menu.height )
+          #set ( $height = ' height="' + $menu.height + '"' )
+        #else
+          #set ( $height = "" )
+        #end
+
+        #set ( $img = '<img class="imageLink"' + $src + $alt + $border + 
$width + $height + "/>" )
+
+        #if ( $align == "left" )
+        <h5>$img $menu.name</h5>
+        #else
+        <h5>$menu.name $img</h5>
+        #end
+      #else
+       <h5>$menu.name</h5>
+      #end
     #end
     #if ( $menu.items && $menu.items.size() > 0 )
     <ul>
@@ -281,36 +390,46 @@
                 #set ( $img = "images/logos/maven-feather.png" )
             #end
 
-            <a href="$href" title="$name" class="poweredBy">
+            #if ( ! ( $img.toLowerCase().startsWith("http") || 
$img.toLowerCase().startsWith("https") ) )
               #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
-              #set ( $img = $img.replaceAll( "\\", "/" ) )
-              <img  class="poweredBy"
-                    alt="$name"
-                    src="$img"
-                    width="90"
-                    height="30"
-              />
+              #set ( $img = $src.replaceAll( "\\", "/" ) )
+            #end
+
+            #if( $item.alt )
+                #set ( $alt = ' alt="' + $item.alt + '"' )
+            #else
+                #set ( $alt = ' alt="' + $name + '"' )
+            #end
+
+            #if( $item.border )
+                #set ( $border = ' border="' + $item.border + '"' )
+            #else
+                #set ( $border = "" )
+            #end
+
+            #if( $item.width )
+                #set ( $width = ' width="' + $item.width + '"' )
+            #else
+                #set ( $width = "" )
+            #end
+            #if( $item.height )
+                #set ( $height = ' height="' + $item.height + '"' )
+            #else
+                #set ( $height = "" )
+            #end
+
+            <a href="$href" title="$name" class="poweredBy">
+              <img class="poweredBy" $alt src="$img" $border $width $height />
             </a>
         #end
         #if( $poweredBy.isEmpty() )
-          <a href="http://maven.apache.org/"; title="$i18n.getString( 
"site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
-            <img class="poweredBy"
-                 alt="$i18n.getString( "site-renderer", $locale, 
"template.builtby" ) Maven"
-                 src="$relativePath/images/logos/maven-feather.png"
-                 width="90"
-                 height="30"
-                 border="1" />
-          </a>
+        <a href="http://maven.apache.org/"; title="$i18n.getString( 
"site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+          <img class="poweredBy" alt="$i18n.getString( "site-renderer", 
$locale, "template.builtby" ) Maven" 
src="$relativePath/images/logos/maven-feather.png" />
+        </a>
         #end
     #else
         <a href="http://maven.apache.org/"; title="$i18n.getString( 
"site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
-          <img class="poweredBy"
-               alt="$i18n.getString( "site-renderer", $locale, 
"template.builtby" ) Maven"
-               src="$relativePath/images/logos/maven-feather.png"
-               width="90"
-               height="30"
-               border="1"
-               />
+          <img class="poweredBy" alt="$i18n.getString( "site-renderer", 
$locale, "template.builtby" ) Maven" 
src="$relativePath/images/logos/maven-feather.png" />
         </a>
     #end
 #end

svn commit: r808861 - in /maven/doxia/doxia-sitetools/trunk: doxia-decoration-model/ doxia-decoration-model/src/main/mdo/ doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/ doxia-site-renderer/src/main/resources/org/a...

Reply via email to