forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r189476 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates
Date Wed, 08 Jun 2005 00:14:25 GMT
Author: thorsten
Date: Tue Jun  7 17:14:23 2005
New Revision: 189476

URL: http://svn.apache.org/viewcvs?rev=189476&view=rev
Log:
deactivated the css generation and relating code. Fixed issue  FOR-525. Patch send by Diwaker
Gupta. In that spirit I cleaned layout code in the contracts. WARNING your design can depend
on container that now are gone. Just add them as forrest:hook in the view and your design
will work as before.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/blank.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feedback-dyn.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feedback.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feeder.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/fontsize.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/grouplogo.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published-net.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/minitoc.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/motd-page.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pdf-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pod-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/projectlogo.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/searchbox.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/txt-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/xml-link.ft

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl
Tue Jun  7 17:14:23 2005
@@ -47,13 +47,7 @@
                     	<!--*No* forrest:css found in the view-->
                         <xsl:if test="not(/*/forrest:views/forrest:view/forrest:css)">
                             <link rel="stylesheet" type="text/css">
-                                <xsl:attribute name="href">{$root}skin/basic.css</xsl:attribute>
-                            </link>
-                            <link rel="stylesheet" type="text/css">
-                                <xsl:attribute name="href">{$root}skin/contracts-<xsl:value-of
select="$request"/>.css</xsl:attribute>
-                            </link>
-                            <link rel="stylesheet" type="text/css">
-                                <xsl:attribute name="href">{$root}skin/profiling.css</xsl:attribute>
+                                <xsl:attribute name="href">{$root}skin/default.css</xsl:attribute>
                             </link>
                         </xsl:if>
                     	<!-- forrest:css *found* in the view-->

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
Tue Jun  7 17:14:23 2005
@@ -160,11 +160,11 @@
   <!--
   Get the css of the requested contract {1}. 
   -->
-   <map:match pattern="get.contract-css.*">
+<!--   <map:match pattern="get.contract-css.*">
      <map:generate src="cocoon:/resolve.contract.xhtml.{1}"/>
      <map:transform src="resources/stylesheets/contract.css.xsl"/>
      <map:serialize type="txt"/>
-   </map:match>
+   </map:match>-->
 <!--FIXME:END-->
 <!--
     FIXME:

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/blank.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/blank.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/blank.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/blank.ft
Tue Jun  7 17:14:23 2005
@@ -28,7 +28,7 @@
   </description>
   
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="blank" inputFormat="xsl" body="false" head="false" css="false">
+    format="xhtml" name="blank" inputFormat="xsl" body="false" head="false">
     <xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
         <!--Add here the needed templates-->

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft
Tue Jun  7 17:14:23 2005
@@ -24,7 +24,7 @@
   </description>
   
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="content-abstract" inputFormat="xsl" body="true" head="false" css="false">
+    format="xhtml" name="content-abstract" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	    <xsl:template name="content-abstract-body">
 	<xsl:comment>+

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
Tue Jun  7 17:14:23 2005
@@ -24,7 +24,7 @@
   </description>
   
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="content-main" inputFormat="xsl" body="true" head="false" css="false">
+    format="xhtml" name="content-main" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	    <xsl:template name="content-main-body" >
 	<xsl:comment>+

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft
Tue Jun  7 17:14:23 2005
@@ -24,7 +24,7 @@
   </description>
   
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="content-title" inputFormat="xsl" body="true" head="false" css="false">
+    format="xhtml" name="content-title" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	    <xsl:template name="content-title-body" match="div[@id='content']/h1[position()=1]">
 	<xsl:comment>+

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feedback-dyn.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feedback-dyn.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feedback-dyn.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feedback-dyn.ft
Tue Jun  7 17:14:23 2005
@@ -24,43 +24,29 @@
 
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="feedback-dyn" inputFormat="xsl" body="true" head="false" css="true">
+  format="xhtml" name="feedback-dyn" inputFormat="xsl" body="true" head="false">
 
       <xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
         xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
         
