From 64a113b537713190c663a12b0b70d282c1827fbb Mon Sep 17 00:00:00 2001 From: David Bartley Date: Tue, 18 Sep 2007 03:01:57 -0400 Subject: [PATCH] Large reorganization of the web site * Removed keyboard on home page * Moved constituion into about * Created services page * Merged users and clubs pages into services page * Moved machine usage policy into services page * Removed now empty docs page * Removed icon-based menu * Inserted text menu at top of home page --- Makefile | 4 +- TODO | 9 -- about/Makefile | 3 +- .../constitution-change-20020920.xml | 0 .../constitution-change-20040205.xml | 0 {docs => about}/constitution.xml | 0 about/directory.xml | 2 + about/exec.xml | 2 +- about/index.xml | 12 +-- buttons/calendar.png | Bin 3366 -> 0 bytes buttons/calendar.xcf | Bin 3476 -> 0 bytes buttons/clubs.png | Bin 3348 -> 0 bytes buttons/csc.png | Bin 1498 -> 0 bytes buttons/csc.xcf | Bin 1628 -> 0 bytes buttons/docs.png | Bin 3951 -> 0 bytes buttons/docs.xcf | Bin 3864 -> 0 bytes buttons/gallery.png | Bin 2777 -> 0 bytes buttons/gerbil.png | Bin 1599 -> 0 bytes buttons/gitweb.png | Bin 208 -> 0 bytes buttons/gopher.png | Bin 24243 -> 0 bytes buttons/home.png | Bin 511 -> 0 bytes buttons/homepage.png | Bin 2449 -> 0 bytes buttons/horde.png | Bin 3627 -> 0 bytes buttons/library.png | Bin 2056 -> 0 bytes buttons/mm-icon.png | Bin 3698 -> 0 bytes buttons/office.png | Bin 2999 -> 0 bytes buttons/office.xcf | Bin 2104 -> 0 bytes buttons/package_multimedia.png | Bin 4183 -> 0 bytes buttons/stats.png | Bin 3106 -> 0 bytes buttons/stats.xcf | Bin 2790 -> 0 bytes buttons/sunflower.png | Bin 3899 -> 0 bytes buttons/users.png | Bin 2796 -> 0 bytes clubs/Makefile | 4 - clubs/directory.xml | 8 -- csc.dtd | 10 +- csc_welcome.jpg | Bin 97125 -> 0 bytes cscweb.xsl | 1 - default.css | 56 ++-------- default.mk.in | 2 +- directory.xml | 7 +- docs/Makefile | 5 - docs/directory.xml | 6 -- docs/index.xml | 23 ----- docs/website.xml | 44 -------- events.xml | 2 +- index.xml | 9 +- logos/csc_logo.gif | Bin 0 -> 5730 bytes menu.xml | 19 ---- news.xml | 15 +-- services/Makefile | 5 + clubs/index.xml => services/clubs.xml | 17 +-- services/directory.xml | 10 ++ services/index.xml | 97 ++++++++++++++++++ .../machine_usage-change-20070819.xml | 6 +- {docs => services}/machine_usage.xml | 6 +- {docs => services}/machine_usage_summary.xml | 0 users/Makefile | 4 - users/directory.xml | 7 -- users/index.xml | 38 ------- xsl/common.xsl | 73 +++++++------ xsl/directory.xsl | 9 +- xsl/menu.xsl | 35 ------- 62 files changed, 202 insertions(+), 348 deletions(-) delete mode 100644 TODO rename {docs => about}/constitution-change-20020920.xml (100%) rename {docs => about}/constitution-change-20040205.xml (100%) rename {docs => about}/constitution.xml (100%) delete mode 100644 buttons/calendar.png delete mode 100644 buttons/calendar.xcf delete mode 100644 buttons/clubs.png delete mode 100644 buttons/csc.png delete mode 100644 buttons/csc.xcf delete mode 100644 buttons/docs.png delete mode 100644 buttons/docs.xcf delete mode 100644 buttons/gallery.png delete mode 100644 buttons/gerbil.png delete mode 100644 buttons/gitweb.png delete mode 100644 buttons/gopher.png delete mode 100644 buttons/home.png delete mode 100644 buttons/homepage.png delete mode 100644 buttons/horde.png delete mode 100644 buttons/library.png delete mode 100644 buttons/mm-icon.png delete mode 100644 buttons/office.png delete mode 100644 buttons/office.xcf delete mode 100644 buttons/package_multimedia.png delete mode 100644 buttons/stats.png delete mode 100644 buttons/stats.xcf delete mode 100644 buttons/sunflower.png delete mode 100644 buttons/users.png delete mode 100644 clubs/Makefile delete mode 100644 clubs/directory.xml delete mode 100644 csc_welcome.jpg delete mode 100644 docs/Makefile delete mode 100644 docs/directory.xml delete mode 100644 docs/index.xml delete mode 100644 docs/website.xml create mode 100644 logos/csc_logo.gif delete mode 100644 menu.xml create mode 100644 services/Makefile rename clubs/index.xml => services/clubs.xml (82%) create mode 100644 services/directory.xml create mode 100644 services/index.xml rename {docs => services}/machine_usage-change-20070819.xml (97%) rename {docs => services}/machine_usage.xml (97%) rename {docs => services}/machine_usage_summary.xml (100%) delete mode 100644 users/Makefile delete mode 100644 users/directory.xml delete mode 100644 users/index.xml delete mode 100644 xsl/menu.xsl diff --git a/Makefile b/Makefile index 34f3e55..b998c84 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ INPUTS = index.xml -SUBDIRS = about events docs office news users clubs media +SUBDIRS = about events docs office news services media -first: noroot events.ics members.xml menu.xml all +first: noroot events.ics members.xml all find ! -regex '.*/\..*' -type f ! -perm -0664 -print0 | xargs -r0 chmod u=rwX,g=rwX,o=rX || true find ! -regex '.*/\..*' -type d ! -perm 2775 -print0 | xargs -r0 chmod 2775 || true find ! -regex '.*/\..*' -type d ! -group www -print0 | xargs -r0 chgrp www || true diff --git a/TODO b/TODO deleted file mode 100644 index ccfcb82..0000000 --- a/TODO +++ /dev/null @@ -1,9 +0,0 @@ -Convert cellspacing and cellpadding to CSS equivalents. -IMO (dtbartle), keyboard thing on front page is way too big - reduce or remove. -Make RSS and ICS feeds more prominent. -Replace /events with a web-based calendar? -Replace all email addresses with generated graphics? -Possibly rewrite web page build instructions. -On media pages, get rid of trailing comma. -Replace
's with

