From 71c0ffc7c9e68f4cb72263917d861d807c5c10ed Mon Sep 17 00:00:00 2001
From: Marc Burns <m4burns@uwaterloo.ca>
Date: Sat, 25 Feb 2012 00:14:58 -0500
Subject: [PATCH] OpenCL registration deadline passed. Update stuff.

---
 opencl/Makefile      |  2 +-
 opencl/directory.xml |  2 +-
 opencl/index.xml     | 15 +++------------
 opencl/register.xml  | 42 +-----------------------------------------
 opencl/submit.xml    | 15 +++++++++++++++
 5 files changed, 21 insertions(+), 55 deletions(-)
 create mode 100644 opencl/submit.xml

diff --git a/opencl/Makefile b/opencl/Makefile
index d6e2ac9..79c8742 100644
--- a/opencl/Makefile
+++ b/opencl/Makefile
@@ -1,3 +1,3 @@
-FILES = index.html register.html register-fail.html register-success.html register.cgi .htaccess openclintro.pdf
+FILES = index.html submit.html register.html register-fail.html register-success.html register.cgi .htaccess openclintro.pdf
 RELDIR = opencl/
 include ../common.mk
diff --git a/opencl/directory.xml b/opencl/directory.xml
index 3970947..d0026bf 100644
--- a/opencl/directory.xml
+++ b/opencl/directory.xml
@@ -3,5 +3,5 @@
 <!DOCTYPE directory SYSTEM "../csc.dtd">
 
 <directory title="OpenCL">
- <diritem title="Register" href="register" />
+ <diritem title="Submit" href="submit" />
 </directory>
diff --git a/opencl/index.xml b/opencl/index.xml
index f65eae6..506b3f7 100644
--- a/opencl/index.xml
+++ b/opencl/index.xml
@@ -7,22 +7,13 @@
  
  <section title="CSC/AMD OpenCL Competition"> 
   <p>
-  The University of Waterloo Computer Science Club and AMD are running an OpenCL programming competition. If you're interested in writing massively parallel software on the OpenCL platform, come register for the competition! You'll have a chance to win an HP laptop or AMD graphics card.
+  The University of Waterloo Computer Science Club and AMD are running an OpenCL programming competition. As of February 25th, 2012, registration has closed. The competition has begun, and will run until 11:59 on March 2nd. A score board for closed problem set submissions will be available shortly.
   </p>
- </section>
-
- <section title="What is this OpenCL of which you speak?">
-  <p>
-  On February 16th, 2012, we ran a tutorial on writing OpenCL programs. Slides are available <a href="openclintro.pdf">here.</a> You can drop by our office in MC 3036 to pick up an OpenCL reference book, courtesy of AMD.
-  </p>
- </section>
-
- <section title="EXTERMINATE!">
   <p>
-  You can register to participate in the contest <a href="register">here.</a> If you want to participate and possibly win prizes, you'll need to register here between the 16th and 24th of February. On March 2nd, we'll be holding a contest code party. All contestants are invited; the submissions deadline will be at 12:00 AM. At the conclusion of the party, there will be judging and prizes. Participants will have the chance to win a laptop or AMD graphics card.
+  For information on electronic submission, <a href="submit">click here.</a>
   </p>
   <p>
-  If you have any questions, please contact <a href="mailto:exec@csclub.uwaterloo.ca">exec@csclub.uwaterloo.ca</a> or drop by the Computer Science Club in MC 3036. We hope you'll join us!
+  Katie's OpenCL introduction slides are available <a href="openclintro.pdf">here.</a>
   </p>
  </section>
 
diff --git a/opencl/register.xml b/opencl/register.xml
index f9c4b1a..df4e7ce 100644
--- a/opencl/register.xml
+++ b/opencl/register.xml
@@ -7,47 +7,7 @@
  
  <section title="CSC/AMD OpenCL Competition Registration">
   <p>
-    The OpenCL contest will be split into two sections of participants: Open Submission and Problem Set.
-  </p>
-  <ul>
-  <li>
-    If you choose to participate in the Open Submission section, you will be able to submit any project which runs in the OpenCL environment. Your submission will be judged subjectively by a panel of three judges.
-  </li>
-  <br />
-  <li>
-    On the other hand, if you participate in the Problem Set section, you will be required to implement several programs to solve a set of problems (released on the 24th). Your submissions will be judged objectively by an electronic judge. In this section, you will be scored on correctness and efficiency.
-  </li>
-  <br />
-  <li>
-    You may choose to work in a team of up to three people, or alone.
-  </li>
-  </ul>
-  <p>
-    In order to process your registration, we'll need your Quest ID, an email address, and your choice of team/section participation. Please fill out the form below:
-  </p>
-  <p>
-
-  <form action="register.cgi" method="post">
-    <table cellpadding="5px">
-    <tr>
-      <td>Quest ID:</td><td><input type="text" name="quest" /></td>
-    </tr>
-    <tr>
-      <td>Email:</td><td><input type="text" name="email" /></td>
-    </tr>
-    <tr>
-      <td>Are you participating with a team?</td><td><input type="checkbox" name="team" value="yes" /></td>
-    </tr>
-    <tr>
-      <td>Problem type:</td><td><input type="checkbox" name="open" value="yes" /> Open Submission
-                                <input type="checkbox" name="closed" value="yes" /> Problem Set</td>
-    </tr>
-    <tr>
-      <td></td><td><input type="submit" name="Register" value="Register" /></td>
-    </tr>
-    </table>
-  </form>
-
+    Registration is now closed.
   </p>
  </section>
 
diff --git a/opencl/submit.xml b/opencl/submit.xml
new file mode 100644
index 0000000..41c67f3
--- /dev/null
+++ b/opencl/submit.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE cscpage SYSTEM "../csc.dtd">
+
+<cscpage title="CSC/AMD OpenCL Competition Submission">
+ <header />
+ 
+ <section title="Submit"> 
+  <p>
+    The submission system is not yet online. Check back tomorrow!
+  </p>
+ </section>
+
+ <footer />
+</cscpage>