forked from pduchesne/ckanext-geoview
-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
use
theme instead of main_css in CKAN >=2.9.6
- Loading branch information
1 parent
9ddc29c
commit 97036fa
Showing
2 changed files
with
16 additions
and
6 deletions.
There are no files selected for viewing
11 changes: 8 additions & 3 deletions
11
ckanext/geoview/templates/geoview/snippets/geojson_asset.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,11 @@ | ||
| {% set main_css = h.get_rtl_css() if h.is_rtl_language() else g.main_css %} | ||
| {# strip '/base/' prefix and '.css' suffix #} | ||
| {% asset main_css[6:-4] %} | ||
| {% if h.ckan_version().split('.') | map('int')| list >= [2, 9, 6] %} | ||
| {% set theme = h.get_rtl_theme() if h.is_rtl_language() else g.theme %} | ||
| {% asset theme %} | ||
| {% else %} | ||
| {% set main_css = h.get_rtl_css() if h.is_rtl_language() else g.main_css %} | ||
| {# strip '/base/' prefix and '.css' suffix #} | ||
| {% asset main_css[6:-4] %} | ||
| {% endif %} | ||
|
|
||
| {% asset 'ckanext-geoview/geojson_js' %} | ||
| {% asset 'ckanext-geoview/geojson_css' %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,11 @@ | ||
| {% set main_css = h.get_rtl_css() if h.is_rtl_language() else g.main_css %} | ||
| {# strip '/base/' prefix and '.css' suffix #} | ||
| {% asset main_css[6:-4] %} | ||
| {% if h.ckan_version().split('.') | map('int')| list >= [2, 9, 6] %} | ||
| {% set theme = h.get_rtl_theme() if h.is_rtl_language() else g.theme %} | ||
| {% asset theme %} | ||
| {% else %} | ||
| {% set main_css = h.get_rtl_css() if h.is_rtl_language() else g.main_css %} | ||
| {# strip '/base/' prefix and '.css' suffix #} | ||
| {% asset main_css[6:-4] %} | ||
| {% endif %} | ||
|
|
||
| {% asset 'ckanext-geoview/shp_js' %} | ||
| {% asset 'ckanext-geoview/shp_css' %} |