#nameAndVersion()

Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r534628 - in
 /cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources:
 META-INF/maven/site.vm css/maven-base.css css/maven-theme.css css/site.css
Date: Wed, 02 May 2007 22:05:58 -0000
To: cvs@cocoon.apache.org
From: hepabolu@apache.org
Message-Id: <20070502220558.D4B851A9838@eris.apache.org>

Author: hepabolu
Date: Wed May  2 15:05:57 2007
New Revision: 534628

URL: http://svn.apache.org/viewvc?view=rev&rev=534628
Log:
The new Cocoon site design (COCOON-2043) - good enough to go live

Modified:
    cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/META-INF/maven/site.vm
    cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/maven-base.css
    cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/maven-theme.css
    cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/site.css

Modified: cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/META-INF/maven/site.vm?view=diff&rev=534628&r1=534627&r2=534628
==============================================================================
--- cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/META-INF/maven/site.vm Wed May  2 15:05:57 2007
@@ -114,6 +114,12 @@
       </ul>
     </li>
   #end
+    <li class="menuVersions">Versions
+       <ul>
+									<li><a href="$project.getProperties().get("docs.urlRelativizer")/2.1/">Cocoon 2.1</a></li>
+									<li><a href="$project.getProperties().get("docs.urlRelativizer")">Cocoon 2.2</a></li>
+       </ul>
+    </li>
   </ul>
 #end
 
@@ -195,11 +201,6 @@
   #end
 #end
 
-#macro (externalUrl )
-  #if( $project.getProperties().get("docs.urlRelativizer") )
-$project.getProperties().get("docs.urlRelativizer")
-  #end
-#end
 
 <html>
   <head>
@@ -241,7 +242,7 @@
 		       src="$PathTool.calculateLink( "images/pmc-home.gif", $relativePath )" 
 		       alt="Back to Apache Cocoon homepage" 
 		       border="0" title="Back to Apache Cocoon homepage" /></a></p>
-		       <h1 class="projectTitle"><a href="#">#nameAndVersion()</a></h1>
+		       <h1 class="projectTitle"><a href="$project.getProperties().get("docs.urlRelativizer")">#nameAndVersion()</a></h1>
 		       <ul class="projectList">
 			        <li><a href="$project.getProperties().get("docs.urlRelativizer")$project.getProperties().get("docs.m.site-core-modules.relPath")">Cocoon Core</a></li>
 			        <li><a href="$project.getProperties().get("docs.urlRelativizer")$project.getProperties().get("docs.m.site-blocks.relPath")">Cocoon Blocks</a></li>

Modified: cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/maven-base.css
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/maven-base.css?view=diff&rev=534628&r1=534627&r2=534628
==============================================================================
--- cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/maven-base.css (original)
+++ cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/maven-base.css Wed May  2 15:05:57 2007
@@ -22,7 +22,7 @@
   padding: 0px;
 }
 
-/* mimic contentBody in site */
+/* mimic contentBody in site.css */
 .section {
    	margin: 0 20px 0 185px;
 	padding: 0;
@@ -34,7 +34,12 @@
 }
 
 img {
-  border:none;
+  border: none;
+}
+
+acronym {
+  cursor: help;
+  border-bottom: 1px dotted #0086b3;
 }
 
 /*
@@ -44,10 +49,6 @@
   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;
@@ -159,9 +160,6 @@
 .navSectionHead {
   font-weight: bold;
   font-size: x-small;
-}
-.section {
-  padding: 4px;
 }
 #footer {
   padding: 3px 10px 3px 10px;

Modified: cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/maven-theme.css
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/maven-theme.css?view=diff&rev=534628&r1=534627&r2=534628
==============================================================================
--- cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/maven-theme.css (original)
+++ cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/maven-theme.css Wed May  2 15:05:57 2007
@@ -26,11 +26,13 @@
   font-size: 13px;
   padding: 0px;
 } */
-td, select, input {
-  font-family: Verdana, Helvetica, Arial, sans-serif;
-  font-size: 12px;
-  color:#333333;
+
+select, input {
+  color:#626262;
 }
+
+/* code is equal to pre in site.css */
+
 code {
 	border:1px solid #aaaaaa;
 	background: #efefef;
@@ -73,58 +75,11 @@
     line-height: 1.35em;
 }
 
-#breadcrumbs {
-  height: 13px;
-  background-image: url(../images/breadcrumbs.jpg);
-  padding: 5px 10px 14px 20px;
-}
-* html #breadcrumbs {
-  padding-bottom: 8px;
-}
-#leftColumn {
-  margin: 10px 0 10px 0;
-  border-top-color: #ccc;
-  border-top-style: solid;
-  border-top-width: 1px;
-  border-right-color: #ccc;
-  border-right-style: solid;
-  border-right-width: 1px;
-  border-bottom-color: #ccc;
-  border-bottom-style: solid;
-  border-bottom-width: 1px;
-  padding-right: 5px;
-  padding-left: 5px;
-}
-#navcolumn h5 {
-  font-size: smaller;
-  border-bottom: 1px solid #aaaaaa;
-  padding-top: 12px;
-  padding-left: 9px;
-  color: #294563; 
-  background-image: url(../images/h5.jpg);
-  background-repeat: no-repeat;
-  background-position: left bottom;  
-  font-weight: bold;
-  
-}
-
 table.bodyTable th {
 	background: #0086b3;
 	color: #fff;
 }
 
-/*
-table.bodyTable th, table.bodyTable td {
-  font-size: 11px;
-}
-*/
-
-/*
-table.bodyTable tr.a {
-  background-color: #ddd;
-}
-*/
-
 table.bodyTable tr.b {
   background: #cce7f0;
 }
@@ -199,26 +154,27 @@
 }
 */
 .errormark, .warningmark, .donemark, .infomark {
-	margin-top: 1em;
-	padding: 0 0 0 45px;
-/*	background: url(../images/errors.gif) no-repeat 10px 7px; */
-	border: 1px solid #9bcd52;
-  background: url(../images/icon_error_sml.gif) no-repeat;
+    margin: 10px 0;
+    padding: 0 0 0 45px;
+    border: 1px solid #9bcd52;
+}
+.errormark {
+   background: url(../images/errors.gif) no-repeat 10px 7px;
 }
 
 .warningmark {
-  background-image: url(../images/icon_warning_sml.gif);
+  background: url(../images/warning.gif) no-repeat 10px 7px;
 }
 
 .donemark {
-  background-image: url(../images/icon_success_sml.gif);
+  background-image: url(../images/icon_success_sml.gif) no-repeat 10px 7px;
 }
 
 .infomark {
-  background-image: url(../images/icon_info_sml.gif);
+  background: url(../images/note.gif) no-repeat 10px 7px;
 }
 
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #bodyColumn {
   margin-left:215px;

Modified: cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/site.css
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/site.css?view=diff&rev=534628&r1=534627&r2=534628
==============================================================================
--- cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/site.css (original)
+++ cocoon/trunk/site/cocoon-thien-maven-site-skin/src/main/resources/css/site.css Wed May  2 15:05:57 2007
@@ -16,20 +16,29 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/* Cocoon site design
- *
- * design by Thien Luh
---------------------------------------*/
 
 body {
	font-family: Arial, Helvetica, sans-serif;
	font-size: 0.8em;
	color: #4c4c4c;
}
a:link, a:visited {
	color: #0086b3;
}
a:hover {
	text-decoration: none;
}
h1 {
-	margin: 0;
	padding: 0 0 0 17px;
	background: url(../images/h1-image.gif) no-repeat bottom left;
	font-size: 130%;
	color: #0086b3;
	border-bottom: 1px solid #0086b3;
}
+	margin: 10px 0 15px 0;
	padding: 0 0 5px 17px;
	background: url(../images/h1-image.gif) no-repeat left 4px;
	font-size: 130%;
	color: #0086b3;
	border-bottom: 1px solid #0086b3;
}
 h1.docTitle {
-	border-bottom: 0;
-	padding-bottom: 1em;
+	margin: 0 0 10px 0;
+	padding: 0 0 5px 0;
 	font-size: 150%;
 	background: none; 
 }
