diff --git a/Makefile b/Makefile index a1cef0c..08e9b1e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ INPUTS = index.xml -SUBDIRS = about events docs office news users clubs media +SUBDIRS = about events office news services media -first: noroot events.ics books.xml 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 @@ -15,12 +15,6 @@ members.xml: ceoquery memberlist | sort | awk -F \| '{ name = $$1; program = $$2; userid = $$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 '' >> $@ - events.ics: perl scripts/xml2ics.pl events.xml > events.ics @@ -30,4 +24,4 @@ default.mk: default.mk.in echo 'ROOT = '`pwd` > $@ cat $< >> $@ -.PHONY: members.xml books.xml +.PHONY: members.xml diff --git a/TODO b/TODO deleted file mode 100644 index 5317ed4..0000000 --- a/TODO +++ /dev/null @@ -1,10 +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? -Remove books.xml or get it to work with koha. -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 94% rename from docs/constitution.xml rename to about/constitution.xml index 5f7adf1..0694ae0 100644 --- a/docs/constitution.xml +++ b/about/constitution.xml @@ -6,12 +6,12 @@

-
+
  1. The name of this organization shall be the "Computer Science Club of the University of Waterloo".
-
+
  1. The Club is organized and will be operated exclusively for educational and scientific purposes in furtherance of:
      @@ -34,7 +34,7 @@ decided by the club membership.
-
+
    @@ -59,7 +59,7 @@ The membership fee is set from time to time by the Executive.
-
+
  1. The officers of the Club shall be:
    1. President
    2. Vice-President
      3. @@ -110,7 +110,7 @@ sale. After a reasonable time, control of the meeting is given to the CRO who will manage the election of the President, Vice-President, Treasurer, and Secretary, in that order. Each election shall be carried out by secret ballot, in a manner to be decided on by the CRO, -with the approval of the memberdip. An accurate count of votes for +with the approval of the membership. An accurate count of votes for each candidate for each position must be made and recorded by the CRO. A simple heads-down-hands-up method is considered acceptable. As soon as possible the CRO will announce the results of the election and the @@ -145,7 +145,7 @@ Such elections would be for all offices which are vacant.
-
+
  1. The duties of the President shall be: @@ -197,7 +197,7 @@ in 7.2.
-
+
  1. The executive council shall consist of the present officers of @@ -213,7 +213,7 @@ all recent executive council decisions shall be announced at the next regular meeting of the club.
-
+

1. Programme Committee

  1. The programme committee shall be a standing committee.
  2. The programme committee shall plan and arrange meetings of the Club in @@ -264,7 +264,7 @@ temporary committees as is deemed necessary.
-
+
  1. General meetings of the Club shall be called at times designated by the @@ -282,12 +282,12 @@ of the Club.
-
+
  1. The Treasurer shall present to the Club, before the end of each -accademic term, a complete financial statement of the past period, and +academic term, a complete financial statement of the past period, and a tentative budget for the following academic term.
  2. The Treasurer shall present, as part of the tentative budget, a @@ -302,7 +302,7 @@ that the financial records are complete and accurate.
-
+
  1. Amendments to the constitution shall be made in the following manner: @@ -342,7 +342,7 @@ Club again within sixty (60) days.
-
+
  1. In the event of dissolution of the Club, all assets of the Club shall be transferred to the Mathematics Society of the University of Waterloo.
    2. @@ -350,7 +350,7 @@ transferred to the Mathematics Society of the University of Waterloo.
-
+
  1. All resources under control of the Club are to be used in accordance with the aims of the Club.
    2. @@ -368,7 +368,7 @@ course, responsible to the person granting permission.
-
+

The constitution was last revised on 5 February 2004.

diff --git a/about/directory.xml b/about/directory.xml index 4d400c8..54196e8 100644 --- a/about/directory.xml +++ b/about/directory.xml @@ -3,6 +3,7 @@ + diff --git a/about/exec.xml b/about/exec.xml index a5e5f3e..4a23bbe 100644 --- a/about/exec.xml +++ b/about/exec.xml @@ -4,49 +4,49 @@
-
+
@@ -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.