forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/src/core/context/skins/krysalis-site/css forrest.css.xslt page.css
Date Thu, 08 Jan 2004 16:18:44 GMT
nicolaken    2004/01/08 08:18:44

  Modified:    src/core/context/skins/krysalis-site/xslt/html
                        document2html.xsl site2xhtml.xsl
               src/core/context/skins/krysalis-site/css forrest.css.xslt
                        page.css
  Removed:     src/core/context/skins/krysalis-site/images bottom-left.png
                        bottom-right.png top-left.png top-right.png
  Log:
  Fixes to the skin to bring it up to snuff.
  
  Added lateral search bar.
  Added credits section.
  Use automatically skinnable borders
  Fix code font size.
  Other small enhancements.
  
  Revision  Changes    Path
  1.6       +4 -4      xml-forrest/src/core/context/skins/krysalis-site/xslt/html/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/krysalis-site/xslt/html/document2html.xsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- document2html.xsl	3 Jan 2004 16:20:35 -0000	1.5
  +++ document2html.xsl	8 Jan 2004 16:18:43 -0000	1.6
  @@ -132,9 +132,9 @@
                 <td></td>
               </tr>
               <tr>
  -              <td class="heading bottom-left-thick"></td>
  -              <td class="heading"></td>
  -              <td class="heading bottom-right-thick"></td>
  +              <td class="heading bottom-left"></td>
  +              <td class="heading bottomborder"></td>
  +              <td class="heading bottom-right"></td>
               </tr>
   
             </tbody>            
  
  
  
  1.8       +81 -27    xml-forrest/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- site2xhtml.xsl	3 Jan 2004 16:20:35 -0000	1.7
  +++ site2xhtml.xsl	8 Jan 2004 16:18:43 -0000	1.8
  @@ -29,6 +29,7 @@
           <title><xsl:value-of select="div[@class='content']/table/tr/td/h1"/></title>
           <link rel="stylesheet" href="{$root}skin/page.css" type="text/css"/>
           <link rel="stylesheet" href="{$root}skin/forrest.css" type="text/css"/>
  +		<link rel="shortcut icon" href="{$root}favicon.ico" />		
           <script type="text/javascript" language="javascript" src="{$root}skin/fontsize.js"></script>
           <script type="text/javascript" language="javascript" src="{$root}skin/menu.js"></script>
         </head>
  @@ -74,7 +75,6 @@
         <tr>
           <!-- ( ================= Group Logo ================== ) -->
           <td >
  -          <xsl:if test="$config/group-url">
               <div class="headerlogo">
               <xsl:call-template name="renderlogo">
                 <xsl:with-param name="name" select="$config/group-name"/>
  @@ -83,8 +83,6 @@
                 <xsl:with-param name="root" select="$root"/>
               </xsl:call-template>
               </div>
  -            <span class="textheader"><xsl:value-of select="$config/group-name"/></span>
  -          </xsl:if>
           </td>
           <!-- ( ================= Project Logo ================== ) -->
           <td align="center" >
  @@ -132,9 +130,9 @@
                   </tr>
   
                   <tr>
  -                  <td class="border bottom-left-thick"></td>
  -                  <td class="border"></td>
  -                  <td class="border bottom-right-thick"></td>
  +                  <td class="search border bottom-left"></td>
  +                  <td class="search border bottomborder"></td>
  +                  <td class="search border bottom-right"></td>
                   </tr>
                 </table>
               </form>
  @@ -181,14 +179,14 @@
       <table cellspacing="0" cellpadding="0" border="0" width="100%">
         <tr>
           <!-- ( =================  Menu  ================== ) -->
  -        <td valign="top">
  +        <td valign="top" >
             <!-- If we have any menu items, draw a menu -->
             <xsl:if test="div[@class='menu']/ul/li">
               <xsl:call-template name="menu"/>
             </xsl:if>
           </td>
           <!-- ( =================  Main Area  ================== ) -->
  -        <td valign="top">
  +        <td valign="top" width="100%">
              <xsl:call-template name="mainarea"/>
           </td>
         </tr>
  @@ -201,8 +199,7 @@
           <!-- ( ================= start left top NavBar ================== ) -->
           <td valign = "top">
             <table class="leftpagemargin" cellspacing="0" cellpadding="0" border="0">
  -            <tr><td class="subborder">&#160;</td></tr>
  -            <tr><td class="border" height="1"></td></tr>
  +            <tr><td class="subborder trail">&#160;</td></tr>
             </table>
           </td>
           <!-- ( ================= end left top NavBar ================== ) -->
  @@ -226,22 +223,75 @@
           <td>
             <table cellspacing="0" cellpadding="0" border="0" width="100%">
               <tr>
  -              <td class="border bottom-left-thick"></td>
  -              <td class="border"></td>
  -              <td class="border bottom-right-thick" ></td>
  +              <td class="border bottom-left"></td>
  +              <td class="border bottomborder"></td>
  +              <td class="border bottom-right" ></td>
               </tr>
             </table>
           </td>      
         </tr>
   
         <tr>
  -        <td height="5" colspan="2"></td>
  +        <td height="10" colspan="2"></td>
         </tr>                
   
  - 	  <xsl:if test="$filename = 'index.html' and $config/credits">
  +      <tr>       	  
  +        <td ></td>
  +       	  <td class="search">
  +            <form method="get" action="http://www.google.com/search" target="_blank">
  +             <table class="dialog" cellspacing="0" cellpadding="0" border="0" width="100%">
  +                <tr>
  +                  <td class="border top-left"></td>
  +                  <td class="border"></td>
  +                  <td class="border top-right"></td>
  +                </tr>    
  +                <tr>
  +                  <td class="border" ></td>
  +                  <td colspan="2" class="border" height="10"><b>Search</b></td>
  +                </tr>
  +                <tr>
  +                  <td colspan="3" height="8"></td>
  +                </tr>
  +                <tr>
  +                  <td></td>
  +                  <td>
  +                    <input type="hidden" name="sitesearch" value="{$config/searchsite-domain}"/>
  +                    the <xsl:value-of select="$config/searchsite-name"/> site
  +                    <br />
  +                    <input type="text" id="query" name="q" size="13"/><input type="submit"
