marino      2004/02/20 04:54:09

  Modified:    examples/layout/layout CSS.vm Default.vm Printable.vm
                        TableBased.vm layout.css
  Log:
  use Apache Software License 2.0
  
  Revision  Changes    Path
  1.2       +19 -5     jakarta-velocity-tools/examples/layout/layout/CSS.vm
  
  Index: CSS.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/examples/layout/layout/CSS.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CSS.vm    27 May 2003 23:15:39 -0000      1.1
  +++ CSS.vm    20 Feb 2004 12:54:09 -0000      1.2
  @@ -1,5 +1,19 @@
   #*
  - * $Id$ 
  + * Copyright 2003 The Apache Software Foundation.
  + *
  + * 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.
  + *
  + * $Id$
    *#
   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
   "http://www.w3.org/TR/html4/strict.dtd";>
  @@ -8,7 +22,7 @@
   <head>
        <title>LAYOUT = $!page_title</title>
        <style type="text/css" media="screen">@import 
"$link.setRelative('/layout/layout.css')";</style>
  -     
  +
   </head>
   <body>
   
  @@ -30,9 +44,9 @@
                <a href="$link.setRelative('index.vm')">Default Layout</a><br>
                <a 
href="$link.setRelative('index.vm').setLayout('Printable.vm')">Printable Layout</a><br>
        </p>
  -     
  +
        <h2>Rollover via CSS</h2>
  -     
  +
        <p>
        <div id="button">
        <ul>
  @@ -40,7 +54,7 @@
                <li><a href="#">Velocity Manual</a></li>
                <li><a href="#">Jakarta</a></li>
                <li><a href="http://www.alistapart.com/stories/taminglists/";>A List 
Apart CSS</a></li>
  -             
  +
        </ul>
        </div>
   
  
  
  
  1.2       +15 -1     jakarta-velocity-tools/examples/layout/layout/Default.vm
  
  Index: Default.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/examples/layout/layout/Default.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Default.vm        27 May 2003 23:15:39 -0000      1.1
  +++ Default.vm        20 Feb 2004 12:54:09 -0000      1.2
  @@ -1,5 +1,19 @@
   #*
  - * $Id$ 
  + * Copyright 2003 The Apache Software Foundation.
  + *
  + * 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.
  + *
  + * $Id$
    *#
   <html>
   <head>
  
  
  
  1.2       +15 -1     jakarta-velocity-tools/examples/layout/layout/Printable.vm
  
  Index: Printable.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/examples/layout/layout/Printable.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Printable.vm      27 May 2003 23:15:39 -0000      1.1
  +++ Printable.vm      20 Feb 2004 12:54:09 -0000      1.2
  @@ -1,5 +1,19 @@
   #*
  - * $Id$  
  + * Copyright 2003 The Apache Software Foundation.
  + *
  + * 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.
  + *
  + * $Id$
    *#
   <html>
   <head>
  
  
  
  1.2       +20 -5     jakarta-velocity-tools/examples/layout/layout/TableBased.vm
  
  Index: TableBased.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/examples/layout/layout/TableBased.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TableBased.vm     27 May 2003 23:15:39 -0000      1.1
  +++ TableBased.vm     20 Feb 2004 12:54:09 -0000      1.2
  @@ -1,5 +1,19 @@
   #*
  - * $Id$ 
  + * Copyright 2003 The Apache Software Foundation.
  + *
  + * 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.
  + *
  + * $Id$
    *#
   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
   "http://www.w3.org/TR/html4/strict.dtd";>
  @@ -7,13 +21,13 @@
   <html>
   <head>
        <title>LAYOUT = $!page_title</title>
  -     
  +
   </head>
   
   <body>
   
  -<TABLE CELLPADDING="10"> 
  - 
  +<TABLE CELLPADDING="10">
  +
   <TR>
   <!-- left nav -->
   <TD BGCOLOR="#66EEFF" VALIGN="TOP" >
  @@ -26,6 +40,7 @@
   <TD>
        <p>$screen_content</p>
   </TD>
  -
  +</TR>
  +</TABLE>
   </body>
   </html>
  
  
  
  1.2       +27 -11    jakarta-velocity-tools/examples/layout/layout/layout.css
  
  Index: layout.css
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/examples/layout/layout/layout.css,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- layout.css        27 May 2003 23:15:39 -0000      1.1
  +++ layout.css        20 Feb 2004 12:54:09 -0000      1.2
  @@ -1,4 +1,20 @@
  -/* $Id$ */
  +/*
  + * Copyright 2003 The Apache Software Foundation.
  + *
  + * 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.
  + *
  + * $Id$
  + */
   
   body {
        color:#333;
  @@ -37,7 +53,7 @@
   a:link {color:#09c;}
   a:visited {color:#07a;}
   a:hover {background-color:#eee;}
  -  
  +
   
   /* All the content boxes belong to the content class. */
   .content {
  @@ -61,21 +77,21 @@
        padding:10px;
        z-index:2;
   
  -/* Here is the ugly brilliant hack that protects IE5/Win from its own stupidity. 
  -Thanks to Tantek Celik for the hack and to Eric Costello for publicizing it. 
  -IE5/Win incorrectly parses the "\"}"" value, prematurely closing the style 
  -declaration. The incorrect IE5/Win value is above, while the correct value is 
  +/* Here is the ugly brilliant hack that protects IE5/Win from its own stupidity.
  +Thanks to Tantek Celik for the hack and to Eric Costello for publicizing it.
  +IE5/Win incorrectly parses the "\"}"" value, prematurely closing the style
  +declaration. The incorrect IE5/Win value is above, while the correct value is
   below. See http://glish.com/css/hacks.asp for details. */
        voice-family: "\"}\"";
        voice-family:inherit;
        width:128px;
        }
  -/* I've heard this called the "be nice to Opera 5" rule. Basically, it feeds 
correct 
  -length values to user agents that exhibit the parsing error exploited above yet get 
  +/* I've heard this called the "be nice to Opera 5" rule. Basically, it feeds correct
  +length values to user agents that exhibit the parsing error exploited above yet get
   the CSS box model right and understand the CSS2 parent-child selector. ALWAYS 
include
   a "be nice to Opera 5" rule every time you use the Tantek Celik hack (above). */
   body>#navAlpha {width:128px;}
  -             
  +
   #navBeta {
        position:absolute;
        width:190px;
  @@ -102,7 +118,7 @@
        padding: 0 0 1em 0;
        margin-bottom: 1em;
        font-family: 'Trebuchet MS', 'Lucida Grande',
  -       Verdana, Lucida, Geneva, Helvetica, 
  +       Verdana, Lucida, Geneva, Helvetica,
          Arial, sans-serif;
        background-color: #90bade;
        color: #333;
  @@ -114,7 +130,7 @@
                padding: 0;
                border: none;
                }
  -             
  +
        #button li {
                border-bottom: 1px solid #90bade;
                margin: 0;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to