From 5cf982e8d59d517589f68d11dcc205236ef8942d Mon Sep 17 00:00:00 2001
From: Sean Hunt <scshunt@csclub.uwaterloo.ca>
Date: Tue, 22 Jul 2014 14:21:41 -0400
Subject: [PATCH] Remind users that club accounts are free.

---
 ceo/urwid/main.py      |  2 ++
 ceo/urwid/newmember.py | 11 ++++++++++-
 debian/changelog       |  7 +++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ceo/urwid/main.py b/ceo/urwid/main.py
index b9694cc..53d3ba2 100644
--- a/ceo/urwid/main.py
+++ b/ceo/urwid/main.py
@@ -50,6 +50,7 @@ def new_club(*args, **kwargs):
 def new_club_user(*args, **kwargs):
     push_wizard("New Club Rep Account", [
         newmember.ClubUserIntroPage,
+        newmember.ClubNoPayPage,
         newmember.InfoPage,
         newmember.NumberOfTermsPage,
         newmember.SignPage,
@@ -77,6 +78,7 @@ def renew_member(*args, **kwargs):
 def renew_club_user(*args, **kwargs):
     push_wizard("Renew Club Rep Account", [
         renew.ClubUserIntroPage,
+        newmember.ClubNoPayPage,
         renew.UserPage,
         renew.EmailPage,
         renew.EmailDonePage,
diff --git a/ceo/urwid/newmember.py b/ceo/urwid/newmember.py
index 04a969e..f3e56e0 100644
--- a/ceo/urwid/newmember.py
+++ b/ceo/urwid/newmember.py
@@ -9,7 +9,7 @@ class IntroPage(WizardPanel):
             urwid.Text( "Joining the Computer Science Club" ),
             urwid.Divider(),
             urwid.Text( "CSC membership is $2.00 per term. Please ensure "
-                        "the fee is deposited into the safe before continuing." ),
+                        "the fee is deposited into the cup before continuing." ),
         ]
     def focusable(self):
         return False
@@ -31,6 +31,15 @@ class ClubIntroPage(WizardPanel):
     def focusable(self):
         return False
 
+class ClubNoPayPage(WizardPanel):
+    def init_widgets(self):
+        self.widgets = [
+            urwid.Text( "Club representative accounts are free. Please ensure "
+                        "that no money was paid for this account." ),
+        ]
+    def focusable(self):
+        return False
+
 class ClubUserIntroPage(WizardPanel):
     def init_widgets(self):
         self.widgets = [
diff --git a/debian/changelog b/debian/changelog
index ed6c1b5..da6fdac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ceo (0.5.25) stable; urgency=low
+
+  * Replace mention of the safe with the cup.
+  * Remind users that club accounts are free.
+
+ -- Sean Hunt <scshunt@csclub.uwaterloo.ca>  Tue, 22 Jul 2014 14:20:16 -0400
+
 ceo (0.5.24ubuntu5) saucy; urgency=low
 
   * Packaging for saucy.