forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r381118 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes: pelt.fv pelt/css/pelt.screen.css pelt/html/siteinfo-credits.ft
Date Sun, 26 Feb 2006 16:34:39 GMT
Author: thorsten
Date: Sun Feb 26 08:34:38 2006
New Revision: 381118

URL: http://svn.apache.org/viewcvs?rev=381118&view=rev
Log:
Applied patch for FOR-811 provided by Gavin. Thx Gavin. :) Further enhanced and polished the
pelt theme. Please review.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.ft

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv?rev=381118&r1=381117&r2=381118&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv Sun Feb
26 08:34:38 2006
@@ -56,12 +56,12 @@
      pelt: body: any remaining parts, e.g. the bottom of the page
      pelt: footer: the second from bottom strip containing credit logos and published date
      pelt: feedback: the optional bottom strip containing feedback link
-  -->
+  
 
 
     <color name="breadtrail" value="#cedfef" font="#0F3660" link="#0F3660" vlink="#0F3660"
hlink="#000066"/>
     <color name="header" value="#294563"/>
-    <color name="tab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="tab-selected" value="#4c6c8f" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
     <color name="tab-unselected" value="#b5c7e7" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
     <color name="subtab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
     <color name="subtab-unselected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
@@ -74,8 +74,8 @@
     <color name="toolbox" value="#4a6d8c"/>
     <color name="border" value="#294563"/>
     <color name="dialog" value="#4a6d8c"/>
-    <color name="searchbox" value="#4a6d8c" font="#000000"/>
-    <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
+    <color name="searchbox" value="#000000" font="#000000"/>
+    <color name="body" value="#000000" link="#0F3660" vlink="#009999" hlink="#000066"/>
     <color name="table" value="#7099C5"/>    
     <color name="table-cell" value="#f0f0ff"/>    
     <color name="highlight" value="#ffff00"/>
@@ -84,7 +84,7 @@
     <color name="warning" value="#990000"/>
     <color name="code" value="#CFDCED"/>
     <color name="footer" value="#cedfef"/>
-
+-->
 
   <!-- Color group: Krysalis -->
 <!--
@@ -198,7 +198,6 @@
       <forrest:property name="branding-css-links-input">
         <css url="common.css" media="screen" rel="alternate stylesheet" theme="common"/>
         <css url="leather-dev.css" media="screen" rel="alternate stylesheet" theme="common"/>
-        <css url="pelt.basic.css" media="screen" theme="Pelt"/>
         <css url="pelt.screen.css" media="screen" theme="Pelt"/>
         <!-- You can request request specific css, but beware that you need to use the
*.dispatcher.css extension!!!-->
         <!-- FIXME: that is not working ATM in forrest for subdir/bla needs more testing
-->
@@ -269,7 +268,7 @@
         <forrest:hook name="nav-main-hook">
           <forrest:contract name="nav-main" 
             dataURI="cocoon://#{$getRequest}.navigation.xml"/>
-          <forrest:hook name="publishedStrip">
+          <forrest:hook name="publishedStrip" nbsp="true">
             <forrest:contract name="nav-main-sub" 
               dataURI="cocoon://#{$getRequest}.navigation.xml"/>
             <forrest:contract name="siteinfo-current-time"/>
@@ -278,7 +277,8 @@
 
       </forrest:hook>
       <forrest:hook name="page">
-        <forrest:contract name="branding-breadcrumbs">
+        <forrest:hook class="breadtrail" nbsp="true" />
+        <!--<forrest:contract name="branding-breadcrumbs">
           <forrest:property name="branding-breadcrumbs">
             <trail>
               <link1 name="myGroup" href="http://www.apache.org/"/>
@@ -286,7 +286,7 @@
               <link3 name="" href=""/>
             </trail>
           </forrest:property>
-        </forrest:contract>
+        </forrest:contract>-->
 
         <forrest:hook name="leftbar">
           <forrest:contract name="nav-section" dataURI="cocoon://#{$getRequest}.navigation.xml">
@@ -294,23 +294,23 @@
                 <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
               </forrest:property>
               <forrest:property name="expanding">true</forrest:property>
-              <forrest:property name="toc" max-depth="2"/>
+              <!--<forrest:property name="toc" max-depth="2"/>-->
           </forrest:contract>