's wherever it makes sense. -Replace , , , etc... tags with CSS. diff --git a/about/Makefile b/about/Makefile index 2aa5c2d..83968cd 100644 --- a/about/Makefile +++ b/about/Makefile @@ -1,4 +1,5 @@ -INPUTS = index.xml exec.xml members.xml +INPUTS = index.xml exec.xml members.xml constitution.xml \ + constitution-change-20020920.xml constitution-change-20040205.xml include ../default.mk diff --git a/docs/constitution-change-20020920.xml b/about/constitution-change-20020920.xml similarity index 100% rename from docs/constitution-change-20020920.xml rename to about/constitution-change-20020920.xml diff --git a/docs/constitution-change-20040205.xml b/about/constitution-change-20040205.xml similarity index 100% rename from docs/constitution-change-20040205.xml rename to about/constitution-change-20040205.xml diff --git a/docs/constitution.xml b/about/constitution.xml similarity index 100% rename from docs/constitution.xml rename to about/constitution.xml diff --git a/about/directory.xml b/about/directory.xml index 4d400c8..40422fb 100644 --- a/about/directory.xml +++ b/about/directory.xml @@ -3,6 +3,8 @@ + + diff --git a/about/exec.xml b/about/exec.xml index 52db937..13b2cae 100644 --- a/about/exec.xml +++ b/about/exec.xml @@ -58,7 +58,7 @@ held, check the homepage and the uw.csc newsgroup. For details on the election rules, see the constitution. + href="constitution.html">constitution.