Updated dashboard to display 'Collection' before 'Sample'. Removed 'A…

…dd Group' and replaced it with 'Add Collection'.
AuScope · Jul 10, 2024 · 2db898e · 2db898e
1 parent 63972cf
commit 2db898e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/ckan/src/ckanext-igsn-theme/ckanext/igsn_theme/templates/organization/index.html b/ckan/src/ckanext-igsn-theme/ckanext/igsn_theme/templates/organization/index.html
@@ -2,7 +2,7 @@
 
 {% block page_primary_action %}
   {% if h.check_access('organization_create') %}
-    {% link_for h.humanize_entity_type('organization', group_type, 'add link') or _('Add Organization'), named_route=group_type ~ '.new', class_='btn btn-primary', icon='plus-square' %}
+    {% link_for h.humanize_entity_type('organization', 'organization', 'add link') or _('Add Organization'), named_route=group_type ~ '.new', class_='btn btn-primary', icon='plus-square' %}
   {% else %}
     {% if c.userobj %}
       <a href="{{ h.url_for('igsn_theme.request_new_collection') }}" role="button" class="btn btn-primary"> {{ _('New Collection') }}</a>      

diff --git a/ckan/src/ckanext-igsn-theme/ckanext/igsn_theme/templates/user/dashboard.html b/ckan/src/ckanext-igsn-theme/ckanext/igsn_theme/templates/user/dashboard.html
@@ -5,6 +5,6 @@
 
 
 {% block dashboard_nav_links %}
-  {{ h.build_nav_icon('dashboard.datasets', h.humanize_entity_type('package', dataset_type, 'my label') or _('My Datasets'), icon='sitemap') }}
   {{ h.build_nav_icon('dashboard.organizations', h.humanize_entity_type('organization', org_type, 'my label') or _('My Organizations'), icon='building') }}
+  {{ h.build_nav_icon('dashboard.datasets', h.humanize_entity_type('package', dataset_type, 'my label') or _('My Datasets'), icon='sitemap') }}
 {% endblock dashboard_nav_links %}
diff --git a/...heme/templates/user/dashboard_groups.html → ...mplates/user/dashboard_organizations.html b/...heme/templates/user/dashboard_groups.html → ...mplates/user/dashboard_organizations.html
@@ -1,7 +1,9 @@
 {% ckan_extends %}
 
+
 {% block page_primary_action %}
   {% if h.check_access('organization_create') %}
+    {% set group_type = 'organization' %}
     {% link_for h.humanize_entity_type('organization', group_type, 'add link') or _('Add Organization'), named_route=group_type ~ '.new', class_='btn btn-primary', icon='plus-square' %}
   {% else %}
     {% if c.userobj %}