-          <forrest:contract name="genericMarkup">
+	  <!-- <forrest:contract name="genericMarkup">
             <forrest:property name="genericMarkup">
               <hr/>
             </forrest:property>
-          </forrest:contract>
-          <forrest:contract name="search-input">
+    </forrest:contract>-->
+	  <!-- <forrest:contract name="search-input">
             <forrest:property name="input-size">18</forrest:property>
             <forrest:property name="search-input">
               <search name="MyProject" domain="mydomain" provider="google"/>
             </forrest:property>
-          </forrest:contract>
+    </forrest:contract>-->
           <forrest:contract name="siteinfo-credits">
             <forrest:property name="box-location">credit</forrest:property>
             <forrest:property name="top-separator">true</forrest:property>
-            <forrest:property name="siteinfo-credits">
+	    <!--<forrest:property name="siteinfo-credits">
               <credits>
                 <credit>
                   <name>Built with Apache Forrest</name>
@@ -320,23 +320,26 @@
                   <height>31</height>
                 </credit>
               </credits>
-            </forrest:property>
+      </forrest:property>-->
           </forrest:contract>
-          <forrest:contract name="genericMarkup">
+	  <!-- <forrest:contract name="genericMarkup">
             <forrest:property name="genericMarkup">
               <hr/>
             </forrest:property>
-          </forrest:contract>
+    </forrest:contract>-->
           <forrest:contract name="content-motd-page">
             <forrest:property name="content-motd-page">
-              <motd>
-                <motd-option pattern="index.html">
+		    <motd>
+<!--FIXME: motd-page location needs removing
+These options are not effective anymore in dispatcher
+ Need to be removed in Structurer and contracts usage/decription-->
+		      <!--<motd-option pattern="index.html">
                   <motd-title>sample</motd-title>
-                  <motd-page location="both">
+                  <motd-page location="page">
                     This is an example of a Message of the day (MOTD).
                   </motd-page>
                   <motd-page-url>index.html</motd-page-url>
-                </motd-option>
+	  </motd-option>-->
                 <motd-option pattern="samples/faq.html">
                   <motd-title></motd-title>
                   <motd-page location="both">
@@ -348,14 +351,15 @@
             </forrest:property>
           </forrest:contract>
           <forrest:contract name="nav-section-round-bottom"/>
-
         </forrest:hook>
-        <jx:import uri="cocoon://prepare.tiles.export-link"/>
+        <forrest:hook name="export-link">
+          <forrest:contract name="content-pdf-link"/>
+        </forrest:hook>
         <forrest:hook name="content">
           <!-- FIXME - Problem with ndeSetTextSize() script from fontsize.js not compliant
between Pelt and Leather-dev... -->
-          <!--<forrest:hook class="trail">
+	  <!-- <forrest:hook class="trail">
             <forrest:contract name="branding-fontsize"/>
-          </forrest:hook>-->
+    </forrest:hook>-->
           <forrest:contract name="content-title" dataURI="cocoon://#{$getRequest}.title.xml"/>
           <forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>
           <forrest:contract name="content-minitoc" dataURI="cocoon://#{$getRequest}.toc.xml">
@@ -390,12 +394,13 @@
               </copyright>
             </forrest:property>
           </forrest:contract>
-        </forrest:hook>
-        <forrest:contract name="siteinfo-compliance-links"/>
+  </forrest:hook>
+            <forrest:contract name="siteinfo-compliance-links"/>
         <forrest:contract name="siteinfo-credits">
           <forrest:property name="box-location">credit</forrest:property>
-          <forrest:property name="top-separator">false</forrest:property>
-          <forrest:property name="siteinfo-credits">
+	  <forrest:property name="top-separator">false</forrest:property>
+	  <forrest:property name="use-br">false</forrest:property>
+	  <forrest:property name="siteinfo-credits">
             <credits>
               <credit>
                 <name>Built with Apache Forrest</name>
@@ -411,8 +416,8 @@
               </credit>
             </credits>
           </forrest:property>
-        </forrest:contract>
-        <forrest:contract name="siteinfo-feedback">
+  </forrest:contract>
+	<!-- <forrest:contract name="siteinfo-feedback">
           <forrest:properties contract="siteinfo-feedback">
             <forrest:property name="siteinfo-feedback">
               <feedback to="the Webmaster"