-        <xsl:template name="feedback-dyn-css">
-#feedback {
-    color: black;
-    background: #CFDCED;
-    text-align:center;
-    margin-top: 5px;
-}
-#feedback #feedbackto {
-    font-size: 90%;
-    color: black;
-}</xsl:template>
-        
 	    <xsl:template name="feedback-dyn-body">
 	      <xsl:param name="main"/>
-		    <div id="feedback"> 
-		      <xsl:value-of select="$main/feedback"/>
-		      <xsl:choose>
-		        <xsl:when test="$main/feedback/@href and not($main/feedback/@href='')">
-		          <a id="feedbackto">
-		            <xsl:attribute name="href">
-		              <xsl:value-of select="$main/feedback/@href"/>
-		              <xsl:value-of select="$path"/>
-		            </xsl:attribute>
-		            <xsl:value-of select="$main/feedback/@to"/>
-		          </a>
-		        </xsl:when>
-		        <xsl:otherwise>
-		          <xsl:value-of select="$config/feedback/@to"/>
-		        </xsl:otherwise>
-		      </xsl:choose>
-		    </div>
+	      <xsl:value-of select="$main/feedback"/>
+	      <xsl:choose>
+	        <xsl:when test="$main/feedback/@href and not($main/feedback/@href='')">
+	          <a id="feedbackto">
+	            <xsl:attribute name="href">
+	              <xsl:value-of select="$main/feedback/@href"/>
+	              <xsl:value-of select="$path"/>
+	            </xsl:attribute>
+	            <xsl:value-of select="$main/feedback/@to"/>
+	          </a>
+	        </xsl:when>
+	        <xsl:otherwise>
+	          <xsl:value-of select="$config/feedback/@to"/>
+	        </xsl:otherwise>
+	      </xsl:choose>
 			</xsl:template>
     </xsl:stylesheet>
 	</forrest:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feedback.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feedback.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feedback.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feedback.ft
Tue Jun  7 17:14:23 2005
@@ -24,22 +24,10 @@
 
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="feedback" inputFormat="xsl" body="true" head="false" css="true">
+  format="xhtml" name="feedback" inputFormat="xsl" body="true" head="false">
 
       <xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        
-        <xsl:template name="feedback-css">
-#feedback {
-    color: black;
-    background: #CFDCED;
-    text-align:center;
-    margin-top: 5px;
-}
-#feedback #feedbackto {
-    font-size: 90%;
-    color: black;
-}</xsl:template>
         
 	    <xsl:template name="feedback-body">
 		    <div id="feedback">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feeder.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feeder.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feeder.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/feeder.ft
Tue Jun  7 17:14:23 2005
@@ -24,41 +24,10 @@
 
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="feeder" inputFormat="xsl" body="true" head="false" css="true">
+  format="xhtml" name="feeder" inputFormat="xsl" body="true" head="false">
 
       <xsl:stylesheet version="1.1" 
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-        
-        <xsl:template name="feeder-css">
-#feeder {
-	width: 23%;
-	display: block;
-	margin: 10px 0 0 0;
-	padding: 0;
-	background: #E0E9E9;
-	float: right;
-    color: black;
-    /*background: #CFDCED;*/
-    text-align:center;
-    margin-top: 5px;
-}
-.channelTitle {
-	background: #EDF2F2;
-	text-decoration: none;
-	font-size: 10pt;
-	font-family: verdana, helvetica, sans;
-  color: #000066;
-  padding: 5px;
-}
-.channelItems {
-	background: #D9E4E4;
-	text-decoration: none;
-	font-size: 10pt;
-	font-family: verdana, helvetica, sans;
-	color: #000066;
-  padding: 5px;
-}</xsl:template>
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
         
 	    <xsl:template name="feeder-body" >
 	      <xsl:param name="feeder"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/fontsize.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/fontsize.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/fontsize.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/fontsize.ft
Tue Jun  7 17:14:23 2005
@@ -23,32 +23,20 @@
   </description>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="fontsize" inputFormat="xsl" body="true" head="true" css="true">
+  format="xhtml" name="fontsize" inputFormat="xsl" body="true" head="true">
 	 	<xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 			  <xsl:template name="fontsize-head">
 		      <script type="text/javascript" language="javascript" 
 			        src="{$root}skin/fontsize.js">&#160;</script>
 			  </xsl:template>
