forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdupoiri...@apache.org
Subject svn commit: r328366 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt: css/pelt.screen.css html/content-main.ft
Date Tue, 25 Oct 2005 13:59:22 GMT
Author: cdupoirieux
Date: Tue Oct 25 06:59:10 2005
New Revision: 328366

URL: http://svn.apache.org/viewcvs?rev=328366&view=rev
Log:
Take into account of underlined or boxed skinconf-heading-2...

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/css/pelt.screen.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/content-main.ft

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/css/pelt.screen.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/css/pelt.screen.css?rev=328366&r1=328365&r2=328366&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/css/pelt.screen.css
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/css/pelt.screen.css
Tue Oct 25 06:59:10 2005
@@ -49,12 +49,12 @@
 
 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 : 130%; margin: 0.8em 0px 0px 0px; padding: 0px; font-weight : bold; }
+h3     { font-size : 120%; margin: 0.8em 0px 0px 0px; padding: 0px; font-weight : bold; }
 .h3 { margin: 22px 0px 3px 0px; }
-h4     { font-size : 120%; margin: 0.7em 0px 0px 0px; padding: 0px; font-weight : normal;
text-align: left; }
+h4     { font-size : 100%; margin: 0.7em 0px 0px 0px; padding: 0px; font-weight : normal;
text-align: left; }
 .h4 { margin: 18px 0px 0px 0px; }
-h4.faq { font-size : 120%; margin: 18px 0px 0px 0px; padding: 0px; font-weight : bold;  
text-align: left; }
-h5     { font-size : 100%; margin: 14px 0px 0px 0px; padding: 0px; font-weight : normal;
text-align: left; }
+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; }
 
 /**
 * table

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/content-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/content-main.ft?rev=328366&r1=328365&r2=328366&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/content-main.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/content-main.ft
Tue Oct 25 06:59:10 2005
@@ -15,13 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:contract 
+<forrest:contract
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-main" type="nugget">
   <description>
     <p>content-main <br/>Template will output the content-main.</p>
-    <p> properties:<br/> &lt;headings type="boxed"/> - Heading types can
be 
+    <p> properties:<br/> &lt;headings type="boxed"/> - Heading types can
be
       clean|underlined|boxed</p>
   </description>
   <usage><![CDATA[<forrest:contract name="content-main">
@@ -41,28 +41,51 @@
         <xsl:param name="content-main"/>
         <xsl:param name="content-main-conf"/>
         <xsl:comment>+ |start content-main +</xsl:comment>
-        <xsl:apply-templates 
+        <xsl:apply-templates
           select="$content-main/div[@id='content']/div[@id='content-main']/*">
-          <xsl:with-param name="content-main-conf" 
+          <xsl:with-param name="content-main-conf"
                   select="$content-main-conf"/>
         </xsl:apply-templates>
         <xsl:comment>+ |end content-main +</xsl:comment>
       </xsl:template>
-		  <!--headings-->
+      <!--headings-->
       <xsl:template match="div[@class = 'skinconf-heading-1']">
         <xsl:param name="content-main-conf"/>
-       <xsl:choose>
-         <xsl:when test="$content-main-conf/headings/@type='underlined'">
-         	<h2 class="underlined_10"><xsl:value-of select="h1"/></h2>
-         </xsl:when>
-         <xsl:when test="$content-main-conf/headings/@type='boxed'">
-   	       <h2 class="boxed"><xsl:value-of select="h1"/></h2>
-         </xsl:when>
-         <xsl:otherwise>
-           <h2 class="h3"><xsl:value-of select="h1"/></h2>
-         </xsl:otherwise>
-       </xsl:choose>
-     </xsl:template>
-	  </xsl:stylesheet>
+        <xsl:choose>
+          <xsl:when test="$content-main-conf/headings/@type='underlined'">
+            <h2 class="underlined_10"><xsl:value-of select="h1"/></h2>
+          </xsl:when>
+          <xsl:when test="$content-main-conf/headings/@type='boxed'">
+            <h2 class="boxed"><xsl:value-of select="h1"/></h2>
+          </xsl:when>
+          <xsl:otherwise>
+            <h2 class="h3"><xsl:value-of select="h1"/></h2>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:template>
+      <xsl:template match="div[@class = 'section']">
+        <xsl:param name="content-main-conf"/>
+        <div class="section">
+          <xsl:apply-templates select="*">
+            <xsl:with-param name="content-main-conf"
+                  select="$content-main-conf"/>
+          </xsl:apply-templates>
+        </div>
+      </xsl:template>
+      <xsl:template match="div[@class = 'skinconf-heading-2']">
+        <xsl:param name="content-main-conf"/>
+        <xsl:choose>
+          <xsl:when test="$content-main-conf/headings/@type='underlined'">
+            <h3 class="underlined_5"><xsl:value-of select="h2"/></h3>
+          </xsl:when>
+          <xsl:when test="$content-main-conf/headings/@type='boxed'">
+            <h3 class="boxed"><xsl:value-of select="h2"/></h3>
+          </xsl:when>
+          <xsl:otherwise>
+            <h3 class="h3"><xsl:value-of select="h2"/></h3>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:template>
+    </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>



Mime
View raw message