@@ -421,7 +426,7 @@
               </feedback>
             </forrest:property>
           </forrest:properties>
-        </forrest:contract>
+  </forrest:contract>-->
 
       </forrest:hook>
 
@@ -429,4 +434,5 @@
 
   </forrest:view>
 </forrest:views>
+
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css?rev=381118&r1=381117&r2=381118&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css
Sun Feb 26 08:34:38 2006
@@ -15,38 +15,6 @@
 * limitations under the License.
 */
 
-.breadtrail {
-    background: #CEDFEF;
-    color: #0F3660;
-    border-bottom: solid 1px white;
-    padding: 3px 10px;
-    font-size: 75%;
-}
-.breadtrail a:link { color: #0F3660; }
-.breadtrail a:visited { color: #0F3660; }
-.breadtrail a:hover { color: #000066; }
-
-#page .breadtrail {
-    clear:both;
-    position: relative;
-    border-bottom: solid 1px black;
-    border-top: solid 1px black;
-    padding: 0px 200px;
-    z-index:10;
-}
-
-#branding-tagline-name {
-    display: none;
-}
-
-#branding-tagline-tagline {
-    display: none;
-}
-
-a:link { color: #0F3660; } 
-a:visited { color: #009999; } 
-a:hover { color: #000066; } 
-
 body { 
     margin: 0px 0px 0px 0px; font-family: Verdana, Helvetica, sans-serif;
     background-color: #FFFFFF;
@@ -54,6 +22,15 @@
     font-size: 12px;
 }
 
+p {
+  line-height: 120%;
+  text-align: left;
+  margin-top: .5em;
+  margin-bottom: 1em;
+}
+
+h1, h2, h3, h4, h5, h6 { font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
}
+
 h1     { font-size : 160%; margin: 0px 0px 0px 0px;  padding: 0px; }
 h2     { font-size : 140%; margin: 0.9em 0px 0px 0px; padding: 0px; font-weight : bold;}
 h3     { font-size : 120%; margin: 0.8em 0px 0px 0px; padding: 0px; font-weight : bold; }
@@ -63,9 +40,66 @@
 h4.faq { font-size : 100%; margin: 18px 0px 0px 0px; padding: 0px; font-weight : bold;  
text-align: left; }
 h5     { font-size : 80%; margin: 14px 0px 0px 0px; padding: 0px; font-weight : normal; text-align:
left; }
 
+#content h1 { margin-bottom: .5em; }
+
+#menu h1 {
+  margin: 0;
+  padding: 10px;
+  background: #336699;
+  color: white;
+}
+
+#content {
+    padding: 20px 20px 20px 200px;
+    margin: 0;
+    font : small Verdana, Helvetica, sans-serif;
+    font-size: 100%;
+}
+
+#content ul {
+    margin: 0;
+    padding: 0 25px;
+}
+#content li {
+    padding: 0 5px;
+}
+#content li, #content th, #content td {
+  line-height: 110%;  
+  margin-top: .1em;
+  margin-bottom: .1em;
+}
+
+#content .attribution {
+  text-align: right;
+  font-style: italic;
+  font-size: 85%;
+  margin-top: 1em;
+}
+
 /**
-* table
+* Content table related
 */
+
+#content table {
+	border: 0;
+	width: 100%;
+}
+
+* html #content table { margin-left: -3px; }
+
+#content th, #content td {
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
+}
+
+.codefrag {
+  font-family: "Courier New", Courier, monospace;
+  font-size: 110%;
+}
+
+/* Table related generic */
+
 table .title { background-color: #000000; }
 .ForrestTable {
     color: #ffffff;
@@ -79,13 +113,14 @@
     color: #000000;
     text-align: left;
     font-weight: bold;
-    background-color: #E5E4D9;
+    background-color: #4C6C8F;
 }
 .ForrestTable td {
     color: black;
     background-color: #F0F0FF;
 }
 .ForrestTable th { text-align: center; }
+
 /**
  * Page Header
  */
@@ -94,13 +129,14 @@
     position: relative;
     float: left;
     width: 100%;
-    background-color: #FFFFFF; /* if you want a background in the header, put it here */
+    background-color: #294563; /* if you want a background in the header, put it here */
 }
 
 #container #header {
     position: relative;
     float: left;
     width: 100%;
