From 01fd749e24fd6fe1a0099ec4477307ed9c25dce3 Mon Sep 17 00:00:00 2001
From: emkael <emkael@tlen.pl>
Date: Thu, 4 May 2017 17:21:24 +0200
Subject: Fixes for single-segment rounds

---
 template/macros.html  | 14 +++++++++++---
 template/segment.html |  7 ++++++-
 template/table.html   |  8 ++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'template')

diff --git a/template/macros.html b/template/macros.html
index 619ad2e..09cd7ea 100644
--- a/template/macros.html
+++ b/template/macros.html
@@ -18,7 +18,11 @@
       {% if 'label' in segment %}
       {{segment['label']}}
       {% else %}
-      {{segment['round']}}-{{segment['segment']}}
+        {% if per_round > 1 %}
+        {{segment['round']}}-{{segment['segment']}}
+        {% else %}
+        {{segment['round']}}
+        {% endif %}
       {% endif %}
     </a>
     {% endfor %}
@@ -30,7 +34,7 @@
 </tr>
 {% endmacro %}
 
-{% macro table_header(segments, segment_limit, prefix) %}
+{% macro table_header(segments, segment_limit, prefix, per_round) %}
 <tr>
   <td class="bdcc12">{{"HEADER_PLACE"|translate}}</td>
   <td class="bdcc2">&nbsp;</td>
@@ -47,7 +51,11 @@
       {% if 'label' in segment %}
       {{segment['label']}}
       {% else %}
-      {{segment['round']}}-{{segment['segment']}}
+        {% if per_round > 1 %}
+        {{segment['round']}}-{{segment['segment']}}
+        {% else %}
+        {{segment['round']}}
+        {% endif %}
       {% endif %}
     </a>
   </td>
diff --git a/template/segment.html b/template/segment.html
index a481dcf..2401e3e 100644
--- a/template/segment.html
+++ b/template/segment.html
@@ -22,7 +22,12 @@
       </tr>
       {{ separator(3) }}
       <tr>
-        <td class="bdnt12" colspan="3">{{"BUTLER_ROUND"|translate}}{{round_no}} {{"SEGMENT"|translate}}{{segment_no}}</td>
+        <td class="bdnt12" colspan="3">
+          {{"BUTLER_ROUND"|translate}}{{round_no}}
+          {% if per_round > 1 %}
+          {{"SEGMENT"|translate}}{{segment_no}}
+          {% endif %}
+        </td>
       </tr>
       {{ separator(3) }}
       <tr valign="top">
diff --git a/template/table.html b/template/table.html
index 4b29c79..8dceb2a 100644
--- a/template/table.html
+++ b/template/table.html
@@ -31,9 +31,9 @@
       </tr>
       {{ separator(segment_limit+5) }}
       {% if segments|length > segment_limit %}
-        {{ previous_rounds(segments, segment_limit, prefix) }}
+        {{ previous_rounds(segments, segment_limit, prefix, per_round) }}
       {% endif %}
-      {{ table_header(segments, segment_limit, prefix) }}
+      {{ table_header(segments, segment_limit, prefix, per_round) }}
       {% for player in above_threshold %}
         {{ table_player(player, segment_limit) }}
       {% endfor %}
@@ -49,9 +49,9 @@
       </tr>
       {{ separator(segment_limit+5) }}
       {% if segments|length > segment_limit %}
-        {{ previous_rounds(segments, segment_limit, prefix) }}
+        {{ previous_rounds(segments, segment_limit, prefix, per_round) }}
       {% endif %}
-      {{ table_header(segments, segment_limit, prefix) }}
+      {{ table_header(segments, segment_limit, prefix, per_round) }}
       {% for player in below_threshold %}
         {{ table_player(player, segment_limit) }}
       {% endfor %}
-- 
cgit v1.2.3