Revert "Cleaned up the ChallengeSettings and docstrings."

This reverts commit 06bf78f.
csdl · Jan 23, 2013 · cd09482 · cd09482
1 parent 829916d
commit cd09482
Show file tree

Hide file tree

Showing 28 changed files with 74 additions and 590 deletions.
diff --git a/makahiki/apps/managers/challenge_mgr/admin.py b/makahiki/apps/managers/challenge_mgr/admin.py
@@ -89,11 +89,11 @@ class ChallengeSettingAdmin(admin.ModelAdmin):
     """ChallengeSetting administrator interface definition."""
 
     fieldsets = (
-        ("Challenge",
+        (None,
             {"fields":
-                  (("name", "location"),
-                   ("logo", "domain"),
-                   ("team_label", "theme"),
+                  (("site_name", "site_logo"),
+                   ("competition_name", "site_domain"),
+                   ("competition_team_label", "theme"),
                   )}),
         ("Authentication",
             {"fields":

diff --git a/makahiki/apps/managers/challenge_mgr/challenge_mgr.py b/makahiki/apps/managers/challenge_mgr/challenge_mgr.py
@@ -63,8 +63,8 @@ def info():
     """Returns the challenge name and site."""
     init()
     challenge = get_challenge()
-    return "Challenge name : %s @ %s" % (challenge.name,
-                                         challenge.location)
+    return "Challenge name : %s @ %s" % (challenge.competition_name,
+                                         challenge.site_name)
 
 
 def get_challenge():

diff --git a/makahiki/apps/managers/challenge_mgr/context_processors.py b/makahiki/apps/managers/challenge_mgr/context_processors.py
@@ -58,7 +58,7 @@ def competition(request):
         "CHALLENGE": challenge,
         "SCORE_SETTINGS": score_mgr.score_setting(),
         "CSS_THEME": css_theme,
-        "TEAM_LABEL": challenge.team_label,
+        "TEAM_LABEL": challenge.competition_team_label,
         "MAKAHIKI_FACEBOOK_APP_ID":
             settings.MAKAHIKI_FACEBOOK_APP_ID if settings.MAKAHIKI_USE_FACEBOOK else '',
         "MAKAHIKI_USE_LESS": settings.MAKAHIKI_USE_LESS,

diff --git a/...migrations/0003_auto__del_field_challengesetting_site_name__add_field_challengesetting.py b/...migrations/0003_auto__del_field_challengesetting_site_name__add_field_challengesetting.py
diff --git a/...migrations/0004_auto__del_field_challengesetting_site_domain__add_field_challengesetti.py b/...migrations/0004_auto__del_field_challengesetting_site_domain__add_field_challengesetti.py