website c19b25081dc980755aa9f2ab338d982ceee42912
letha...@gmail.com
commit c19b25081dc980755aa9f2ab338d982ceee42912
Author: Luca Bruno <letha...@gmail.com>
Date: Sun Jan 18 20:01:40 2009 +0100
More changes in the Makefile. Added func.inc. Completed the index
:100644 100644 62161c0... ef84d3f... M Makefile
:100644 100644 551579b... 9316640... M index.html
:000000 100644 0000000... 765a579... A wml/func.inc
:100644 100644 0099661... 49dc862... M wml/index.wml
:100644 000000 cc7f368... 0000000... D wml/site.tmpl
:000000 100644 0000000... cc7f368... A wml/template.inc
diff --git a/Makefile b/Makefile
index 62161c0..ef84d3f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
CC=wml
SUBDIRS=wml
SRCDIR=./wml
+INCS=$(wildcard $(SRCDIR)/*.inc)
SRCS=$(wildcard $(SRCDIR)/*.wml)
OBJS=$(subst $(SRCDIR)/,,$(SRCS:.wml=.html))
@@ -10,10 +11,10 @@ subdirs: $(SUBDIRS)
wml: $(OBJS)
-clean: $(OBJS)
- rm -f $<
+clean:
+ rm -f $(OBJS)
-%.html: $(SRCDIR)/%.wml
- wml -DROOT=$(SRCDIR) -o $@ $<
+%.html: $(SRCDIR)/%.wml $(INCS)
+ wml $(patsubst %,-i%,$(INCS)) -o $@ $<
.PHONY: clean
\ No newline at end of file
diff --git a/index.html b/index.html
index 551579b..9316640 100644
--- a/index.html
+++ b/index.html
@@ -49,17 +49,14 @@
<img src="./images/feed-icon.png" id="feed" alt="" width="40" height="40">
</a>
<ul id="items">
- <li>
- <h1>New website</h1> <h2>at: 20 August 2008</h2>
- <div class="content">
- <p>
- The new <a href="http://syx.netsons.org">website</a> is up!<br>
- Once the <a href="http://syx.googlecode.com">google code project</a> doesn't host the code anymore, it only held information about Smalltalk YX.<br>
- I think it's better to have things organized better in a flexible HTML website rather than using such a limited wiki <i>(nothing against Google)</i>.
- </p>
- <a href="#toppage" id="top" class="next">TOP</a>
- </div> <!-- content -->
- </li>
+ <li><h1>New website</h1> <h2>at: 20 August 2008</h2><div class="content">
+ <p>
+ The new <a href="http://syx.netsons.org">website</a> is up!<br>
+ Once the <a href="http://syx.googlecode.com">google code project</a> doesn't host the code anymore, it only held information about Smalltalk YX.<br>
+ I think it's better to have things organized better in a flexible HTML website rather than using such a limited wiki <i>(nothing against Google)</i>.
+ </p>
+ <a href="#toppage" id="top" class="next">TOP</a>
+ </div> <!-- content --></li>
</ul> <!-- items -->
</div> <!-- main -->
<div id="footer">
diff --git a/wml/func.inc b/wml/func.inc
new file mode 100644
index 0000000..765a579
--- /dev/null
+++ b/wml/func.inc
@@ -0,0 +1,12 @@
+m4_define(LATEST, 0.1.7)
+
+<define-tag top><a href="#toppage" id="top" class="next">TOP</a></define-tag>
+
+<define-tag news endtag=required whitespace=delete>
+ <li>
+ <h1>%0</h1> <h2>at: %1</h2>
+ <div class="content">
+ %body
+ </div> <!-- content -->
+ </li>
+</define-tag>
\ No newline at end of file
diff --git a/wml/index.wml b/wml/index.wml
index 0099661..49dc862 100644
--- a/wml/index.wml
+++ b/wml/index.wml
@@ -1,4 +1,3 @@
-#include '$(ROOT)/site.tmpl'
{#TITLE#:Homepage:##}
{#ALTERNATE#:
<link rel="alternate" type="application/atom+xml" title="Thoughts about computer technologies - Atom" href="http://lethalman.blogspot.com/feeds/posts/default/-/syx">
@@ -6,7 +5,7 @@
:##}
<div id="info">
- <span>Latest version is</span> <a href="./install.html">0.1.7</a>
+ <span>Latest version is</span> <a href="./install.html">LATEST</a>
· <a href="./release-notes.html">release notes</a>
· <a href="./features.html">features list</a>
· <a href="./roadmap.html">roadmap</a>
@@ -18,15 +17,12 @@
</a>
<ul id="items">
- <li>
- <h1>New website</h1> <h2>at: 20 August 2008</h2>
- <div class="content">
- <p>
- The new <a href="http://syx.netsons.org">website</a> is up!<br>
- Once the <a href="http://syx.googlecode.com">google code project</a> doesn't host the code anymore, it only held information about Smalltalk YX.<br>
- I think it's better to have things organized better in a flexible HTML website rather than using such a limited wiki <i>(nothing against Google)</i>.
- </p>
- <a href="#toppage" id="top" class="next">TOP</a>
- </div> <!-- content -->
- </li>
+ <news "New website" "20 August 2008">
+ <p>
+ The new <a href="http://syx.netsons.org">website</a> is up!<br>
+ Once the <a href="http://syx.googlecode.com">google code project</a> doesn't host the code anymore, it only held information about Smalltalk YX.<br>
+ I think it's better to have things organized better in a flexible HTML website rather than using such a limited wiki <i>(nothing against Google)</i>.
+ </p>
+ <top>
+ </news>
</ul> <!-- items -->
diff --git a/wml/site.tmpl b/wml/site.tmpl
deleted file mode 100644
index cc7f368..0000000
--- a/wml/site.tmpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>Smalltalk YX -- {#TITLE#}</title>
- <link rev="made" href="mailto:letha...@gmail.com">
- <link rel="shortcut icon" href="favicon.ico">
- {#ALTERNATE#}
- <link href="./css/site.css" rel="stylesheet" type="text/css">
- <meta name="Keywords" content="smalltalk, smalltalk yx, syx, open source, free, mit, programming language, language, development">
- <meta name="Description" content="Smalltalk YX is an open source MIT-licensed Smalltalk-80 implementation">
- </head>
-
- <body>
- <a name="toppage" style="position: absolute; top: 0"></a>
- <div id="page" class="centered">
- <div id="header" class="centered">
- <table class="centered">
- <tr>
- <td>
- <ul id="left">
- <li style="margin-right: -1em"><a href="./index.html">News</a></li>
- <li><a href="./about.html">About</a></li>
- <li style="margin-right: -1em"><a href="./screenshots.html">Screenshots</a></li>
- </ul>
- </td>
- <td>
- <img src="./images/syx-logo.png" align="middle" id="logo" class="centered">
- </td>
- <td>
- <ul>
- <li style="margin-left: -1em"><a href="./install.html">Install</a></li>
- <li><a href="./documentation.html">Documentation</a></li>
- <li style="margin-left: -1em"><a href="./community.html">Community</a></li>
- </ul>
- </td>
- </tr>
- </table>
- </div>
- <div id="main">
- {#BODY#}
- </div> <!-- main -->
- <div id="footer">
- To report a problem with either the web site or the project, see the <a href="./contacts.html">contact page</a>.<br>
- Copyright (C) 2008 <a href="mailto:letha...@gmail.com">Luca Bruno</a>
- </div>
-
- </div> <!-- page -->
- </body>
-</html>
-{#BODY#:
diff --git a/wml/template.inc b/wml/template.inc
new file mode 100644
index 0000000..cc7f368
--- /dev/null
+++ b/wml/template.inc
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <title>Smalltalk YX -- {#TITLE#}</title>
+ <link rev="made" href="mailto:letha...@gmail.com">
+ <link rel="shortcut icon" href="favicon.ico">
+ {#ALTERNATE#}
+ <link href="./css/site.css" rel="stylesheet" type="text/css">
+ <meta name="Keywords" content="smalltalk, smalltalk yx, syx, open source, free, mit, programming language, language, development">
+ <meta name="Description" content="Smalltalk YX is an open source MIT-licensed Smalltalk-80 implementation">
+ </head>
+
+ <body>
+ <a name="toppage" style="position: absolute; top: 0"></a>
+ <div id="page" class="centered">
+ <div id="header" class="centered">
+ <table class="centered">
+ <tr>
+ <td>
+ <ul id="left">
+ <li style="margin-right: -1em"><a href="./index.html">News</a></li>
+ <li><a href="./about.html">About</a></li>
+ <li style="margin-right: -1em"><a href="./screenshots.html">Screenshots</a></li>
+ </ul>
+ </td>
+ <td>
+ <img src="./images/syx-logo.png" align="middle" id="logo" class="centered">
+ </td>
+ <td>
+ <ul>
+ <li style="margin-left: -1em"><a href="./install.html">Install</a></li>
+ <li><a href="./documentation.html">Documentation</a></li>
+ <li style="margin-left: -1em"><a href="./community.html">Community</a></li>
+ </ul>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div id="main">
+ {#BODY#}
+ </div> <!-- main -->
+ <div id="footer">
+ To report a problem with either the web site or the project, see the <a href="./contacts.html">contact page</a>.<br>
+ Copyright (C) 2008 <a href="mailto:letha...@gmail.com">Luca Bruno</a>
+ </div>
+
+ </div> <!-- page -->
+ </body>
+</html>
+{#BODY#: