From 0dc5f695d08536c55badecc857870c91293aa69e Mon Sep 17 00:00:00 2001 From: Sagar Ghimire Date: Mon, 20 May 2024 12:42:27 +0545 Subject: [PATCH 1/3] [Fix][s]: Translation fixes --- ckanext/rvr/templates/home/index.html | 2 +- .../templates/package/snippets/package_basic_fields.html | 2 +- ckanext/rvr/templates/user/dashboard_groups.html | 7 +++++++ ckanext/rvr/templates/user/dashboard_organizations.html | 9 +++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 ckanext/rvr/templates/user/dashboard_groups.html create mode 100644 ckanext/rvr/templates/user/dashboard_organizations.html diff --git a/ckanext/rvr/templates/home/index.html b/ckanext/rvr/templates/home/index.html index 28b40e3..a2304ad 100644 --- a/ckanext/rvr/templates/home/index.html +++ b/ckanext/rvr/templates/home/index.html @@ -96,7 +96,7 @@

{{ _("Welcome to CKAN") }}

- ÜBER UNS + Über mich
diff --git a/ckanext/rvr/templates/package/snippets/package_basic_fields.html b/ckanext/rvr/templates/package/snippets/package_basic_fields.html index 9525976..89e7dd4 100644 --- a/ckanext/rvr/templates/package/snippets/package_basic_fields.html +++ b/ckanext/rvr/templates/package/snippets/package_basic_fields.html @@ -172,7 +172,7 @@
- + {% if org_default == 'Unmigrated' %} diff --git a/ckanext/rvr/templates/user/dashboard_groups.html b/ckanext/rvr/templates/user/dashboard_groups.html new file mode 100644 index 0000000..d1557a9 --- /dev/null +++ b/ckanext/rvr/templates/user/dashboard_groups.html @@ -0,0 +1,7 @@ +{% ckan_extends %} + +{% block page_primary_action %} + {% if h.check_access('group_create') %} + {% link_for h.humanize_entity_type('group', group_type, 'add link') or _('Add Group'), named_route=group_type ~ '.new', class_="btn btn-primary", icon="plus-square" %} + {% endif %} +{% endblock %} diff --git a/ckanext/rvr/templates/user/dashboard_organizations.html b/ckanext/rvr/templates/user/dashboard_organizations.html new file mode 100644 index 0000000..9b2ae2a --- /dev/null +++ b/ckanext/rvr/templates/user/dashboard_organizations.html @@ -0,0 +1,9 @@ +{% ckan_extends %} + +{% set org = 'organization' %} + +{% block page_primary_action %} + {% if h.check_access('organization_create') %} + {% link_for h.humanize_entity_type('organization', org, 'add link') or _('Add Organization'), named_route=org ~ '.new', class_="btn btn-primary", icon="plus-square" %} + {% endif %} +{% endblock %} \ No newline at end of file From 89077b05bc4249c655eeea482e9c6b0e59aa292e Mon Sep 17 00:00:00 2001 From: Sagar Ghimire Date: Mon, 20 May 2024 13:19:51 +0545 Subject: [PATCH 2/3] [Center][xs]: centerpoint map update for spatial search --- ckanext/rvr/assets/js/rvrSpatialQuery.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ckanext/rvr/assets/js/rvrSpatialQuery.js b/ckanext/rvr/assets/js/rvrSpatialQuery.js index 0d383c7..3ae6490 100644 --- a/ckanext/rvr/assets/js/rvrSpatialQuery.js +++ b/ckanext/rvr/assets/js/rvrSpatialQuery.js @@ -85,6 +85,7 @@ this.ckan.module('rvr-spatial-query', function ($, _) { 'dataset-map-container', mapConfig, { + center: [51.53662006757711, 7.1741345200178], attributionControl: false, drawControlTooltips: false, maxBounds: this.options.default_extent, From da4db884f98268d81e3d77a52865635473194061 Mon Sep 17 00:00:00 2001 From: Sagar Ghimire Date: Mon, 20 May 2024 14:45:32 +0545 Subject: [PATCH 3/3] [Fix][xs]: Map expand and clear improvement --- ckanext/rvr/assets/css/rvr.css | 14 ++++++++++++++ ckanext/rvr/assets/js/rvrSpatialQuery.js | 12 ++++++++++-- ckanext/rvr/templates/spatial/spatial_query.html | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/ckanext/rvr/assets/css/rvr.css b/ckanext/rvr/assets/css/rvr.css index 24d8307..9560ae5 100644 --- a/ckanext/rvr/assets/css/rvr.css +++ b/ckanext/rvr/assets/css/rvr.css @@ -833,6 +833,17 @@ div#dataset-map-attribution div a{ background-color: #c8e9e842; } +.spatial-map-clear { + position: absolute; + z-index: 1; + right: 40px; + top: 4px; + color: #888888; + font-size: 12px; + line-height: 20px; + text-decoration: underline; +} + .dataset-map-expanded #dataset-map { height: 412px !important; @@ -964,6 +975,9 @@ div#dataset-map-container.map-draw-field { } +#dataset-map { + position: relative; +} .dataset-map-expanded #dataset-map { position: absolute; diff --git a/ckanext/rvr/assets/js/rvrSpatialQuery.js b/ckanext/rvr/assets/js/rvrSpatialQuery.js index 3ae6490..aba9c43 100644 --- a/ckanext/rvr/assets/js/rvrSpatialQuery.js +++ b/ckanext/rvr/assets/js/rvrSpatialQuery.js @@ -108,15 +108,23 @@ this.ckan.module('rvr-spatial-query', function ($, _) { // OK add the expander $('a.leaflet-draw-draw-rectangle', module.el).on('click', function(e) { + e.preventDefault(); + if (!is_exanded) { $('body').addClass('dataset-map-expanded'); - if (should_zoom && !extentLayer) { + + if (should_zoom && !extentLayer && map) { map.zoomIn(); } - resetMap(); + + if (typeof resetMap === "function") { + resetMap(); + } + is_exanded = true; } }); + var buttonsHtml = [ '
', ''+ this._('Cancel')+ ' ', diff --git a/ckanext/rvr/templates/spatial/spatial_query.html b/ckanext/rvr/templates/spatial/spatial_query.html index 8d32d20..81e180a 100644 --- a/ckanext/rvr/templates/spatial/spatial_query.html +++ b/ckanext/rvr/templates/spatial/spatial_query.html @@ -12,11 +12,11 @@ #}
+ {{ _('Clear') }}

{{ _('Filter this by location') }} - {{ _('Clear') }}

{{ _('Mit Klick auf den Stift Filterbereich festlegen.') }}

{% set map_config = h.get_common_map_config() %}