Index: /FCKeditor.Java/branches/2.4/src/site/site.vm
===================================================================
--- /FCKeditor.Java/branches/2.4/src/site/site.vm	(revision 1954)
+++ /FCKeditor.Java/branches/2.4/src/site/site.vm	(revision 1955)
@@ -12,7 +12,7 @@
   #if ( $banner )
     #if( $banner.href )
-      <a href="$banner.href" id="$id" #if( $banner.alt ) title="$banner.alt" #end >
-    #else
-        <div id="$id">
+      <a href="$banner.href" id="$id">
+    #else
+        <span id="$id">
     #end
 
@@ -26,5 +26,5 @@
             #set ( $alt = $banner.alt )
         #else
-            #set ( $alt = $banner.name )
+            #set ( $alt = "" )
         #end
         <img src="$src" alt="$alt" />
@@ -36,5 +36,5 @@
         </a>
     #else
-        </div>
+        </span>
     #end
   #end
@@ -77,5 +77,5 @@
       #set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
       #set ( $subitemHref = $subitemHref.replaceAll( "\\", "/" ) )
-      #set ( $display = false )
+
       #if ( $alignedFileName == $subitemHref )
         #set ( $display = true )
@@ -151,14 +151,22 @@
 #macro ( copyright )
   #if ( $project )
-    #set ( $currentYear = ${currentDate.year} + 1900 )
-
+    #if ( ${project.organization} ) 
+      #set ( $period = "" )
+	#else 
+	  #set ( $period = "." )
+	#end
+	#set ( $currentYear = ${currentDate.year} + 1900 )
     #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
-      ${project.inceptionYear}-${currentYear}
-    #else
-      ${currentYear}
-    #end
-
-    #if ( ${project.organization} && ${project.organization.name} )
-      ${project.organization.name}
+      ${project.inceptionYear}-${currentYear}${period}
+    #else
+      ${currentYear}${period}
+    #end
+
+    #if ( ${project.organization} )
+      #if ( ${project.organization.name} && ${project.organization.url} )
+          <a href="$project.organization.url">$project.organization.name</a>.
+      #elseif ( ${project.organization.name} )
+        $project.organization.name.
+      #end
     #end
   #end
@@ -188,7 +196,4 @@
       #set ( $versionPosition = "left" )
     #end
-  #else
-    #set ( $version = "" )
-    #set ( $versionPosition = "left" )
   #end
 
@@ -276,31 +281,15 @@
               #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
               #set ( $img = $img.replaceAll( "\\", "/" ) )
-              <img  class="poweredBy"  
-                    alt="$name" 
-                    src="$img" 
-                    width="90"
-                    height="30"
-              />
+              <img alt="$name" src="$img" />
             </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" />
+            <img alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"></img>
           </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 alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"></img>
         </a>
     #end
@@ -367,5 +356,5 @@
     </div>
     <div id="footer">
-      <div class="xright">&copy; 2004 - 2008 Frederico Caldeira Knabben (<a href="http://www.fredck.com/">FredCK.com</a>). All rights reserved.</div>
+      <div class="xright">Copyright &#169;#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
       <div class="clear">
         <hr/>