+/*    background: #294563;*/
     background: url("../themes/images/header_white_line.gif") repeat-x bottom;
 }
 
@@ -119,7 +155,7 @@
     white-space: nowrap;
     text-align: right;
     color: #000000;
-    background-color: #E5E4D9;
+    background-color: #4C6C8F;
     z-index:0;
     bottom: 18px; /* compensate for IE rendering issue */
 }
@@ -131,39 +167,42 @@
 #header .round-top-left-small {
   background-repeat: no-repeat;
   background-position: top left;
-  background-image: url(../themes/images/roundcorner-t-l-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  background-image: url(../themes/images/roundcorner-t-l-5-bg294563-stroke4C6C8F-fg4C6C8F.png);
   } 
 #header .round-top-right-small {
   background-repeat: no-repeat;
   background-position: top right;
-  background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  background-image: url(../themes/images/roundcorner-t-r-5-bg294563-stroke4C6C8F-fg4C6C8F.png);
   }
 .round-bottom-left-small {
   background-repeat: no-repeat;
   background-position: bottom left;
-  background-image: url(../themes/images/roundcorner-b-l-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  background-image: url(../themes/images/roundcorner-b-l-5-bg294563-stroke4C6C8F-fg4C6C8F.png);
   } 
 .round-bottom-right-small {
   background-repeat: no-repeat;
   background-position: bottom right;
-  background-image: url(../themes/images/roundcorner-b-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  background-image: url(../themes/images/roundcorner-b-r-5-bg294563-stroke4C6C8F-fg4C6C8F.png);
   }
 .round-bottom-left-big {
   background-repeat: no-repeat;
   background-position: bottom left;
-  background-image: url(../themes/images/roundcorner-b-l-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  background-image: url(../themes/images/roundcorner-b-l-15-bg294563-stroke4C6C8F-fg4C6C8F.png);
   } 
 .round-bottom-right-big {
   background-repeat: no-repeat;
   background-position: bottom right;
-  background-image: url(../themes/images/roundcorner-b-r-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+  background-image: url(../themes/images/roundcorner-b-r-15-bg294563-stroke4C6C8F-fg4C6C8F.png);
   }
 
 #header .search-field {
     float: left;
 }
 
+/* Navigation - Top Horizontal Tabbed Navigation */
+
 #nav-main {
+    /* font-size:90% -- Transfered from pelt.basic.css but do not use as it messes up tab
positions */
     clear: both;
     padding-left: 10px;
     margin: 0;
@@ -172,10 +211,10 @@
 
 #nav-main li {
     float: left;
-    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-strokeF5F4E9-fgF5F4E9.png);
+    background-image: url(../themes/images/roundcorner-t-r-5-bg294563-strokeCEDFEF-fgCEDFEF.png);
     background-repeat: no-repeat;
     background-position: top right;
-    background-color: #F5F4E9;
+    background-color: #CEDFEF;
     margin: 0 3px 0 0;
     padding: 0;
 }
@@ -187,7 +226,7 @@
     text-decoration: none;
     color: black;
     white-space: nowrap;
-    background-image: url(../themes/images/roundcorner-t-l-5-bgffffff-strokeF5F4E9-fgF5F4E9.png);
+    background-image: url(../themes/images/roundcorner-t-l-5-bg294563-strokeCEDFEF-fgCEDFEF.png);
     background-repeat: no-repeat;
     background-position: top left;
     padding: 5px 15px 4px;
@@ -204,8 +243,8 @@
 /* End IE5-Mac hack */
 
 #nav-main .current {
-    background-color: #E5E4D9;
-    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-color: #4C6C8F;
+    background-image: url(../themes/images/roundcorner-t-r-5-bg294563-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
@@ -213,7 +252,7 @@
     font-weight: bold;
     padding-bottom: 5px;
     color: #000000;
-    background-image: url(../themes/images/roundcorner-t-l-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-image: url(../themes/images/roundcorner-t-l-5-bg294563-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top left;
 }
@@ -224,16 +263,17 @@
 
 #publishedStrip {
     position: relative;
-    background: #E5E4D9;
+    background: #4C6C8F;
     clear:both;
     padding-right: 10px;
     padding-left: 20px;
     padding-top: 3px;
     padding-bottom:3px;
-    color: #000000;
+    color: #fff;
     font-size : 80%;
     font-weight: bold;
     text-align:right;
+    min-height:10px;
 }
 
 #level2tabs {
@@ -241,7 +281,7 @@
     margin: 0;
     float:left;
     position:relative;
-    /*background-color: #4A6D8C ;*/
+    background-color: #4C6C8F ;
 }
 #level2tabs a{padding-right: 5px;}
 #level2tabs a:link {  color: #000000; }
@@ -260,19 +300,19 @@
 * Round corner
 */
 #roundtop {
-    background-image: url(../themes/images/roundcorner-t-r-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-image: url(../themes/images/roundcorner-t-r-15-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
 
 #roundbottom {
-    background-image: url(../themes/images/roundcorner-b-r-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-image: url(../themes/images/roundcorner-b-r-15-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
 
 #roundbottomLeft {
-    background-image: url(../themes/images/roundcorner-b-l-15-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-image: url(../themes/images/roundcorner-b-l-15-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: bottom left;
 }
@@ -285,13 +325,13 @@
 }
 
 .roundtopsmall {
-    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-image: url(../themes/images/roundcorner-t-r-5-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
 
 #roundbottomsmall {
-    background-image: url(../themes/images/roundcorner-b-r-5-bgffffff-strokeE5E4D9-fgE5E4D9.png);
+    background-image: url(../themes/images/roundcorner-b-r-5-bgffffff-stroke4C6C8F-fg4C6C8F.png);
     background-repeat: no-repeat;
     background-position: top right;
 }
@@ -302,9 +342,15 @@
    border: none;
    display: block !important;
 }
-/**
- * Side menu
- */
+
+/* Navigation - Left Side Vertical Navigation */
+
+#nav-section ul {
+    list-style: none;
+    margin: 0px;
+    padding: 0px;
+}
+
 #leftbar a {  font-weight: normal;}
 #leftbar a:link { color: #000000; }
 #leftbar a:visited { color: #000000; }
@@ -318,20 +364,15 @@
     float: left;
     width: 180px;
     padding-top: 0px;
-    top:-16px;
+    top:-15px;
     left:10px;
     z-index: 20;
     border-color: #000000; 
-    background-color: #E5E4D9;
+    background-color: #4C6C8F;
     font-size : 90%;
     color: #000000;
 }
 
-#nav-section ul {
-    list-style: none;
-    margin: 0px;
-    padding: 0px;
-}
 
 .pagegroup ul {
     list-style: none;
@@ -418,7 +459,7 @@
         border-right: 1px solid ;
         margin-right: 10px;
         border-color: #999999;
-        background-color: #E5E4D9;
+        background-color: #4C6C8F;
 }
 
 #nav-section .menupageitem {
@@ -431,7 +472,7 @@
 #nav-section .menupageitem a:link { color: #000000;}
 #nav-section .menupageitem a:visited { color: #000000;}
 #nav-section .menupageitem a:hover {
-        background-color: #E5E4D9;
+        background-color: #4C6C8F;
         color: #000000;
 }
 
@@ -454,19 +495,6 @@
     margin: 0;
 }
 
