From 0c1e40aecd6483a6d8a4a13176e777f45d380cd8 Mon Sep 17 00:00:00 2001 From: Calvin Metcalf Date: Tue, 17 Jan 2017 11:25:16 -0500 Subject: [PATCH] prefixes --- ckanext/agsview/plugin.py | 10 +++++----- ckanext/agsview/templates/ags_fs_form.html | 4 ++-- ckanext/agsview/templates/ags_fs_view.html | 4 ++-- ckanext/agsview/templates/ags_ms_form.html | 6 +++--- ckanext/agsview/templates/ags_ms_view.html | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ckanext/agsview/plugin.py b/ckanext/agsview/plugin.py index 598c150..f934336 100644 --- a/ckanext/agsview/plugin.py +++ b/ckanext/agsview/plugin.py @@ -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'), @@ -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'), diff --git a/ckanext/agsview/templates/ags_fs_form.html b/ckanext/agsview/templates/ags_fs_form.html index 55eab49..e6d6e1a 100644 --- a/ckanext/agsview/templates/ags_fs_form.html +++ b/ckanext/agsview/templates/ags_fs_form.html @@ -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']) }} diff --git a/ckanext/agsview/templates/ags_fs_view.html b/ckanext/agsview/templates/ags_fs_view.html index dc03d2c..6a678bb 100644 --- a/ckanext/agsview/templates/ags_fs_view.html +++ b/ckanext/agsview/templates/ags_fs_view.html @@ -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() }}">

{{ _('Loading...') }}
diff --git a/ckanext/agsview/templates/ags_ms_form.html b/ckanext/agsview/templates/ags_ms_form.html index 6091dc4..d4a68d9 100644 --- a/ckanext/agsview/templates/ags_ms_form.html +++ b/ckanext/agsview/templates/ags_ms_form.html @@ -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']) }} diff --git a/ckanext/agsview/templates/ags_ms_view.html b/ckanext/agsview/templates/ags_ms_view.html index 35bc571..894e93f 100644 --- a/ckanext/agsview/templates/ags_ms_view.html +++ b/ckanext/agsview/templates/ags_ms_view.html @@ -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() }}">

{{ _('Loading2...') }}