forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r185086 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates
Date Mon, 06 Jun 2005 22:53:34 GMT
Author: thorsten
Date: Mon Jun  6 15:53:34 2005
New Revision: 185086

URL: http://svn.apache.org/viewcvs?rev=185086&view=rev
Log:
Applied patch for FOR-523 with small tweaks to enhance re-usability. Reported by Diwaker Gupta.
Thx Diwaker. :)

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/site-branding.ft
  (with props)
Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv?rev=185086&r1=185085&r2=185086&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
Mon Jun  6 15:53:34 2005
@@ -20,22 +20,31 @@
     <forrest:view type="xhtml">
         <forrest:css url="default.css"/>
         <forrest:contract name="meta"/>
-        <forrest:hook name="header">
-            <forrest:contract name="nav-main"/>
-        </forrest:hook>
         <forrest:hook name="container">
-            <forrest:hook name="leftbar">
-                <forrest:contract name="nav"/>
+            <forrest:hook name="header">
+              <forrest:contract name="site-branding">
+		            <forrest:properties contract="site-branding">
+								  <forrest:property name="site-name">new seed</forrest:property>
+		              <forrest:property name="site-tagline">powered by forrest:views</forrest:property>
+								 </forrest:properties>
+		          </forrest:contract>
+              <forrest:contract name="nav-main"/>
             </forrest:hook>
-            <forrest:hook name="export-link">
-                <forrest:contract name="txt-link"/>
-                <forrest:contract name="pdf-link"/>
-            </forrest:hook>
-            <forrest:hook name="content">
-              <forrest:contract name="content-title"/>
-              <forrest:contract name="minitoc"/>
-			        <forrest:contract name="content-abstract"/>
-              <forrest:contract name="content-main"/>
+            <forrest:hook name="page">
+                <forrest:hook name="leftbar">
+                    <forrest:contract name="nav"/>
+                    <forrest:contract name="searchbox"/>
+                </forrest:hook>
+                <forrest:hook name="export-link">
+                    <forrest:contract name="txt-link"/>
+                    <forrest:contract name="pdf-link"/>
+                </forrest:hook>
+                <forrest:hook name="content">
+                    <forrest:contract name="content-title"/>
+                    <forrest:contract name="content-abstract"/>
+                    <forrest:contract name="minitoc"/>
+                    <forrest:contract name="content-main"/>
+                </forrest:hook>
             </forrest:hook>
         </forrest:hook>
         <forrest:hook name="footer">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css?rev=185086&r1=185085&r2=185086&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css
Mon Jun  6 15:53:34 2005
@@ -23,9 +23,8 @@
     text-align: center;
     text-decoration: none;
     font-weight: bold;
-    font-variant: small-caps;
-    font-family: serif;
-    letter-spacing: 0.2em;
+    text-transform: lowercase;
+    font-family: sans-serif;
 }
 
 #nav-main li { 
@@ -41,9 +40,9 @@
     text-decoration: underline;
 }
 
-#nav-main li a.base-selected{
-   color: #980101;
-}
+/*#nav-main li a.base-selected{*/
+   /*color: #339900;*/
+/*}*/
 
 #nav-main li a.base-selected:before {
     content: "[ ";
@@ -55,7 +54,7 @@
 
 /* menu */
 #leftbar {
-    width: 20%;
+    width: 25%;
     float: left;
     background: #eae8e3;
     border: thin dashed #565248;
@@ -77,7 +76,7 @@
 
 
 .menupagetitle {
-    color: #990000;
+    color: #013396;
     display: inline;
     font-weight: bold;
 }
@@ -93,25 +92,22 @@
 
 /* The actual content */
 #content {
-    margin-left: 20%;
+    margin-left: 25%;
     padding: 0 20px 0 20px;
 }
 
 /* footer */
 #footer {
-    padding: 1em;
-    border: thin dotted #000066;
     text-align: center;
     font-style: italic;
-    font-size: small;
+    font-size: 10px;
+    background: #314e6c;
+    color: #ffffff;
+    padding: 2px;
 }
 
 #footer a {
-    color: #006666;
-}
-
-#footer a:hover {
-    font-weight: normal;
+    color: #9db8d2;
 }
 
 /* note */
@@ -153,6 +149,63 @@
     float: right;
 }
 
+/* search box */
+#searchbox {
+    padding-left: 10px;
+    padding-top: 10px;
+    border-top: 4px groove #bab5ab;
+}
+
+#searchbox form input {
+    width: 90%;
+}
+
+div.searchbox-input form input {
+    display: block;
+}
+
+/* header */
+#site-name {
+    text-align: center;
+    font-size: 24px;
+    font-weight: bold;
+    text-transform: lowercase;
+    background: #314e6c;
+    color: #ffffff;
+    padding-top: 10px;
+}
+
+#site-tagline {
+    text-align: center;
+    font-size: 16px;
+    font-weight: bold;
+    text-transform: lowercase;
+    background: #314e6c;
+    color: #ffffff;
+    padding-bottom: 10px;
+    border-bottom: thick solid #002b3d;
+}
+
+/* abstract */
+
+div.abstract {
+    font-style: italic;
+}
+
+/* container */
+#container {
+    max-width: 900px;
+    margin-left: auto;
+    margin-right: auto;
+    border: thin solid #565248;
+    background: #ffffff;
+}
+
+/* page */
+#page {
+    padding: 10px;
+}
+
 /* HTML elements */
 a {
     color: #013397;
@@ -166,22 +219,37 @@
 
 a:hover {
     text-decoration: underline;
-    font-weight: bold;
 }
 
 body {
     color: #000000;
     font-family: sans-serif;
-    background: #ffffff
+    background: #eae8e3;
+    font-size: 12px;
 }
 
 pre {
     background: #eae8e3;
     border: thin dashed #565248;
     font-family: monospace;
+    padding-top: 10px;
 }
 
 img {
     border: 0;
 }
 
+h1 {
+    font-size: 18px;
+    margin: 4px 0 4px 0;
+}
+
+h2 {
+    font-size: 16px;
+    margin: 4px 0 4px 0;
+}
+
+h3 {
+    font-size: 14px;
+    margin: 4px 0 4px 0
+}

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/site-branding.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/site-branding.ft?rev=185086&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/site-branding.ft
(added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/site-branding.ft
Mon Jun  6 15:53:34 2005
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2002-2004 The Apache Software Foundation or its licensors,
+as applicable.
+
+Licensed 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.
+-->
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    name="site-branding" type="nugget">
+    <description>
+        Sitewide branding - Site name and tagline
+    </description>
+    <forrest:template 
+        xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+        xmlns:forrest="http://apache.org/forrest/templates/1.0"
+        format="xhtml" name="site-branding" inputFormat="xsl" body="true" head="false" css="false">
+        <xsl:stylesheet version="1.1" 
+            xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+            <xsl:template name="site-branding-body">
+              <xsl:param name="site-name"/>
+              <xsl:param name="site-tagline"/>
+                <div id="site-name"><xsl:value-of select="$site-name"/> </div>
+                <div id="site-tagline"><xsl:value-of select="$site-tagline"/></div>
+            </xsl:template>
+        </xsl:stylesheet>
+    </forrest:template>
+</forrest:contract>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/site-branding.ft
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message