Merge branch 'master' of /users/www/www/

Conflicts:

	favicon.ico
news-update
David Tenty 16 years ago
commit 442910af90
  1. 12
      Makefile
  2. 10
      TODO
  3. 3
      about/Makefile
  4. 0
      about/constitution-change-20020920.xml
  5. 0
      about/constitution-change-20040205.xml
  6. 30
      about/constitution.xml
  7. 1
      about/directory.xml
  8. 28
      about/exec.xml
  9. 28
      about/index.xml
  10. BIN
      buttons/calendar.png
  11. BIN
      buttons/calendar.xcf
  12. BIN
      buttons/clubs.png
  13. BIN
      buttons/csc.png
  14. BIN
      buttons/csc.xcf
  15. BIN
      buttons/docs.png
  16. BIN
      buttons/docs.xcf
  17. BIN
      buttons/gallery.png
  18. BIN
      buttons/gerbil.png
  19. BIN
      buttons/gitweb.png
  20. BIN
      buttons/gopher.png
  21. BIN
      buttons/home.png
  22. BIN
      buttons/homepage.png
  23. BIN
      buttons/horde.png
  24. BIN
      buttons/koha.png
  25. BIN
      buttons/mm-icon.png
  26. BIN
      buttons/office.png
  27. BIN
      buttons/office.xcf
  28. BIN
      buttons/package_multimedia.png
  29. BIN
      buttons/stats.png
  30. BIN
      buttons/stats.xcf
  31. BIN
      buttons/sunflower.png
  32. BIN
      buttons/users.png
  33. 4
      clubs/Makefile
  34. 8
      clubs/directory.xml
  35. 21
      csc.dtd
  36. BIN
      csc_welcome.jpg
  37. BIN
      csclub.der
  38. 30
      csclub.pem
  39. 4
      cscweb.xsl
  40. 65
      default.css
  41. 2
      default.mk.in
  42. 9
      directory.xml
  43. 7
      docs/Makefile
  44. 9
      docs/directory.xml
  45. 3
      docs/editing-example1/Makefile
  46. 8
      docs/editing-example1/directory.xml
  47. 6
      docs/editing-example1/operating-systems.xml
  48. 3
      docs/editing-example2/Makefile
  49. 9
      docs/editing-example2/directory.xml
  50. 6
      docs/editing-example2/operating-systems.xml
  51. 3
      docs/editing-example3/Makefile
  52. 9
      docs/editing-example3/directory.xml
  53. 13
      docs/editing-example3/operating-systems.xml
  54. 190
      docs/editing-howto.xml
  55. 20
      docs/execmanual.xml
  56. 36
      docs/execmanual/Makefile
  57. 17
      docs/execmanual/book.xml
  58. 93
      docs/execmanual/general.xml
  59. 64
      docs/execmanual/president.xml
  60. 135
      docs/execmanual/sysadmin.xml
  61. 208
      docs/execmanual/vice-president.xml
  62. 23
      docs/index.xml
  63. BIN
      docs/mathsoc.club.pdf
  64. 19
      docs/official.xml
  65. 16
      docs/procedure.xml
  66. 10
      docs/procedure/.gitignore
  67. 36
      docs/procedure/Makefile
  68. 1377
      docs/procedure/csc.procedure.latex
  69. 1379
      docs/procedure/procedure.tex
  70. 48
      docs/website.xml
  71. 120
      events.xml
  72. BIN
      favicon.ico
  73. 11
      index.xml
  74. BIN
      logos/csc_logo.gif
  75. 10
      media/index.xml
  76. 19
      menu.xml
  77. 33
      news.xml
  78. 5
      office/Makefile
  79. 8
      office/books.xml
  80. 3
      office/books/Makefile
  81. 8
      office/books/directory.xml
  82. 105
      office/computers.xml
  83. 4
      office/directory.xml
  84. 17
      office/index.xml
  85. 39
      office/operating-systems.xml
  86. 24
      office/staff.xml
  87. 6
      office/webcam-streaming.xml
  88. 6
      office/webcam.xml
  89. 2
      scripts/xml2ics.pl
  90. 5
      services/Makefile
  91. 21
      services/clubs.xml
  92. 10
      services/directory.xml
  93. 95
      services/index.xml
  94. 275
      services/machine_usage-change-20070819.xml
  95. 39
      services/machine_usage.xml
  96. 2
      services/machine_usage_summary.xml
  97. 4
      users/Makefile
  98. 7
      users/directory.xml
  99. 38
      users/index.xml
  100. 63
      xsl/books.xsl
  101. Some files were not shown because too many files have changed in this diff Show More

@ -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(/&/, "\\&amp;", name); gsub(/&/, "\\&amp;", program); gsub(/"/, "\\&quot;", name); gsub(/"/, "\\&quot;", program); print "<member name=\"" name "\" program=\"" program "\" userid=\"" userid "\" />"; }' >> $@
echo '</memberlist>' >> $@
books.xml:
echo '<?xml version='\''1.0'\'' encoding="ISO-8859-1"?>' > $@
echo '<booklist>' >> $@
ceoquery booklist | awk -F \| '{ isbn = $$1; title = $$2; author = $$3; edition = $$4; published = $$5; gsub(/&/, "\\&amp;", title); gsub(/&/, "\\&amp;", author); gsub(/&/, "\\&amp;", published); gsub(/&/, "\\&amp;", edition); gsub(/"/, "\\&quot;", title); gsub(/"/, "\\&quot;", author); gsub(/"/, "\\&quot;", published); gsub(/"/, "\\&quot;", edition); print "<book isbn=\"" isbn "\" title=\"" title "\" author=\"" author "\" edition=\"" edition "\" published=\"" published "\"/>"; }' >> $@
echo '</booklist>' >> $@
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