-			  
-        <xsl:template name="fontsize-css">
-.branding-trail {
-  position: relative; /* IE bugfix cont'd */
-  font-size: 70%;
-  text-align: right;
-  float: right;
-  margin: -10px 5px 0px 5px;
-  padding: 0;
-}</xsl:template>
         
 			  <xsl:template name="fontsize-body">
 			      <script type="text/javascript">ndeSetTextSize();</script>
-			      <div class="branding-trail">
-			            <i18n:text >Font size:</i18n:text>
-			              &#160;<input type="button" onclick="ndeSetTextSize('reset'); return
false;" title="Reset text" class="resetfont" value="Reset"/>      
-			              &#160;<input type="button" onclick="ndeSetTextSize('decr'); return
false;" title="Shrink text" class="smallerfont" value="-a"/>
-			              &#160;<input type="button" onclick="ndeSetTextSize('incr'); return
false;" title="Enlarge text" class="biggerfont" value="+a"/>
-			      </div>
+            <i18n:text >Font size:</i18n:text>
+              &#160;<input type="button" onclick="ndeSetTextSize('reset'); return
false;" title="Reset text" class="resetfont" value="Reset"/>      
+              &#160;<input type="button" onclick="ndeSetTextSize('decr'); return false;"
title="Shrink text" class="smallerfont" value="-a"/>
+              &#160;<input type="button" onclick="ndeSetTextSize('incr'); return false;"
title="Enlarge text" class="biggerfont" value="+a"/>
 			  </xsl:template>
 			
 			</xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/grouplogo.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/grouplogo.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/grouplogo.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/grouplogo.ft
Tue Jun  7 17:14:23 2005
@@ -23,19 +23,9 @@
   
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="grouplogo" inputFormat="xsl" body="true" head="false" css="true">
+  format="xhtml" name="grouplogo" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-		  
-		  <xsl:template name="grouplogo-css">
-#grouplogo {
-	height: 75px;
-	width: 150px;
-	margin-left: 25px;
-	padding: 5px;
-	float: left;
-}</xsl:template>
-		  
 		  <xsl:template name="grouplogo-body">
 		      <xsl:comment>+
     |start group Logo

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published-net.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published-net.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published-net.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published-net.ft
Tue Jun  7 17:14:23 2005
@@ -23,7 +23,7 @@
     <forrest:template 
         xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:forrest="http://apache.org/forrest/templates/1.0"
-        format="xhtml" name="last-published-net" inputFormat="xsl" body="true" head="false"
css="false">
+        format="xhtml" name="last-published-net" inputFormat="xsl" body="true" head="false">
         <xsl:stylesheet version="1.1" 
             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
             <xsl:template name="last-published-net-body">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published.ft
Tue Jun  7 17:14:23 2005
@@ -24,27 +24,10 @@
   <forrest:template 
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="last-published" inputFormat="xsl" body="true" head="false" css="true">
+    format="xhtml" name="last-published" inputFormat="xsl" body="true" head="false">
     <xsl:stylesheet version="1.1" 
 		    xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:template name="last-published-css">
-          #last-published-tagline {
-    position: relative; /* IE bugfix cont'd */
-    float: right;
-    font-size: 70%;
-    text-align: right;
-    width: 50%;
-    background-color: #f0f0ff;
-    border-top: solid 1px #4C6C8F;
-    border-bottom: solid 1px #4C6C8F;
-    margin-bottom: 15px;
-    margin-left: 15px;
-    margin-right: 0;
-    padding-bottom: 5px;
-    padding-top: 5px;
-}
-        </xsl:template>
         <xsl:template name="last-published-body">
 		      <script type="text/javascript">document.write("<i18n:text >Last Published:</i18n:text>&#160;"
+ document.lastModified);</script>
 		    </xsl:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/minitoc.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/minitoc.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/minitoc.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/minitoc.ft
