From 4f2fe85c9f2d0c064a86f2dc7bd2d53c455cd67b Mon Sep 17 00:00:00 2001 From: "Ivan R. Judson" Date: Wed, 7 Aug 2013 06:50:02 -0700 Subject: [PATCH] Fixed "my competitions" Changed order so participation is before management (since it's the more common case). Fixed partials so participation is filled in correctly. --- .../apps/web/templates/web/my/_entered.html | 4 ++-- codalab/apps/web/templates/web/my/index.html | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/codalab/apps/web/templates/web/my/_entered.html b/codalab/apps/web/templates/web/my/_entered.html index ab4c15e4c..23893dd18 100644 --- a/codalab/apps/web/templates/web/my/_entered.html +++ b/codalab/apps/web/templates/web/my/_entered.html @@ -1,7 +1,7 @@ -{% if not participations %} +{% if not competitions %}

You have not participated in any competitions.

{% else %} - {% for item in participations %} + {% for item in competitions %}
diff --git a/codalab/apps/web/templates/web/my/index.html b/codalab/apps/web/templates/web/my/index.html index 196f7b99d..1b1f1de5a 100644 --- a/codalab/apps/web/templates/web/my/index.html +++ b/codalab/apps/web/templates/web/my/index.html @@ -5,22 +5,21 @@
-

- Competitions I'm Running +

+ Competitions I'm Participating In

-
- {% include "web/my/_managed.html" with competitions=my_competitions %} +
+ {% include "web/my/_entered.html" with competitions=competitions_im_in %}
-
-
-

- Competitions I'm Participating In +

+

+ Competitions I'm Running

-
- {% include "web/my/_entered.html" with competitions=competitions_im_in %} +
+ {% include "web/my/_managed.html" with competitions=my_competitions %}