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 2008/10/01 16:17:45 UTC
svn commit: r700779 - in /directory/sandbox/felixk/skins/studio-skin: ./
src/main/resources/META-INF/maven/ src/main/resources/css/
src/main/resources/images/ src/main/resources/images/logos/
Author: felixk
Date: Wed Oct 1 07:17:44 2008
New Revision: 700779
URL: http://svn.apache.org/viewvc?rev=700779&view=rev
Log:
some changes
Added:
directory/sandbox/felixk/skins/studio-skin/src/main/resources/images/content-background.png (props changed)
- copied unchanged from r700691, directory/sandbox/felixk/skins/studio-skin/src/main/resources/images/content-backgound.png
directory/sandbox/felixk/skins/studio-skin/src/main/resources/images/logos/
Removed:
directory/sandbox/felixk/skins/studio-skin/src/main/resources/images/content-backgound.png
Modified:
directory/sandbox/felixk/skins/studio-skin/ (props changed)
directory/sandbox/felixk/skins/studio-skin/src/main/resources/META-INF/maven/site.vm
directory/sandbox/felixk/skins/studio-skin/src/main/resources/css/maven-theme.css
directory/sandbox/felixk/skins/studio-skin/src/main/resources/css/site.css
Propchange: directory/sandbox/felixk/skins/studio-skin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Oct 1 07:17:44 2008
@@ -1,3 +1,4 @@
.settings
.project
target
+.classpath
Modified: directory/sandbox/felixk/skins/studio-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/skins/studio-skin/src/main/resources/META-INF/maven/site.vm?rev=700779&r1=700778&r2=700779&view=diff
==============================================================================
--- directory/sandbox/felixk/skins/studio-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ directory/sandbox/felixk/skins/studio-skin/src/main/resources/META-INF/maven/site.vm Wed Oct 1 07:17:44 2008
@@ -8,44 +8,13 @@
#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 )
#if ( $links.size() > $counter )
|
@@ -59,6 +28,7 @@
#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
@@ -118,7 +88,7 @@
#if ( $alignedFileName == $currentItemHref )
<strong>$item.name</strong>
#else
- #link( $currentItemHref $item.name )
+ #link( $currentItemHref $StringUtils.replace( $item.name.toString(), "Apache ", "" ) )
#end
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $collapse == "expanded" )
@@ -309,10 +279,9 @@
<head>
<title>$title</title>
<style type="text/css" media="all">
- @import url("$relativePath/css/maven-theme.css");
@import url("$relativePath/css/site.css");
</style>
- <link rel="shortcut icon" href="$relativePath/images/studio-icon_16x16.png">
+ <link rel="shortcut icon" href="$relativePath/images/studio-icon_16x16.png" />
#foreach( $author in $authors )
<meta name="author" content="$author" />
@@ -337,31 +306,29 @@
<div id="container">
<div id="header">
<div id="subProjectsNavBar">
- <div>#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
- </div><!-- subProjectsNavBar -->
- </div><!-- header -->
+ <div>#links( $decoration.body.links )</div>
+ </div>
+ </div>
<div id="content">
<div id="leftColumn">
<div id="navigation">
- #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
#mainMenu( $decoration.body.menus )
#poweredByLogo( $decoration.poweredBy )
- #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
- </div><!-- navigation -->
- <br />
- <hr width="75%" />
- <br />
- </div><!-- leftColumn -->
-
+ </div>
+ </div>
+
<div id="rightColumn">
- <div id="editPage">
+ <div id="contentBox">
$bodyContent
- </div><!-- rightColumn -->
- <div id="endContent" />
- </div><!-- content -->
-
- <div id="footer">©#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version )</div><!-- content -->
- </div><!-- container -->
+ </div>
+ </div>
+ </div>
+
+ <div id="endContent" />
+
+ <div id="footer">©#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
+
+ </div>
</body>
</html>
Modified: directory/sandbox/felixk/skins/studio-skin/src/main/resources/css/maven-theme.css
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/skins/studio-skin/src/main/resources/css/maven-theme.css?rev=700779&r1=700778&r2=700779&view=diff
==============================================================================
--- directory/sandbox/felixk/skins/studio-skin/src/main/resources/css/maven-theme.css (original)
+++ directory/sandbox/felixk/skins/studio-skin/src/main/resources/css/maven-theme.css Wed Oct 1 07:17:44 2008
@@ -56,6 +56,7 @@
background: url(../images/newwindow.png) right center no-repeat;
padding-right: 18px;
}
+/*
h2 {
padding: 4px 4px 4px 6px;
border: 1px solid #999;
@@ -85,6 +86,7 @@
color: #900;
font-size: medium;
}
+*/
p {
line-height: 1.3em;
font-size: small;
@@ -94,6 +96,7 @@
border-bottom: 1px solid #aaa;
background-color: #ccc;
}
+/*
#leftColumn {
margin: 10px 0 0 5px;
border: 1px solid #999;
@@ -105,7 +108,7 @@
padding-top: 2px;
color: #000;
}
-
+*/
table.bodyTable th {
color: white;
background-color: #bbb;
Modified: directory/sandbox/felixk/skins/studio-skin/src/main/resources/css/site.css
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/skins/studio-skin/src/main/resources/css/site.css?rev=700779&r1=700778&r2=700779&view=diff
==============================================================================
--- directory/sandbox/felixk/skins/studio-skin/src/main/resources/css/site.css (original)
+++ directory/sandbox/felixk/skins/studio-skin/src/main/resources/css/site.css Wed Oct 1 07:17:44 2008
@@ -1,270 +1,233 @@
body {
- background-color: white;
- background-image: url('../images/body-bg.png');
- background-repeat: repeat-x;
- background-position: bottom;
- background-attachment: fixed;
- color: #777777;
- font-family: 'Lucida Sans', 'Helvetica', 'Sans-serif', 'sans';
- font-size: 9pt;
- line-height: 1.8em;
- height: 99%;
- padding: 0px;
- margin: 0px;
+ background-color: white;
+ background-image: url(../images/body-bg.png);
+ background-repeat: repeat-x;
+ background-position: bottom;
+ background-attachment: fixed;
+ color: #777777;
+ font-family: 'Lucida Sans', 'Helvetica', 'Sans-serif', 'sans';
+ font-size: 9pt;
+ line-height: 1.8em;
+ height: 99%;
+ padding: 0px;
+ margin: 0px;
+}
+
+code {
+ font-family: Courier, monospace;
+ font-size: 13px;
+}
+
+#legend li.externalLink {
+ background: url(../images/external.png) left top no-repeat;
+ padding-left: 18px;
+}
+
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+ background: url(../images/external.png) right center no-repeat;
+ padding-right: 18px;
+}
+
+#legend li.newWindow {
+ background: url(../images/newwindow.png) left top no-repeat;
+ padding-left: 18px;
+}
+
+a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
+ background: url(../images/newwindow.png) right center no-repeat;
+ padding-right: 18px;
}
#container {
- width: 1000px;
- margin-left: auto;
- margin-right: auto;
- left: auto;
- right: auto;
- height: 100%;
+ width: 1000px;
+ margin-left: auto;
+ margin-right: auto;
+ left: auto;
+ right: auto;
+ height: 100%;
}
#header {
- width: 1000px;
- height: 157px;
- background-image: url('../images/header-blue.png');
- background-repeat: no-repeat;
+ width: 1000px;
+ height: 157px;
+ background-image: url(../images/header-blue.png);
+ background-repeat: no-repeat;
}
#subProjectsNavBar {
- color: white;
- text-align: right;
- margin: 0px;
- color: #ffffff;
- padding: 134px 14px 2px;
- font-size: 12px;
+ color: white;
+ text-align: right;
+ margin: 0px;
+ color: #ffffff;
+ padding: 134px 14px 2px;
+ font-size: 12px;
}
#subProjectsNavBar a, #subProjectsNavBar a:link, #subProjectsNavBar a:visited {
- color: #ffffff;
- text-decoration:none;
+ color: #ffffff;
+ text-decoration:none;
}
#subProjectsNavBar a:hover {
- color: #ffffff;
- border-bottom: solid #ffffff 1px;
+ color: #ffffff;
+ border-bottom: solid #ffffff 1px;
}
#subProjectsNavBar a strong {
- font-size: 14px;
- font-weight: bold;
- color: #ffffff;
- border-bottom: solid #ffffff 1px;
+ font-size: 14px;
+ font-weight: bold;
+ color: #ffffff;
+ border-bottom: solid #ffffff 1px;
}
#content {
- background: url(images/content-backgound.png) repeat-y;
+ background: url(../images/content-background.png) repeat-y;
}
#endContent {
- clear: both;
+ clear: both;
}
#leftColumn {
- float: left;
- width: 206px;
+ float: left;
+ width: 206px;
}
#rightColumn {
- float: right;
- width: 760px;
- padding-right: 25px;
- text-align: left;
- padding-top: 8px;
+ float: right;
+ width: 760px;
+ padding-right: 25px;
+ text-align: left;
+ padding-top: 8px;
}
-#editPage {
- float: right;
- padding-top: 5px;
+#contentBox {
+ float: left;
}
h1,h2,h3,h4,h5,h6,h7,h8 {
- color: #2c7a95;
+ color: #2c7a95;
}
h2 {
- font-size: 1.25em;
+ font-size: 1.25em;
}
h3 {
- font-size: 1em;
+ font-size: 1em;
}
h5 {
- font-size: 1em;
+ font-size: 1em;
}
a {
- color: #777777;
- text-decoration: underline;
+ color: #777777;
+ text-decoration: underline;
}
a:hover {
- color: #000000;
+ color: #000000;
}
a.none {
- background: transparent;
- padding-right: 0px;
+ background: transparent;
+ padding-right: 0px;
}
#navigation {
- padding-left: 20px;
- font-weight: 600;
+ padding-left: 20px;
+ font-weight: 600;
}
#navigation ul {
- margin: 0px;
- padding: 0px;
+ margin: 0px;
+ padding: 0px;
}
#navigation li {
- list-style-type: none;
- margin-left: 15px;
- padding-left: 0px;
- font-size: 10px;
+ list-style-type: none;
+ margin-left: 15px;
+ padding-left: 0px;
}
#navigation li ul {
- margin-left: 1.5em;
+ margin-left: 1.5em;
}
#navigation a {
- text-decoration: none;
- color: #777777;
+ text-decoration: none;
+ color: #777777;
}
#navigation a:hover {
- color: #000000;
- font-weight: bolder;
+ color: #000000;
+ font-weight: bolder;
}
#navigation div {
- line-height: 1.5em;
- margin-bottom: 2em;
+ line-height: 1.5em;
+ margin-bottom: 2em;
}
#navigation h5 {
- font-size: 1em;
- margin-bottom: 0px;
- padding-bottom: 0px;
+ 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 {
- color: #2c7a95;
- text-decoration: none;
- font-weight: bolder;
- background: url(images/news-blue.png) no-repeat;
- padding: 1px;
- padding-left: 20px;
-
-}
-
-.blogHeading a {
- color: #2c7a95;
- text-decoration: none;
- font-weight: bolder;
- padding-left: 20px;
- margin: 10px;
- background: url(images/post-blue.png) no-repeat;
+ color: #000000;
}
#footer {
- font-size: 11px;
- width: 1000px;
- height: 32px;
- text-align: center;
- background-image: url('../images/footer.png');
- background-repeat: no-repeat;
+ font-size: 11px;
+ width: 1000px;
+ height: 32px;
+ text-align: center;
+ background-image: url(../images/footer.png);
+ background-repeat: no-repeat;
}
.nobr sup img {
- display:none;
+ display:none;
}
.preformattedContent pre {
- padding: 5px 10px;
- border: 1px dashed #2c7a95;
- background-color: #f0f0f0;
+ padding: 5px 10px;
+ border: 1px dashed #2c7a95;
+ background-color: #f0f0f0;
}
blockquote {
- margin: 10px;
- padding: 0px 10px;
- border-left: 1px solid #2c7a95;
-}
-
-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;
+ margin: 10px;
+ padding: 0px 10px;
+ border-left: 1px solid #2c7a95;
}
-td.confluenceTd
-{
- border-width: 1px;
- border-style: solid;
- border-color: #ccc;
- padding: 3px 4px 3px 4px;
+table.bodyTable th {
+ color: white;
+ background-color: #bbb;
+ text-align: left;
+ font-weight: bold;
}
-th.confluenceTh
-{
- border-width: 1px;
- border-style: solid;
- border-color: #ccc;
- padding: 3px 4px 3px 4px;
- background-color: #f0f0f0;
- text-align: center;
+table.bodyTable th, table.bodyTable td {
+ font-size: 1em;
+}
+
+table.bodyTable tr.a {
+ background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+ background-color: #eee;
}
.noteMacro {
- border: 1px solid #f0c000;
- background-color: #ffffce;
+ border: 1px solid #f0c000;
+ background-color: #ffffce;
margin-top: 5px;
margin-bottom: 5px
}
@@ -294,18 +257,18 @@
}
.code {
- border: 1px dashed #3c78b5;
+ border: 1px dashed #3c78b5;
font-size: 11px;
- font-family: Courier;
+ font-family: Courier;
margin: 10px;
- line-height: 13px;
+ line-height: 13px;
}
.codeHeader {
background-color: #f0f0f0;
- border-bottom: 1px dashed #3c78b5;
+ border-bottom: 1px dashed #3c78b5;
padding: 3px;
- text-align: center;
+ text-align: center;
}
.codeContent {
Propchange: directory/sandbox/felixk/skins/studio-skin/src/main/resources/images/content-background.png
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: directory/sandbox/felixk/skins/studio-skin/src/main/resources/images/content-background.png
------------------------------------------------------------------------------
svn:mime-type = image/png