10
TODO

@ -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 <br>'s with <p>'s wherever it makes sense.
Replace <strong>, <b>, <i>, etc... tags with CSS.

@ -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

@ -6,12 +6,12 @@
<header />
<section title="1. Name">
<section title="1. Name" anchor="name">
<ol><li> The name of this organization shall be the "Computer Science Club
of the University of Waterloo".</li>
</ol>
</section>
<section title="2. Purpose">
<section title="2. Purpose" anchor="purpose">
<ol><li><a id="purpose">The Club</a> is organized and will be operated exclusively for educational
and scientific purposes in furtherance of:
<ul>
@ -34,7 +34,7 @@ decided by the club membership.</li>
</ol>
</section>
<section title="3. Membership">
<section title="3. Membership" anchor="membership">
<ol>
@ -59,7 +59,7 @@ The membership fee is set from time to time by the Executive.</li>
</ol>
</section>
<section title="4. Officers">
<section title="4. Officers" anchor="officers">
<ol><li> The officers of the Club shall be:
<ol><li> President</li>
<li> Vice-President</li>
@ -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.</li>
</ol>
</section>
<section title="5. Duties of Officers">
<section title="5. Duties of Officers" anchor="duties">
<ol>
<li> The duties of the President shall be:
@ -197,7 +197,7 @@ in <a href="#sysduties">7.2</a>.</li>
</li>
</ol>
</section>
<section title="6. Executive Council">
<section title="6. Executive Council" anchor="executive">
<ol>
<li> 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.</li>
</ol>
</section>
<section title="7. Committees">
<section title="7. Committees" anchor="committees">
<h3>1. Programme Committee</h3>
<ol><li>The programme committee shall be a standing committee.</li>
<li> The programme committee shall plan and arrange meetings of the Club in
@ -264,7 +264,7 @@ temporary committees as is deemed necessary.</li>
</ol>
</section>
<section title="8. Meetings">
<section title="8. Meetings" anchor="meetings">
<ol><li> General meetings of the Club shall
be called at times designated by the
@ -282,12 +282,12 @@ of the Club.</li>
</ol>
</section>
<section title="9. Finances">
<section title="9. Finances" anchor="finances">
<ol>
<li> 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.</li>
<li> The Treasurer shall present, as part of the tentative budget, a
@ -302,7 +302,7 @@ that the financial records are complete and accurate.</li>
</ol>
</section>
<section title="10. Amendments and Procedures">
<section title="10. Amendments and Procedures" anchor="amendments">
<ol><li> Amendments to the constitution shall be made in the following
manner:
@ -342,7 +342,7 @@ Club again within sixty (60) days.</li>
</ol>
</section>
<section title="11. Dissolution">
<section title="11. Dissolution" anchor="dissolution">
<ol><li> 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.</li>
@ -350,7 +350,7 @@ transferred to the Mathematics Society of the University of Waterloo.</li>
</section>
<section title="12. Use of Club Resources">
<section title="12. Use of Club Resources" anchor="resources">
<ol><li> All resources under control of the Club are to be used in accordance with
the aims of the Club.</li>
@ -368,7 +368,7 @@ course, responsible to the person granting permission.</li>
</ol>
</section>
<section title="Revision">
<section title="Revision" anchor="revision">
<p>The constitution was last revised on 5 February 2004.</p>
</section>

@ -3,6 +3,7 @@
<!DOCTYPE directory SYSTEM "../csc.dtd">
<directory title="About">
<diritem title="Constitution" href="constitution.html" />
<diritem title="The Executive" href="exec.html" />
<diritem title="Membership List" href="members.html" />
</directory>

@ -4,49 +4,49 @@
<cscpage title="The CSC Executive">
<header />
<section title="The Spring 2007 Executive">
<section title="The Executive">
<execlist>
<exec position="President"
name="Gaelan D'costa"
name="Holden Karau"
sex="male"
userid="president" />
<exec position="Vice President"
name="Kyle Larose"
name="Alex McCausland"
sex="male"
userid="vice-president" />
<exec position="Treasurer"
name="Kyle Spaans"
name="Dominik Chlobowski"
sex="male"
userid="treasurer" />
<exec position="Secretary"
name="Erik Louie"
name="Sean Cumming"
sex="male"
userid="secretary" />
<exec position="System Administrator"
type="appointed"
name="Michael Spang"
type="appointed"
name="David Tenty"
sex="male"
userid="sysadmin" />
<exec position="Librarian"
type="appointed"
name="David Tenty"
type="appointed"
name="Nobody"
sex="male"
userid="librarian" />
<exec position="Imapd (Individual Making Arrangements for Pop Delivery)"
type="appointed"
name="could be you? or groccery gateway"
type="appointed"
name="Nobody"
sex="male"
userid="imapd" />
<exec position="Web Master"
type="appointed"
name="Nick Guenther"
type="appointed"
name="Nobody"
sex="male"
userid="www" />
</execlist>
@ -58,7 +58,7 @@
held, check the <a href="../index.html">homepage</a> and the <a
href="http://csclub.uwaterloo.ca/newsgroup/thread.php?group=uw.csc">uw.csc newsgroup</a>. For details on the
election rules, see the <a
href="../docs/constitution.html">constitution</a>.
href="constitution.html">constitution</a>.
</p>
</section>
<footer/>

