From 51c473f23ee252d71516a93385628293556fda6a Mon Sep 17 00:00:00 2001
From: Stefanus Du Toit
Date: Tue, 23 Apr 2002 01:02:42 +0000
Subject: [PATCH] Added books... yay.
---
Makefile | 14 ++++++---
csc.dtd | 12 ++++++++
cscweb.xsl | 67 ++++++++++++++++++++++++++++++++++++-----
default.css | 1 +
docs/Makefile | 2 +-
docs/website.xml | 6 ++--
office/Makefile | 7 +++--
office/books.xml | 11 +++++++
office/books/.cvsignore | 1 +
office/books/Makefile | 3 ++
office/directory.xml | 1 +
11 files changed, 108 insertions(+), 17 deletions(-)
create mode 100755 office/books.xml
create mode 100755 office/books/.cvsignore
create mode 100755 office/books/Makefile
diff --git a/Makefile b/Makefile
index 64634e3..da9e51e 100755
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-INPUTS = index.xml
+INPUTS = index.xml
SUBDIRS = about events docs office
# the following two rules are there so cow gets built first.
-cow-first: recurse-cow members.xml all
+cow-first: recurse-cow books.xml members.xml all
recurse-cow:
cd cow && $(MAKE) && cd ..
@@ -10,13 +10,19 @@ recurse-cow:
members.xml:
echo '' > $@
echo '' >> $@
- ceoquery memberlist | awk -F \| '{ id = $$1; name = $$2; program = $$3; gsub(/"/, "\\"", name); gsub(/"/, "\\"", program); gsub(/&/, "\\&", name); gsub(/&/, "\\&", program); print ""; }' >> $@
+ ceoquery memberlist | awk -F \| '{ id = $$1; name = $$2; program = $$3; gsub(/&/, "\\&", name); gsub(/&/, "\\&", program); gsub(/"/, "\\"", name); gsub(/"/, "\\"", program); print ""; }' >> $@
echo '' >> $@
+books.xml:
+ echo '' > $@
+ echo '' >> $@
+ ceoquery booklist | awk -F \| '{ isbn = $$1; title = $$2; author = $$3; edition = $$4; published = $$5; gsub(/&/, "\\&", title); gsub(/&/, "\\&", author); gsub(/&/, "\\&", published); gsub(/&/, "\\&", edition); gsub(/"/, "\\"", title); gsub(/"/, "\\"", author); gsub(/"/, "\\"", published); gsub(/"/, "\\"", edition); print ""; }' >> $@
+ echo '' >> $@
+
include default.mk
default.mk: default.mk.in
echo 'ROOT = '`pwd` > $@
cat $< >> $@
-.PHONY: members.xml
+.PHONY: members.xml books.xml
diff --git a/csc.dtd b/csc.dtd
index fdd4576..963e6b9 100755
--- a/csc.dtd
+++ b/csc.dtd
@@ -39,6 +39,17 @@
+
+
+
+
+
+
+
diff --git a/cscweb.xsl b/cscweb.xsl
index 0751ae5..f82e0c7 100755
--- a/cscweb.xsl
+++ b/cscweb.xsl
@@ -34,14 +34,18 @@
-
-
+
+
-  |
- University of Waterloo |
-
-
- Computer Science Club |
+  |
+  |
+  |
@@ -239,6 +243,9 @@
+
+ #cee6ff
+
|
|
|
@@ -247,6 +254,52 @@
+
+ The books we currently own include:
+
+
+ Title |
+ Author |
+
+
+
+
+ #cee6ff
+
+ () |
+ |
+
+
+]]>
+
+
+
+ Book:
+
+
+
+
+
+
+
+ Title:
+ Edition:
+ ISBN:
+ Author:
+ Published:
+
+
+
+
+
+
+
+
+
diff --git a/default.css b/default.css
index 524e636..0ad46e9 100755
--- a/default.css
+++ b/default.css
@@ -15,3 +15,4 @@ td.eventitem { background: white; text-align: left}
td.eventroom { background: #eeffee; font-family: sans-serif; font-size: x-small; text-align: center}
th.news { background: #222255; color: white; font-family: sans-serif; font-size: x-small; text-align: left; }
td.pagetitle { font-size: large; font-weight: bold; }
+th { background: #002288; color: white; }
\ No newline at end of file
diff --git a/docs/Makefile b/docs/Makefile
index 5bcb63a..81af537 100755
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,4 +1,4 @@
INPUTS = index.xml constitution.xml official.xml machine_usage.xml \
- machine_usage_summary.xml website.xml
+ machine_usage_summary.xml website.xml editing-howto.xml
include ../default.mk
\ No newline at end of file
diff --git a/docs/website.xml b/docs/website.xml
index f77e27a..bc0348c 100755
--- a/docs/website.xml
+++ b/docs/website.xml
@@ -21,9 +21,9 @@
generating the events pages).
-
- Soon I'll hopefully have some documentation here on how to add
- content to the website and make other changes.
+
diff --git a/office/Makefile b/office/Makefile
index c3528c8..ad980e2 100755
--- a/office/Makefile
+++ b/office/Makefile
@@ -1,3 +1,6 @@
-INPUTS = index.xml staff.xml
+SUBDIRS = books
+INPUTS = index.xml staff.xml books.xml
-include ../default.mk
\ No newline at end of file
+include ../default.mk
+
+books.html: ../books.xml
diff --git a/office/books.xml b/office/books.xml
new file mode 100755
index 0000000..ea2ebb5
--- /dev/null
+++ b/office/books.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
diff --git a/office/books/.cvsignore b/office/books/.cvsignore
new file mode 100755
index 0000000..2d19fc7
--- /dev/null
+++ b/office/books/.cvsignore
@@ -0,0 +1 @@
+*.html
diff --git a/office/books/Makefile b/office/books/Makefile
new file mode 100755
index 0000000..0029419
--- /dev/null
+++ b/office/books/Makefile
@@ -0,0 +1,3 @@
+INPUTS =
+
+include ../../default.mk
diff --git a/office/directory.xml b/office/directory.xml
index 64ba253..78bdbe3 100755
--- a/office/directory.xml
+++ b/office/directory.xml
@@ -4,4 +4,5 @@
+