-#content {
-    padding: 20px 20px 20px 200px;
-    margin: 0;
-    font : small Verdana, Helvetica, sans-serif;
-}
-
-#content ul {
-    margin: 0;
-    padding: 0 25px;
-}
-#content li {
-    padding: 0 5px;
-}
 #feedback {
     color: black;
     background: #CFDCED;
@@ -478,31 +506,32 @@
     color: black;
 }
 #footer {
+    font-size: x-small;
     clear: both;
     position: relative; /* IE bugfix (http://www.dracos.co.uk/web/css/ie6floatbug/) */
     width: 100%;
-    background-color: #E5E4D9;
-    border-top: solid 1px #4C6C8F;
+    background-color: #CFDCED;
+    border-top: solid 1px #CFDCED;
     color: black;
 }
 #footer .copyright {
     position: relative; /* IE bugfix cont'd */
     padding: 5px;
     margin: 0;
-    width: 45%;
+    width: 75%;
 }
 #footer .lastmodified {
     position: relative; /* IE bugfix cont'd */
     float: right;
-    width: 45%;
+    width: 35%;
     padding: 5px;
     margin: 0;
     text-align: right;
 }
-#footer a { color: brown; }
 
 #footer #siteinfo-compliance-links {
     text-align: left;
+    float:left;
 }
 
 
