Author: dylan
Date: 2005-03-14 23:51:10 -0500 (Mon, 14 Mar 2005)
New Revision: 644
Added:
trunk/web/templates/copying.tt
Removed:
trunk/web/templates/bottom.tt
trunk/web/templates/macros/
Modified:
trunk/
trunk/web/Makefile
trunk/web/applet.ttml
trunk/web/clients/havernet/index.ttml
trunk/web/clients/index.ttml
trunk/web/clients/javer/index.ttml
trunk/web/contact.ttml
trunk/web/download.ttml
trunk/web/index.ttml
trunk/web/not-found.ttml
trunk/web/templates/config.tt
trunk/web/templates/credits.tt
trunk/web/templates/page.tt
trunk/web/why-not-xml.ttml
Log:
[EMAIL PROTECTED]: dylan | 2005-03-14 23:13:37 -0500
fixed WRAPPER page to WRAPPER page.tt, and preparing to remove
copying.tt and credits.tt.
They are now included in page.tt
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:814
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
+ 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:815
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
Modified: trunk/web/Makefile
===================================================================
--- trunk/web/Makefile 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/Makefile 2005-03-15 04:51:10 UTC (rev 644)
@@ -13,7 +13,7 @@
TARGETS = css/haver.css
PERL5LIB = lib
-TTFLAGS = -I $T -P init -P config
+TTFLAGS = -I $T -P config.tt
FIXFLAGS = --noext
RSYNCFLAGS = -vrzlpt \
--include .htaccess \
@@ -23,7 +23,7 @@
# END CONFIG
-TT = ./bin/tt
+TT = ./bin/ttproc
FIX = ./bin/fixhtml
RSYNC = rsync
VALIDATE = /bin/sh ./bin/validator.sh
@@ -51,8 +51,8 @@
export PERL5LIB
-input := $(patsubst ./%,%,$(shell find -name '*.thtml'))
-html := $(input:.thtml=.html)
+input := $(patsubst ./%,%,$(shell find -name '*.ttml'))
+html := $(input:.ttml=.html)
targets := $(html) $(TARGETS)
@@ -75,13 +75,13 @@
-%.html: %.thtml $(DEPENDS)
+%.html: %.ttml
@echo "TT $<"
@$(TT) $(TTFLAGS) $< > $@
@echo "FIX $@"
@$(FIX) $(FIXFLAGS) $@
-%.css: %.tcss $(GDEPENDS)
+%.css: %.tcss
@echo "TT $<"
@$(TT) $(TTFLAGS) $< > $@
Modified: trunk/web/applet.ttml
===================================================================
--- trunk/web/applet.ttml 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/applet.ttml 2005-03-15 04:51:10 UTC (rev 644)
@@ -1,4 +1,4 @@
-[% WRAPPER page
+[% WRAPPER "page.tt"
title = "Applet"
author = "Bryan Donlan"
date = '$Date$'
Modified: trunk/web/clients/havernet/index.ttml
===================================================================
--- trunk/web/clients/havernet/index.ttml 2005-03-15 04:51:08 UTC (rev
643)
+++ trunk/web/clients/havernet/index.ttml 2005-03-15 04:51:10 UTC (rev
644)
@@ -1,4 +1,4 @@
-[% WRAPPER page
+[% WRAPPER "page.tt"
title = 'HaverNet'
author = 'ElasticMuffin'
date = '$Date$'
Modified: trunk/web/clients/index.ttml
===================================================================
--- trunk/web/clients/index.ttml 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/clients/index.ttml 2005-03-15 04:51:10 UTC (rev 644)
@@ -1,4 +1,4 @@
-[% WRAPPER page
+[% WRAPPER "page.tt"
title = 'Haver Clients'
author = 'Dylan Hardison'
date = '$Date$'
Modified: trunk/web/clients/javer/index.ttml
===================================================================
--- trunk/web/clients/javer/index.ttml 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/clients/javer/index.ttml 2005-03-15 04:51:10 UTC (rev 644)
@@ -1,4 +1,4 @@
-[% WRAPPER page
+[% WRAPPER "page.tt"
title = 'Javer'
author = 'Bryan Donlan'
date = '$Date$'
Modified: trunk/web/contact.ttml
===================================================================
--- trunk/web/contact.ttml 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/contact.ttml 2005-03-15 04:51:10 UTC (rev 644)
@@ -1,4 +1,4 @@
-[% WRAPPER page
+[% WRAPPER "page.tt"
title = "Contact Information"
author = 'Dylan Hardison'
date = '$Date$'
Modified: trunk/web/download.ttml
===================================================================
--- trunk/web/download.ttml 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/download.ttml 2005-03-15 04:51:10 UTC (rev 644)
@@ -1,4 +1,4 @@
-[% WRAPPER page
+[% WRAPPER "page.tt"
title = 'Download'
author = 'Dylan Hardison'
date = '$Date$'
Modified: trunk/web/index.ttml
===================================================================
--- trunk/web/index.ttml 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/index.ttml 2005-03-15 04:51:10 UTC (rev 644)
@@ -1,9 +1,8 @@
-[% WRAPPER page
+[% WRAPPER "page.tt"
title = "Home"
author = "Dylan Hardison"
date = '$Date$'
%]
-
<h2>Welcome</h2>
<p>Welcome to the strange and irrational world of Haver,
Modified: trunk/web/not-found.ttml
===================================================================
--- trunk/web/not-found.ttml 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/not-found.ttml 2005-03-15 04:51:10 UTC (rev 644)
@@ -1,4 +1,4 @@
-[% WRAPPER page
+[% WRAPPER "page.tt"
title = "File Not Found"
author = 'Dylan Hardison'
date = '$Date$'
Deleted: trunk/web/templates/bottom.tt
===================================================================
--- trunk/web/templates/bottom.tt 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/templates/bottom.tt 2005-03-15 04:51:10 UTC (rev 644)
@@ -1,18 +0,0 @@
-[% # vim: set syn=template:
- USE date;
- year = date.format(date.now, "%Y")
-%]
-
-[% SWITCH page.copyright; %]
-[% CASE 'FREE' %]
- Copyright © 2001-$year [% page.author %].<br/>
- Verbatim copying and redistribution of this entire page is permitted
- in any medium provided this notice is preserved.
-[% CASE 'LICENSE' %]
- [% INCLUDE $page.licence %]
-[% CASE 'NONFREE' %]
- Copyright © 2003-$year [% page.author %]. All rights reserved.
-[% CASE %]
- [% THROW "Unknown copyright type: $page.copyright" %]
-[% END %]
-
Modified: trunk/web/templates/config.tt
===================================================================
--- trunk/web/templates/config.tt 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/templates/config.tt 2005-03-15 04:51:10 UTC (rev 644)
@@ -3,27 +3,17 @@
# $Revision: 1.11 $
# $Date: 2004/03/11 18:52:56 $
-USE page = Page;
-DEFAULT
- page.title = 'Untitled Page'
- page.copyright = 'FREE'
- page.author = 'Dylan William Hardison'
- page.email = '[EMAIL PROTECTED]'
-;
-
-
# Set to 0 if not using source forge.
-config.sf_gid = 127478;
-config.title = "The Haver Project";
-
-people.nornagon = {
- email => '[EMAIL PROTECTED]',
+config = {
+ title => "The Haver Project",
+ sf_gid => 127478,
+ email => {
+ dylan => '[EMAIL PROTECTED]',
+ nornagon => '[EMAIL PROTECTED]',
+ },
};
-people.dylan = {
- email => '[EMAIL PROTECTED]',
-};
%]
Added: trunk/web/templates/copying.tt
===================================================================
--- trunk/web/templates/copying.tt 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/templates/copying.tt 2005-03-15 04:51:10 UTC (rev 644)
@@ -0,0 +1,8 @@
+[% # vim: set syn=template:
+ USE date;
+ year = date.format(date.now, "%Y")
+%]
+
+Copyright © 2003-$year [% config.author %].<br/>
+Verbatim copying and redistribution of this entire page is permitted
+in any medium provided this notice is preserved.
Modified: trunk/web/templates/credits.tt
===================================================================
--- trunk/web/templates/credits.tt 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/templates/credits.tt 2005-03-15 04:51:10 UTC (rev 644)
@@ -4,8 +4,8 @@
[% INCLUDE "logos.tt" %]
<p class="credits" style="text-align: right; font-size: 8pt;">
-Design by <a href="mailto:[% people.nornagon.email %]">Jeremy "nornagon"
Apthorp</a>,
-Build System by <a href="mailto:[% people.dylan.email %]">Dylan Hardison</a>.
-Last Updated on [% page.date %]<br/>
+Design by <a href="mailto:[% config.email.nornagon %]">Jeremy "nornagon"
Apthorp</a>,
+Build System by <a href="mailto:[% config.email.dylan %]">Dylan Hardison</a>.
+Last Updated on [% date %] by [% author %]<br/>
</p>
Modified: trunk/web/templates/page.tt
===================================================================
--- trunk/web/templates/page.tt 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/templates/page.tt 2005-03-15 04:51:10 UTC (rev 644)
@@ -7,11 +7,12 @@
- strict (defaults to 'yes', change to 'no' for transitional xhtml)
%]
+[% DEFAULT strict = 'yes' %]
[% PROCESS "doctype.tt" %]
<html xmlns="http://www.w3.org/1999/xhtml"; lang="EN">
<head>
<title>$config.title: $title</title>
- <meta name="author" content="$author" />
+ <meta name="author" content="[% author %]" />
<link type="text/css" rel="stylesheet" href="/css/haver.css" />
</head>
<body>
@@ -40,10 +41,19 @@
</table>
<!-- The bottom bar -->
<div id="bottom">
- [% INCLUDE "copying.tt" %]
+ Copyright © 2003, 2004, 2005 [% author
%]<br/>
+ Verbatim copying and redistribution of this
entire page is permitted
+ in any medium provided this notice is preserved.
</div>
<div id="thanks">
- [% INCLUDE "credits.tt" %]
+ [% INCLUDE "logos.tt" %]
+ <p class="credits" style="text-align: right;
font-size: 8pt;">
+ Design by
+ <a href="mailto:[% config.email.nornagon
%]">Jeremy "nornagon" Apthorp</a>.
+ Build System by
+ <a href="mailto:[% config.email.dylan %]">Dylan
Hardison</a>.
+ Last Updated on [% date %].<br/>
+ </p>
</div>
</div>
</body>
Modified: trunk/web/why-not-xml.ttml
===================================================================
--- trunk/web/why-not-xml.ttml 2005-03-15 04:51:08 UTC (rev 643)
+++ trunk/web/why-not-xml.ttml 2005-03-15 04:51:10 UTC (rev 644)
@@ -1,4 +1,4 @@
-[% WRAPPER page
+[% WRAPPER "page.tt"
title = 'Why not use XML?'
author = 'Dylan Hardison'
date = '$Date$'