Tue Jun  7 17:14:23 2005
@@ -22,7 +22,7 @@
   </description>
   
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="minitoc" inputFormat="xsl" body="true" head="false" css="false">
+    format="xhtml" name="minitoc" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	    <xsl:template name="minitoc-body" match="div[@id='content']/div[@id='skinconf-toc-page']">
 	<xsl:comment>+

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/motd-page.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/motd-page.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/motd-page.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/motd-page.ft
Tue Jun  7 17:14:23 2005
@@ -24,7 +24,7 @@
   </description>
   
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="motd-page" inputFormat="xsl" body="true" head="false" css="false">
+    format="xhtml" name="motd-page" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	    <xsl:template name="motd-page-body" match="div[@id='content']/div[@id='skinconf-toc-page']">
 	<xsl:comment>+

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft
Tue Jun  7 17:14:23 2005
@@ -23,16 +23,9 @@
   
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="nav-main-sub" inputFormat="xsl" body="true" head="false" css="true">
+  format="xhtml" name="nav-main-sub" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-		  <xsl:template name="nav-main-sub-css">
-
-/*============Sub-tabs===========================*/
-#nav-main-sub {
-	text-align: right;
-	margin-right: 20px;
-}</xsl:template>   
 		  <xsl:template name="nav-main-sub-body">
 		     <xsl:apply-templates select="div[@id='nav-main-sub']"/>
 		  </xsl:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main.ft
Tue Jun  7 17:14:23 2005
@@ -23,44 +23,9 @@
   
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="nav-main" inputFormat="xsl" body="true" head="false" css="true">
+  format="xhtml" name="nav-main" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-		  
-		  <xsl:template name="nav-main-css">
-#branding ul {
-	position: absolute;
-	/*display: block;*/
-	bottom: 0px;
-	right: 0;
-	margin: 0;
-	padding: 0px 15px 0px 0px;
-	list-style: none;
-}
-#branding li {
-	float: right;
-	background: transparent url("/skin/images/tr-on.gif") 100% 0% no-repeat;
-	padding: 0 6px 0 0;
-	margin: 0 1px 0 0;
-	border-bottom: 1px solid #515358;
-}
-#branding ul a {
-	float: left;
-	display: block;
-	padding: 4px 4px 4px 10px;
-	background: transparent url("/skin/images/tl-on.gif") no-repeat;
-	font-weight: bold;
-	color: #fff;
-	text-decoration: none;
-}
-#branding ul li:hover a {background: url("/skin/images/tl-off.gif") no-repeat;}
-#branding ul li:hover {background: url("/skin/images/tr-off.gif") 100% 0% no-repeat;}
-
-#branding ul li.current a {background: url("/skin/images/tl-off.gif") no-repeat;}
-#branding ul li.current {background: url("/skin/images/tr-off.gif") 100% 0% no-repeat;}
-
-</xsl:template>
-		  
 		  <xsl:template name="nav-main-body">
 		     <div id="tabs">
 <xsl:comment>+
@@ -70,7 +35,6 @@
 <xsl:comment>+
     |end Tabs
     +</xsl:comment>
-
             </div>
 		  </xsl:template>
 		</xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav.ft