@@ -511,9 +540,9 @@
  */
 
 acronym { cursor: help; }
-.boxed          { background-color: #E5E4D9;}
-.underlined_5   { border-bottom: solid 5px #E5E4D9;}
-.underlined_10  { border-bottom: solid 10px #E5E4D9;}
+.boxed          { background-color: #4C6C8F;}
+.underlined_5   { border-bottom: solid 5px #4C6C8F;}
+.underlined_10  { border-bottom: solid 10px #4C6C8F;}
 .code           { border-color: #CFDCED;} 
 
 
@@ -605,3 +634,98 @@
   list-style-position: outside;
   margin-left: 2em;
 } 
+
+.breadtrail {
+    background: #CEDFEF;
+    color: #0F3660;
+    border-bottom: solid 1px white;
+    padding: 3px 10px;
+    font-size: 75%;
+    min-height:12px;
+}
+.breadtrail a:link { color: #0F3660; }
+.breadtrail a:visited { color: #0F3660; }
+.breadtrail a:hover { color: #000066; }
+
+#page .breadtrail {
+    clear:both;
+    position: relative;
+    border-bottom: solid 1px black;
+    border-top: solid 1px black;
+    padding: 0px 200px;
+    z-index:10;
+}
+
+#branding-tagline-name {
+    display: none;
+}
+
+#branding-tagline-tagline {
+    display: none;
+}
+
+a:link { color: #0F3660; } 
+a:visited { color: #009999; } 
+a:hover { color: #000066; }
+
+/* This stuff was in pelt.basic.css. Any duplicate code or other code that
+could be combined have been added above */
+
+img { border: 0; }
+
+.clearboth {
+  clear: both;
+}
+
+.frame {
+  border: solid black 1px;
+  margin: 1em 3em;
+}
+
+.frame .label {
+  background: #369;
+  color: white;
+  font-weight: bold;
+  padding: 5px 10px;
+}
+.frame .content {
+  padding: 5px 10px;
+  background: #F0F0FF;
+  color: black;
+  line-height: 120%;
+  font-size: 90%;
+}
+/*
+ * Notes, Warnings, Fixme ...
+ */
+.note, .warning, .fixme {
+  border: solid black 1px;
+  margin: 1em 3em;
+}
+.fixme    { border-color: #CC6600;} 
+.note     { border-color: #006699;} 
+.warning  { border-color: #990000;} 
+
+/* Label */
+.note    .label { background: #336699; }
+.warning .label { background: #CC0000; }
+.fixme   .label { background: #C6C600; }
+
+.note .label, .warning .label, .fixme .label {
+  color: white;
+  font-weight: bold;
+  padding: 5px 10px;
+}
+
+/* Content */
+.note    .content { background: #F0F0FF; }
+.warning .content { background: #FFF0F0; }
+.fixme   .content { background: #FFFFBF; }
+
+.note .content, .warning .content, .fixme .content {
+  color: black;
+  line-height: 120%;
+  font-size: 90%;
+  padding: 5px 10px;
+}
+

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.ft?rev=381118&r1=381117&r2=381118&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.ft
Sun Feb 26 08:34:38 2006
@@ -46,6 +46,7 @@
         <xsl:param name="box-location"></xsl:param>
         <xsl:param name="top-separator">false</xsl:param>
         <xsl:param name="use-role-as-prefix">false</xsl:param>
+ 	<xsl:param name="use-br">false</xsl:param>
         <xsl:variable name="filename" select="$defaultVariables/*/*[@name='filename']/@value"/>
         <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
 
@@ -60,7 +61,7 @@
                 </xsl:if>
                 <xsl:for-each
                   select="$siteinfo-credits/credits/credit[($use-role-as-prefix = 'true'
and starts-with( $filename, concat( @role, '.') ) ) or starts-with( $filename, 'index') ]">
-                  <xsl:if test="not( position()=1 )">
+                  <xsl:if test="not( position()=1 ) and $use-br='true'">
                     <br/>
                   </xsl:if>
                   <xsl:variable name="name" select="name"/>
@@ -93,4 +94,5 @@
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>
+



Mime
View raw message