Remind users that club accounts are free.
[public/pyceo-broken.git] / ceo / urwid / main.py
index 3417667..53d3ba2 100644 (file)
@@ -30,22 +30,11 @@ def program_name():
 
     return "%s %s %s" % (cword, eword, oword)
 
-office_data = {
-    "name" : "Office Staff",
-    "group" : "office",
-    "groups" : [ "cdrom", "audio", "video", "www" ],
-}
-
-syscom_data = {
-    "name" : "Systems Committee",
-    "group" : "syscom",
-    "groups" : [ "office", "staff", "adm", "src" ],
-}
-
 def new_member(*args, **kwargs):
     push_wizard("New Member", [
         newmember.IntroPage,
         newmember.InfoPage,
+        newmember.NumberOfTermsPage,
         newmember.SignPage,
         newmember.PassPage,
         newmember.EndPage,
@@ -61,7 +50,9 @@ 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,
         newmember.PassPage,
         (newmember.EndPage, "clubuser"),
@@ -87,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,
@@ -159,8 +151,6 @@ def top_menu():
     syscom_only = [
         ("Manage Club or Group Members", manage_group, None),
         ("Manage Positions", manage_positions, None),
-        ("Manage Office Staff", groups.group_members, office_data),
-        ("Manage Systems Committee", groups.group_members, syscom_data),
     ]
     unrestricted = [
         ("Display Member", display_member, None),