Move count to front & only show if > 0

dodona-edu · Oct 1, 2020 · 3a5e259 · 3a5e259
1 parent 0b0a898
commit 3a5e259
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
@@ -211,7 +211,12 @@ def questions
                        .order(updated_at: :desc)
                        .includes(:user, :last_updated_by, submission: [:exercise])
                        .paginate(page: parse_pagination_param(params[:answered_page]), per_page: 10)
-    @title = I18n.t('courses.questions.questions.page_title', count: @course.unanswered_questions.count)
+    count = @course.unanswered_questions.count
+    @title = if count == 0
+               I18n.t('courses.questions.questions.title')
+             else
+               I18n.t('courses.questions.questions.page_title', count: count)
+             end
     @dot_icon.push(:questions) if @unanswered.any?
   end
 

diff --git a/app/views/courses/questions.js.erb b/app/views/courses/questions.js.erb
@@ -6,7 +6,7 @@ document.querySelector(".question-table-answered").innerHTML = "<%= escape_javas
 <% else %>
   document.getElementById("questions-in-progress").classList.remove("hidden");
 <% end %>
-dodona.setDocumentTitle("Dodona - <%= @title %>");
+dodona.setDocumentTitle("<%= @title %> - Dodona");
 <% if @unanswered.any? %>
   dodona.dotManager.requestDot("questions");
 <% else %>

diff --git a/config/locales/views/courses/en.yml b/config/locales/views/courses/en.yml
@@ -173,7 +173,7 @@ en:
         open: "Unanswered questions"
         in_progress: "Questions in progress"
         closed: "Answered questions"
-        page_title: "Questions (%{count})"
+        page_title: "(%{count}) Questions"
         title: "Questions"
         auto_refresh: Automatically refresh questions
       ago: "%{when} ago"

diff --git a/config/locales/views/courses/nl.yml b/config/locales/views/courses/nl.yml
@@ -170,7 +170,7 @@ nl:
         in_progress: "Vragen in behandeling"
         closed: "Beantwoorde vragen"
         title: "Vragen"
-        page_title: "Vragen (%{count})"
+        page_title: "(%{count}) Vragen"
         auto_refresh: Vragen automatisch vernieuwen
       ago: "%{when} geleden"
       last_edited_by: