You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2010/01/11 11:32:51 UTC
svn commit: r897829 [1/2] - in /directory/skins/trunk:
apacheds-skin/src/main/resources/META-INF/maven/
apacheds-skin/src/main/resources/css/
apacheds-skin/src/main/resources/images/
studio-skin/src/main/resources/META-INF/maven/ studio-skin/src/main/r...
Author: felixk
Date: Mon Jan 11 10:32:50 2010
New Revision: 897829
URL: http://svn.apache.org/viewvc?rev=897829&view=rev
Log:
Fix for DIR-253 (Adapt maven skins to layout changes of directory site from 20091029)
Added:
directory/skins/trunk/apacheds-skin/src/main/resources/css/common_20091029.css (with props)
directory/skins/trunk/apacheds-skin/src/main/resources/css/green_20091029.css (with props)
directory/skins/trunk/apacheds-skin/src/main/resources/css/print.css (with props)
directory/skins/trunk/apacheds-skin/src/main/resources/images/content-backgound_20091029.png (with props)
directory/skins/trunk/apacheds-skin/src/main/resources/images/footer_20091029.png (with props)
directory/skins/trunk/apacheds-skin/src/main/resources/images/header-green_20091029.png (with props)
directory/skins/trunk/apacheds-skin/src/main/resources/images/news-green.png (with props)
directory/skins/trunk/apacheds-skin/src/main/resources/images/post-green.png (with props)
directory/skins/trunk/studio-skin/src/main/resources/css/blue_20091029.css (with props)
directory/skins/trunk/studio-skin/src/main/resources/css/common_20091029.css (with props)
directory/skins/trunk/studio-skin/src/main/resources/css/print.css (with props)
directory/skins/trunk/studio-skin/src/main/resources/images/content-backgound_20091029.png (with props)
directory/skins/trunk/studio-skin/src/main/resources/images/footer_20091029.png (with props)
directory/skins/trunk/studio-skin/src/main/resources/images/header-blue_20091029.png (with props)
directory/skins/trunk/triplesec-skin/src/main/resources/css/common_20091029.css (with props)
directory/skins/trunk/triplesec-skin/src/main/resources/css/print.css (with props)
directory/skins/trunk/triplesec-skin/src/main/resources/css/red_20091029.css (with props)
directory/skins/trunk/triplesec-skin/src/main/resources/images/content-backgound_20091029.png (with props)
directory/skins/trunk/triplesec-skin/src/main/resources/images/footer_20091029.png (with props)
directory/skins/trunk/triplesec-skin/src/main/resources/images/header-red_20091029.png (with props)
directory/skins/trunk/triplesec-skin/src/main/resources/images/news-red.png (with props)
directory/skins/trunk/triplesec-skin/src/main/resources/images/post-red.png (with props)
Removed:
directory/skins/trunk/apacheds-skin/src/main/resources/css/site.css
directory/skins/trunk/studio-skin/src/main/resources/css/maven-theme.css
directory/skins/trunk/studio-skin/src/main/resources/css/site.css
directory/skins/trunk/triplesec-skin/src/main/resources/css/maven-theme.css
directory/skins/trunk/triplesec-skin/src/main/resources/css/site.css
Modified:
directory/skins/trunk/apacheds-skin/src/main/resources/META-INF/maven/site.vm
directory/skins/trunk/studio-skin/src/main/resources/META-INF/maven/site.vm
directory/skins/trunk/triplesec-skin/src/main/resources/META-INF/maven/site.vm
Modified: directory/skins/trunk/apacheds-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/directory/skins/trunk/apacheds-skin/src/main/resources/META-INF/maven/site.vm?rev=897829&r1=897828&r2=897829&view=diff
==============================================================================
--- directory/skins/trunk/apacheds-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ directory/skins/trunk/apacheds-skin/src/main/resources/META-INF/maven/site.vm Mon Jan 11 10:32:50 2010
@@ -1,65 +1,123 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!--
- @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
--->
-
-#macro ( link $href $name )
+<!-- Generated by Apache Maven Doxia at $dateFormat.format( $currentDate ) -->
+#macro ( link $href $name $target $img $position $alt $border $width $height )
+ #set ( $linkTitle = ' title="' + $name + '"' )
+ #if( $target )
+ #set ( $linkTarget = ' target="' + $target + '"' )
+ #else
+ #set ( $linkTarget = "" )
+ #end
#if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) )
- <a href="$href" class="externalLink">$name</a>
+ #set ( $linkClass = ' class="externalLink"' )
+ #else
+ #set ( $linkClass = "" )
+ #end
+ #if ( $img )
+ #if ( $position == "left" )
+ <a href="$href"$linkClass$linkTarget$linkTitle>#image($img $alt $border $width $height)$name</a>
+ #else
+ <a href="$href"$linkClass$linkTarget$linkTitle>$name #image($img $alt $border $width $height)</a>
+ #end
#else
- <a href="$href">$name</a>
+ <a href="$href"$linkClass$linkTarget$linkTitle>$name</a>
#end
#end
-
+##
+#macro ( image $img $alt $border $width $height )
+ #if( $img )
+ #if ( ! ( $img.toLowerCase().startsWith("http") || $img.toLowerCase().startsWith("https") ) )
+ #set ( $imgSrc = $PathTool.calculateLink( $img, $relativePath ) )
+ #set ( $imgSrc = $imgSrc.replaceAll( "\\", "/" ) )
+ #set ( $imgSrc = ' src="' + $imgSrc + '"' )
+ #else
+ #set ( $imgSrc = ' src="' + $img + '"' )
+ #end
+ #if( $alt )
+ #set ( $imgAlt = ' alt="' + $alt + '"' )
+ #else
+ #set ( $imgAlt = ' alt=""' )
+ #end
+ #if( $border )
+ #set ( $imgBorder = ' border="' + $border + '"' )
+ #else
+ #set ( $imgBorder = "" )
+ #end
+ #if( $width )
+ #set ( $imgWidth = ' width="' + $width + '"' )
+ #else
+ #set ( $imgWidth = "" )
+ #end
+ #if( $height )
+ #set ( $imgHeight = ' height="' + $height + '"' )
+ #else
+ #set ( $imgHeight = "" )
+ #end
+ <img class="imageLink"$imgSrc$imgAlt$imgBorder$imgWidth$imgHeight/>
+ #end
+#end
+#macro ( banner $banner $id )
+ #if ( $banner )
+ #if( $banner.href )
+ <a href="$banner.href" id="$id"#if( $banner.alt ) title="$banner.alt"#end>
+ #else
+ <div id="$id">
+ #end
+##
+ #if( $banner.src )
+ #set ( $src = $banner.src )
+ #if ( ! ( $src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https") ) )
+ #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
+ #set ( $src = $src.replaceAll( "\\", "/" ) )
+ #end
+ #if ( $banner.alt )
+ #set ( $alt = $banner.alt )
+ #else
+ #set ( $alt = $banner.name )
+ #end
+ <img src="$src" alt="$alt" />
+ #else
+ $banner.name
+ #end
+##
+ #if( $banner.href )
+ </a>
+ #else
+ </div>
+ #end
+ #end
+#end
+##
#macro ( links $links )
#set ( $counter = 0 )
#foreach( $item in $links )
#set ( $counter = $counter + 1 )
#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
#set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "%2e", "." ) )
- #link( $currentItemHref $item.name )
+ #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
#if ( $links.size() > $counter )
|
#end
#end
#end
-
+##
#macro ( breadcrumbs $breadcrumbs )
#set ( $counter = 0 )
#foreach( $item in $breadcrumbs )
#set ( $counter = $counter + 1 )
#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
#set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "%2e", "." ) )
-
+##
#if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
$item.name
#else
- #link( $currentItemHref $item.name )
+ #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
#end
#if ( $breadcrumbs.size() > $counter )
>
#end
#end
#end
-
+##
#macro ( displayTree $display $item )
#if ( $item && $item.items && $item.items.size() > 0 )
#foreach( $subitem in $item.items )
@@ -68,17 +126,17 @@
#if ( $alignedFileName == $subitemHref )
#set ( $display = true )
#end
-
+##
#displayTree( $display $subitem )
#end
#end
#end
-
+##
#macro ( menuItem $item )
#set ( $collapse = "none" )
#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
#set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
-
+##
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $item.collapse == false )
#set ( $collapse = "expanded" )
@@ -86,29 +144,36 @@
## By default collapsed
#set ( $collapse = "collapsed" )
#end
-
+##
#set ( $display = false )
#displayTree( $display $item )
-
+##
#if ( $alignedFileName == $currentItemHref || $display )
#set ( $collapse = "expanded" )
#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.position == "left" )
+ #if ( $alignedFileName == $currentItemHref )
+ <strong>#image($item.img $item.alt $item.border $item.width $item.height) $item.name</strong>
+ #else
+ #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
+ #end
+ #else
+ #if ( $alignedFileName == $currentItemHref )
+ <strong>$item.name #image($item.img $item.alt $item.border $item.width $item.height)</strong>
#else
- <img src="$item.img" align="absbottom" style="border-width: 0"/>
+ #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
#end
#end
+ #else
#if ( $alignedFileName == $currentItemHref )
<strong>$item.name</strong>
#else
- #link( $currentItemHref $StringUtils.replace( $item.name.toString(), "Apache Directory Studio ", "" ) )
+ #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
#end
+ #end
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $collapse == "expanded" )
<ul>
@@ -120,11 +185,58 @@
#end
</li>
#end
-
+##
#macro ( mainMenu $menus )
#foreach( $menu in $menus )
#if ( $menu.name )
- <h5>$menu.name</h5>
+ #if ( $menu.img )
+ #if( $menu.position )
+ #set ( $position = $menu.position )
+ #else
+ #set ( $position = "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 ( $position == "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>
@@ -135,40 +247,50 @@
#end
#end
#end
-
+##
#macro ( copyright )
#if ( $project )
- #set ( $currentYear = ${currentDate.year} + 1900 )
-
+ #if ( ${project.organization} && ${project.organization.name} )
+ #set ( $period = "" )
+ #else
+ #set ( $period = "." )
+ #end
+##
+ #set ( $currentYear = ${currentDate.year} + 1900 )
+##
#if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
- ${project.inceptionYear}-${currentYear}
+ ${project.inceptionYear}-${currentYear}${period}
#else
- ${currentYear}
+ ${currentYear}${period}
#end
-
- #if ( ${project.organization} && ${project.organization.name} )
- ${project.organization.name}
+##
+ #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
#end
-
+##
#macro ( publishDate $position $publishDate $version )
#if ( $publishDate && $publishDate.format )
#set ( $format = $publishDate.format )
#else
#set ( $format = "yyyy-MM-dd" )
#end
-
+##
$dateFormat.applyPattern( $format )
-
+##
#set ( $dateToday = $dateFormat.format( $currentDate ) )
-
+##
#if ( $publishDate && $publishDate.position )
#set ( $datePosition = $publishDate.position )
#else
#set ( $datePosition = "left" )
#end
-
+##
#if ( $version )
#if ( $version.position )
#set ( $versionPosition = $version.position )
@@ -179,7 +301,7 @@
#set ( $version = "" )
#set ( $versionPosition = "left" )
#end
-
+##
#set ( $breadcrumbs = $decoration.body.breadcrumbs )
#set ( $links = $decoration.body.links )
@@ -188,25 +310,25 @@
#else
#set ( $prefix = "" )
#end
-
+##
#if ( $datePosition.equalsIgnoreCase( $position ) )
#if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
- $prefix $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ $prefix <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
#if ( $versionPosition.equalsIgnoreCase( $position ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ | <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
#end
#elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
<div id="lastPublished">
- $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
#if ( $versionPosition.equalsIgnoreCase( $position ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ | <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
#end
</div>
#elseif ( $datePosition.equalsIgnoreCase("left") )
<div class="xleft">
- $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
#if ( $versionPosition.equalsIgnoreCase( $position ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ | <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
#end
#if ( $breadcrumbs && $breadcrumbs.size() > 0 )
| #breadcrumbs( $breadcrumbs )
@@ -215,14 +337,14 @@
#end
#elseif ( $versionPosition.equalsIgnoreCase( $position ) )
#if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) )
- $prefix $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ $prefix <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
#elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
<div id="lastPublished">
- $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
</div>
#elseif ( $versionPosition.equalsIgnoreCase("left") )
<div class="xleft">
- $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
#if ( $breadcrumbs && $breadcrumbs.size() > 0 )
| #breadcrumbs( $breadcrumbs )
#end
@@ -236,76 +358,95 @@
#end
#end
#end
-
+##
#macro ( poweredByLogo $poweredBy )
- #if( $poweredBy )
- #foreach ($item in $poweredBy)
- #if( $item.href )
- #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $href = $href.replaceAll( "\\", "/" ) )
- #else
- #set ( $href="http://maven.apache.org/" )
- #end
-
- #if( $item.name )
- #set ( $name = $item.name )
- #else
- #set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" ) )
- #set ( $name = "${name} Maven" )
- #end
-
- #if( $item.img )
- #set ( $img = $item.img )
- #else
- #set ( $img = "images/logos/maven-feather.png" )
- #end
-
- <a href="$href" title="$name" class="poweredBy">
- #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
- #set ( $img = $img.replaceAll( "\\", "/" ) )
- <img class="poweredBy"
- alt="$name"
- src="$img"
- width="90"
- height="30"
- />
- </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>
- #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"
- />
- </a>
+ #if( $poweredBy )
+ #foreach ($item in $poweredBy)
+ #if( $item.href )
+ #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $href = $href.replaceAll( "\\", "/" ) )
+ #else
+ #set ( $href="http://maven.apache.org/" )
+ #end
+##
+ #if( $item.name )
+ #set ( $name = $item.name )
+ #else
+ #set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" ) )
+ #set ( $name = "${name} Maven" )
+ #end
+##
+ #if( $item.img )
+ #set ( $img = $item.img )
+ #else
+ #set ( $img = "images/logos/maven-feather.png" )
+ #end
+##
+ #if ( ! ( $img.toLowerCase().startsWith("http") || $img.toLowerCase().startsWith("https") ) )
+ #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
+ #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" />
+ </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" />
+ </a>
+ #end
#end
-
-<html xmlns="http://www.w3.org/1999/xhtml">
+##
+<html xmlns="http://www.w3.org/1999/xhtml"#if ( $locale ) xml:lang="$locale.language" lang="$locale.language"#end>
<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
<title>$title</title>
<style type="text/css" media="all">
- @import url("$relativePath/css/site.css");
+ @import url("$relativePath/css/common_20091029.css");
+ @import url("$relativePath/css/green_20091029.css");
</style>
- <link rel="shortcut icon" href="$relativePath/images/server-icon_16x16.png" />
-
- #foreach( $author in $authors )
+ <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
+#foreach( $author in $authors )
<meta name="author" content="$author" />
- #end
- <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
+#end
+#if ( $dateCreation )
+ <meta name="Date-Creation-yyyymmdd" content="$dateCreation" />
+#end
+#if ( $dateRevision )
+ <meta name="Date-Revision-yyyymmdd" content="$dateRevision" />
+#end
+#if ( $locale )
+ <meta http-equiv="Content-Language" content="$locale.language" />
+#end
#if ( $decoration.body.head )
#foreach( $item in $decoration.body.head.getChildren() )
## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
@@ -320,25 +461,7 @@
#end
#end
#end
-
- <!--[if lt IE 8]>
- <style type="text/css">
- #leftColumn, #rightColumn {
- float: left;
- }
- </style>
-
- <script type="text/javascript">
- function layout_colheight()
- {
- var h = document.getElementById("content").scrollHeight;
- document.getElementById("leftColumn").style.height = h+'px';
- document.getElementById("rightColumn").style.height = h+'px';
- document.getElementById("rightColumn").style.paddingRight = 0+'px';
- }
- window.onload = layout_colheight;
- </script>
- <![endif]-->
+## $headContent
</head>
<body>
@@ -359,10 +482,13 @@
<div id="rightColumn">
$bodyContent
</div>
- <br/>
+ <div id="endContent">
+ </div>
</div>
- <div id="footer">#publishDate( "bottom" $decoration.publishDate $decoration.version ) ©#copyright()</div>
+ <div id="footer">
+ #publishDate( "bottom" $decoration.publishDate $decoration.version ) ©#copyright()
+ </div>
</div>
</body>
Added: directory/skins/trunk/apacheds-skin/src/main/resources/css/common_20091029.css
URL: http://svn.apache.org/viewvc/directory/skins/trunk/apacheds-skin/src/main/resources/css/common_20091029.css?rev=897829&view=auto
==============================================================================
--- directory/skins/trunk/apacheds-skin/src/main/resources/css/common_20091029.css (added)
+++ directory/skins/trunk/apacheds-skin/src/main/resources/css/common_20091029.css Mon Jan 11 10:32:50 2010
@@ -0,0 +1,438 @@
+html
+{
+ overflow-y: scroll;
+}
+
+body
+{
+ padding: 0;
+ margin: 0;
+ font-family: 'Lucida Sans', 'Helvetica', 'Sans-serif', 'sans';
+ font-size: 77%;
+ color: #777777;
+ background-color: white;
+ background-image: url('../images/body-bg.png');
+ background-repeat: repeat-x;
+ background-position: bottom;
+ background-attachment: fixed;
+ height: 99%;
+}
+
+h1, h2, h3, h4, h5, h6
+{
+ font-weight: bold;
+ margin: 0.67em 0px 0.67em 0px;
+}
+
+h1
+{
+ font-size: 197%;
+
+/* 26px equivalent */
+}
+
+h2
+{
+ font-size: 153.9%;
+
+/* 20px equivalent */
+}
+
+h3
+{
+ font-size: 131%;
+
+/* 17px equivalent */
+}
+
+h4
+{
+ font-size: 93%;
+
+/* 12px equivalent */
+}
+
+h5
+{
+ font-size: 85%;
+
+/* 11px equivalent */
+}
+
+h6
+{
+ font-size: 77%;
+
+/* 10px equivalent */
+}
+
+#container
+{
+ position: absolute;
+ width: 1005px;
+ margin-left: -502px;
+ left: 50%;
+}
+
+#header
+{
+ width: 1005px;
+ height: 165px;
+ background-repeat: no-repeat;
+}
+
+#subProjectsNavBar
+{
+ color: white;
+ text-align: right;
+ margin: 0px;
+ color: #ffffff;
+ font-size: 12px;
+ padding: 140px 20px 2px;
+}
+
+#subProjectsNavBar a, #subProjectsNavBar a:link, #subProjectsNavBar a:visited
+{
+ color: #ffffff;
+ text-decoration: none;
+}
+
+#subProjectsNavBar a:hover
+{
+ color: #ffffff;
+ border-bottom: solid #ffffff 1px;
+}
+
+#subProjectsNavBar a strong
+{
+ font-size: 14px;
+ font-weight: bold;
+ color: #ffffff;
+ border-bottom: solid #ffffff 1px;
+}
+
+#content
+{
+ background: url('../images/content-backgound_20091029.png') repeat-y;
+}
+
+#endContent
+{
+ clear: both;
+}
+
+#leftColumn
+{
+ float: left;
+ width: 193px;
+ padding-top: 10px;
+ margin-left: 10px;
+ line-height: 1.8em;
+}
+
+#rightColumn
+{
+ float: left;
+ margin-left: 15px;
+ width: 762px;
+ text-align: left;
+ line-height: 1.5em;
+}
+
+#editZone
+{
+
+
+/* Netscape 4, IE 4.x-5.0/Win and other lesser browsers will use this */
+ position: absolute;
+ right: 0;
+ top: 0;
+ height: 60px;
+ width: 60px;
+ z-index: 1000;
+}
+
+body > div#editZone
+{
+
+
+/* used by Opera 5+, Netscape6+/Mozilla, Konqueror, Safari, OmniWeb 4.5+, iCab, ICEbrowser */
+ position: fixed;
+}
+
+a
+{
+ color: #777777;
+ text-decoration: underline;
+}
+
+a:hover
+{
+ color: #000000;
+}
+
+a.none
+{
+ background: transparent;
+ padding-right: 0px;
+}
+
+#navigation
+{
+ padding-left: 12px;
+ font-weight: bold;
+}
+
+#navigation ul
+{
+ margin: 0px;
+ padding: 0px;
+ margin-bottom: 10px;
+}
+
+#navigation li
+{
+ list-style-type: none;
+ margin-left: 15px;
+ padding-left: 0px;
+}
+
+#navigation li ul
+{
+ margin-left: 1.5em;
+}
+
+#navigation a
+{
+ text-decoration: none;
+ color: #777777;
+}
+
+#navigation a:hover
+{
+ color: #000000;
+ font-weight: bolder;
+}
+
+#navigation div
+{
+ line-height: 1.5em;
+ margin-bottom: 2em;
+}
+
+#navigation h5
+{
+ font-size: 1em;
+ margin-bottom: 0px;
+ padding-bottom: 0px;
+}
+
+#navigation strong
+{
+ color: #000000;
+}
+
+.blogSurtitle
+{
+ padding-bottom: 10px;
+}
+
+.blogSurtitle img
+{
+ display: none;
+}
+
+.endsection, .pagesubheading
+{
+ display: none;
+}
+
+.blogpost .wiki-content
+{
+ padding-left: 25px;
+}
+
+.blogDate
+{
+ text-decoration: none;
+ font-weight: bolder;
+ padding: 1px;
+ padding-left: 20px;
+}
+
+a.blogHeading
+{
+ text-decoration: none;
+ font-weight: bolder;
+ padding-left: 20px;
+ margin: 10px;
+}
+
+#footer
+{
+ font-size: 11px;
+ padding-left: 203px;
+ height: 40px;
+ text-align: center;
+ background: url('../images/footer_20091029.png') no-repeat;
+}
+
+.nobr sup img
+{
+ display: none;
+}
+
+.preformattedContent pre
+{
+ padding: 5px 10px;
+ border: 1px dashed #1a6c0b;
+ background-color: #f0f0f0;
+}
+
+blockquote
+{
+ margin: 10px;
+ padding: 0px 10px;
+ border-left: 1px solid #1a6c0b;
+}
+
+table.confluenceTable
+{
+ margin: 5px;
+ border-collapse: collapse;
+}
+
+/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */
+
+table.confluenceTable td.confluenceTd
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+}
+
+/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */
+
+table.confluenceTable th.confluenceTh
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+ background-color: #f0f0f0;
+ text-align: center;
+}
+
+td.confluenceTd
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+}
+
+th.confluenceTh
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+ background-color: #f0f0f0;
+ text-align: center;
+}
+
+.noteMacro
+{
+ border: 1px solid #f0c000;
+ background-color: #ffffce;
+ margin-top: 5px;
+ margin-bottom: 5px
+}
+
+.warningMacro
+{
+ border: 1px solid #c00;
+ background-color: #fcc;
+ text-align: left;
+ margin-top: 5px;
+ margin-bottom: 5px
+}
+
+.infoMacro
+{
+ border: 1px solid #3c78b5;
+ background-color: #D8E4F1;
+ text-align: left;
+ margin-top: 5px;
+ margin-bottom: 5px
+}
+
+.tipMacro
+{
+ border: 1px solid #090;
+ background-color: #dfd;
+ text-align: left;
+ margin-top: 5px;
+ margin-bottom: 5px
+}
+
+.code
+{
+ border: 1px dashed #1a6c0b;
+ font-size: 11px;
+ font-family: Courier;
+ margin: 10px;
+ line-height: 13px;
+}
+
+.codeHeader
+{
+ background-color: #f0f0f0;
+ border-bottom: 1px dashed #1a6c0b;
+ padding: 3px;
+ text-align: center;
+}
+
+.codeContent
+{
+ text-align: left;
+ background-color: #f0f0f0;
+ padding: 3px;
+}
+
+.code-keyword
+{
+ color: #000091;
+ background-color: inherit;
+}
+
+.code-object
+{
+ color: #910091;
+ background-color: inherit;
+}
+
+.code-quote
+{
+ color: #009100;
+ background-color: inherit;
+}
+
+.code-comment
+{
+ color: #808080;
+ background-color: inherit;
+}
+
+.code-xml .code-keyword
+{
+ color: inherit;
+ font-weight: bold;
+}
+
+.code-tag
+{
+ color: #000091;
+ background-color: inherit;
+}
\ No newline at end of file
Propchange: directory/skins/trunk/apacheds-skin/src/main/resources/css/common_20091029.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/skins/trunk/apacheds-skin/src/main/resources/css/common_20091029.css
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: directory/skins/trunk/apacheds-skin/src/main/resources/css/green_20091029.css
URL: http://svn.apache.org/viewvc/directory/skins/trunk/apacheds-skin/src/main/resources/css/green_20091029.css?rev=897829&view=auto
==============================================================================
--- directory/skins/trunk/apacheds-skin/src/main/resources/css/green_20091029.css (added)
+++ directory/skins/trunk/apacheds-skin/src/main/resources/css/green_20091029.css Mon Jan 11 10:32:50 2010
@@ -0,0 +1,21 @@
+h1, h2, h3, h4, h5, h6
+{
+ color: #196e0b;
+}
+
+#header
+{
+ background-image: url('../images/header-green_20091029.png');
+}
+
+.blogDate
+{
+ color: #1a6c0b;
+ background: url('../images/news-green.png') no-repeat;
+}
+
+a.blogHeading
+{
+ color: #1a6c0b;
+ background: url('../images/post-green.png') no-repeat;
+}
\ No newline at end of file
Propchange: directory/skins/trunk/apacheds-skin/src/main/resources/css/green_20091029.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/skins/trunk/apacheds-skin/src/main/resources/css/green_20091029.css
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: directory/skins/trunk/apacheds-skin/src/main/resources/css/print.css
URL: http://svn.apache.org/viewvc/directory/skins/trunk/apacheds-skin/src/main/resources/css/print.css?rev=897829&view=auto
==============================================================================
--- directory/skins/trunk/apacheds-skin/src/main/resources/css/print.css (added)
+++ directory/skins/trunk/apacheds-skin/src/main/resources/css/print.css Mon Jan 11 10:32:50 2010
@@ -0,0 +1,7 @@
+#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
+ display: none !important;
+}
+#bodyColumn, body.docs div.docs {
+ margin: 0 !important;
+ border: none !important
+}
Propchange: directory/skins/trunk/apacheds-skin/src/main/resources/css/print.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/skins/trunk/apacheds-skin/src/main/resources/css/print.css
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: directory/skins/trunk/apacheds-skin/src/main/resources/images/content-backgound_20091029.png
URL: http://svn.apache.org/viewvc/directory/skins/trunk/apacheds-skin/src/main/resources/images/content-backgound_20091029.png?rev=897829&view=auto
==============================================================================
Binary file - no diff available.
Propchange: directory/skins/trunk/apacheds-skin/src/main/resources/images/content-backgound_20091029.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: directory/skins/trunk/apacheds-skin/src/main/resources/images/footer_20091029.png
URL: http://svn.apache.org/viewvc/directory/skins/trunk/apacheds-skin/src/main/resources/images/footer_20091029.png?rev=897829&view=auto
==============================================================================
Binary file - no diff available.
Propchange: directory/skins/trunk/apacheds-skin/src/main/resources/images/footer_20091029.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: directory/skins/trunk/apacheds-skin/src/main/resources/images/header-green_20091029.png
URL: http://svn.apache.org/viewvc/directory/skins/trunk/apacheds-skin/src/main/resources/images/header-green_20091029.png?rev=897829&view=auto
==============================================================================
Binary file - no diff available.
Propchange: directory/skins/trunk/apacheds-skin/src/main/resources/images/header-green_20091029.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: directory/skins/trunk/apacheds-skin/src/main/resources/images/news-green.png
URL: http://svn.apache.org/viewvc/directory/skins/trunk/apacheds-skin/src/main/resources/images/news-green.png?rev=897829&view=auto
==============================================================================
Binary file - no diff available.
Propchange: directory/skins/trunk/apacheds-skin/src/main/resources/images/news-green.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: directory/skins/trunk/apacheds-skin/src/main/resources/images/post-green.png
URL: http://svn.apache.org/viewvc/directory/skins/trunk/apacheds-skin/src/main/resources/images/post-green.png?rev=897829&view=auto
==============================================================================
Binary file - no diff available.
Propchange: directory/skins/trunk/apacheds-skin/src/main/resources/images/post-green.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: directory/skins/trunk/studio-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/directory/skins/trunk/studio-skin/src/main/resources/META-INF/maven/site.vm?rev=897829&r1=897828&r2=897829&view=diff
==============================================================================
--- directory/skins/trunk/studio-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ directory/skins/trunk/studio-skin/src/main/resources/META-INF/maven/site.vm Mon Jan 11 10:32:50 2010
@@ -1,65 +1,123 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!--
- @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
--->
-
-#macro ( link $href $name )
+<!-- Generated by Apache Maven Doxia at $dateFormat.format( $currentDate ) -->
+#macro ( link $href $name $target $img $position $alt $border $width $height )
+ #set ( $linkTitle = ' title="' + $name + '"' )
+ #if( $target )
+ #set ( $linkTarget = ' target="' + $target + '"' )
+ #else
+ #set ( $linkTarget = "" )
+ #end
#if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) )
- <a href="$href" class="externalLink">$name</a>
+ #set ( $linkClass = ' class="externalLink"' )
+ #else
+ #set ( $linkClass = "" )
+ #end
+ #if ( $img )
+ #if ( $position == "left" )
+ <a href="$href"$linkClass$linkTarget$linkTitle>#image($img $alt $border $width $height)$name</a>
+ #else
+ <a href="$href"$linkClass$linkTarget$linkTitle>$name #image($img $alt $border $width $height)</a>
+ #end
#else
- <a href="$href">$name</a>
+ <a href="$href"$linkClass$linkTarget$linkTitle>$name</a>
#end
#end
-
+##
+#macro ( image $img $alt $border $width $height )
+ #if( $img )
+ #if ( ! ( $img.toLowerCase().startsWith("http") || $img.toLowerCase().startsWith("https") ) )
+ #set ( $imgSrc = $PathTool.calculateLink( $img, $relativePath ) )
+ #set ( $imgSrc = $imgSrc.replaceAll( "\\", "/" ) )
+ #set ( $imgSrc = ' src="' + $imgSrc + '"' )
+ #else
+ #set ( $imgSrc = ' src="' + $img + '"' )
+ #end
+ #if( $alt )
+ #set ( $imgAlt = ' alt="' + $alt + '"' )
+ #else
+ #set ( $imgAlt = ' alt=""' )
+ #end
+ #if( $border )
+ #set ( $imgBorder = ' border="' + $border + '"' )
+ #else
+ #set ( $imgBorder = "" )
+ #end
+ #if( $width )
+ #set ( $imgWidth = ' width="' + $width + '"' )
+ #else
+ #set ( $imgWidth = "" )
+ #end
+ #if( $height )
+ #set ( $imgHeight = ' height="' + $height + '"' )
+ #else
+ #set ( $imgHeight = "" )
+ #end
+ <img class="imageLink"$imgSrc$imgAlt$imgBorder$imgWidth$imgHeight/>
+ #end
+#end
+#macro ( banner $banner $id )
+ #if ( $banner )
+ #if( $banner.href )
+ <a href="$banner.href" id="$id"#if( $banner.alt ) title="$banner.alt"#end>
+ #else
+ <div id="$id">
+ #end
+##
+ #if( $banner.src )
+ #set ( $src = $banner.src )
+ #if ( ! ( $src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https") ) )
+ #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
+ #set ( $src = $src.replaceAll( "\\", "/" ) )
+ #end
+ #if ( $banner.alt )
+ #set ( $alt = $banner.alt )
+ #else
+ #set ( $alt = $banner.name )
+ #end
+ <img src="$src" alt="$alt" />
+ #else
+ $banner.name
+ #end
+##
+ #if( $banner.href )
+ </a>
+ #else
+ </div>
+ #end
+ #end
+#end
+##
#macro ( links $links )
#set ( $counter = 0 )
#foreach( $item in $links )
#set ( $counter = $counter + 1 )
#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
#set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "%2e", "." ) )
- #link( $currentItemHref $item.name )
+ #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
#if ( $links.size() > $counter )
|
#end
#end
#end
-
+##
#macro ( breadcrumbs $breadcrumbs )
#set ( $counter = 0 )
#foreach( $item in $breadcrumbs )
#set ( $counter = $counter + 1 )
#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
#set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "%2e", "." ) )
-
+##
#if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
$item.name
#else
- #link( $currentItemHref $item.name )
+ #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
#end
#if ( $breadcrumbs.size() > $counter )
>
#end
#end
#end
-
+##
#macro ( displayTree $display $item )
#if ( $item && $item.items && $item.items.size() > 0 )
#foreach( $subitem in $item.items )
@@ -68,17 +126,17 @@
#if ( $alignedFileName == $subitemHref )
#set ( $display = true )
#end
-
+##
#displayTree( $display $subitem )
#end
#end
#end
-
+##
#macro ( menuItem $item )
#set ( $collapse = "none" )
#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
#set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
-
+##
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $item.collapse == false )
#set ( $collapse = "expanded" )
@@ -86,29 +144,36 @@
## By default collapsed
#set ( $collapse = "collapsed" )
#end
-
+##
#set ( $display = false )
#displayTree( $display $item )
-
+##
#if ( $alignedFileName == $currentItemHref || $display )
#set ( $collapse = "expanded" )
#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.position == "left" )
+ #if ( $alignedFileName == $currentItemHref )
+ <strong>#image($item.img $item.alt $item.border $item.width $item.height) $item.name</strong>
+ #else
+ #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
+ #end
+ #else
+ #if ( $alignedFileName == $currentItemHref )
+ <strong>$item.name #image($item.img $item.alt $item.border $item.width $item.height)</strong>
#else
- <img src="$item.img" align="absbottom" style="border-width: 0"/>
+ #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
#end
#end
+ #else
#if ( $alignedFileName == $currentItemHref )
<strong>$item.name</strong>
#else
- #link( $currentItemHref $StringUtils.replace( $item.name.toString(), "Apache Directory Studio ", "" ) )
+ #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
#end
+ #end
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $collapse == "expanded" )
<ul>
@@ -120,11 +185,58 @@
#end
</li>
#end
-
+##
#macro ( mainMenu $menus )
#foreach( $menu in $menus )
#if ( $menu.name )
- <h5>$menu.name</h5>
+ #if ( $menu.img )
+ #if( $menu.position )
+ #set ( $position = $menu.position )
+ #else
+ #set ( $position = "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 ( $position == "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>
@@ -135,40 +247,50 @@
#end
#end
#end
-
+##
#macro ( copyright )
#if ( $project )
- #set ( $currentYear = ${currentDate.year} + 1900 )
-
+ #if ( ${project.organization} && ${project.organization.name} )
+ #set ( $period = "" )
+ #else
+ #set ( $period = "." )
+ #end
+##
+ #set ( $currentYear = ${currentDate.year} + 1900 )
+##
#if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
- ${project.inceptionYear}-${currentYear}
+ ${project.inceptionYear}-${currentYear}${period}
#else
- ${currentYear}
+ ${currentYear}${period}
#end
-
- #if ( ${project.organization} && ${project.organization.name} )
- ${project.organization.name}
+##
+ #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
#end
-
+##
#macro ( publishDate $position $publishDate $version )
#if ( $publishDate && $publishDate.format )
#set ( $format = $publishDate.format )
#else
#set ( $format = "yyyy-MM-dd" )
#end
-
+##
$dateFormat.applyPattern( $format )
-
+##
#set ( $dateToday = $dateFormat.format( $currentDate ) )
-
+##
#if ( $publishDate && $publishDate.position )
#set ( $datePosition = $publishDate.position )
#else
#set ( $datePosition = "left" )
#end
-
+##
#if ( $version )
#if ( $version.position )
#set ( $versionPosition = $version.position )
@@ -179,7 +301,7 @@
#set ( $version = "" )
#set ( $versionPosition = "left" )
#end
-
+##
#set ( $breadcrumbs = $decoration.body.breadcrumbs )
#set ( $links = $decoration.body.links )
@@ -188,25 +310,25 @@
#else
#set ( $prefix = "" )
#end
-
+##
#if ( $datePosition.equalsIgnoreCase( $position ) )
#if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
- $prefix $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ $prefix <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
#if ( $versionPosition.equalsIgnoreCase( $position ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ | <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
#end
#elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
<div id="lastPublished">
- $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
#if ( $versionPosition.equalsIgnoreCase( $position ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ | <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
#end
</div>
#elseif ( $datePosition.equalsIgnoreCase("left") )
<div class="xleft">
- $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
#if ( $versionPosition.equalsIgnoreCase( $position ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ | <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
#end
#if ( $breadcrumbs && $breadcrumbs.size() > 0 )
| #breadcrumbs( $breadcrumbs )
@@ -215,14 +337,14 @@
#end
#elseif ( $versionPosition.equalsIgnoreCase( $position ) )
#if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) )
- $prefix $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ $prefix <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
#elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
<div id="lastPublished">
- $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
</div>
#elseif ( $versionPosition.equalsIgnoreCase("left") )
<div class="xleft">
- $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
#if ( $breadcrumbs && $breadcrumbs.size() > 0 )
| #breadcrumbs( $breadcrumbs )
#end
@@ -236,76 +358,95 @@
#end
#end
#end
-
+##
#macro ( poweredByLogo $poweredBy )
- #if( $poweredBy )
- #foreach ($item in $poweredBy)
- #if( $item.href )
- #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $href = $href.replaceAll( "\\", "/" ) )
- #else
- #set ( $href="http://maven.apache.org/" )
- #end
-
- #if( $item.name )
- #set ( $name = $item.name )
- #else
- #set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" ) )
- #set ( $name = "${name} Maven" )
- #end
-
- #if( $item.img )
- #set ( $img = $item.img )
- #else
- #set ( $img = "images/logos/maven-feather.png" )
- #end
-
- <a href="$href" title="$name" class="poweredBy">
- #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
- #set ( $img = $img.replaceAll( "\\", "/" ) )
- <img class="poweredBy"
- alt="$name"
- src="$img"
- width="90"
- height="30"
- />
- </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>
- #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"
- />
- </a>
+ #if( $poweredBy )
+ #foreach ($item in $poweredBy)
+ #if( $item.href )
+ #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $href = $href.replaceAll( "\\", "/" ) )
+ #else
+ #set ( $href="http://maven.apache.org/" )
+ #end
+##
+ #if( $item.name )
+ #set ( $name = $item.name )
+ #else
+ #set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" ) )
+ #set ( $name = "${name} Maven" )
+ #end
+##
+ #if( $item.img )
+ #set ( $img = $item.img )
+ #else
+ #set ( $img = "images/logos/maven-feather.png" )
+ #end
+##
+ #if ( ! ( $img.toLowerCase().startsWith("http") || $img.toLowerCase().startsWith("https") ) )
+ #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
+ #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" />
+ </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" />
+ </a>
+ #end
#end
-
-<html xmlns="http://www.w3.org/1999/xhtml">
+##
+<html xmlns="http://www.w3.org/1999/xhtml"#if ( $locale ) xml:lang="$locale.language" lang="$locale.language"#end>
<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
<title>$title</title>
<style type="text/css" media="all">
- @import url("$relativePath/css/site.css");
+ @import url("$relativePath/css/common_20091029.css");
+ @import url("$relativePath/css/blue_20091029.css");
</style>
- <link rel="shortcut icon" href="$relativePath/images/studio-icon_16x16.png" />
-
- #foreach( $author in $authors )
+ <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
+#foreach( $author in $authors )
<meta name="author" content="$author" />
- #end
- <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
+#end
+#if ( $dateCreation )
+ <meta name="Date-Creation-yyyymmdd" content="$dateCreation" />
+#end
+#if ( $dateRevision )
+ <meta name="Date-Revision-yyyymmdd" content="$dateRevision" />
+#end
+#if ( $locale )
+ <meta http-equiv="Content-Language" content="$locale.language" />
+#end
#if ( $decoration.body.head )
#foreach( $item in $decoration.body.head.getChildren() )
## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
@@ -320,25 +461,7 @@
#end
#end
#end
-
- <!--[if lt IE 8]>
- <style type="text/css">
- #leftColumn, #rightColumn {
- float: left;
- }
- </style>
-
- <script type="text/javascript">
- function layout_colheight()
- {
- var h = document.getElementById("content").scrollHeight;
- document.getElementById("leftColumn").style.height = h+'px';
- document.getElementById("rightColumn").style.height = h+'px';
- document.getElementById("rightColumn").style.paddingRight = 0+'px';
- }
- window.onload = layout_colheight;
- </script>
- <![endif]-->
+## $headContent
</head>
<body>
@@ -359,10 +482,13 @@
<div id="rightColumn">
$bodyContent
</div>
- <br/>
+ <div id="endContent">
+ </div>
</div>
- <div id="footer">#publishDate( "bottom" $decoration.publishDate $decoration.version ) ©#copyright()</div>
+ <div id="footer">
+ #publishDate( "bottom" $decoration.publishDate $decoration.version ) ©#copyright()
+ </div>
</div>
</body>
Added: directory/skins/trunk/studio-skin/src/main/resources/css/blue_20091029.css
URL: http://svn.apache.org/viewvc/directory/skins/trunk/studio-skin/src/main/resources/css/blue_20091029.css?rev=897829&view=auto
==============================================================================
--- directory/skins/trunk/studio-skin/src/main/resources/css/blue_20091029.css (added)
+++ directory/skins/trunk/studio-skin/src/main/resources/css/blue_20091029.css Mon Jan 11 10:32:50 2010
@@ -0,0 +1,21 @@
+h1, h2, h3, h4, h5, h6
+{
+ color: #2c7a95;
+}
+
+#header
+{
+ background-image: url('../images/header-blue_20091029.png');
+}
+
+.blogDate
+{
+ color: #2c7a95;
+ background: url('../images/news-blue.png') no-repeat;
+}
+
+a.blogHeading
+{
+ color: #2c7a95;
+ background: url('../images/post-blue.png') no-repeat;
+}
\ No newline at end of file
Propchange: directory/skins/trunk/studio-skin/src/main/resources/css/blue_20091029.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/skins/trunk/studio-skin/src/main/resources/css/blue_20091029.css
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: directory/skins/trunk/studio-skin/src/main/resources/css/common_20091029.css
URL: http://svn.apache.org/viewvc/directory/skins/trunk/studio-skin/src/main/resources/css/common_20091029.css?rev=897829&view=auto
==============================================================================
--- directory/skins/trunk/studio-skin/src/main/resources/css/common_20091029.css (added)
+++ directory/skins/trunk/studio-skin/src/main/resources/css/common_20091029.css Mon Jan 11 10:32:50 2010
@@ -0,0 +1,438 @@
+html
+{
+ overflow-y: scroll;
+}
+
+body
+{
+ padding: 0;
+ margin: 0;
+ font-family: 'Lucida Sans', 'Helvetica', 'Sans-serif', 'sans';
+ font-size: 77%;
+ color: #777777;
+ background-color: white;
+ background-image: url('../images/body-bg.png');
+ background-repeat: repeat-x;
+ background-position: bottom;
+ background-attachment: fixed;
+ height: 99%;
+}
+
+h1, h2, h3, h4, h5, h6
+{
+ font-weight: bold;
+ margin: 0.67em 0px 0.67em 0px;
+}
+
+h1
+{
+ font-size: 197%;
+
+/* 26px equivalent */
+}
+
+h2
+{
+ font-size: 153.9%;
+
+/* 20px equivalent */
+}
+
+h3
+{
+ font-size: 131%;
+
+/* 17px equivalent */
+}
+
+h4
+{
+ font-size: 93%;
+
+/* 12px equivalent */
+}
+
+h5
+{
+ font-size: 85%;
+
+/* 11px equivalent */
+}
+
+h6
+{
+ font-size: 77%;
+
+/* 10px equivalent */
+}
+
+#container
+{
+ position: absolute;
+ width: 1005px;
+ margin-left: -502px;
+ left: 50%;
+}
+
+#header
+{
+ width: 1005px;
+ height: 165px;
+ background-repeat: no-repeat;
+}
+
+#subProjectsNavBar
+{
+ color: white;
+ text-align: right;
+ margin: 0px;
+ color: #ffffff;
+ font-size: 12px;
+ padding: 140px 20px 2px;
+}
+
+#subProjectsNavBar a, #subProjectsNavBar a:link, #subProjectsNavBar a:visited
+{
+ color: #ffffff;
+ text-decoration: none;
+}
+
+#subProjectsNavBar a:hover
+{
+ color: #ffffff;
+ border-bottom: solid #ffffff 1px;
+}
+
+#subProjectsNavBar a strong
+{
+ font-size: 14px;
+ font-weight: bold;
+ color: #ffffff;
+ border-bottom: solid #ffffff 1px;
+}
+
+#content
+{
+ background: url('../images/content-backgound_20091029.png') repeat-y;
+}
+
+#endContent
+{
+ clear: both;
+}
+
+#leftColumn
+{
+ float: left;
+ width: 193px;
+ padding-top: 10px;
+ margin-left: 10px;
+ line-height: 1.8em;
+}
+
+#rightColumn
+{
+ float: left;
+ margin-left: 15px;
+ width: 762px;
+ text-align: left;
+ line-height: 1.5em;
+}
+
+#editZone
+{
+
+
+/* Netscape 4, IE 4.x-5.0/Win and other lesser browsers will use this */
+ position: absolute;
+ right: 0;
+ top: 0;
+ height: 60px;
+ width: 60px;
+ z-index: 1000;
+}
+
+body > div#editZone
+{
+
+
+/* used by Opera 5+, Netscape6+/Mozilla, Konqueror, Safari, OmniWeb 4.5+, iCab, ICEbrowser */
+ position: fixed;
+}
+
+a
+{
+ color: #777777;
+ text-decoration: underline;
+}
+
+a:hover
+{
+ color: #000000;
+}
+
+a.none
+{
+ background: transparent;
+ padding-right: 0px;
+}
+
+#navigation
+{
+ padding-left: 12px;
+ font-weight: bold;
+}
+
+#navigation ul
+{
+ margin: 0px;
+ padding: 0px;
+ margin-bottom: 10px;
+}
+
+#navigation li
+{
+ list-style-type: none;
+ margin-left: 15px;
+ padding-left: 0px;
+}
+
+#navigation li ul
+{
+ margin-left: 1.5em;
+}
+
+#navigation a
+{
+ text-decoration: none;
+ color: #777777;
+}
+
+#navigation a:hover
+{
+ color: #000000;
+ font-weight: bolder;
+}
+
+#navigation div
+{
+ line-height: 1.5em;
+ margin-bottom: 2em;
+}
+
+#navigation h5
+{
+ font-size: 1em;
+ margin-bottom: 0px;
+ padding-bottom: 0px;
+}
+
+#navigation strong
+{
+ color: #000000;
+}
+
+.blogSurtitle
+{
+ padding-bottom: 10px;
+}
+
+.blogSurtitle img
+{
+ display: none;
+}
+
+.endsection, .pagesubheading
+{
+ display: none;
+}
+
+.blogpost .wiki-content
+{
+ padding-left: 25px;
+}
+
+.blogDate
+{
+ text-decoration: none;
+ font-weight: bolder;
+ padding: 1px;
+ padding-left: 20px;
+}
+
+a.blogHeading
+{
+ text-decoration: none;
+ font-weight: bolder;
+ padding-left: 20px;
+ margin: 10px;
+}
+
+#footer
+{
+ font-size: 11px;
+ padding-left: 203px;
+ height: 40px;
+ text-align: center;
+ background: url('../images/footer_20091029.png') no-repeat;
+}
+
+.nobr sup img
+{
+ display: none;
+}
+
+.preformattedContent pre
+{
+ padding: 5px 10px;
+ border: 1px dashed #1a6c0b;
+ background-color: #f0f0f0;
+}
+
+blockquote
+{
+ margin: 10px;
+ padding: 0px 10px;
+ border-left: 1px solid #1a6c0b;
+}
+
+table.confluenceTable
+{
+ margin: 5px;
+ border-collapse: collapse;
+}
+
+/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */
+
+table.confluenceTable td.confluenceTd
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+}
+
+/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */
+
+table.confluenceTable th.confluenceTh
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+ background-color: #f0f0f0;
+ text-align: center;
+}
+
+td.confluenceTd
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+}
+
+th.confluenceTh
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+ background-color: #f0f0f0;
+ text-align: center;
+}
+
+.noteMacro
+{
+ border: 1px solid #f0c000;
+ background-color: #ffffce;
+ margin-top: 5px;
+ margin-bottom: 5px
+}
+
+.warningMacro
+{
+ border: 1px solid #c00;
+ background-color: #fcc;
+ text-align: left;
+ margin-top: 5px;
+ margin-bottom: 5px
+}
+
+.infoMacro
+{
+ border: 1px solid #3c78b5;
+ background-color: #D8E4F1;
+ text-align: left;
+ margin-top: 5px;
+ margin-bottom: 5px
+}
+
+.tipMacro
+{
+ border: 1px solid #090;
+ background-color: #dfd;
+ text-align: left;
+ margin-top: 5px;
+ margin-bottom: 5px
+}
+
+.code
+{
+ border: 1px dashed #1a6c0b;
+ font-size: 11px;
+ font-family: Courier;
+ margin: 10px;
+ line-height: 13px;
+}
+
+.codeHeader
+{
+ background-color: #f0f0f0;
+ border-bottom: 1px dashed #1a6c0b;
+ padding: 3px;
+ text-align: center;
+}
+
+.codeContent
+{
+ text-align: left;
+ background-color: #f0f0f0;
+ padding: 3px;
+}
+
+.code-keyword
+{
+ color: #000091;
+ background-color: inherit;
+}
+
+.code-object
+{
+ color: #910091;
+ background-color: inherit;
+}
+
+.code-quote
+{
+ color: #009100;
+ background-color: inherit;
+}
+
+.code-comment
+{
+ color: #808080;
+ background-color: inherit;
+}
+
+.code-xml .code-keyword
+{
+ color: inherit;
+ font-weight: bold;
+}
+
+.code-tag
+{
+ color: #000091;
+ background-color: inherit;
+}
\ No newline at end of file
Propchange: directory/skins/trunk/studio-skin/src/main/resources/css/common_20091029.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/skins/trunk/studio-skin/src/main/resources/css/common_20091029.css
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: directory/skins/trunk/studio-skin/src/main/resources/css/print.css
URL: http://svn.apache.org/viewvc/directory/skins/trunk/studio-skin/src/main/resources/css/print.css?rev=897829&view=auto
==============================================================================
--- directory/skins/trunk/studio-skin/src/main/resources/css/print.css (added)
+++ directory/skins/trunk/studio-skin/src/main/resources/css/print.css Mon Jan 11 10:32:50 2010
@@ -0,0 +1,7 @@
+#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
+ display: none !important;
+}
+#bodyColumn, body.docs div.docs {
+ margin: 0 !important;
+ border: none !important
+}
Propchange: directory/skins/trunk/studio-skin/src/main/resources/css/print.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/skins/trunk/studio-skin/src/main/resources/css/print.css
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: directory/skins/trunk/studio-skin/src/main/resources/images/content-backgound_20091029.png
URL: http://svn.apache.org/viewvc/directory/skins/trunk/studio-skin/src/main/resources/images/content-backgound_20091029.png?rev=897829&view=auto
==============================================================================
Binary file - no diff available.
Propchange: directory/skins/trunk/studio-skin/src/main/resources/images/content-backgound_20091029.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: directory/skins/trunk/studio-skin/src/main/resources/images/footer_20091029.png
URL: http://svn.apache.org/viewvc/directory/skins/trunk/studio-skin/src/main/resources/images/footer_20091029.png?rev=897829&view=auto
==============================================================================
Binary file - no diff available.
Propchange: directory/skins/trunk/studio-skin/src/main/resources/images/footer_20091029.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: directory/skins/trunk/studio-skin/src/main/resources/images/header-blue_20091029.png
URL: http://svn.apache.org/viewvc/directory/skins/trunk/studio-skin/src/main/resources/images/header-blue_20091029.png?rev=897829&view=auto
==============================================================================
Binary file - no diff available.
Propchange: directory/skins/trunk/studio-skin/src/main/resources/images/header-blue_20091029.png
------------------------------------------------------------------------------
svn:mime-type = image/png