value="Go" name="Search"/>
  +                  </td>
  +                  <td></td>
  +                </tr>
  +
  +                <tr>
  +                  <td colspan="3" height="7"></td>
  +                </tr>
  +
  +                <tr>
  +                  <td class="border bottom-left"></td>
  +                  <td class="border bottomborder"></td>
  +                  <td class="border bottom-right"></td>
  +                </tr>
  +              </table>
  +              </form>
  +              </td>
  +          </tr>     
  + 	  
  +          <xsl:if test="$filename = 'index.html' and $config/credits">
    	     <tr>
  - 	       <td colspan="2">
  -             <table>
  +               <td></td>
  + 	       <td class="search">
  +             <table class="dialog" cellspacing="0" cellpadding="0" border="0" width="100%">

  +                <tr>
  +                  <td class="border top-left"></td>
  +                  <td class="border"></td>
  +                  <td class="border top-right"></td>
  +                </tr>     
  +                  <td class="border" ></td>
  +                  <td colspan="2" class="border" height="10"><b>Credits</b></td>
  +                <tr>
  +                  <td colspan="3" height="8"></td>
  +                </tr>
   		        <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
   		          <xsl:variable name="name" select="name"/>
   		          <xsl:variable name="url" select="url"/>
  @@ -262,8 +312,18 @@
   		                </img>
   		              </a>
   		            </td>
  +		            <td></td>
   		          </tr> 
   		        </xsl:for-each>
  +                <tr>
  +                  <td colspan="3" height="7"></td>
  +                </tr>
  +
  +                <tr>
  +                  <td class="border bottom-left"></td>
  +                  <td class="border bottomborder"></td>
  +                  <td class="border bottom-right"></td>
  +                </tr>       
               </table> 
             </td>
           </tr> 
  @@ -315,7 +375,6 @@
   
                             <xsl:if test="toc2/tocc">
                             <!-- nicolaken: this enables double-nested page links-->
  -                          <!--
                               <ul>
                                 <xsl:for-each select = "toc2/tocc">
   
  @@ -330,7 +389,7 @@
   
                                 </xsl:for-each>
                               </ul> 
  -                            -->
  +                          <!-- nicolaken: ...till here -->
                             </xsl:if>
                           </div>
                         </xsl:for-each>
  @@ -353,10 +412,9 @@
     </xsl:template>
     
     <xsl:template name="mainarea">
  -	  <table cellspacing="0" cellpadding="0" border="0">
  +	  <table cellspacing="0" cellpadding="0" border="0" width="100%">
   	    <!-- ( ================= middle NavBar ================== ) -->
   	    <tr>
  -	      <td></td>
   	      <!-- ============ Breadcrumbs =========== -->
             <td class="subborder trail">
   	         &#160;<xsl:call-template name="breadcrumbs"/>&#160;
  @@ -368,17 +426,13 @@
   	          &#160;<input type="button" onclick="ndeSetTextSize('incr'); return false;"