-
h2 {
	font-size: 120%;
}
ul {
	margin: 5px 0 10px 0;
	padding: 0 0 0 20px;
	list-style: none;
}
li {
	background: url(../images/list.gif) no-repeat left 3px;
	padding-left: 15px;
	padding-bottom: 3px;
}
pre {
	border:1px solid #aaaaaa;
	background: #efefef;
	font-size: 110%;
	padding:10px;
}
table {
	margin: 0 0 10px 0;
	width: 99.5%;
	border: 1px solid #cce7f0;
}
table th, table td {
	padding: 4px;
}
thead {
	background: #0086b3;
	color: #fff;
}
tbody {
	background: #e5f3f7;
}
table .alt {
	background: #cce7f0;
}
/* Header part
+
h2 {
	font-size: 120%;
}
+
+h3, h4, h5 {
+   font-size: 100%;
+   font-weight: bold;
+}
+
ul {
	margin: 5px 0 10px 0;
	padding: 0 0 0 20px;
	list-style: none;
}
li {
	padding-left: 15px;
	padding-bottom: 3px;
}
+ul li {
+	background: url(../images/list.gif) no-repeat left 3px;   
+}
+ol li {
+   padding-left: 5px;
+}
+pre {
	border:1px solid #aaaaaa;
	background: #efefef;
	font-size: 110%;
	padding:10px;
}
table {
	margin: 0 0 10px 0;
	width: 99.5%;
	border: 1px solid #cce7f0;
}
table th, table td {
	padding: 4px;
}
thead {
	background: #0086b3;
	color: #fff;
}
tbody {
	background: #e5f3f7;
}
table .alt {
	background: #cce7f0;
}
/* Header part
 --------------------------------------*/
 #breadtrail {
	background: #2698be url(../images/breadtrail-bg.gif) repeat-x bottom left;
}
#breadtrail p {
	margin: 0;
	padding: 2px 0 5px 20px;
	color: #fff;
}
#breadtrail a {
	color: #fff;
	text-decoration: none;
}
#breadtrail a:hover {
	text-decoration: underline;
}
#top {
	background: url(../images/top-background.jpg) repeat-x;
}
#header {
	height: 129px;
	background: url(../images/logo-background.jpg) no-repeat;
}
.projectlogo {
	float: left;
}
.logoImage {
	margin: 30px 0 0 34px;
}
.grouplogo {
	margin: 10px 10px 0 0;
	float: right;
}
.grouptitle {
	margin: 0;
	padding-bottom: 5px;
	background: url(../images/group-title-line.gif) repeat-x bottom;
}
.grouptitle a:link, .grouptitle a:visited {
	color: #545454;
	text-decoration: none;
}
.searchbox {
	margin: 3px 0;
	padding: 0;
}
.searchbox input {
	padding: 3px;
	font-size: 11px;
	border: 1px solid #626262;
	color: #626262;
}
.searchbox .searchboxsubmit {
	background: #626262;
	border: none;
	color: #fff;
}

#projectBar
  {
	margin-bottom: 10px;
	height: 25px;
	border-top: 1px solid #f2f2f2;
	border-bottom: 1px solid #f2f2f2;
}
#projectBar .projectTitle {
	margin: 0;
	padding: 6px 0 0 5px;
	background: none;
	border: none;
	float: left;
	font-size: 100%;
	color: #0086b3;
}
.projectTitle a {
	text-decoration: none;
}
.projectTitle a:hover {
	text-decoration: underline;
}
#projectBar .projectList {
	margin: 5px 15px 0 0;
	padding: 0;
	list-style: none;
	float: right;
}
#projectBar .projectList li {
	padding: 0 8px;
	background: none;
	float: left;
	border-right: 1px solid #f2f2f2;
}
#projectBar .projectList a {
	color: #acacac;
	text-decoration: none;
}
#projectBar .projectList a:hover {
	text-decoration: underline;
}
.projectList img {
	padding-top: 2px;
}
.cocoonHome {
	margin: 0;
	padding: 4px 0 0 10px;
	float: left;
}
.projectBarClear {
	height: 1%;
	clear: both;
}
 /* Menu
@@ -63,6 +72,7 @@
 	height: auto;
	padding: 83px 0 25px 0;
	background: url(../images/download-bg.jpg) no-repeat;
	font-size: 120%;
	font-weight: bold;
	text-align: center;
}
#getting .moreDownload {
	height: auto;
 	width: auto;
	margin: 0;
	padding: 0 10px;
	background: #2e93b5;
	color: #fff;
}
#getting .moreDownload a {
	color: #fff;
}
/* News section
 --------------------------------------*/
.news {
	margin: 10px 0 0 0;
	padding: 0;
}
.news dt {
	margin-bottom: 5px;
	font-weight: bold;
	font-size: 110%;
}
.news dd {
	margin: 0;
	padding: 0;
}
.news .newsMeta {
	margin: 5px 0 15px 0;
	padding-left: 8px;
	background: url(../images/news-meta.gif) no-repeat left 4px;
	font-size: 90%;
	color: #959595;
}
+
.errors, .fixme, .warning, .note {
    margin: 10px 0;
    padding: 0 0 0 45px;
    border: 1px solid #9bcd52;
}
.errors div, .fixme div, .warning div, .note div {
    margin: 5px;
    padding: 8px 0;
}
.errors {
    background: url(../images/errors.gif) no-repeat 10px 7px;
}
.fixme {
    background: url(../images/fixme.gif) no-repeat 10px 7px;
}
.warning {
    background: url(../images/warning.gif) no-repeat 10px 7px;
}
.note {
    background: url(../images/note.gif) no-repeat 10px 7px;
}
 /* Bottom link to Daisy page
 --------------------------------------*/
.editUrl {
 	margin-top: 1em;
	padding: 0 0 0 45px;
	background: url(../images/errors.gif) no-repeat 10px 7px;
	border: 1px solid #9bcd52;
}
.editUrl div {
	margin: 5px;
	padding: 8px 0;
}