Tue Jun  7 17:14:23 2005
@@ -23,95 +23,10 @@
   
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="nav" inputFormat="xsl" body="true" head="false" css="true">
+  format="xhtml" name="nav" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-		  <xsl:template name="nav-css">
-
-#nav {
-	width: 23%;
-	display: block;
-	margin: 10px 0 0 0;
-	padding: 0;
-	background: #E0E9E9;
-	float: left;
-}
-#nav ul {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-	font-size: 0px;
-}
-#nav ul li a {
-	display: block;
-	width: auto;
-	padding: 6px 10px 6px 10px;
-	background: #EDF2F2;
-	text-decoration: none;
-	font-size: 10pt;
-	font-family: verdana, helvetica, sans;
-	color: #000066;
-	margin: 0;
-	border-left: 1px solid #fff;
-	border-bottom: 1px solid #ddd;
-	border-top: 1px solid #fff;
-	border-right: 1px solid #ddd;
-}
-#nav ul .menupage {
-	display: block;
-	font-weight: bold;
-	width: auto;
-	padding: 6px 10px;
-	background: #D9E4E4;
-	text-decoration: none;
-	font-size: 10pt;
-	font-family: verdana, helvetica, sans;
-	color: #000066;
-	margin: 0;
-	border-left: 1px solid #fff;
-	border-bottom: 1px solid #ddd;
-	border-top: 1px solid #fff;
-	border-right: 1px solid #ddd;
-}
-#nav ul li .menupage {
-	display: block;
-	font-weight: bold;
-	width: auto;
-	padding: 4px 8px 4px 20px;
-	background: #C9D4D4;
-	text-decoration: none;
-	font-size: 8pt;
-	font-family: verdana, helvetica, sans;
-	color: #000066;
-	margin: 0;
-	border-left: 1px solid #fff;
-	border-bottom: 1px solid #ddd;
-	border-top: 1px solid #fff;
-	border-right: 1px solid #ddd;
-}
-#nav ul strong {
-	display: block;
-	width: auto;
-	padding: 6px 10px;
-	background: #E0E9E9;
-	text-decoration: none;
-	font-size: 10pt;
-	font-family: verdana, helvetica, sans;
-	color: #000066;
-	margin: 0;
-	border-left: 1px solid #fff;
-	border-bottom: 1px solid #ddd;
-	border-top: 1px solid #fff;
-	border-right: 1px solid #ddd;
-}
-#nav ul li li a {
-	padding: 4px 8px 4px 20px;
-	margin: 0;
-	font-size: 8pt;
-}
-#nav ul li a:hover {
-	background: #E0E9E9;
-}</xsl:template>   
+		  
 		  <xsl:template name="nav-body">
 <xsl:comment>+
     |start menu

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pdf-link.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pdf-link.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pdf-link.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pdf-link.ft
Tue Jun  7 17:14:23 2005
@@ -23,15 +23,15 @@
 
 	<forrest:template
   	xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  	format="xhtml" name="pdf-link" inputFormat="xsl" body="true" head="false" css="false">
+  	format="xhtml" name="pdf-link" inputFormat="xsl" body="true" head="false">
   	<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <xsl:template name="pdf-link-body">
           <a href="{$filename-noext}.pdf" class="format">
 		        <img class="skin" src="{$skin-img-dir}/pdfdoc.gif" alt="PDF - icon"/>
-            <div class="caption">PDF</div>
+            <span class="caption">PDF</span>
           </a>
 		  </xsl:template>
 		
 		</xsl:stylesheet>
 	</forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pod-link.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pod-link.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pod-link.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/pod-link.ft
Tue Jun  7 17:14:23 2005
@@ -28,7 +28,7 @@
 		  <xsl:template name="pod-link-body">
 		    <a href="{$filename-noext}.pod" class="format">
 	        <img class="skin" src="{$skin-img-dir}/poddoc.png" alt="POD - icon" />
-	        <div class="caption">POD</div></a>
+	        <span class="caption">POD</span></a>
 		  </xsl:template>
 		</xsl:stylesheet>
   </forrest:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/projectlogo.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/projectlogo.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/projectlogo.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/projectlogo.ft
Tue Jun  7 17:14:23 2005
@@ -23,17 +23,9 @@
   
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="projectlogo" inputFormat="xsl" body="true" head="false" css="true">
+  format="xhtml" name="projectlogo" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-		  
-		  <xsl:template name="projectlogo-css">
-#projectlogo {
-	height: 75px;
-	width: 150px;
-	padding: 5px;
-	float: left;
-}</xsl:template>
 		  
 		  <xsl:template name="projectlogo-body">
 		      <xsl:comment>+

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/searchbox.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/searchbox.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/searchbox.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/searchbox.ft
Tue Jun  7 17:14:23 2005
@@ -24,53 +24,47 @@
   <forrest:template
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="searchbox" inputFormat="xsl" body="true" head="false" css="true">
+  format="xhtml" name="searchbox" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-		  
-		  <xsl:template name="searchbox-css">
-#searchbox {
-	padding: 8px;
-	float: right;
-	font-family: verdana, helvetica, sans;
-	font-size: 8pt;
-	font-weight: bold;
-	color: #ddddff;
-}
-#searchbox input {
-	font-size: 8pt;
-	font-family: verdana, helvetica, sans;
-}</xsl:template>
-		  
+		  <!--FIXME: IMO each search provider should provide a form. This form should be refactored
into
+        a meta-search from-->
 		  <xsl:template name="searchbox-body">