title="Enlarge text" class="biggerfont" value="+a"/>
   	          &#160;<input type="button" onclick="ndeSetTextSize('reset'); return false;"
title="Reset text" class="resetfont" value="Reset"/>           
             </td>
  -          <td colspan="2" class="subborder">&#160;</td>
   	    </tr>
  -	    <tr><td class="border" height="1" colspan="4"></td></tr>
   
   	    <!-- ( ================= Content================== ) -->
   	    <tr >
  -	      <td width="10" align="left"></td>
  -	      <td width="100%" align="left" colspan="3">
  +	      <td align="left" colspan="2">
   	        <xsl:apply-templates select="div[@class='content']"/>
   	      </td>
  -	      <td width="10"></td>
   	    </tr>
   	  </table>
     </xsl:template>
  
  
  
  1.3       +8 -4      xml-forrest/src/core/context/skins/krysalis-site/css/forrest.css.xslt
  
  Index: forrest.css.xslt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/krysalis-site/css/forrest.css.xslt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- forrest.css.xslt	3 Jan 2004 16:20:35 -0000	1.2
  +++ forrest.css.xslt	8 Jan 2004 16:18:44 -0000	1.3
  @@ -10,8 +10,10 @@
   
   <!-- ==================== main block colors ============================ -->
   <xsl:template match="color[@name='header']">
  -.header         { background-color: <xsl:value-of select="@value"/>;} </xsl:template>
  -
  +.header         { background-color: <xsl:value-of select="@value"/>;} 
  +.subborder.trail {border-bottom: 1px solid <xsl:value-of select="@value"/>;
  +                  border-top: 1px solid <xsl:value-of select="@value"/>; } 
  +.footer          {border-top: 1px solid <xsl:value-of select="@value"/>; } </xsl:template>
   <xsl:template match="color[@name='tab-selected']"> 
   .tab.selected      { background-color: <xsl:value-of select="@value"/>;} 
   .border         { background-color: <xsl:value-of select="@value"/>;} 
  @@ -31,7 +33,9 @@
   .subheading { background-color: <xsl:value-of select="@value"/>;} </xsl:template>

   
   <xsl:template match="color[@name='navstrip']">
  -.subborder      { background-color: <xsl:value-of select="@value"/>;} </xsl:template>

  +.subborder      { background-color: <xsl:value-of select="@value"/>;}
  +</xsl:template> 
  +
   <xsl:template match="color[@name='toolbox']">
   <!-- toolbox unused -->
   </xsl:template> 
  
  
  
  1.7       +46 -22    xml-forrest/src/core/context/skins/krysalis-site/css/page.css
  
  Index: page.css
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/krysalis-site/css/page.css,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- page.css	3 Jan 2004 16:20:35 -0000	1.6
  +++ page.css	8 Jan 2004 16:18:44 -0000	1.7
  @@ -1,6 +1,4 @@
  -/* $Id$
  -<xsl:value-of select="group-logo"/>
  -*/
  +/* $Id$*/
   
   /* ==================== html tags ============================ */
   
  @@ -25,7 +23,7 @@
   /* ==================== general class modifiers ============================ */
   
   .content { padding: 5px 5px 5px 10px; font : small Verdana, Helvetica, sans-serif;  font-size
: 80%;  }
  -.content .ForrestTable { width: 100%; font-size : 100%;}
  +.content .ForrestTable { width: 100%; font-size : 100%; empty-cells: show;}
   .content .ForrestTable caption { text-align: left; font-weight: bold; }
   .content .ForrestTable th { text-align: center; }
   
  @@ -35,12 +33,12 @@
   .headerlogo { padding: 0px 2px 2px 0px;  }
   .skin       { border: 0;  margin: 0px;}
   .figure     { border: 0; vertical-align: top ; margin-top: 10px; margin-bottom: 10px; }
  -.codefrag   { font-family: "Courier New", Courier, monospace; font-size : 120%;}
  +.codefrag   { font-family: "Courier New", Courier, monospace; font-size : 100%;}
   .minitoc    { list-style-image: url('images/current.gif'); font-weight : normal;}
   .search     { font-size : 70%;  }
   .datenote   { font-size : 60%; text-align: right;  height: 10px;}
   .dtdTag     { text-transform : uppercase;  font-style : normal;  font-size : 120%;  font-weight
: bold; }
  -.code       { border-style: solid;  border-width: 1px;  font-size : 120%; padding: 1em
1.33em 1em 1.33em;}
  +.code       { border-style: solid;  border-width: 1px;  font-size : 90%; padding: 1em 1.33em
1em 1.33em;}
   .label      { font-weight: bold; }
   
   /* ==================== menu ============================ */
  @@ -138,6 +136,8 @@
          background-color: #a5b6c6;
   }
   
  +.bottomborder { height:10px; }
  +    
   /* ==================== tabs ============================ */
   
   .tab.separator { width:6px; }
  @@ -209,8 +209,9 @@
              width: 100%;
              font-size : 70%;  }
   	   
  +/* ==================== corners ============================ */
   .top-left {
  -	background-image: url(images/top-left.png);
  +	background-image: url(images/rc-t-l-5-1body-2tab-selected-3tab-selected.png);
   	background-repeat: no-repeat;
   	background-position: top left;
   	width : 5px;
  @@ -218,15 +219,30 @@
   }
   
   .top-right {
  -	background-image: url(images/top-right.png);
  +	background-image: url(images/rc-t-r-5-1body-2tab-selected-3tab-selected.png);
   	background-repeat: no-repeat;
   	background-position: top right;
   	width : 5px;
   	height : 5px;
   }
   
  +.tab.selected.top-left {
  +	background-image: url(images/rc-t-l-5-1header-2tab-selected-3tab-selected.png);
  +}
  +
  +.tab.selected.top-right {
  +	background-image: url(images/rc-t-r-5-1header-2tab-selected-3tab-selected.png);
  +}
  +.tab.unselected.top-left {
  +	background-image: url(images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png);
  +}
  +
  +.tab.unselected.top-right {   
  +	background-image: url(images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png);
  +}
  +
   .bottom-left {
  -	background-image: url(images/bottom-left.png);
  +	background-image: url(images/rc-b-l-5-1body-2tab-selected-3tab-selected.png);
   	background-repeat: no-repeat;
   	background-position: bottom left;
   	width : 5px;
  @@ -234,27 +250,35 @@
   }
   
   .bottom-right {
  -	background-image: url(images/bottom-right.png);
  +	background-image: url(images/rc-b-r-5-1body-2tab-selected-3tab-selected.png);
   	background-repeat: no-repeat;
   	background-position: bottom right;
   	width : 5px;
   	height : 5px;
   }
   
  -.bottom-left-thick {
  -	background-image: url(images/bottom-left.png);
  -	background-repeat: no-repeat;
  -	background-position: bottom left;
  -	width : 5px;
  -	height : 9px;
  +.search.border.bottom-left {
  +	background-image: url(images/rc-b-l-5-1header-2tab-selected-3tab-selected.png);
   }
   
  -.bottom-right-thick {
  -	background-image: url(images/bottom-right.png);
  -	background-repeat: no-repeat;
  -	background-position: bottom right;
  -	width : 5px;
  -	height : 9px;
  +.search.border.bottom-right {
  +	background-image: url(images/rc-b-r-5-1header-2tab-selected-3tab-selected.png);
  +}
  +
  +.heading.bottom-left {
  +	background-image: url(images/rc-b-l-4-1body-2heading-3heading.png);
  +}
  +
  +.heading.bottom-right {
  +	background-image: url(images/rc-b-r-4-1body-2heading-3heading.png);
  +}
  +
  +.subheading.bottom-left {
  +	background-image: url(images/rc-b-l-3-1body-2subheading-3subheading.png);
  +}
  +
  +.subheading.bottom-right {
  +	background-image: url(images/rc-b-r-3-1body-2subheading-3subheading.png);
   }
   
   /* ==================== main block colors ============================ */
  
  
  

Mime
View raw message