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.
kalpathy · Aug 7, 2013 · 4f2fe85 · 4f2fe85
1 parent 8814181
commit 4f2fe85
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git 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 %}
     <p>You have not participated in any competitions.</p>
 {% else %}
-  {% for item in participations %}
+  {% for item in competitions %}
      <div class="competition-tile">
         <article class="subContainer">
             <input id="competitionID" type="hidden" value="{{ item.competition.pk }}" />

diff --git a/codalab/apps/web/templates/web/my/index.html b/codalab/apps/web/templates/web/my/index.html
@@ -5,22 +5,21 @@
     <div class="large-9 push-3 columns">
         <div class="section-container auto competitionsDetailTabArea " data-section data-section-resized>
           <section>
-            <p class="title" id="managed" data-section-title>
-                <a href="#manage">Competitions I'm Running</a>
+            <p class="title active" id="participating" data-section-title>
+                <a href="#participate">Competitions I'm Participating In</a>
             </p>
             <div class="content" data-section-content>
-                <div class="my_managed">
-                    {% include "web/my/_managed.html" with competitions=my_competitions %}
+                <div class="my_participating">
+                    {% include "web/my/_entered.html" with competitions=competitions_im_in %}
                 </div>
             </div>
-          </section>
-          <section>
-            <p class="title" id="participating" data-section-title>
-                <a href="#participate">Competitions I'm Participating In</a>
+          </section>          <section>
+            <p class="title" id="managed" data-section-title>
+                <a href="#manage">Competitions I'm Running</a>
             </p>
             <div class="content" data-section-content>
-                <div class="my_participating">
-                    {% include "web/my/_entered.html" with competitions=competitions_im_in %}
+                <div class="my_managed">
+                    {% include "web/my/_managed.html" with competitions=my_competitions %}
                 </div>
             </div>
           </section>