Merge pull request #1505 from open-data/links-title

add title to truncated links
open-data · Sep 13, 2024 · 1023f83 · 1023f83
2 parents 33a1f22 + 7233100
commit 1023f83
Show file tree

Hide file tree

Showing 15 changed files with 176 additions and 135 deletions.
diff --git a/changes/1505.changes b/changes/1505.changes
@@ -0,0 +1,7 @@
+- show title with truncated link text
+- show title in breadcrumbs
+- increase breadcrumb length to 80 for package and resource
+- increase title length from ckan's default 80 to 150 before truncating
+- use the breadcrumb trail guidance to not display the current page
+at the end of the breadcrumb trail (linked or unlinked) for the Portal only
+https://design.canada.ca/common-design-patterns/breadcrumb-trail.html
diff --git a/ckanext/canada/assets/internal/canada_internal.css b/ckanext/canada/assets/internal/canada_internal.css
@@ -12,6 +12,14 @@
 ol.breadcrumb {
   margin-bottom: 0px;
 }
+.breadcrumb li:last-child a {
+  background: transparent !important;
+  color: black;
+  pointer-events: none;
+  cursor: default;
+  text-decoration: none;
+}
+
 #wb-info a {
   text-decoration: none;
 }

diff --git a/ckanext/canada/assets/public/canada_public.css b/ckanext/canada/assets/public/canada_public.css
@@ -83,14 +83,6 @@ details.alert-error {
   color: #295376;
 }
 
