Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make chart name in dashboard a href #887

Merged
merged 7 commits into from
Sep 27, 2024
Merged

Make chart name in dashboard a href #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b5858bc
Make chart name in dashboard a href
murdo-moj Sep 26, 2024
a9c04ef
Lengthen description allowed length
murdo-moj Sep 26, 2024
e6d769d
Remove description character limit
murdo-moj Sep 26, 2024
2675261
Change on dashboiard
murdo-moj Sep 26, 2024
5b406c3
Increased limit
murdo-moj Sep 26, 2024
92c3019
Add more
murdo-moj Sep 26, 2024
0d1c69e
Removed all limits
murdo-moj Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 22 additions & 23 deletions locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand All @@ -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"

Expand Down Expand Up @@ -275,23 +275,19 @@ 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"

#: templates/details_dashboard.html:13
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)"

Expand Down Expand Up @@ -593,3 +589,6 @@ msgstr "first name"
#: users/models.py:12
msgid "last name"
msgstr "last name"

#~ msgid "Chart details"
#~ msgstr "Chart details"
8 changes: 1 addition & 7 deletions templates/details_dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,16 @@
<tr class="govuk-table__row">
<th scope="col" class="govuk-table__header app-custom-class">{% translate "Chart name" %}</th>
<th scope="col" class="govuk-table__header app-custom-class">{% translate "Description" %}</th>
<th scope="col" class="govuk-table__header app-custom-class">{% translate "Chart details" %}</th>
</tr>
</thead>
<tbody class="govuk-table__body">
{% for chart in charts %}
{% with chart_type=chart.entity_type|lower %}
<tr class="govuk-table__row">
<td class="govuk-table__cell">{{chart.entity_ref.display_name}}</td>
<td class="govuk-table__cell"><a href="{% url 'home:details' result_type=chart_type urn=chart.entity_ref.urn %}" class="govuk-link">{{chart.entity_ref.display_name}}</a></td>
<td class="govuk-table__cell">
{% if chart.description|length > 200 %}
{{ chart.description|slice:":200"|add:"..."|markdown:3 }}
{% else %}
{{ chart.description|markdown:3 }}
{% endif %}
</td>
<td class="govuk-table__cell"> <a href="{% url 'home:details' result_type=chart_type urn=chart.entity_ref.urn %}" class="govuk-link">{% translate "Chart details" %}</a></td>
</tr>
{% endwith %}
{% endfor %}
Expand Down