From e046635d3be743204287059aca3e2953ee5ae410 Mon Sep 17 00:00:00 2001 From: Brook Elgie Date: Thu, 27 Apr 2017 07:56:01 +0100 Subject: [PATCH 1/3] [#1061] Replace question with short version in popover --- census/views/includes/dataviews/table_slice_dataset.html | 2 +- census/views/includes/dataviews/table_slice_place.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/census/views/includes/dataviews/table_slice_dataset.html b/census/views/includes/dataviews/table_slice_dataset.html index e9b43653..8d9cf15f 100644 --- a/census/views/includes/dataviews/table_slice_dataset.html +++ b/census/views/includes/dataviews/table_slice_dataset.html @@ -59,7 +59,7 @@ {% set answer = entry.getAnswerValueForQuestion(question) %} {% set pass = 'yes' if question.pass(answer) else 'no' %} {% endif %} -
  •  
    • +
  •  
    • {% endfor %} diff --git a/census/views/includes/dataviews/table_slice_place.html b/census/views/includes/dataviews/table_slice_place.html index cd582675..7ee96662 100644 --- a/census/views/includes/dataviews/table_slice_place.html +++ b/census/views/includes/dataviews/table_slice_place.html @@ -64,7 +64,7 @@ {% set answer = entry.getAnswerValueForQuestion(question) %} {% set pass = 'yes' if question.pass(answer) else 'no' %} {% endif %} -
  •  
    • +
  •  
    • {% endfor %} From 9db6f48056ba3e0480b1bce173928ca87e9f6764 Mon Sep 17 00:00:00 2001 From: Brook Elgie Date: Thu, 27 Apr 2017 08:13:41 +0100 Subject: [PATCH 2/3] [#1061] Remove info column from data slice tables. Fixes #1062 --- census/static/scripts/site/table.js | 18 +++------ .../dataviews/table_slice_dataset.html | 35 ------------------ .../includes/dataviews/table_slice_place.html | 37 ------------------- 3 files changed, 6 insertions(+), 84 deletions(-) diff --git a/census/static/scripts/site/table.js b/census/static/scripts/site/table.js index 2b41fbde..39b7bbfd 100644 --- a/census/static/scripts/site/table.js +++ b/census/static/scripts/site/table.js @@ -49,33 +49,27 @@ define(['jquery', 'bootstrap', 'chroma', 'tablesorter', 'stickykit'], headers: { 2: {sorter: false}, 3: {sorter: false}, - 4: {sorter: false}, - 6: {sorter: false} + 5: {sorter: false} } }, tablesorterSliceIndexOptions = { sortList: [[0, 0]], headers: { - 2: {sorter: false}, - 3: {sorter: false}, - 4: {sorter: false}, - 6: {sorter: false} + 2: {sorter: false} } }, tablesorterPlaceSliceOptions = { - sortList: [[4, 1]], + sortList: [[3, 1]], headers: { 1: {sorter: false}, 2: {sorter: false}, - 3: {sorter: false}, - 5: {sorter: false} + 4: {sorter: false} } }, tablesorterPlaceSliceIndexOptions = { - sortList: [[3, 1]], + sortList: [[2, 1]], headers: { - 1: {sorter: false}, - 2: {sorter: false} + 1: {sorter: false} } }, sortFlag = true; diff --git a/census/views/includes/dataviews/table_slice_dataset.html b/census/views/includes/dataviews/table_slice_dataset.html index 8d9cf15f..cf23b0bf 100644 --- a/census/views/includes/dataviews/table_slice_dataset.html +++ b/census/views/includes/dataviews/table_slice_dataset.html @@ -15,7 +15,6 @@ - {% else %} @@ -23,7 +22,6 @@ - @@ -35,7 +33,6 @@ {{ gettext("Rank") }} {{ gettext("Place") }} {{ gettext("Breakdown") }} - {{ gettext("Info") }} {% if not is_index %} {{ gettext("Year") }} {% endif %} @@ -63,11 +60,6 @@ {% endfor %} - - - {% if not is_index %} {% if entry %} @@ -88,18 +80,6 @@ {% endif %} - {% if entry.details %} - - {# hack around tablesorter and our row toggler #}{{ place.rank }} - - {# hack around tablesorter and our row toggler #}{{ place.name }} - {% if entry.details %} - {{ entry.details|marked }} - {% endif %} -
    - - - {% endif %} {% if not is_index %} {% for submission in submissions %} @@ -129,11 +109,6 @@
    ↳ {{ gettext("Awaiting review") }}
    {% endfor %} - - - {% if not is_index %} {% if submission %} @@ -148,16 +123,6 @@
    ↳ {{ gettext("Awaiting review") }}
    {% endif %} - - {# hack around tablesorter and our row toggler #}{{ place.rank }} - - {# hack around tablesorter and our row toggler #}{{ place.name }} - {% if submission.details %} - {{ submission.details|marked }} - {% endif %} -
    - - {% endfor %} {% endif %} diff --git a/census/views/includes/dataviews/table_slice_place.html b/census/views/includes/dataviews/table_slice_place.html index 7ee96662..22089766 100644 --- a/census/views/includes/dataviews/table_slice_place.html +++ b/census/views/includes/dataviews/table_slice_place.html @@ -14,14 +14,12 @@ - {% else %} - @@ -32,7 +30,6 @@ {{ gettext("Dataset") }} {{ gettext("Breakdown") }} - {{ gettext("Info") }} {% if not is_index %} {{ gettext("Year") }} {% endif %} @@ -68,11 +65,6 @@ {% endfor %} - - - {% if not is_index %} {% if entry %} @@ -93,21 +85,6 @@ {% endif %} - {% if entry.details %} - - {% if is_index %} - - {% else %} - - {% endif %} - {# hack around tablesorter and our row toggler #}{{ dataset.name }} - {% if entry.details %} - {{ entry.details|marked }} - {% endif %} -
    - - - {% endif %} {% if not is_index %} {% for submission in submissions %} @@ -136,11 +113,6 @@
    ↳ {{ gettext("Awaiting review") }}
    {% endfor %} - - - {% if not is_index %} {% if submission %} @@ -155,15 +127,6 @@
    ↳ {{ gettext("Awaiting review") }}
    {% endif %} - - - {# hack around tablesorter and our row toggler #}{{ dataset.name }} - {% if submission.details %} - {{ submission.details|marked }} - {% endif %} -
    - - {% endfor %} {% endif %} From 61f11f2af999680091fb0cab6e5542dc9d07c7d0 Mon Sep 17 00:00:00 2001 From: Brook Elgie Date: Thu, 27 Apr 2017 09:30:26 +0100 Subject: [PATCH 3/3] [#1061] Change popover to tooltip, only showing title --- census/views/includes/dataviews/table_slice_dataset.html | 2 +- census/views/includes/dataviews/table_slice_place.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/census/views/includes/dataviews/table_slice_dataset.html b/census/views/includes/dataviews/table_slice_dataset.html index cf23b0bf..4ea1c0d6 100644 --- a/census/views/includes/dataviews/table_slice_dataset.html +++ b/census/views/includes/dataviews/table_slice_dataset.html @@ -56,7 +56,7 @@ {% set answer = entry.getAnswerValueForQuestion(question) %} {% set pass = 'yes' if question.pass(answer) else 'no' %} {% endif %} -
  •  
    • +
  •  
    • {% endfor %} diff --git a/census/views/includes/dataviews/table_slice_place.html b/census/views/includes/dataviews/table_slice_place.html index 22089766..7749bd85 100644 --- a/census/views/includes/dataviews/table_slice_place.html +++ b/census/views/includes/dataviews/table_slice_place.html @@ -61,7 +61,7 @@ {% set answer = entry.getAnswerValueForQuestion(question) %} {% set pass = 'yes' if question.pass(answer) else 'no' %} {% endif %} -
  •  
    • +
  •  
    • {% endfor %}