Merge pull request #233 from tessie/feature_fixBug1032426

Fixed Bug 1032426 - Unclear that front page displays only some tasks

oneanddone/base/views.py

@@ -4,6 +4,8 @@
 from django.shortcuts import redirect
 from django_filters.views import FilterView
 
+from tower import ugettext as _
+
 from oneanddone.tasks.filters import TasksFilterSet
 from oneanddone.tasks.models import Task
 from oneanddone.tasks.mixins import TaskMustBeAvailableMixin
@@ -17,6 +19,11 @@ class HomeView(TaskMustBeAvailableMixin, FilterView):
     paginate_by = 10
     filterset_class = TasksFilterSet
 
+    def get_context_data(self, *args, **kwargs):
+        ctx = super(HomeView, self).get_context_data(*args, **kwargs)
+        ctx['task_list_heading'] = _('Suggested First Tasks')
+        return ctx
+
     def dispatch(self, request, *args, **kwargs):
         if (request.user.is_authenticated() and
                 not UserProfile.objects.filter(user=request.user).exists()):

oneanddone/tasks/templates/tasks/task_listing.html

@@ -1,6 +1,6 @@
   <div class="task-list-container">
     <h3>
-      Tasks
+      {{ task_list_heading }}
       {% if request.GET.get('keyword', '') %}
         {% trans keyword=request.GET['keyword'] %}
           for keyword: {{ keyword }}

oneanddone/tasks/views.py

@@ -66,6 +66,11 @@ class AvailableTasksView(TaskMustBeAvailableMixin, FilterView):
     template_name = 'tasks/list.html'
     paginate_by = 10
     filterset_class = TasksFilterSet
+
+    def get_context_data(self, *args, **kwargs):
+        ctx = super(AvailableTasksView, self).get_context_data(*args, **kwargs)
+        ctx['task_list_heading'] = _('Tasks')
+        return ctx
 
 
 class CreateFeedbackView(LoginRequiredMixin, PrivacyPolicyRequiredMixin,
@@ -257,6 +262,11 @@ class ListTasksView(LoginRequiredMixin, MyStaffUserRequiredMixin, FilterView):
     paginate_by = 20
     filterset_class = TasksFilterSet
 
+    def get_context_data(self, *args, **kwargs):
+        ctx = super(ListTasksView, self).get_context_data(*args, **kwargs)
+        ctx['task_list_heading'] = _('Tasks')
+        return ctx
+
 
 class LeaderboardView(generic.ListView):
     template_name = 'tasks/leaderboard.html'