Skip to content

maybe prefixes will help? #6

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

Open
calvinmetcalf wants to merge 2 commits into
base: master
Choose a base branch
from
Open

maybe prefixes will help? #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c1e40a
prefixes
calvinmetcalf Jan 17, 2017
d2cd574
Merge branch 'master' of github.com:AppGeo/ckanext-agsview
calvinmetcalf Jan 17, 2017
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
10 changes: 5 additions & 5 deletions ckanext/agsview/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ def info(self):
'title': p.toolkit._('ArcGIS FeatureServer Service'),
'icon': 'compass',
'schema': {
'ags_url': [ignore_empty, unicode],
'basemap_url': [ignore_empty, unicode]
'fs_ags_url': [ignore_empty, unicode],
'fs_basemap_url': [ignore_empty, unicode]
},
'iframed': False,
'default_title': p.toolkit._('ArcGIS FeatureServer Service'),
Expand Down Expand Up @@ -83,9 +83,9 @@ def info(self):
'title': p.toolkit._('ArcGIS MapServer Service'),
'icon': 'compass',
'schema': {
'ags_url': [ignore_empty, unicode],
'basemap_url': [ignore_empty, unicode],
'layer_ids': [ignore_empty, unicode]
'ms_ags_url': [ignore_empty, unicode],
'ms_basemap_url': [ignore_empty, unicode],
'ms_layer_ids': [ignore_empty, unicode]
},
'iframed': False,
'default_title': p.toolkit._('ArcGIS MapServer Service'),
Expand Down
4 changes: 2 additions & 2 deletions ckanext/agsview/templates/ags_fs_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% import 'macros/form.html' as form %}

{{ form.input('ags_url', id='field-ags_url', label=_('ags url'), placeholder=_('eg. http://.../MapServer/0'), value=data.ags_url, error=errors.ags_url, classes=['control-full', 'control-large']) }}
{{ form.input('basemap_url', id='field-basemap_url', label=_('basemap url'), placeholder=_('eg. http://.../tile/{z}/{x}/{y}'), value=data.basemap_url, error=errors.basemap_url, classes=['control-full', 'control-large']) }}
{{ form.input('fs_ags_url', id='field-fs_ags_url', label=_('ags url'), placeholder=_('eg. http://.../MapServer/0'), value=data.fs_ags_url, error=errors.ags_url, classes=['control-full', 'control-large']) }}
{{ form.input('fs_basemap_url', id='field-fs_basemap_url', label=_('basemap url'), placeholder=_('eg. http://.../tile/{z}/{x}/{y}'), value=data.fs_basemap_url, error=errors.fs_basemap_url, classes=['control-full', 'control-large']) }}
4 changes: 2 additions & 2 deletions ckanext/agsview/templates/ags_fs_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
data-module="ags_fs_view"
id="data-preview"
data-module-site_url="{{ h.dump_json(h.url('/', locale='default', qualified=true)) }}"
data-module-path="{{ resource_view.get('ags_url') or c.resource.url }}"
data-module-basemap="{{ resource_view.get('basemap_url') or h.ags_view_default_basemap_url() }}">
data-module-path="{{ resource_view.get('fs_ags_url') or c.resource.url }}"
data-module-basemap="{{ resource_view.get('fs_basemap_url') or h.ags_view_default_basemap_url() }}">
<h4 class="loading-dialog">
<div class="loading-spinner"></div>
<div class="left">{{ _('Loading...') }}</div>
Expand Down
6 changes: 3 additions & 3 deletions ckanext/agsview/templates/ags_ms_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

{% import 'macros/form.html' as form %}

{{ form.input('ags_url', id='field-ags_url', label=_('ags url'), placeholder=_('eg. http://.../MapServer'), value=data.ags_url, error=errors.ags_url, classes=['control-full', 'control-large']) }}
{{ form.input('layer_ids', id='field-layer_ids', label=_('layer ids'), placeholder=_('Leave blank to return all layers'), value=data.layer_ids, error=errors.layer_ids, classes=['control-full', 'control-large']) }}
{{ form.input('basemap_url', id='field-basemap_url', label=_('basemap url'), placeholder=_('eg. http://.../tile/{z}/{x}/{y}'), value=data.basemap_url, error=errors.basemap_url, classes=['control-full', 'control-large']) }}
{{ form.input('ms_ags_url', id='field-ms_ags_url', label=_('ags url'), placeholder=_('eg. http://.../MapServer'), value=data.ms_ags_url, error=errors.ms_ags_url, classes=['control-full', 'control-large']) }}
{{ form.input('ms_layer_ids', id='field-ms_layer_ids', label=_('layer ids'), placeholder=_('Leave blank to return all layers'), value=data.ms_layer_ids, error=errors.ms_layer_ids, classes=['control-full', 'control-large']) }}
{{ form.input('ms_basemap_url', id='field-ms_basemap_url', label=_('basemap url'), placeholder=_('eg. http://.../tile/{z}/{x}/{y}'), value=data.ms_basemap_url, error=errors.ms_basemap_url, classes=['control-full', 'control-large']) }}
6 changes: 3 additions & 3 deletions ckanext/agsview/templates/ags_ms_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
data-module="ags_ms_view"
id="data-preview"
data-module-site_url="{{ h.dump_json(h.url('/', locale='default', qualified=true)) }}"
data-module-layer_ids="{{ resource_view.get('layer_ids') or '' }}"
data-module-path="{{ resource_view.get('ags_url') or c.resource.url }}"
data-module-basemap="{{ resource_view.get('basemap_url') or h.ags_view_default_basemap_url() }}">
data-module-layer_ids="{{ resource_view.get('ms_layer_ids') or '' }}"
data-module-path="{{ resource_view.get('ms_ags_url') or c.resource.url }}"
data-module-basemap="{{ resource_view.get('ms_basemap_url') or h.ags_view_default_basemap_url() }}">
<h4 class="loading-dialog">
<div class="loading-spinner"></div>
<div class="left">{{ _('Loading2...') }}</div>
Expand Down