From b5858bcf8b8ee963dd89a188170d2108680083f4 Mon Sep 17 00:00:00 2001 From: Murdo Moyse Date: Thu, 26 Sep 2024 14:42:51 +0100 Subject: [PATCH 1/7] Make chart name in dashboard a href --- locale/en/LC_MESSAGES/django.po | 45 ++++++++++++++++---------------- templates/details_dashboard.html | 4 +-- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index a05d0128..4c22f1cc 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Find MoJ data\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-24 08:56+0100\n" +"POT-Creation-Date: 2024-09-26 14:40+0100\n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,8 +72,8 @@ msgstr "All subject areas" msgid "Analytical Platform" msgstr "Analytical Platform" -#: home/forms/search.py:69 home/service/search.py:119 -#: home/service/search.py:229 templates/partial/filter.html:19 +#: home/forms/search.py:69 home/service/search.py:127 +#: home/service/search.py:237 templates/partial/filter.html:19 msgid "Domain" msgstr "Subject area" @@ -93,58 +93,58 @@ msgstr "Glossary" msgid "Metadata specification" msgstr "Metadata specification" -#: home/service/search.py:128 templates/partial/filter.html:33 +#: home/service/search.py:136 templates/partial/filter.html:33 msgid "Entity Types" msgstr "Entity types" -#: home/service/search.py:138 +#: home/service/search.py:146 msgid "Where To Access" msgstr "Where to access" -#: home/service/search.py:146 +#: home/service/search.py:154 msgid "Tags" msgstr "Tags" -#: home/service/search.py:178 +#: home/service/search.py:186 msgctxt "Page title" msgid "Search MoJ data" msgstr "Search MoJ data" -#: home/service/search.py:227 +#: home/service/search.py:235 msgid "ID" msgstr "ID" -#: home/service/search.py:228 +#: home/service/search.py:236 msgid "URN" msgstr "URN" -#: home/service/search.py:230 +#: home/service/search.py:238 msgid "Title" msgstr "Title" -#: home/service/search.py:231 +#: home/service/search.py:239 msgid "Name" msgstr "Name" -#: home/service/search.py:232 templates/details_base.html:41 +#: home/service/search.py:240 templates/details_base.html:41 #: templates/details_dashboard.html:14 templates/details_database.html:14 #: templates/details_table.html:14 msgid "Description" msgstr "Description" -#: home/service/search.py:233 templates/details_table.html:13 +#: home/service/search.py:241 templates/details_table.html:13 msgid "Column name" msgstr "Column name" -#: home/service/search.py:234 +#: home/service/search.py:242 msgid "Column description" msgstr "Column description" -#: home/service/search.py:235 +#: home/service/search.py:243 msgid "Available on" msgstr "Available on" -#: home/service/search.py:236 +#: home/service/search.py:244 msgid "Qualified name" msgstr "Qualified name" @@ -275,7 +275,7 @@ msgstr "Access this data" msgid "%(display_name)s on Justice Data (opens in new tab)" msgstr "%(display_name)s on Justice Data (opens in new tab)" -#: templates/details_dashboard.html:10 templates/details_dashboard.html:37 +#: templates/details_dashboard.html:10 templates/details_dashboard.html:35 msgid "Dashboard content" msgstr "Dashboard content" @@ -283,15 +283,11 @@ msgstr "Dashboard content" msgid "Chart name" msgstr "Chart name" -#: templates/details_dashboard.html:15 templates/details_dashboard.html:30 -msgid "Chart details" -msgstr "Chart details" - -#: templates/details_dashboard.html:38 +#: templates/details_dashboard.html:36 msgid "This dashboard is missing chart information." msgstr "This dashboard is missing table information." -#: templates/details_dashboard.html:49 +#: templates/details_dashboard.html:47 msgid "Justice Data (opens in new tab)" msgstr "Justice Data (opens in new tab)" @@ -593,3 +589,6 @@ msgstr "first name" #: users/models.py:12 msgid "last name" msgstr "last name" + +#~ msgid "Chart details" +#~ msgstr "Chart details" diff --git a/templates/details_dashboard.html b/templates/details_dashboard.html index 0de2239c..e89bfc39 100644 --- a/templates/details_dashboard.html +++ b/templates/details_dashboard.html @@ -12,14 +12,13 @@ {% translate "Chart name" %} {% translate "Description" %} - {% translate "Chart details" %} {% for chart in charts %} {% with chart_type=chart.entity_type|lower %} - {{chart.entity_ref.display_name}} + {{chart.entity_ref.display_name}} {% if chart.description|length > 200 %} {{ chart.description|slice:":200"|add:"..."|markdown:3 }} @@ -27,7 +26,6 @@ {{ chart.description|markdown:3 }} {% endif %} - {% translate "Chart details" %} {% endwith %} {% endfor %} From a9c04ef594c2656f3d3b83c331a95419db824bfe Mon Sep 17 00:00:00 2001 From: Murdo Moyse Date: Thu, 26 Sep 2024 15:16:09 +0100 Subject: [PATCH 2/7] Lengthen description allowed length --- templates/details_database.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/details_database.html b/templates/details_database.html index 91998b48..c34936e8 100644 --- a/templates/details_database.html +++ b/templates/details_database.html @@ -20,8 +20,8 @@ {{table.entity_ref.display_name}} - {% if table.description|length > 200 %} - {{ table.description|slice:":200"|add:"..."|markdown:3 }} + {% if table.description|length > 250 %} + {{ table.description|slice:":250"|add:"..."|markdown:3 }} {% else %} {{ table.description|markdown:3 }} {% endif %} From e6d769d463d3b028297e9d3487b9507f2427d184 Mon Sep 17 00:00:00 2001 From: Murdo Moyse Date: Thu, 26 Sep 2024 15:32:04 +0100 Subject: [PATCH 3/7] Remove description character limit --- templates/details_database.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/details_database.html b/templates/details_database.html index c34936e8..da80082f 100644 --- a/templates/details_database.html +++ b/templates/details_database.html @@ -20,8 +20,8 @@ {{table.entity_ref.display_name}} - {% if table.description|length > 250 %} - {{ table.description|slice:":250"|add:"..."|markdown:3 }} + {% if table.description %} + {{ table.description|markdown:3 }} {% else %} {{ table.description|markdown:3 }} {% endif %} From 2675261302dc8ad9491615dba2aacd9ad2a94a29 Mon Sep 17 00:00:00 2001 From: Murdo Moyse Date: Thu, 26 Sep 2024 15:42:24 +0100 Subject: [PATCH 4/7] Change on dashboiard --- templates/details_dashboard.html | 4 ++-- templates/details_database.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/details_dashboard.html b/templates/details_dashboard.html index e89bfc39..71b77740 100644 --- a/templates/details_dashboard.html +++ b/templates/details_dashboard.html @@ -20,8 +20,8 @@ {{chart.entity_ref.display_name}} - {% if chart.description|length > 200 %} - {{ chart.description|slice:":200"|add:"..."|markdown:3 }} + {% if chart.description|length > 250 %} + {{ chart.description|slice:":250"|add:"..."|markdown:3 }} {% else %} {{ chart.description|markdown:3 }} {% endif %} diff --git a/templates/details_database.html b/templates/details_database.html index da80082f..91998b48 100644 --- a/templates/details_database.html +++ b/templates/details_database.html @@ -20,8 +20,8 @@ {{table.entity_ref.display_name}} - {% if table.description %} - {{ table.description|markdown:3 }} + {% if table.description|length > 200 %} + {{ table.description|slice:":200"|add:"..."|markdown:3 }} {% else %} {{ table.description|markdown:3 }} {% endif %} From 5b406c36954b94439ba772fd7ba397dc3b7972c5 Mon Sep 17 00:00:00 2001 From: Murdo Moyse Date: Thu, 26 Sep 2024 15:48:43 +0100 Subject: [PATCH 5/7] Increased limit --- templates/details_dashboard.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/details_dashboard.html b/templates/details_dashboard.html index 71b77740..9cdb6560 100644 --- a/templates/details_dashboard.html +++ b/templates/details_dashboard.html @@ -20,8 +20,8 @@ {{chart.entity_ref.display_name}} - {% if chart.description|length > 250 %} - {{ chart.description|slice:":250"|add:"..."|markdown:3 }} + {% if chart.description|length > 300 %} + {{ chart.description|slice:":300"|add:"..."|markdown:3 }} {% else %} {{ chart.description|markdown:3 }} {% endif %} From 92c301963286ed6e0fe4e2c085839bc2e5d4d9cd Mon Sep 17 00:00:00 2001 From: Murdo Moyse Date: Thu, 26 Sep 2024 15:55:22 +0100 Subject: [PATCH 6/7] Add more --- templates/details_dashboard.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/details_dashboard.html b/templates/details_dashboard.html index 9cdb6560..727a61f3 100644 --- a/templates/details_dashboard.html +++ b/templates/details_dashboard.html @@ -20,8 +20,8 @@ {{chart.entity_ref.display_name}} - {% if chart.description|length > 300 %} - {{ chart.description|slice:":300"|add:"..."|markdown:3 }} + {% if chart.description|length > 400 %} + {{ chart.description|slice:":400"|add:"..."|markdown:3 }} {% else %} {{ chart.description|markdown:3 }} {% endif %} From 0d1c69e61c2938ce1e5b44ea2e914543fe45ac42 Mon Sep 17 00:00:00 2001 From: Murdo Moyse Date: Thu, 26 Sep 2024 15:59:50 +0100 Subject: [PATCH 7/7] Removed all limits --- templates/details_dashboard.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/templates/details_dashboard.html b/templates/details_dashboard.html index 727a61f3..b04db3c8 100644 --- a/templates/details_dashboard.html +++ b/templates/details_dashboard.html @@ -20,11 +20,7 @@ {{chart.entity_ref.display_name}} - {% if chart.description|length > 400 %} - {{ chart.description|slice:":400"|add:"..."|markdown:3 }} - {% else %} {{ chart.description|markdown:3 }} - {% endif %} {% endwith %}