[Devil-linux-commit] web index.shtml,1.4,1.5

[<fr...@us...>]

Update of /cvsroot/devil-linux/web
In directory sc8-pr-cvs1:/tmp/cvs-serv21756

Modified Files:
	index.shtml 
Log Message:
better handling of inclusions

Index: index.shtml
===================================================================
RCS file: /cvsroot/devil-linux/web/index.shtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- index.shtml	2 Jan 2004 00:09:45 -0000	1.4
+++ index.shtml	2 Jan 2004 00:56:25 -0000	1.5
@@ -3,24 +3,28 @@
 <html>
 <head>
   <meta content="text/html; charset=ISO-8859-15" http-equiv="content-type">
-  <!--#if expr="${THIS_PAGE}" --><!--#include virtual="head_${THIS_PAGE}.shtml" --><!--#else --><!--#include virtual="head.shtml" --><!--#endif -->
   <link rel="stylesheet" type="text/css" href="/dl.css">
+  <!--#set var="HEAD_PAGE" value="head" -->
+  <!--#set var="HEAD_PAGE_EXT" value="shtml" -->
+  <!--#if expr="${THIS_PAGE}" --><!--#set var="HEAD_PAGE" value="${HEAD_PAGE}_${THIS_PAGE}" --><!--#endif -->
+  <!--#if expr="${SECTION}" --><!--#set var="HEAD_PAGE" value="${SECTION}/${HEAD_PAGE}" --><!--#endif -->
+  <!--#include virtual="${HEAD_PAGE}.${HEAD_PAGE_EXT}" --><!--#endif -->
 </head>
 
 <body>
 <!--#if expr="${THIS_PAGE}" --><!-- THIS_PAGE="<!--#echo var="THIS_PAGE" -->" --><!--#endif -->
 <!--#if expr="${SECTION}" --><!-- SECTION="<!--#echo var="SECTION" -->" --><!--#endif -->
 
-<!--#set var="CONTENT_FRAME" value="content" -->
-<!--#set var="CONTENT_FRAME_EXT" value="shtml" -->
-<!--#if expr="${THIS_PAGE}" --><!--#set var="CONTENT_FRAME" value="${CONTENT_FRAME}_${THIS_PAGE}" --><!--#endif -->
-<!--#if expr="${SECTION}" --><!--#set var="CONTENT_FRAME" value="${SECTION}/${CONTENT_FRAME}" --><!--#endif -->
+<!--#set var="CONTENT_PAGE" value="content" -->
+<!--#set var="CONTENT_PAGE_EXT" value="shtml" -->
+<!--#if expr="${THIS_PAGE}" --><!--#set var="CONTENT_PAGE" value="${CONTENT_PAGE}_${THIS_PAGE}" --><!--#endif -->
+<!--#if expr="${SECTION}" --><!--#set var="CONTENT_PAGE" value="${SECTION}/${CONTENT_PAGE}" --><!--#endif -->
 
 <table border=0 width="100%">
 <tr>
  <td class="frameleft"><!--#include virtual="menu.shtml" --></td>
  <td class="top"><p>&nbsp;</p></td>
- <td class="frameright"><!--#include virtual="${CONTENT_FRAME}.${CONTENT_FRAME_EXT}" --></td>
+ <td class="frameright"><!--#include virtual="${CONTENT_PAGE}.${CONTENT_PAGE_EXT}" --></td>
 </tr>
 </table>