Merge pull request #143 from bitgeeky/ImproveDisplay

Bug 1031196 - Improve Display for Profile Details Page
mozilla · Jun 28, 2014 · 0664581 · 0664581
2 parents e67fe32 + 1a50f8e
commit 0664581
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/oneanddone/base/templates/base/dashboard.html b/oneanddone/base/templates/base/dashboard.html
@@ -22,9 +22,11 @@ <h4>{{ _('Tasks in progress') }}</h4>
 
   </section>
 
-  <nav class="actions-container">
-    {% if not user.attempts_in_progress %}
-      <a href="{{ url('tasks.available') }}" class="button" id="pick-a-task">{{ _('Pick a task to do') }}</a>
+    {% if not page == 'ProfileDetails' %}
+        <nav class="actions-container">
+        {% if not user.attempts_in_progress %}
+            <a href="{{ url('tasks.available') }}" class="button" id="pick-a-task">{{ _('Pick a task to do') }}</a>
+        {% endif %}
+        </nav>
     {% endif %}
-  </nav>
 </section>
diff --git a/oneanddone/users/templates/users/profile/detail.html b/oneanddone/users/templates/users/profile/detail.html
@@ -6,17 +6,18 @@
 {% set title = _('User profile for {username}')|f(username=user.profile.name) %}
 
 {% block content %}
-<h1><span id="user-profile-name">{{ _("{name}")|fe(name=user.profile.name) }}</span>{{_("'s Profile")}}</h1>
 
+<main class="billboard content-container">
+<h1><span id="user-profile-name">{{ _("{name}")|fe(name=user.profile.name) }}</span>{{_("'s Profile")}}</h1>
  {% include 'base/dashboard.html' %}
 
-<main class="billboard content-container">
+<div class="billboard content-container">
 
   <section class="task-status">
 
       <h4>
           <span id="completed-tasks-count">{{ _('{count}')|f(count=user.attempts_finished_count) }}</span>
-          {{ ngettext('task completed', 'tasks completed', attempts_finished)}}
+          {{ ngettext('Task Completed', 'Tasks Completed', attempts_finished)}}
       </h4>
     <ul>
       {% for attempt in attempts_finished %}
@@ -29,9 +30,12 @@ <h4>
 
   </section>
 
+  </div>
   <div class="actions-container">
+      {% if not user.attempts_in_progress %}
+      <a href="{{ url('tasks.available') }}" class="button" id="pick-a-task">{{ _('Pick a task to do') }}</a>
+      {% endif %}
     <a href="{{ url('users.profile.update') }}" id="edit-profile" class="button">{{ _('Edit profile') }}</a>
   </div>
-
 </main>
 {% endblock %}
diff --git a/oneanddone/users/views.py b/oneanddone/users/views.py
@@ -132,6 +132,7 @@ def get_context_data(self, **kwargs):
 
         context = super(ProfileDetailsView, self).get_context_data(**kwargs)
         context['attempts_finished'] = attempts_finished
+        context['page'] = 'ProfileDetails'
         return context