-<div id="searchbox">
 <xsl:comment>+
     |start Search
     +</xsl:comment> 
-             <div class="searchbox-input">
+           <div class="searchbox-input">
              <xsl:choose>
               <xsl:when test="$config/search/@provider = 'lucene'">
                 <!-- Lucene search -->
                 <form method="get" action="{$root}{$lucene-search}">
-                  <input type="text" id="query" name="queryString" size="25" value="Search
the site with {$config/search/@provider}:" onFocus="getBlank (this, 'Search the site with
{$config/search/@provider}:');"/>
-		  &#160;
-		  <input type="submit" value="Search" name="Search" i18n:attr="value"/>
-		 </form>
-	      </xsl:when>
-	      <xsl:otherwise>
-                <form class="roundtopsmall" method="get" action="http://www.google.com/search">

-                    <input type="hidden" 
-                    name="sitesearch" value="{$config/search/@domain}"/> 
-                    <input type="text" id="query" name="q" size="25"/>&#160; 
-                   <input type="submit" value="Search" name="Search" i18n:attr="value"/>
</form>
-        </xsl:otherwise>
-</xsl:choose>
+                  <div id="search-field">
+                   <input type="text" id="query" name="queryString" size="25" value="Search
the site with {$config/search/@provider}:" onFocus="getBlank (this, 'Search the site with
{$config/search/@provider}:');"/>
+									  &#160;</div>
+							      <div id="search-submit">
+										  <input type="submit" value="Search" name="Search" i18n:attr="value"/>
+						      </div>
+	 							</form>
+     					</xsl:when>
+      				<xsl:otherwise>
+              	<form method="get" action="http://www.google.com/search"> 
+	            		<div id="search-hidden">
+	                	<input type="hidden" name="sitesearch" value="{$config/search/@domain}"/>

+	              	</div>
+	              	<div id="search-field">
+	                  <input type="text" id="query" name="q" size="25"/>
+	              	</div>
+	              	<div id="search-submit">
+	                  <input type="submit" value="Search" name="Search" i18n:attr="value"/>

+	              	</div>
+	              </form>
+        			</xsl:otherwise>
+						</xsl:choose>
             </div>
 <xsl:comment>+
     |end search
     +</xsl:comment>
-    </div>
 		  </xsl:template>
 		</xsl:stylesheet>
 	</forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/txt-link.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/txt-link.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/txt-link.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/txt-link.ft
Tue Jun  7 17:14:23 2005
@@ -27,8 +27,9 @@
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="txt-link-body">
         <a href="{$filename-noext}.txt" class="format"> <img class="skin" 
-          src="{$skin-img-dir}/txtdoc.png" alt="TXT - icon" /><div class="caption">TXT</div></a>
+          src="{$skin-img-dir}/txtdoc.png" alt="TXT - icon" /><span
+          class="caption">TXT</span></a>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/xml-link.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/xml-link.ft?rev=189476&r1=189475&r2=189476&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/xml-link.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/xml-link.ft
Tue Jun  7 17:14:23 2005
@@ -23,36 +23,12 @@
     
     <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="xml-link" inputFormat="xsl" body="true" css="true">
+  format="xhtml" name="xml-link" inputFormat="xsl" body="true">
       <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-			  <xsl:template name="xml-link-css">
-.xml-link {
-    position: relative; /* IE bugfix cont'd */
-    float: right;
-    margin: 0px 5px;
-    padding: 0;
-}
-.xml-link br {
-    margin-top: -10px;
-    padding-left: 1px;
-}
-.xml-link a {
-    display: block;
-    font-size: 70%;
-    text-align: center;
-    margin: 0;
-    padding: 0;
-}
-
-.xml-link img {
-    display: block;
-    height: 16px;
-    width: 16px;
-}</xsl:template>
 			  <xsl:template name="xml-link-body">
           <a href="{$filename-noext}.xml" class="dida">
 			      <img class="skin" src="{$skin-img-dir}/xmldoc.gif" alt="XML - icon" />
-						<div class="caption">XML</div>
+						<span class="caption">XML</span>
           </a>
 			  </xsl:template>
 			



Mime
View raw message