-.breadcrumb li:last-child a {
-  background: transparent !important;
-  color: black;
-  pointer-events: none;
-  cursor: default;
-  text-decoration: none;
-}
-
 .fgpv {
   height: 700px;
   border: 1px solid black;

diff --git a/ckanext/canada/helpers.py b/ckanext/canada/helpers.py
@@ -853,16 +853,35 @@ def ckan_to_cdts_breadcrumbs(breadcrumb_content):
     See: https://cdts.service.canada.ca/app/cls/WET/gcweb/v4_1_0/cdts/samples/breadcrumbs-en.html
     """
     breadcrumb_html = BeautifulSoup(breadcrumb_content, 'html.parser')
-    cdts_breadcrumbs = [{
-        'title': _('Registry Home') if g.is_registry else _('Open Government Portal'),
-        'href': '/%s' % h.lang(),
-    }]
+    cdts_breadcrumbs = []
+    if g.is_registry:
+        cdts_breadcrumbs.append({
+            'title': _('Registry Home'),
+            'href': '/%s' % h.lang(),
+        })
+    else:
+        cdts_breadcrumbs.extend([{
+            'title': _('Open Government'),
+            'href': '/%s' % h.lang(),
+        },{
+            'title': _('Search'),
+            'href': adv_search_url(),
+        }])
+
     for breadcrumb in breadcrumb_html.find_all('li'):
         anchor = breadcrumb.find('a')
-        cdts_breadcrumbs.append({
+        link = {
             'title': breadcrumb.text if not anchor else anchor.text,
             'href': '' if not anchor else anchor['href'],
-        })
+        }
+        if anchor and anchor.get('title'):
+            link['acronym'] = anchor.get('title')
+
+        if g.is_registry:
+            cdts_breadcrumbs.append(link)
+        elif 'active' not in breadcrumb.get('class', []):
+            cdts_breadcrumbs.append(link)
+
     return cdts_breadcrumbs
 
 

diff --git a/ckanext/canada/i18n/ckanext-canada.pot b/ckanext/canada/i18n/ckanext-canada.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ckanext-canada 0.4.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-09-12 09:58-0400\n"
+"POT-Creation-Date: 2024-09-13 10:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -191,12 +191,21 @@ msgstr ""
 msgid "Scheduled"
 msgstr ""
 
-#: ckanext/canada/helpers.py:857
+#: ckanext/canada/helpers.py:859
 msgid "Registry Home"
 msgstr ""
 
-#: ckanext/canada/helpers.py:857 ckanext/canada/strings.py:82
-msgid "Open Government Portal"
+#: ckanext/canada/helpers.py:864
+msgid "Open Government"
+msgstr ""
+
+#: ckanext/canada/helpers.py:867
+#: ckanext/canada/templates/admin/publish_search.html:18
+#: ckanext/canada/templates/home/quick_links.html:104
+#: ckanext/canada/templates/organization/snippets/organization_search.html:7
+#: ckanext/canada/templates/snippets/cdts/header.html:146
+#: ckanext/canada/templates/snippets/search_form.html:44
+msgid "Search"
 msgstr ""
 
 #: ckanext/canada/logic.py:296
@@ -389,7 +398,7 @@ msgid "Request Reset"
 msgstr ""
 
 #: ckanext/canada/strings.py:38
-#: ckanext/canada/templates/user/edit_user_form.html:45
+#: ckanext/canada/templates/user/edit_user_form.html:47
 msgid "Create API Token"
 msgstr ""
 
@@ -536,6 +545,10 @@ msgstr ""
 msgid "Your form submission could not be validated, please re-submit the form."
 msgstr ""
 
+#: ckanext/canada/strings.py:82
+msgid "Open Government Portal"
+msgstr ""
+
 #: ckanext/canada/strings.py:83
 msgid "Open Government Portal (staging)"
 msgstr ""
@@ -1739,7 +1752,7 @@ msgid "Load more"
 msgstr ""
 
 #: ckanext/canada/templates/admin/base.html:5
-#: ckanext/canada/templates/snippets/cdts/header.html:197
+#: ckanext/canada/templates/snippets/cdts/header.html:193
 msgid "Admin"
 msgstr ""
 
@@ -1815,14 +1828,6 @@ msgstr ""
 msgid "Search datasets..."
 msgstr ""
 
-#: ckanext/canada/templates/admin/publish_search.html:18
-#: ckanext/canada/templates/home/quick_links.html:104
-#: ckanext/canada/templates/organization/snippets/organization_search.html:7
-#: ckanext/canada/templates/snippets/cdts/header.html:150
-#: ckanext/canada/templates/snippets/search_form.html:44
-msgid "Search"
-msgstr ""
-
 #: ckanext/canada/templates/admin/publish_search.html:52
 #: ckanext/canada/templates/scheming/form_snippets/repeating_subfields.html:8
 #: ckanext/canada/templates/snippets/search_form.html:82
@@ -1970,14 +1975,14 @@ msgid "Add information about government programs, activities and publications."
 msgstr ""
 
 #: ckanext/canada/templates/home/quick_links.html:91
-#: ckanext/canada/templates/snippets/cdts/header.html:135
+#: ckanext/canada/templates/snippets/cdts/header.html:131
 #: ckanext/canada/templates/snippets/dataset_facets.html:4
 #: ckanext/canada/templates/snippets/package_item.html:19
 msgid "Open Dialogue"
 msgstr ""
 
 #: ckanext/canada/templates/home/quick_links.html:98
-#: ckanext/canada/templates/snippets/cdts/header.html:144
+#: ckanext/canada/templates/snippets/cdts/header.html:140
 msgid "Consultations master dataset"
 msgstr ""
 
@@ -2025,7 +2030,7 @@ msgid "Briefing packages"
 msgstr ""
 
 #: ckanext/canada/templates/home/quick_links.html:165
-#: ckanext/canada/templates/snippets/cdts/header.html:118
+#: ckanext/canada/templates/snippets/cdts/header.html:114
 msgid "New or incoming ministers"
 msgstr ""
 
@@ -2036,7 +2041,7 @@ msgid ""
 msgstr ""
 
 #: ckanext/canada/templates/home/quick_links.html:173
-#: ckanext/canada/templates/snippets/cdts/header.html:122
+#: ckanext/canada/templates/snippets/cdts/header.html:118
 msgid "New or incoming deputy heads"
 msgstr ""
 
@@ -2047,7 +2052,7 @@ msgid ""
 msgstr ""
 
 #: ckanext/canada/templates/home/quick_links.html:181
-#: ckanext/canada/templates/snippets/cdts/header.html:126
+#: ckanext/canada/templates/snippets/cdts/header.html:122
 msgid "Parliamentary Committee appearances for ministers"
 msgstr ""
 
@@ -2058,7 +2063,7 @@ msgid ""
 msgstr ""
 
 #: ckanext/canada/templates/home/quick_links.html:189
-#: ckanext/canada/templates/snippets/cdts/header.html:130
+#: ckanext/canada/templates/snippets/cdts/header.html:126
 msgid "Parliamentary Committee appearances for deputy heads"
 msgstr ""
 
@@ -2117,7 +2122,7 @@ msgstr ""
 #: ckanext/canada/templates/organization/index.html:26
 #: ckanext/canada/templates/organization/members.html:10
 #: ckanext/canada/templates/organization/read_base.html:6
-#: ckanext/canada/templates/snippets/cdts/header.html:154
+#: ckanext/canada/templates/snippets/cdts/header.html:150
 #: ckanext/canada/templates/user/read.html:28
 #: ckanext/canada/templates/user/read_base.html:99
 msgid "Organizations"
@@ -2167,7 +2172,7 @@ msgstr ""
 #: ckanext/canada/templates/organization/member_new.html:60
 #: ckanext/canada/templates/scheming/package/read.html:26
 #: ckanext/canada/templates/scheming/snippets/form_field.html:21
-#: ckanext/canada/templates/user/edit_user_form.html:40
+#: ckanext/canada/templates/user/edit_user_form.html:42
 msgid "Delete"
 msgstr ""
 
@@ -2493,7 +2498,7 @@ msgstr ""
 msgid "Go back"
 msgstr ""
 
-#: ckanext/canada/templates/package/resource_read.html:53
+#: ckanext/canada/templates/package/resource_read.html:58
 #: ckanext/canada/templates/package/snippets/resource_item.html:73
 msgid "Download"
 msgstr ""
@@ -3026,27 +3031,27 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: ckanext/canada/templates/snippets/cdts/header.html:159
+#: ckanext/canada/templates/snippets/cdts/header.html:155
 msgid "FAQ"
 msgstr ""
 
-#: ckanext/canada/templates/snippets/cdts/header.html:189
+#: ckanext/canada/templates/snippets/cdts/header.html:185
 #: ckanext/canada/templates/user/dashboard.html:4
 #: ckanext/canada/templates/user/dashboard_datasets.html:15
 #: ckanext/canada/templates/user/dashboard_groups.html:9
 #: ckanext/canada/templates/user/dashboard_organizations.html:9
 msgid "Dashboard"
 msgstr ""
 
-#: ckanext/canada/templates/snippets/cdts/header.html:205
+#: ckanext/canada/templates/snippets/cdts/header.html:201
 msgid "Get Help"
 msgstr ""
 
-#: ckanext/canada/templates/snippets/cdts/header.html:226
+#: ckanext/canada/templates/snippets/cdts/header.html:222
 msgid "Signed in as"
 msgstr ""
 
-#: ckanext/canada/templates/snippets/cdts/header.html:226
+#: ckanext/canada/templates/snippets/cdts/header.html:222
 msgid "View profile"
 msgstr ""
 
@@ -3136,39 +3141,39 @@ msgstr ""
 msgid "Subscribe to notification emails"
 msgstr ""
 
-#: ckanext/canada/templates/user/edit_user_form.html:20
+#: ckanext/canada/templates/user/edit_user_form.html:19
 msgid "Change password"
 msgstr ""
 
-#: ckanext/canada/templates/user/edit_user_form.html:21
+#: ckanext/canada/templates/user/edit_user_form.html:22
 #: ckanext/canada/templates/user/perform_reset.html:8
 msgid "password reset requirements"
 msgstr ""
 
-#: ckanext/canada/templates/user/edit_user_form.html:25
+#: ckanext/canada/templates/user/edit_user_form.html:27
 msgid "Sysadmin Password"
 msgstr ""
 
-#: ckanext/canada/templates/user/edit_user_form.html:25
+#: ckanext/canada/templates/user/edit_user_form.html:27
 msgid "Old Password"
 msgstr ""
 
-#: ckanext/canada/templates/user/edit_user_form.html:33
+#: ckanext/canada/templates/user/edit_user_form.html:35
 #: ckanext/canada/templates/user/new_user_form.html:21
 #: ckanext/canada/templates/user/snippets/login_form.html:12
 msgid "Password"
 msgstr ""
 
-#: ckanext/canada/templates/user/edit_user_form.html:34
+#: ckanext/canada/templates/user/edit_user_form.html:36
 #: ckanext/canada/templates/user/new_user_form.html:24
 msgid "Confirm Password"
 msgstr ""
 
-#: ckanext/canada/templates/user/edit_user_form.html:40
+#: ckanext/canada/templates/user/edit_user_form.html:42
 msgid "Are you sure you want to delete this User?"
 msgstr ""
 
-#: ckanext/canada/templates/user/edit_user_form.html:48
+#: ckanext/canada/templates/user/edit_user_form.html:50
 msgid "Update Profile"
 msgstr ""