Author: rineholt
Date: Thu Jul 27 08:28:42 2006
New Revision: 426102
URL: http://svn.apache.org/viewvc?rev=426102&view=rev
Log:
fixes to allow us to build back the old site
Added:
incubator/tuscany/site/src/site/css/
incubator/tuscany/site/src/site/css/maven-base.css
incubator/tuscany/site/src/site/css/maven-theme.css
incubator/tuscany/site/src/site/css/print.css
incubator/tuscany/site/src/site/maven-site.vm
- copied, changed from r425925, incubator/tuscany/site/maven-site.vm
Removed:
incubator/tuscany/site/maven-site.vm
Modified:
incubator/tuscany/site/pom.xml
incubator/tuscany/site/src/site/site.xml
Modified: incubator/tuscany/site/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/site/pom.xml?rev=426102&r1=426101&r2=426102&view=diff
==============================================================================
--- incubator/tuscany/site/pom.xml (original)
+++ incubator/tuscany/site/pom.xml Thu Jul 27 08:28:42 2006
@@ -82,10 +82,10 @@
<tasks>
<mkdir dir="target/site/samples/java/javadoc" />
<copy todir='target/site/samples/java/javadoc' >
- <fileset dir="../java/javadoc"/>
+ <fileset
dir="../branches/java-post-M1/javadoc"/>
</copy>
<copy todir="target/site/samples/java/samples" >
- <fileset dir="../java/samples">
+ <fileset
dir="../branches/java-post-M1/samples">
<patternset>
<include name="**/*.htm*" />
<include name="**/*.jpg" />
@@ -96,7 +96,7 @@
</copy>
<mkdir dir="target/site/samples/java/sampleapps" />
<copy todir="target/site/samples/java/sampleapps" >
- <fileset dir="../java/sampleapps">
+ <fileset
dir="../branches/java-post-M1/sampleapps">
<patternset>
<include name="**/*.htm*" />
<include name="**/*.jpg" />
@@ -109,7 +109,12 @@
<copy todir="target/site/scripts" >
<fileset dir="src/site/scripts"/>
</copy>
- <copy file='../java/GettingStarted.htm'
todir='target/site/samples/java'/>
+ <mkdir dir="target/site/css" />
+ <copy todir="target/site/css" >
+ <fileset dir="src/site/css">
+ </fileset>
+ </copy>
+ <copy
file='../branches/java-post-M1/GettingStarted.htm'
todir='target/site/samples/java'/>
</tasks>
</configuration>
<goals>
@@ -139,8 +144,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+
<configuration>
+ <!--
<templateDirectory>file:///${basedir}/</templateDirectory>
+ -->
<template>maven-site.vm</template>
</configuration>
</plugin>
Added: incubator/tuscany/site/src/site/css/maven-base.css
URL:
http://svn.apache.org/viewvc/incubator/tuscany/site/src/site/css/maven-base.css?rev=426102&view=auto
==============================================================================
--- incubator/tuscany/site/src/site/css/maven-base.css (added)
+++ incubator/tuscany/site/src/site/css/maven-base.css Thu Jul 27 08:28:42 2006
@@ -0,0 +1,148 @@
+body {
+ margin: 0px;
+ padding: 0px;
+}
+img {
+ border:none;
+}
+table {
+ padding:0px;
+ width: 100%;
+ margin-left: -2px;
+ margin-right: -2px;
+}
+acronym {
+ cursor: help;
+ border-bottom: 1px dotted #feb;
+}
+table.bodyTable th, table.bodyTable td {
+ padding: 2px 4px 2px 4px;
+ vertical-align: top;
+}
+div.clear{
+ clear:both;
+ visibility: hidden;
+}
+div.clear hr{
+ display: none;
+}
+#bannerLeft, #bannerRight {
+ font-size: xx-large;
+ font-weight: bold;
+}
+#bannerLeft img, #bannerRight img {
+ margin: 0px;
+}
+.xleft, #bannerLeft img {
+ float:left;
+ text-shadow: #7CFC00;
+}
+.xright, #bannerRight img {
+ float:right;
+ text-shadow: #7CFC00;
+}
+#banner {
+ padding: 0px;
+}
+#banner img {
+ border: none;
+}
+#breadcrumbs {
+ padding: 3px 10px 3px 10px;
+}
+#leftColumn {
+ width: 170px;
+ float:left;
+ overflow: auto;
+}
+#bodyColumn {
+ margin-right: 1.5em;
+ margin-left: 197px;
+}
+#legend {
+ padding: 8px 0 8px 0;
+}
+#navcolumn {
+ padding: 8px 4px 0 8px;
+}
+#navcolumn h5 {
+ margin: 0;
+ padding: 0;
+ font-size: small;
+}
+#navcolumn ul {
+ margin: 0;
+ padding: 0;
+ font-size: small;
+}
+#navcolumn li {
+ list-style-type: none;
+ background-image: none;
+ background-repeat: no-repeat;
+ background-position: 0 0.4em;
+ padding-left: 16px;
+ list-style-position: outside;
+ line-height: 1.2em;
+ font-size: smaller;
+}
+#navcolumn li.expanded {
+ background-image: url(../images/expanded.gif);
+}
+#navcolumn li.collapsed {
+ background-image: url(../images/collapsed.gif);
+}
+#poweredBy {
+ text-align: center;
+}
+#navcolumn img {
+ margin-top: 10px;
+ margin-bottom: 3px;
+}
+#poweredBy img {
+ display:block;
+ margin: 20px 0 20px 17px;
+ border: 1px solid black;
+ width: 90px;
+ height: 30px;
+}
+#search img {
+ margin: 0px;
+ display: block;
+}
+#search #q, #search #btnG {
+ border: 1px solid #999;
+ margin-bottom:10px;
+}
+#search form {
+ margin: 0px;
+}
+#lastPublished {
+ font-size: x-small;
+}
+.navSection {
+ margin-bottom: 2px;
+ padding: 8px;
+}
+.navSectionHead {
+ font-weight: bold;
+ font-size: x-small;
+}
+.section {
+ padding: 4px;
+}
+#footer {
+ padding: 3px 10px 3px 10px;
+ font-size: x-small;
+}
+#breadcrumbs {
+ font-size: x-small;
+ margin: 0pt;
+}
+.source {
+ padding: 12px;
+ margin: 1em 7px 1em 7px;
+}
+.source pre {
+ margin: 0px;
+ padding: 0px;
+}
Added: incubator/tuscany/site/src/site/css/maven-theme.css
URL:
http://svn.apache.org/viewvc/incubator/tuscany/site/src/site/css/maven-theme.css?rev=426102&view=auto
==============================================================================
--- incubator/tuscany/site/src/site/css/maven-theme.css (added)
+++ incubator/tuscany/site/src/site/css/maven-theme.css Thu Jul 27 08:28:42 2006
@@ -0,0 +1,860 @@
+body {
+ background: #fff;
+ color: #000;
+ padding: 0px 0px 10px 0px;
+ }
+
+h2 {
+ background-color: #036;
+ }
+
+h3 {
+ background-color: #888;
+ }
+
+.a td {
+ background: #ddd;
+ color: #000;
+ }
+
+.b td {
+ background: #efefef;
+ color: #000;
+ }
+
+th {
+ background-color: #bbb;
+ color: #fff;
+ }
+
+div#banner {
+ border-top: 1px solid #369;
+ border-bottom: 1px solid #003;
+ }
+
+#banner, #banner td {
+ background: #036;
+ color: #fff;
+ }
+#banner {
+ border-bottom: 1px solid #fff;
+}
+
+#leftColumn {
+ background-color: #eee;
+ color: #000;
+ border-right: 1px solid #aaa;
+ border-bottom: 1px solid #aaa;
+ border-top: 1px solid #fff;
+}
+
+#navcolumn {
+ color: #000;
+ border-right: none;
+ border-bottom: none;
+ border-top: none;
+ }
+
+#navcolumn h5 {
+ font-size: inherit;
+}
+
+#breadcrumbs {
+ background-color: #ddd;
+ color: #000;
+ border-top: 1px solid #fff;
+ border-bottom: 1px solid #aaa;
+ }
+
+.source {
+ background-color: #fff;
+ color: #000;
+ border-right: 1px solid #888;
+ border-left: 1px solid #888;
+ border-top: 1px solid #888;
+ border-bottom: 1px solid #888;
+ margin-right: 7px;
+ margin-left: 7px;
+ margin-top: 1em;
+ }
+
+.source pre {
+ margin-right: 7px;
+ margin-left: 7px;
+ }
+
+a[name]:hover, #leftColumn a[name]:hover {
+ color: inherit !important;
+ }
+
+a:link, #breadcrumbs a:visited, #navcolumn a:visited, .contentBox a:visited,
.tasknav a:visited {
+ color: blue;
+ }
+
+a:active, a:hover, #leftColumn a:active, #leftColumn a:hover {
+ color: #f30 !important;
+ }
+
+a:link.selfref, a:visited.selfref {
+ color: #555 !important;
+ }
+
+#legend li.externalLink {
+ background: url(../images/external-classic.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-classic.png) right center no-repeat;
+ padding-right: 18px;
+}
+
+#legend li.newWindow {
+ background: url(../images/newwindow-classic.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-classic.png) right center no-repeat;
+ padding-right: 18px;
+}
+
+h2, h3 {
+ margin-top: 1em;
+ margin-bottom: 0;
+ background-image: url(../images/nw_maj_rond.gif);
+ background-repeat: no-repeat;
+ color: #fff;
+ padding: 5px;
+ margin-right: 2px;
+}
+
+img.handle {
+ border: 0;
+ padding-right: 2px;
+}
+
+#navcolumn div div {
+ background-image: none;
+ background-repeat: no-repeat;
+}
+
+#navcolumn div div {
+ padding-left: 10px;
+}
+
+.functnbar, .functnbar2 {
+ background-color: #aaa;
+}
+
+.functnbar2, .functnbar3 {
+ background-color: #aaa;
+ background-image: url(../images/sw_maj_rond.gif);
+ background-repeat: no-repeat;
+ background-position: bottom left;
+}
+
+.functnbar3 {
+ background-color: #ddd;
+ background-image: url(../images/sw_med_rond.gif);
+}
+
+.functnbar, .functnbar2, .functnbar3 {
+ color: #000;
+}
+
+.functnbar a, .functnbar2 a, .functnbar3 a {
+ color: #000;
+ text-decoration: underline;
+}
+
+#navcolumn .body div, body.docs #toc li li {
+ background-image: url(../images/strich.gif);
+ background-repeat: no-repeat;
+ background-position: .5em .5em;
+}
+
+#searchbox .body div, #navcolumn .body .heading {
+ background-image: none;
+}
+
+a:link.selfref, a:visited.selfref {
+ text-decoration: none;
+}
+
+#leftColumn a, #breadcrumbs a {
+ text-decoration: none;
+}
+
+/* Unsure of this. TODO */
+.contentBox h2 a:link, .contentBox h2 a:visited, .contentBox h3 a:link,
.contentBox h3 a:visited {
+ color: #fff !important;
+ text-decoration: underline;
+}
+
+table, th, td {
+ border: none;
+}
+
+div.colbar {
+ background: #eee;
+ border-color: #999 #EEE #EEE #999;
+ border-width: 1px;
+ border-style: solid;
+}
+
+.toolgroup {
+ background: #efefef;
+}
+
+.toolgroup .label {
+ border-bottom: 1px solid #666;
+ border-right: 1px solid #666;
+ background: #ddd;
+ color: #555;
+}
+
+.toolgroup .body {
+ border-right: 1px solid #aaa;
+ border-bottom: 1px solid #aaa;
+}
+
+#main {
+ border-top: 1px solid #999;
+}
+
+#rightcol div.www, #rightcol div.help {
+ border: 1px solid #ddd;
+}
+
+body.docs div.docs {
+ background-color: #fff;
+ border-left: 1px solid #ddd;
+ border-top: 1px solid #ddd;
+}
+
+#helptext .label {
+ background-image: url(../images/icon_help_sml.gif);
+ background-repeat: no-repeat;
+ background-position: 97%;
+}
+
+body.docs {
+ background: #eee url(../images/help_logo.gif) top right no-repeat !important;
+}
+
+.docs h2, .docs h3 {
+ border-top: solid 1px #000;
+}
+
+#apphead h2 em {
+ color: #777;
+}
+
+.tabs th {
+ border-right: 1px solid #333;
+ background-color: #ddd;
+ color: #fff;
+ border-left: 1px solid #fff;
+}
+
+.tabs td {
+ background-color: #999;
+ border-bottom: 1px solid #fff;
+ border-right: 1px solid #fff;
+ border-left: 1px solid #fff;
+}
+
+.tabs {
+ border-bottom: 6px #ddd solid;
+}
+
+.tabs th, .tabs th a:link, .tabs th a:visited {
+ color: #555;
+}
+
+.tabs td, .tabs td a:link, .tabs td a:visited {
+ color: #fff;
+}
+
+.tabs a {
+ text-decoration: none;
+}
+
+.axial th {
+ background-color: #ddd;
+ color: black;
+}
+
+.alert {
+ background-color: #ff9;
+}
+
+.expandedwaste {
+ background: url(../images/icon_arrowwaste2_sml.gif) no-repeat;
+}
+
+.collapsedwaste {
+ background: url(../images/icon_arrowwaste1_sml.gif) no-repeat;
+}
+
+.filebrowse .expanded, .filebrowse-alt .expanded {
+ background-image: url(../images/icon_arrowfolderopen2_sml.gif);
+ background-repeat: no-repeat;
+}
+
+.filebrowse .collapsed, .filebrowse-alt .collapsed {
+ background-image: url(../images/icon_arrowfolderclosed1_sml.gif);
+ background-repeat: no-repeat;
+}
+
+.filebrowse .leafnode, .filebrowse-alt .leafnode {
+ background-image: url(../images/icon_folder_sml.gif);
+ background-repeat: no-repeat;
+}
+
+.filebrowse .leaf, .filebrowse-alt .leaf {
+ background-image: url(../images/icon_doc_sml.gif);
+ background-repeat: no-repeat;
+}
+
+.sortup {
+ background: url(../images/icon_sortup.gif) no-repeat;
+}
+
+.sortdown {
+ background: url(../images/icon_sortdown.gif) no-repeat;
+}
+
+.collapsedwaste {
+ background: url(../images/icon_arrowwaste1_sml.gif) no-repeat;
+}
+
+body .grid td {
+ border-top: 1px solid #ccc;
+ border-left: 1px solid #ccc;
+ background-color: transparent;
+}
+
+.confirm {
+ color: #090;
+}
+
+.info {
+ color: #069;
+}
+
+.errormessage, .warningmessage, .donemessage, .infomessage {
+ border-top: 5px solid #900;
+ border-left: 1px solid #900;
+ background-image: url(../images/icon_error_lrg.gif);
+ background-repeat: no-repeat;
+ background-position: 5px 1.33em;
+}
+
+.warningmessage {
+ background-image: url(../images/icon_warning_lrg.gif);
+ border-color: #c60;
+}
+
+.donemessage {
+ background-image: url(../images/icon_success_lrg.gif);
+ border-color: #090;
+}
+
+.infomessage {
+ background-image: url(../images/icon_info_lrg.gif);
+ border-color: #069;
+}
+
+.docinfo {
+ background: url(../images/icon_doc_lrg.gif) no-repeat;
+}
+
+.dirinfo {
+ background: url(../images/icon_folder_lrg.gif) no-repeat;
+}
+
+.memberinfo {
+ background: url(../images/icon_members_lrg.gif) no-repeat;
+}
+
+.usergroupinfo {
+ background: url(../images/icon_usergroups_lrg.gif) no-repeat;
+}
+
+.errormark, .warningmark, .donemark, .infomark {
+ background: url(../images/icon_error_sml.gif) no-repeat;
+}
+
+.warningmark {
+ background-image: url(../images/icon_warning_sml.gif);
+}
+
+.donemark {
+ background-image: url(../images/icon_success_sml.gif);
+}
+
+.infomark {
+ background-image: url(../images/icon_info_sml.gif);
+}
+
+.cvsdiff, .cvsblame {
+ background-color: #ccc;
+}
+
+.cvsdiffadd {
+ background-color: #afa;
+}
+
+.cvsdiffremove {
+ background-color: #faa;
+}
+
+.cvsdiffchanges1 {
+ background-color: #ff7;
+}
+
+.cvsdiffchanges2 {
+ background-color: #ff7;
+}
+
+li.selection ul a {
+ background: #fff;
+}
+
+.band1 {
+ color: #fff;
+ background-color: #663;
+}
+
+.band2 {
+ color: #fff;
+ background-color: #66C;
+}
+
+.band3 {
+ background-color: #C99;
+}
+
+.band4 {
+ background-color: #CFF;
+}
+
+.band5 {
+ color: #fff;
+ background-color: #336;
+}
+
+.band6 {
+ color: #fff;
+ background-color: #966;
+}
+
+.band7 {
+ background-color: #9CC;
+}
+
+.band8 {
+ background-color: #FFC;
+}
+
+.band9 {
+ color: #fff;
+ background-color: #633;
+}
+
+.band10 {
+ color: #fff;
+ background-color: #699;
+}
+
+.band11 {
+ background-color: #CC9;
+}
+
+.band12 {
+ background-color: #CCF;
+}
+
+.band13 {
+ color: #fff;
+ background-color: #366;
+}
+
+.band14 {
+ color: #fff;
+ background-color: #996;
+}
+
+.band15 {
+ background-color: #99C;
+}
+
+.band16 {
+ background-color: #FCC;
+}
+
+.contentBox .helplink, #helptext .helplink {
+ cursor: help;
+}
+
+.legend th, .bars th {
+ background-color: #fff;
+}
+
+/* font and text properties, exclusive of link indication, alignment,
text-indent */
+body, th, td, input, select {
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+}
+
+code, pre {
+ font-family: 'Andale Mono', Courier, monospace;
+}
+
+body, h2, h3, #rightcol h2, pre, code, #apphead h2 small, h3, th, td {
+ font-size: small;
+}
+
+small, div#footer, div#login, div.tabs th, div.tabs td, input, select,
.paginate, .functnbar, .functnbar2, .functnbar3, #breadcrumbs, .courtesylinks,
#rightcol div.help, .colbar, .tasknav, body.docs div#toc, #leftColumn, .legend,
.bars {
+ font-size: xx-small;
+ voice-family: "\"}\"";
+ voice-family: inherit;
+ font-size: x-small;
+}
+
+.tabs td, .tabs th, dt, .tasknav .selfref, #login .username, .selection {
+ font-weight: bold;
+}
+
+li.selection ul {
+ font-weight: normal;
+}
+
+#apphead h2 em {
+ font-style: normal;
+}
+
+#banner h1 {
+ font-size: 1.25em;
+}
+
+/* box properties (exclusive of borders), positioning, alignments, list types,
text-indent */
+#bodyColumn h2 {
+ margin-top: .3em;
+ margin-bottom: .5em;
+}
+
+p, ul, ol, dl, .bars table {
+ margin-top: .67em;
+ margin-bottom: .67em;
+}
+
+form {
+ margin: 0;
+}
+
+#bodyColumn {
+ margin-right: 0;
+ margin-top: 1em;
+ padding-right: 12px;
+ margin-left: 190px;
+}
+
+html>body #bodyColumn {
+ width: auto;
+}
+
+.docs {
+ line-height: 1.4;
+}
+
+ol ol {
+ list-style-type: lower-alpha;
+}
+
+ol ol ol {
+ list-style-type: lower-roman;
+}
+
+.contentBox td, .contentBox th {
+ padding: 2px 3px;
+}
+
+.section p, .section p, .section dt, .section dt {
+ margin-right: 7px;
+ margin-left: 7px;
+}
+
+.tasknav {
+ margin-bottom: 1.33em;
+}
+
+div.colbar {
+ padding: 3px;
+ margin: 2px 2px 0;
+}
+
+.tabs {
+ margin-top: .67em;
+ margin-right: 2px;
+ margin-left: 2px;
+ padding-left: 8px;
+}
+
+.tabs td, .tabs th {
+ padding: 3px 9px;
+}
+
+#rightcol div.www, #rightcol div.help {
+ padding: 0 .5em;
+}
+
+body.docs #toc {
+ position: absolute;
+ top: 15px;
+ left: 0px;
+ width: 120px;
+ padding: 0 20px 0 0;
+}
+
+body.docs #toc ul, #toc ol {
+ margin-left: 0;
+ padding-left: 0;
+}
+
+body.docs #toc li {
+ margin-top: 7px;
+ padding-left: 10px;
+ list-style-type: none;
+}
+
+body.docs div.docs {
+ margin: 61px 0 0 150px;
+ padding: 1em 2em 1em 1em !important;
+}
+
+.docs p+p {
+ text-indent: 5%;
+ margin-top: -.67em;
+}
+
+.docs h2, .docs h3 {
+ margin-bottom: .1em;
+ padding-top: .3em;
+}
+
+.functnbar, .functnbar2, .functnbar3 {
+ padding: 5px;
+ margin: .67em 2px;
+}
+
+.functnbar3 {
+ margin-top: 0;
+}
+
+body {
+ padding: 1em;
+}
+
+body.composite, body.docs {
+ margin: 0;
+ padding: 0;
+}
+
+th, td {
+ text-align: left;
+ vertical-align: top;
+}
+
+.right {
+ text-align: right !important;
+}
+
+.center {
+ text-align: center !important;
+}
+
+.axial th, .axial th .strut {
+ text-align: right;
+}
+
+.contentBox .axial td th {
+ text-align: left;
+}
+
+body .stb {
+ margin-top: 1em;
+ text-indent: 0;
+}
+
+body .mtb {
+ margin-top: 2em;
+ text-indent: 0;
+}
+
+.courtesylinks {
+ margin-top: 1em;
+ padding-top: 1em;
+}
+
+dd {
+ margin-bottom: .67em;
+}
+
+.toolgroup {
+ margin-bottom: 6px;
+}
+
+.toolgroup .body {
+ padding: 4px 4px 4px 0;
+}
+
+.toolgroup .label {
+ padding: 4px;
+}
+
+.toolgroup .body div {
+ padding-bottom: .3em;
+ padding-left: 1em;
+}
+
+.toolgroup .body div div {
+ margin-top: .3em;
+ padding-bottom: 0;
+}
+
+.tier1 {
+ margin-left: 0;
+}
+
+.tier2 {
+ margin-left: 1.5em;
+}
+
+.tier3 {
+ margin-left: 3em;
+}
+
+.tier4 {
+ margin-left: 4.5em;
+}
+
+.tier5 {
+ margin-left: 6em;
+}
+
+.tier6 {
+ margin-left: 7.5em;
+}
+
+.tier7 {
+ margin-left: 9em;
+}
+
+.tier8 {
+ margin-left: 10.5em;
+}
+
+.tier9 {
+ margin-left: 12em;
+}
+
+.tier10 {
+ margin-left: 13.5em;
+}
+
+.filebrowse .expanded, .filebrowse .collapsed {
+ padding-left: 34px;
+}
+
+.filebrowse .leafnode, .filebrowse .leaf {
+ padding-left: 20px;
+}
+
+.messagechild {
+ padding-left: 34px;
+}
+
+.filebrowse-alt .expanded, .filebrowse-alt .collapsed, .filebrowse-alt .leaf,
.filebrowse-alt .leafnode, .expandedwaste, .collapsedwaste, .sortup, .sortdown {
+ /* hide from macie5\*/
+ float: left;
+ /* resume */
+ display: inline-block;
+ height: 15px;
+ width: 34px;
+ padding-left: 0 !important;
+}
+
+.filebrowse-alt .leaf, .filebrowse-alt .leafnode, .sortup, .sortdown {
+ width: 20px;
+}
+
+.filebrowse ul, .filebrowse-alt ul {
+ list-style-type: none;
+ padding-left: 0;
+ margin-left: 0;
+}
+
+.filebrowse ul ul, .filebrowse-alt ul ul {
+ margin-left: 1.5em;
+ margin-top: 0;
+ padding-top: .67em;
+}
+
+.filebrowse li, .filebrowse-alt li {
+ margin-bottom: .67em;
+}
+
+td.filebrowse h2 {
+ margin-top: 0;
+}
+
+.errormessage, .warningmessage, .donemessage, .infomessage, .docinfo,
.dirinfo, .memberinfo, .usergroupinfo {
+ margin: .67em 0;
+ padding: .33em 0 .67em 42px;
+ min-height: 32px;
+}
+
+.errormark, .warningmark, .donemark, .infomark {
+ padding-left: 20px;
+ min-height: 15px;
+}
+
+.alt {
+ display: none;
+}
+
+#banner h1 {
+ margin: 0;
+}
+
+.axial th, .axial th .strut, #leftColumn .strut {
+ width: 12em;
+}
+
+#breadcrumbs {
+ padding: 2px 8px;
+}
+
+.legend {
+ float: right;
+}
+
+.legend th, .bars th {
+ text-align: right;
+ padding-left: 1em;
+}
+
+.bars table {
+ table-layout: fixed;
+}
+
+.bars th {
+ width: 12em;
+}
+
+#projectdocumentlist td.filebrowse-alt {
+ padding-right: .75em;
+}
+#organizationLogo img, #projectLogo img, #projectLogo span{
+ margin: 8px;
+}
Added: incubator/tuscany/site/src/site/css/print.css
URL:
http://svn.apache.org/viewvc/incubator/tuscany/site/src/site/css/print.css?rev=426102&view=auto
==============================================================================
--- incubator/tuscany/site/src/site/css/print.css (added)
+++ incubator/tuscany/site/src/site/css/print.css Thu Jul 27 08:28:42 2006
@@ -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
+}
Copied: incubator/tuscany/site/src/site/maven-site.vm (from r425925,
incubator/tuscany/site/maven-site.vm)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/site/src/site/maven-site.vm?p2=incubator/tuscany/site/src/site/maven-site.vm&p1=incubator/tuscany/site/maven-site.vm&r1=425925&r2=426102&rev=426102&view=diff
==============================================================================
--- incubator/tuscany/site/maven-site.vm (original)
+++ incubator/tuscany/site/src/site/maven-site.vm Thu Jul 27 08:28:42 2006
@@ -1,30 +1,30 @@
-#macro ( banner $id )
- #if ( $siteDescriptor.getChild( $id ) )
- #set ( $e = $siteDescriptor.getChild( $id ) )
- #if( $e.getChild( "href" ) )
- #set ( $link = $e.getChild( "href" ).getValue() )
- <a href="$link" id="$id">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+#macro ( banner $banner $id )
+ #if ( $banner )
+ #if( $banner.href )
+ <a href="$banner.href" id="$id">
#else
<span id="$id">
#end
- #if( $e.getChild( "src" ) )
- #set ( $src = $e.getChild( "src" ).getValue() )
+ #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 ( $e.getChild( "alt" ) )
- #set ( $alt = $e.getChild( "alt" ).getValue() )
+ #if ( $banner.alt )
+ #set ( $alt = $banner.alt )
#else
#set ( $alt = "" )
#end
<img src="$src" alt="$alt" />
#else
- $e.getChild( "name" ).getValue()
+ $banner.name
#end
- #if( $e.getChild( "href" ) )
+ #if( $banner.href )
</a>
#else
</span>
@@ -32,25 +32,44 @@
#end
#end
-#macro ( links )
+#macro ( links $links )
#set ( $counter = 0 )
- #set ( $links = $siteDescriptor.getChild( "body" ).getChild( "links" ) )
- #foreach( $item in $links.getChildren() )
+ #foreach( $item in $links )
#set ( $counter = $counter + 1 )
- <a href="$item.getAttribute( "href" )">$item.getAttribute( "name" )</a>
- #if ( $links.getChildCount() > $counter )
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.href,
$relativePath ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+ <a href="$currentItemHref">$item.name</a>
+ #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( "\\", "/" ) )
+
+ #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
+ $item.name
+ #else
+ <a href="$currentItemHref">$item.name</a>
+ #end
+ #if ( $breadcrumbs.size() > $counter )
+ >
+ #end
+ #end
+#end
+
#macro ( displayTree $display $item )
- #if ( $item && $item.getChildren() && $item.getChildCount() > 0 )
- #foreach( $subitem in $item.getChildren() )
- #set ( $subitemHref = $PathTool.calculateLink( $subitem.getAttribute(
"href" ), $relativePath ) )
+ #if ( $item && $item.items && $item.items.size() > 0 )
+ #foreach( $subitem in $item.items )
+ #set ( $subitemHref = $PathTool.calculateLink( $subitem.href,
$relativePath ) )
#set ( $subitemHref = $subitemHref.replaceAll( "\\", "/" ) )
- #if ( $currentFileName == $subitemHref )
+ #if ( $alignedFileName == $subitemHref )
#set ( $display = true )
#end
@@ -61,36 +80,43 @@
#macro ( menuItem $item )
#set ( $collapse = "none" )
- #set ( $currentItemHref = $PathTool.calculateLink( $item.getAttribute(
"href" ), $relativePath ) )
- #set ( $currentFileName = $currentFileName.replaceAll( "\\", "/" ) )
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath
) )
#set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
- #if ( $item && $item.getChildCount() > 0 )
- #if ( ( $item.getAttribute( "collapse" ) ) && ( $item.getAttribute(
"collapse" ).equalsIgnoreCase( "false" ) ) )
+ #if ( $item && $item.items && $item.items.size() > 0 )
+ #if ( $item.collapse == false )
#set ( $collapse = "expanded" )
#else
## By default collapsed
#set ( $collapse = "collapsed" )
#end
- #if ( $currentFileName == $currentItemHref )
+ #set ( $display = false )
+ #displayTree( $display $item )
+
+ #if ( $alignedFileName == $currentItemHref || $display )
#set ( $collapse = "expanded" )
#end
#end
<li class="$collapse">
- #if ( $currentFileName == $currentItemHref )
- <strong><a href="$currentItemHref">$item.getAttribute( "name"
)</a></strong>
+ #if ( $item.img )
+ #if ( ! ( $item.img.toLowerCase().startsWith("http") ||
$item.img.toLowerCase().startsWith("https") ) )
+ #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) )
+ #set ( $src = $item.img.replaceAll( "\\", "/" ) )
+ <img src="$src"/>
+ #else
+ <img src="$item.img" align="absbottom" style="border-width: 0"/>
+ #end
+ #end
+ #if ( $alignedFileName == $currentItemHref )
+ <strong>$item.name</strong>
#else
- <a href="$currentItemHref">$item.getAttribute( "name" )</a>
+ <a href="$currentItemHref">$item.name</a>
#end
- #if ( $item && $item.getChildren() && $item.getChildCount() > 0 )
- #set ( $display = false )
- #set ( $itemTmp = $item )
- #displayTree( $display $itemTmp )
-
- #if ( $collapse == "expanded" || $display )
+ #if ( $item && $item.items && $item.items.size() > 0 )
+ #if ( $collapse == "expanded" )
<ul>
- #foreach( $subitem in $item.getChildren() )
+ #foreach( $subitem in $item.items )
#menuItem( $subitem )
#end
</ul>
@@ -99,12 +125,13 @@
</li>
#end
-#macro ( mainMenu )
- #set ( $menus = $siteDescriptor.getChild( "body" ).getChildren( "menu" ) )
+#macro ( mainMenu $menus )
#foreach( $menu in $menus )
- <h5>$menu.getAttribute( "name" )</h5>
+ #if ( $menu.name )
+ <h5>$menu.name</h5>
+ #end
<ul>
- #foreach( $item in $menu.getChildren() )
+ #foreach( $item in $menu.items )
#menuItem( $item )
#end
</ul>
@@ -127,7 +154,122 @@
#end
#end
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+#macro ( publishDate $position $publishDate $version )
+ #if ( $publishDate && $publishDate.format )
+ #set ( $format = $publishDate.format )
+ #else
+ #set ( $format = "MM/dd/yyyy" )
+ #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 )
+ #else
+ #set ( $versionPosition = "left" )
+ #end
+ #end
+
+ #set ( $breadcrumbs = $decoration.body.breadcrumbs )
+
+ #if ( $datePosition.equalsIgnoreCase( $position ) )
+ #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || (
$datePosition.equalsIgnoreCase( "bottom" ) ) )
+ | $i18n.getString( "site-renderer", $locale,
"template.lastpublished" ): $dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-renderer", $locale, "template.version"
): ${project.version}
+ #end
+ #elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || (
$datePosition.equalsIgnoreCase( "navigation-top" ) ) )
+ <div id="lastPublished">
+ $i18n.getString( "site-renderer", $locale, "template.lastpublished" ):
$dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-renderer", $locale,
"template.version" ): ${project.version}
+ #end
+ </div>
+ #elseif ( $datePosition.equalsIgnoreCase("left") )
+ <div class="xleft">
+ $i18n.getString( "site-renderer", $locale, "template.lastpublished" ):
$dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-renderer", $locale,
"template.version" ): ${project.version}
+ #end
+ #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+ | #breadcrumbs( $breadcrumbs )
+ #end
+ </div>
+ #end
+ #elseif ( $versionPosition.equalsIgnoreCase( $position ) )
+ #if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || (
$versionPosition.equalsIgnoreCase( "bottom" ) ) )
+ | $i18n.getString( "site-renderer", $locale, "template.version" ):
${project.version}
+ #elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) ||
( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
+ <div id="lastPublished">
+ $i18n.getString( "site-renderer", $locale, "template.version" ):
${project.version}
+ </div>
+ #elseif ( $versionPosition.equalsIgnoreCase("left") )
+ <div class="xleft">
+ $i18n.getString( "site-renderer", $locale, "template.version" ):
${project.version}
+ #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+ | #breadcrumbs( $breadcrumbs )
+ #end
+ </div>
+ #end
+ #elseif ( $position.equalsIgnoreCase( "left" ) )
+ #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+ <div class="xleft">
+ #breadcrumbs( $breadcrumbs )
+ </div>
+ #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" id="poweredBy">
+ #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
+ #set ( $img = $img.replaceAll( "\\", "/" ) )
+ <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" id="poweredBy">
+ <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" id="poweredBy">
+ <img alt="$i18n.getString( "site-renderer", $locale,
"template.builtby" ) Maven"
src="$relativePath/images/logos/maven-feather.png"></img>
+ </a>
+ #end
+#end
+
<html>
<head>
<title>$title</title>
@@ -139,33 +281,43 @@
<link rel="stylesheet" href="$relativePath/css/print.css" type="text/css"
media="print" />
<script src="scripts/tuscanymain.js">
</script>
-
#foreach( $author in $authors )
<meta name="author" content="$author" />
#end
<meta http-equiv="Content-Type" content="text/html;
charset=${outputEncoding}" />
+ #if ( $decoration.body.head )
+ #foreach( $item in $decoration.body.head.getChildren() )
+ #if ( $item.name == "script" )
+ $item.toUnescapedString()
+ #else
+ $item.toString()
+ #end
+ #end
+ #end
</head>
<body class="composite">
<div id="banner">
- #set ( $banner = "bannerLeft" )
- #banner( $banner )
- #set ( $banner = "bannerRight" )
- #banner( $banner )
+ #banner( $decoration.bannerLeft "bannerLeft" )
+ #banner( $decoration.bannerRight "bannerRight" )
<div class="clear">
<hr/>
</div>
</div>
<div id="breadcrumbs">
- <div class="xleft">$i18n.getString( "site-plugin", $locale,
"template.lastpublished" ): $currentDate</div>
- <div class="xright">#links()</div>
+ #publishDate( "left" $decoration.publishDate $decoration.version )
+ <div class="xright">#links( $decoration.body.links )#publishDate(
"right" $decoration.publishDate $decoration.version )</div>
<div class="clear">
<hr/>
</div>
</div>
- <div id="leftColumn"><div id="navcolumn">#mainMenu()<a
href="http://maven.apache.org/"; title="$i18n.getString( "site-plugin", $locale,
"template.builtby" ) Maven" id="poweredBy">
- <img alt="$i18n.getString( "site-plugin", $locale,
"template.builtby" ) Maven"
src="$relativePath/images/logos/maven-feather.png"></img>
- </a>
- </div></div>
+ <div id="leftColumn">
+ <div id="navcolumn">
+ #publishDate( "navigation-top" $decoration.publishDate
$decoration.version )
+ #mainMenu( $decoration.body.menus )
+ #poweredByLogo( $decoration.poweredBy )
+ #publishDate( "navigation-bottom" $decoration.publishDate
$decoration.version )
+ </div>
+ </div>
<div id="bodyColumn">
<div id="contentBox">
$bodyContent
@@ -175,7 +327,7 @@
<hr/>
</div>
<div id="footer">
- <div class="xright">©#copyright()</div>
+ <div class="xright">©#copyright()#publishDate( "bottom"
$decoration.publishDate $decoration.version )</div>
<div class="clear">
<hr/>
</div>
Modified: incubator/tuscany/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/site/src/site/site.xml?rev=426102&r1=426101&r2=426102&view=diff
==============================================================================
--- incubator/tuscany/site/src/site/site.xml (original)
+++ incubator/tuscany/site/src/site/site.xml Thu Jul 27 08:28:42 2006
@@ -15,7 +15,6 @@
limitations under the License.
-->
<project name="Apache Tuscany">
- <title>Apache Tuscany</title>
<body>
<links>
<item name="Apache" href="http://www.apache.org"; />
@@ -77,8 +76,20 @@
<item name="Axis" href="http://ws.apache.org/axis/"; />
<item name="Geronimo"
href="http://geronimo.apache.org/"; />
</menu>
+ <!--
<footer>
<div>© 2005, Apache Software Foundation</div>
</footer>
+ -->
</body>
+<skin>
+ <groupId>org.apache.maven.skins</groupId>
+
+ <artifactId>maven-classic-skin</artifactId>
+<!--
+ <artifactId>maven-default-skin</artifactId>
+ -->
+ <version>1.0</version>
+ </skin>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