@ -7,7 +7,7 @@
<section title="What... is your name?">
<p>
According to our <a href="../docs/constitution.html">constitution</a> we
According to our <a href="constitution.html">constitution</a> we
are officially the &quot;Computer Science Club of the University
of Waterloo.&quot; You can contact <a href="exec.html">our
executive</a> by e-mail at <a
@ -15,20 +15,18 @@
come by the <a href="../office/">office</a> in MC3036/3037 or mail
us at the following address.
</p>
<pre>
Computer Science Club
<pre>Computer Science Club
Math &amp; Computer 3036/3037
University of Waterloo
200 University Avenue West
Waterloo, Ontario, CANADA
N2L 3G1
</pre>
<p>Our office phone number is (519) 888-4567 x33870</p>
N2L 3G1</pre>
<p>Our office phone number is (519) 888-4567 x33870.</p>
</section>
<section title="What... is your quest?">
<p>
Again our lovely <a href="../docs/constitution.html">constitution</a> (it
Again our lovely <a href="constitution.html">constitution</a> (it
really <i>is</i> quite a read, see for yourself!) answers this
question. In short, we exist to promote knowledge of and interest
in computer science as well as allowing those interested in
@ -39,8 +37,8 @@ N2L 3G1
computing and brings together many students and professionals from
all over the world with an interest in computing. We have an <a
href="../office/">office</a> where members get together, a
<a href="../office/books.html">library</a> of computer science books
available to our members, computer accounts on our various
<a href="http://library.csclub.uwaterloo.ca/">library</a> of computer
science books available to our members, computer accounts on our various
machines and much more. Frequently we host <a
href="../events/">events</a> related to computing, including talks,
tutorials and demonstrations.
@ -66,12 +64,12 @@ N2L 3G1
<section title="Can I join?">
<p>
If you are (or have been) a student, faculty or staff at the
<a href="http://www.uwaterloo.ca/">University of Waterloo</a>, you
can become a full member of the CSC. Otherwise, you can become an
affiliate member, meaning you can't vote or hold executive
office. Membership costs a mere $2 (Canadian) a term at the time of
this writing, but may change in the future.
In compliance with MathSoc regulations and in recognition of the club being
primarily targeted at undergraduate students, full membership is open to all
Social Members of the Mathematics Society and restricted to the same.
Affiliate membership is open to all others. Affiliate members may not vote
or hold executive positions. Membership costs a mere $2 (Canadian) a term
at the time of this writing, but may change in the future.
</p>
</section>
<footer />

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 511 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

@ -1,4 +0,0 @@
INPUTS = index.xml
SUBDIRS =
include ../default.mk

@ -1,8 +0,0 @@
<?xml version='1.0'?>
<!DOCTYPE directory SYSTEM "../csc.dtd">
<directory title="Clubs">
<diritem title="Mailing Lists"
href="http://mailman.csclub.uwaterloo.ca/" />
</directory>

@ -1,9 +1,8 @@
<!ELEMENT cscpage (biglogo*, menu*, section*, header*, footer*)>
<!ELEMENT cscpage (biglogo*, section*, header*, footer*)>
<!ATTLIST cscpage
title CDATA #REQUIRED>
<!ELEMENT biglogo EMPTY>
<!ELEMENT menu EMPTY>
<!ELEMENT section (#PCDATA)>
<!ATTLIST section
title CDATA #REQUIRED>
@ -39,24 +38,6 @@
<!ELEMENT members-this-term EMPTY>
<!ELEMENT booklist (member*)>
<!ELEMENT book EMPTY>
<!ATTLIST book
isbn CDATA #REQUIRED
title CDATA #REQUIRED
author CDATA #REQUIRED
published CDATA ""
edition CDATA "">
<!ELEMENT all-books EMPTY>
<!ELEMENT menudefs (menuitem*)>
<!ELEMENT menuitem EMPTY>
<!ATTLIST menuitem
icon CDATA #REQUIRED
href CDATA #REQUIRED
title CDATA #REQUIRED>
<!ELEMENT directory (diritem*)>
<!ATTLIST directory
href CDATA ""

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

@ -0,0 +1,30 @@
-----BEGIN CERTIFICATE-----
MIIFMzCCBBugAwIBAgIJAPR1nfSO+Jy1MA0GCSqGSIb3DQEBBQUAMIHBMR8wHQYD
VQQKExZVbml2ZXJzaXR5IG9mIFdhdGVybG9vMR4wHAYDVQQLExVDb21wdXRlciBT
Y2llbmNlIENsdWIxKDAmBgkqhkiG9w0BCQEWGWNlcnRzQGNzY2x1Yi51d2F0ZXJs
b28uY2ExETAPBgNVBAcTCFdhdGVybG9vMRAwDgYDVQQIEwdPbnRhcmlvMQswCQYD
VQQGEwJDQTEiMCAGA1UEAxMZQ1NDIENlcnRpZmljYXRlIEF1dGhvcml0eTAeFw0w
NzA4MjkxMjEyMDdaFw0xNzA4MjkxMjEyMDdaMIHBMR8wHQYDVQQKExZVbml2ZXJz
aXR5IG9mIFdhdGVybG9vMR4wHAYDVQQLExVDb21wdXRlciBTY2llbmNlIENsdWIx
KDAmBgkqhkiG9w0BCQEWGWNlcnRzQGNzY2x1Yi51d2F0ZXJsb28uY2ExETAPBgNV
BAcTCFdhdGVybG9vMRAwDgYDVQQIEwdPbnRhcmlvMQswCQYDVQQGEwJDQTEiMCAG
A1UEAxMZQ1NDIENlcnRpZmljYXRlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEB
BQADggEPADCCAQoCggEBALdpE8mFzGLpAQRtNSy+mJs4P335wuyEEXzjYM+elffk
TO6ek74NiFSCymfcWNwCG62y4HQoAjY+bYm+b1qp+5iHGWEHWHSTz3IMzV9UdrZo
zHXKV3YWxAkjXg8NU1PQVybj6F9ICjhf19POg2NDJ2dHxDAGJtfoBB8vbm9wcj16
Aa3dSSj5PZ7rPTUyChiqQg6DPAgvveNtc6SEcwnfD8Fhf7evBCw3En0YxvLFNiaa
cd7173EsKXzICADnEdhqCSyc8HwUwc0KA012NymP/IWQx1qlYthNVjHKNorBMcVt
hW3QrE97RqiOUdZ2UCpGom6F1bdO5dd2bDWvV9Rvnj0CAwEAAaOCASowggEmMAwG
A1UdEwQFMAMBAf8wHQYDVR0OBBYEFLiqXbgrCsS9f+KZeHrGhB/s1MwPMIH2BgNV
HSMEge4wgeuAFLiqXbgrCsS9f+KZeHrGhB/s1MwPoYHHpIHEMIHBMR8wHQYDVQQK
ExZVbml2ZXJzaXR5IG9mIFdhdGVybG9vMR4wHAYDVQQLExVDb21wdXRlciBTY2ll
bmNlIENsdWIxKDAmBgkqhkiG9w0BCQEWGWNlcnRzQGNzY2x1Yi51d2F0ZXJsb28u
Y2ExETAPBgNVBAcTCFdhdGVybG9vMRAwDgYDVQQIEwdPbnRhcmlvMQswCQYDVQQG
EwJDQTEiMCAGA1UEAxMZQ1NDIENlcnRpZmljYXRlIEF1dGhvcml0eYIJAPR1nfSO
+Jy1MA0GCSqGSIb3DQEBBQUAA4IBAQA5z4a8c7PXhDUm2wgslWBftfCiY7lek7Vt
nZK/gPQ7gqg4IVuRMVhbjt7MUAXV/3PqJqJTIcLqJ6NlqIviryafaX4Njqr6EUq3
LqAEeqqFtGSLnIQxF6SrWOkMNNvj6yRD1cCz6Sbj4sPxh301wfDJCvxnRRsWMxDH
NjYtQq0+hTK2FIlHP9FDp9FjHYOJw12WtatAQEfeB0tcXNMaUGtCjy15OGgFoLMT
x+iD/QU27fU2eeUlZowCtKrsYTnHPE65PY9czBxUnSCkFISldzuQ8/N9qkW9JnLI
xqplu2SWNdPTtUhBjCxYai4NeAAjVc0RYUC9xIDFXY1PrkfNUb6v
-----END CERTIFICATE-----

@ -5,7 +5,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:fn="http://www.w3.org/2005/xpath-functions"
xmlns:csc="http://www.csclub.uwaterloo.ca/xslt">
xmlns:csc="http://csclub.uwaterloo.ca/xslt">
<xsl:param name="g_date" required="yes" />
<xsl:param name="g_time" required="yes" />
@ -36,9 +36,7 @@
<xsl:include href="./xsl/functions.xsl" />
<xsl:include href="./xsl/common.xsl" />
<xsl:include href="./xsl/directory.xsl" />
<xsl:include href="./xsl/menu.xsl" />
<xsl:include href="./xsl/exec.xsl" />
<xsl:include href="./xsl/books.xsl" />
<xsl:include href="./xsl/members.xsl" />
<xsl:include href="./xsl/events.xsl" />
<xsl:include href="./xsl/news.xsl" />

@ -104,12 +104,6 @@ tr.members1 {
tr.members2 {
background: #cee6ff;
}
tr.books1 {
background: white;
}
tr.book2 {
background: #cee6ff;
}
img {
border-width: 0;
@ -129,8 +123,7 @@ div.webcam {
}
div.biglogo {
background: url(./csc_welcome.jpg) -20px 25px transparent no-repeat;
height: 340px;
height: 100px;
}
div.biglogo div {
float: left;
@ -141,6 +134,10 @@ div.biglogo div.uwlogo {
div.biglogo div.acmlogo {
margin-top: 12px;
}
div.biglogo div.csclogo {
margin-top: 12px;
float: right;
}
div.template-header {
padding-top: 5px;
@ -165,43 +162,9 @@ div.webtitle div.csclogo {
background-color: #215498;
}
div.menubar {
background-color: white;
padding-top: 12px;
margin: 0 auto;
text-align: center;
height: 75px;
vertical-align: middle;
font-size: 11px;
text-transform: uppercase;
}
div.menuitem {
margin: 0;
padding: 0;
text-align: center;
float: left;
}
div.menuitem a {
display: block;
text-align: center;
padding: 5px;
margin: 0;
text-decoration: none;
font-weight: 400;
font-family: 'Lucida Grande', Sans, Sans-serif;
}
div.menuitem a:hover {
font-weight: 700;
color: black;
background-color: #eee;
border: 1px solid #ccc;
}
a.diritem, a.diritem:link, a.diritem:visited, a.diritem:active {
font-family: 'Lucida Grande', Sans, Sans-serif;
font-size: 14px;
border-left: 4px solid #ccc;
padding: 0 15px 0 5px;
color: blue;
@ -211,16 +174,15 @@ a.diritem:hover {
border-left: 4px solid green;
}
a.headdir {
a.homedir {
font-weight: 700;
}
a.pagetop, a.pagetop:link, a.pagetop:visited, a.pagetop:hover {
font-family: 'Lucida Grande',sans, sans-serif;
display: block;
padding: 0 10px 10px 10px;
margin: 10px 0 0 0;
border-top: 1px solid #ccc;
padding: 5px 10px 5px 10px;
border: 1px solid #ccc;
background-color: #eee;
color: #999;
font-size: 9px;
@ -235,9 +197,14 @@ div.footer {
color: #666;
}
p.infobox {
div.infobox {
border: 1px solid #ccc;
padding: 5px 10px;
padding: 2px 2px;
}
div.infobox p {
margin: 5px;
padding: 0;
}
p.mediafile {

@ -11,6 +11,6 @@ clean:
@for i in $(SUBDIRS) ; do cd $$i && ($(MAKE) clean || exit 1) && cd .. ; done
rm -f *.html events.ics
%.html: %.xml $(ROOT)/csc.dtd $(ROOT)/cscweb.xsl $(ROOT)/xsl/*.xsl $(ROOT)/events.xml $(ROOT)/news.xml $(ROOT)/menu.xml $(ROOT)/default.mk directory.xml
%.html: %.xml $(ROOT)/csc.dtd $(ROOT)/cscweb.xsl $(ROOT)/xsl/*.xsl $(ROOT)/events.xml $(ROOT)/news.xml $(ROOT)/default.mk directory.xml
java -classpath $(CLASSPATH) net.sf.saxon.Transform -o $@ $< $(ROOT)/cscweb.xsl $(XSLTARGS)
sed -i 's| xmlns=""||' $@

@ -2,5 +2,12 @@
<!DOCTYPE directory SYSTEM "csc.dtd">
<directory title="Index">
<directory>
<diritem title="About" href="about/" />
<diritem title="Services" href="services/" />
<diritem title="Office" href="office/" />
<diritem title="Events" href="events/" />
<diritem title="Media" href="media/" />
<diritem title="Wiki" href="http://wiki.csclub.uwaterloo.ca/" />
<diritem title="Webmail" href="https://mail.csclub.uwaterloo.ca/" />
</directory>

@ -1,7 +0,0 @@
SUBDIRS = editing-example1 editing-example2 editing-example3 execmanual \
procedure
INPUTS = index.xml constitution.xml official.xml machine_usage.xml \
machine_usage_summary.xml website.xml editing-howto.xml \
constitution-change-20020920.xml execmanual.xml procedure.xml
include ../default.mk

@ -1,9 +0,0 @@
<?xml version='1.0'?>
<!DOCTYPE directory SYSTEM "../csc.dtd">
<directory title="Documents">
<diritem title="Official documents" href="official.html" />
<diritem title="Website documents" href="website.html" />
<diritem title="Executive manual" href="execmanual.html" />
</directory>

@ -1,3 +0,0 @@
INPUTS = operating-systems.xml
include ../../default.mk

@ -1,8 +0,0 @@
<?xml version='1.0'?>
<!DOCTYPE directory SYSTEM "../../csc.dtd">
<directory title="Office">
<diritem title="Staff" href="staff.html" />
<diritem title="Books" href="books.html" />
</directory>

@ -1,6 +0,0 @@
<?xml version='1.0'?>
<!DOCTYPE cscpage SYSTEM "../../csc.dtd">
<cscpage title="Operating Systems the CSC distributes" pre="../../">
<header/>
<footer/>
</cscpage>

@ -1,3 +0,0 @@
INPUTS = operating-systems.xml
include ../../default.mk

@ -1,9 +0,0 @@
<?xml version='1.0'?>
<!DOCTYPE directory SYSTEM "../../csc.dtd">
<directory title="Office">
<diritem title="Staff" href="staff.html" />
<diritem title="Books" href="books.html" />
<diritem title="Operating Systems" href="operating-systems.html" />
</directory>

@ -1,6 +0,0 @@
<?xml version='1.0'?>
<!DOCTYPE cscpage SYSTEM "../../csc.dtd">
<cscpage title="Operating Systems the CSC distributes" pre="../../">
<header/>
<footer/>
</cscpage>

@ -1,3 +0,0 @@
INPUTS = operating-systems.xml
include ../../default.mk

@ -1,9 +0,0 @@
<?xml version='1.0'?>
<!DOCTYPE directory SYSTEM "../../csc.dtd">
<directory title="Office">
<diritem title="Staff" href="staff.html" />
<diritem title="Books" href="books.html" />
<diritem title="Operating Systems" href="operating-systems.html" />
</directory>

@ -1,13 +0,0 @@
<?xml version='1.0'?>
<!DOCTYPE cscpage SYSTEM "../../csc.dtd">
<cscpage title="Operating Systems the CSC distributes" pre="../../">
<header/>
<section title="List of operating systems">
<ul>
<li><a href="http://www.debian.org/">Debian GNU/Linux</a></li>
<li><a href="http://www.freebsd.org/">FreeBSD</a></li>
</ul>
<p>More operating systems may be available.</p>
</section>
<footer/>
</cscpage>

@ -1,190 +0,0 @@
<?xml version='1.0'?>
<!DOCTYPE cscpage SYSTEM "../csc.dtd">
<cscpage title="CSC Website Editing Howto">
<header/>
<section title="Getting started">
<p>
In order to edit the website you will first have to get the CVS
repository in which it is stored. To do so, go somewhere in your
home directory and type:
</p>
<code>
export CVS_RSH=ssh<br />
cvs -d username@caffeine.uwaterloo.ca:/u/www/cvsroot co www
</code>
<p>
Where <code>username</code> is your CSC user name. You will be
prompted for your password (unless you use an SSH key). After a
while you should have a new directory, <code>www/</code>, with
the CSC pages in it.
</p>
<p>
You will also need <code>libxslt</code> and <code>libxml</code>
(including development headers) from Gnome. In debian,
<code>apt-get install libxml2-dev libxslt1-dev</code>.
</p>
</section>
<section title="Compiling the website">
<p>
The CSC website is <i>compiled</i>. This means that when you
edit a page, you don't edit the HTML source directly, but
instead edit a page describing the page's <i>content</i> (and
some formatting) and then run a command to generate the HTML
page from these content description pages.
</p>
<p>
To generate the CSC website, make sure you are in the directory
into which you checked it out (the <code>www/</code> directory)
and enter
</p>
<code>
make
</code>
<p>
This will compile the whole website. After any changes you make
you will have to recompile the website in the same manner.
</p>
</section>
<section title="Adding a regular page">
<p>
Let's now suppose we want to add a page detailing what operating
systems the CSC distributes through its CD-burning. First, we go
to the appropriate directory, in this case probably
<code>www/office</code>. Here we now open a new file called
<code>operating-systems.xml</code> in our favourite text editor
(emacs, of course). Take note that the filename ends in
<code>.xml</code>. All CSC web pages should have this file
ending.
</p>
<p>
The next thing to do is to add a few standard XML things to the
file. We add the two lines:
</p>
<code>
&lt;&#63;xml version='1.0'&#63;&gt;<br />
&lt;!DOCTYPE cscpage SYSTEM &quot;../csc.dtd&quot;&gt;
</code>
<p>
Note the reference to the file <code>../csc.dtd</code>. This
file is located in the <code>www/</code> directory, which is the
parent directory of <code>www/office/</code>, therefore we use
<code>../</code>. These two lines should appear at the top of
every CSC web page.
</p>
<p>
Next we start the actual page. To begin, we open a
<code>cscpage</code> tag with the title attribute set to the
title of our page. We also want to add a header with the CSC
logo, the current section directory and the title of the
page. Don't worry though, as you'll see this is really easy. Add
the following two lines to the end of the page:
</p>
<code>
&lt;cscpage title=&quot;Operating Systems the CSC
distributes&quot;&gt;<br />
&lt;header /&gt;
</code>
<p>
That's it! So we can see what our page looks like so far, we
also add the footer (with the menu, generation date, and
copyright information) and we close the <code>cscpage</code>
tag. Add the following lines to the end:
</p>
<code>
&lt;footer /&gt;<br />
&lt;/cscpage&gt;
</code>
<p>
Notice how in the case of <code>header</code> and
<code>footer</code> we have a <code>/</code> before the
<code>&gt;</code>? This is one of the major differences between
HTML and XML: tags that don't really have an end tag, such as
<code>&lt;br&gt;</code> have to be specified as being
<i>empty</i> in XML by adding a <code>/</code> before the
<code>&gt;</code>. This is particularily important to remember
when you add XHTML (XML's version of HTML) to the page.
</p>
<p>
Now we want to see what the resulting HTML page looks like. But
first we have to tell <code>make</code> about our new page. To
do so, open up the file <code>www/office/Makefile</code>, find
the line beginning with <code>INPUTS = </code> and simply add
<code>operating-systems.xml</code> to the end of that line. So
the line might look like <code>INPUTS = index.html staff.xml
books.xml operating-systems.xml</code>. Save
<code>Makefile</code> and close it. Now, in the
<code>www/</code> directory, type <code>make</code>. This will
build the whole website, (hopefully!) including our little
document. Once <code>make</code> is done, have a look at the
resulting file,
<code>www/office/operating-systems.html</code>. It should look
like <a href="editing-example1/operating-systems.html">example
1</a> (use your browsers Back button to return to this page
after viewing the example).
</p>
<p>
Looking at the generated page, you may have noticed that it does
not yet appear in the menu at the top of the page. Opening up
the special file <code>www/office/directory.xml</code> you will
see several entries, each corresponding to one of the menu
items. After the last line beginning with
<code>&lt;diritem</code>, add in the following line:
</p>
<code>
&lt;diritem title=&quot;"Operating Systems&quot;
href=&quot;operating-systems.html&quot; /&gt;
</code>
<p>
Now recompile the site with <code>make</code>. You should see
that the page now looks something like <a
href="editing-example2/operating-systems.html">example
2</a>. Also note that all the other office pages will now have a
reference to the new operating systems page.
</p>
<p>
With that out of the way, it's time to add some content. You may
be happy to hear that you can add regular (X)HTML to any CSC web
page. So, we'll add the following content between the
<code>&lt;header /&gt;</code> and <code>&lt;footer /&gt;</code>
of the page:
</p>
<code>
&lt;section title=&quot;List of operating systems&quot;&gt;<br/>
&lt;ul&gt;<br/>
&lt;li&gt;&lt;a href=&quot;http://www.debian.org/&quot;&gt;Debian GNU/Linux&lt;/a&gt;&lt;/li&gt;<br/>
&lt;li&gt;&lt;a href=&quot;http://www.freebsd.org/&quot;&gt;FreeBSD&lt;/a&gt;&lt;/li&gt;<br/>
&lt;/ul&gt;<br/>
&lt;p&gt;More operating systems may be available.&lt;/p&gt;<br/>
&lt;/section&gt;<br/>
</code>
<p>
As usual, compile your changes using <code>make</code> and have
a look. The resulting file should look something like <a
href="editing-example3/operating-systems.html">example 3</a>. A
few things to keep in mind are:
</p>
<ul>
<li>
Always use lower-case in your XHTML tags. XML is
case-sensitive. For example: <code>&lt;br/&gt;</code> is good
whereas <code>&lt;BR/&gt;</code> is bad.
</li>
<li>
Always close your tags. If it's a tag that never encloses
anything use the <code>&lt;tag/&gt;</code> syntax. For
example: <code>&lt;ul&gt; &lt;li&gt;Item
1&lt;br/&gt;Linebreak&lt;/li&gt; &lt;li&gt;Item
2&lt;/li&gt;&lt;/ul&gt;</code> is good, whereas
<code>&lt;ul&gt; &lt;li&gt;Item
1&lt;br&gt;Linebreak &lt;li&gt;Item 2&lt;/ul&gt;</code> is bad.
</li>
<li>
You must place HTML code inside <code>&lt;section&gt;</code>
tags. You can have as many section as you want on the page.
</li>
</ul>
</section>
<footer />
</cscpage>

@ -1,20 +0,0 @@
<?xml version='1.0'?>
<!DOCTYPE cscpage SYSTEM "../csc.dtd">
<cscpage title="Executive manual">
<header />
<section title="The CSC Executive Manual">
<p>The CSC exec manual is intended to provide exec with a wealth of information on
useful topics provided by past executives. It should be kept up-to-date every term
by the current executives. One chapter is devoted to each executive position, with
descriptions of that position's duties and how to carry them out effectively.</p>
<p>At this point in time the exec manual is nowhere near complete. If you feel the
manual is a good contribution to the club, please bug the exec to put more work
into it.</p>
<p>The executive manual is written using DocBook and is available
<a href="execmanual/book.html">in HTML format</a>. The
<a href="execmanual/">DocBook source</a> is also on-line.</p>
</section>
<footer/>
</cscpage>

@ -1,36 +0,0 @@
STYLESHEET = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl
FOSTYLESHEET = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/fo/docbook.xsl
XSLTPROC = xsltproc
XMLS = $(wildcard *.xml)
HTMLS = $(XMLS:.xml=.html)
#all: book.html book.tex book.pdf
all: book.html
clean-recurse: clean
clean:
rm -f *.html *.fot *.out *.fo *.pdf *.log *.aux *.ps *.dvi *.tex
book.html: $(XMLS)
%.html: %.xml
$(XSLTPROC) $(STYLESHEET) $< > $@
%.fo: %.xml
$(XSLTPROC) $(FOSTYLESHEET) $< > $@
#%.pdf: %.fo
# pdfxmltex $<
%.tex: %.xml
openjade -t tex -d /usr/share/sgml/docbook/stylesheet/dsssl/modular/print/docbook.dsl $<
%.dvi: %.tex
jadetex $<
%.pdf: %.tex
pdfjadetex $<
%.ps: %.dvi
dvips -o $@ $<

@ -1,17 +0,0 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
[
<!ENTITY prez SYSTEM "president.xml">
<!ENTITY veep SYSTEM "vice-president.xml">
<!ENTITY sysadmin SYSTEM "sysadmin.xml">
<!ENTITY general SYSTEM "general.xml">
]>
<book><title>Computer Science Club Exec Manual</title>
&prez;
&veep;
&sysadmin;
&general;
</book>

@ -1,93 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter>
<title>General Information</title>
<para>Our mailbox is in the MathSoc office. It should be checked on a
regular basis.
</para>
<sect1>
<title>Useful Contacts</title>
<para>There are several people that many exec will need contact information
for. Their contact info follows and <emphasis> should be updated when
these people change!</emphasis></para>
<itemizedlist>
<listitem>
<para>Donna Schell: We use her to book most rooms in the MC or elsewhere on
campus. She can generally book any lecture hall. If she can't do it, she
can tell you who can! She can be reached at
<email>dschell@uwaterloo.ca</email> or at extension 2207.</para>
</listitem>
<listitem>
<para>Vera Korody: ICR secretary. Should we wish to use the DC fishbowl for
anything we can contact her. She may require us to get the permission of a
ICR director to use it. Currently the friendly director is Vic DiCiccio at
<email>vicd@uwaterloo.ca</email>. I am including the text of an email
I sent and the response from Vic at the end of this segment. It is easiest
to talk to her directly at the ICR reception area beside the fishbowl in DC,
however she can also be e-mailed at <email>vkorody@uwaterloo.ca</email> or
called at ext. 2042.</para>
</listitem>
<listitem>
<para>MathSoc: It is often smart to have executive in MathSoc who are
friendly with the CSC. To that end it is helpful to keep up with the
MathSoc exec and attend MathSoc events. Their office is directly across the
always closed door from ours. The president and VPF are particularily
helpful, in case we go a little over budget for any event they can approve
funding up to $100 extra by themselves. They can be reached at
<email>president@mathsoc.uwaterloo.ca</email> and
<email>VPF@mathsoc.uwaterloo.ca</email>. They also have a projector that
we can borrow from time to time.</para>
</listitem>
<listitem>
<para>AV stuff should be handled through AV services at extension
3033. Keys for AV stuff can be obtained at E2 1309. Note that they
will charge you $80 if you intend to use a projector (and that's
non-refundable - apparently bulbs are expensive and need to be
replaced often).
</para>
</listitem>
</itemizedlist>
</sect1>
<para>The E-mail I sent to Vic:</para>
<para>Hi,</para>
<para>The Computer Science Club is interested in booking DC 1301 (The Fishbowl)
for a student-prof mixer on the afternoon Monday, October 17. We were
told that it would require the permission of someone higher up in ICR since
we're a student club. We considered asking our faculty advisor, Prabhakar
Ragde, to book it on our behalf, but that would require him to be present
for the entire event and we don't want to impose on him to that extent
unless we have to. We are hoping to get your permission to book it since
our primary purpose is to remove alcohol from the picture, to get it away
from the "pints" mentallity and focus it more towards the frosh.</para>
<para>Thanks for your consideration.</para>
<para>Tim Loach</para>
<para>CSC President</para>
<para> And his Response:</para>
<para>Hi Timothy,</para>
<para>Sure, I would definitely approve this. Have you been turned down by
others? But you need to email Vera Korody to book the room, because it
might be booked, and you need to get her rules about moving chairs,
etc. I'll copy her on this email.</para>
<para>BTW, does the CSC know that Mike Lazaridis is coming to Fed Hall on Oct
3 to explain why RIM is a cool place to work, and that there are still
challenges there to interest co-ops and grads. We could use your help
in getting the word out. You've probably seen the posters.</para>
<para>Best,</para>
<para>Vic</para>
</chapter>

@ -1,64 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter>
<title>President</title>
<para>This chapter covers various useful notes for the CSC president,
ranging from who to call for room bookings to when the term should end.
I&#39;ll rant some more later.</para>
<sect1>
<title>What to do</title>
<para>The President is the person responsible. As ungrammatical as that
may seem, it is exactly accurate. He or she is responsible to make certain
that everything the CSC is involved in gets proper attention. Specifically,
the President&#39;s duties are:</para>
<itemizedlist>
<listitem>
<para> to call and preside at all general, special, and executive
meetings of the Club;</para>
</listitem>
<listitem>
<para> to appoint all committees of the Club and the committee chair
of such committees, except the chair of the Programme Committee;</para>
</listitem>
<listitem>
<para> to audit, or to appoint a representative to audit, the
financial records of the club at the end of each academic term.</para>
</listitem>
</itemizedlist>
<para>Wherever possible, the President should delegate tasks to others.
Not doing this can overburden the President.</para>
</sect1>
<sect1>
<title>Explanation</title>
<para>As listed above the president is responsible for appointing
committee chair&#39;s and other positions. So, it is basically up to the
president to decide whether or not there is an explicit office staff. How
do people become office staff? Must the office close every day? What do
the members expect to get out of the club in this term? </para>
</sect1>
<sect1>
<title>MathSoc</title>
<para>The CSC is a MathSoc club as such you should know the <ulink
url="http://www.math.uwaterloo.ca/pinkbook.php">MathSoc club policies</ulink>
and know that the president is a non-voting member of MathSoc council,
like MathSoc directors.</para>
</sect1>
<sect1>
<title>Planning events</title>
<para>Planning events is a useful thing to know, so go read the
Vice-President&#39;s section.</para>
</sect1>
</chapter>

@ -1,135 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter>
<title>System Administrator</title>
<para>The systems administrator position is probably the position
requiring the largest amount of &quot;ad-hoc&quot; knowledge. In
particular, there are many decisions related to how the CSC
computers are run which may not be so obvious from looking at the
systems themselves.</para>
<para>For this reason, as sysadmin of the CSC it is of vital
importance that you not only read this document, but keep it up to
date as well.</para>
<sect1>
<title>Your responsibilities</title>
<para>According to the constitution, the following are the duties
of the sysadmin:</para>
<itemizedlist>
<listitem>
<para>to operate any and all equipment in the possession of the Club;</para>
</listitem>
<listitem>
<para> to maintain and upgrade the software on equipment that is
operated by the Club;</para>
</listitem>
<listitem>
<para>to facilitate the use of equipment that is operated by the Club.</para>
</listitem>
</itemizedlist>
<para>It has become quite regular for the CSC to get new equipment each
term. The sysadmin is responsible for ensuring this gear gets installed
and works as intended.</para>
</sect1>
<sect1>
<title>Useful contacts</title>
<itemizedlist>
<listitem>
<para>You can try getting access to the machine room from MFCF/CSCF.
You probably want to talk to Dave Gawley, <email>dlgawley@cs.uwaterloo.ca</email>.
He&#39;s been really friendly to the CSC in the past and is a cool guy
in general.</para>
</listitem>
</itemizedlist>
</sect1>
<sect1>
<title>Changing Users</title>
<para>To alter users and groups please use the cpu command. cpu is setup
to use ldap to change any given user or group.</para>
<itemizedlist>
<listitem>To change a users group use cpu usermod -G current,groups,new,groups</listitem>
<listitem>man cpu-ldap</listitem>
<listitem>cpu groupadd cvs-ceo</listitem>
</itemizedlist>
</sect1>
<sect1>
<title>Expiring Users</title>
<para>This procedure is for users that were expired at the end of spring
2003.</para>
<orderedlist>
<listitem>
<para>login as root on peri (you probably can&#39;t do this, but might
have access to someone who can..)</para>
</listitem>
<listitem>
<para>Unexpire the account in the ldap database</para>
<para><prompt>peri# </prompt><userinput>echo username