Remove ckanext-schemingdcat deps

mjanez · Nov 10, 2024 · f2cdb28 · f2cdb28
1 parent 95889d2
commit f2cdb28
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 33 deletions.
diff --git a/ckanext/harvest/templates/snippets/source_item.html b/ckanext/harvest/templates/snippets/source_item.html
@@ -48,7 +48,6 @@ <h3 class="dataset-heading">
       {% endif %}
       {% if not within_organization and source.organization %}
       &mdash; {{ _('Organization') }}: {{ h.link_to(source.organization.title or source.organization.name, h.url_for('organization.read', id=source.organization.name)) }}</a>
-      &mdash; {{ _('Datasets') }}: {{ h.link_to(h.schemingdcat_package_count_for_source(source.id), url) }}</a>
       {% endif %}
     </p>
 

diff --git a/ckanext/harvest/templates/source/new.html b/ckanext/harvest/templates/source/new.html
@@ -24,18 +24,12 @@ <h2 class="module-heading"><i class="fa fa-lg fa-info-circle icon-large icon-inf
     <div class="module-content">
       <p>
         {% trans %}
-        Harvest sources allow importing remote metadata into this catalog.   Remote sources can be other catalogs such as other CKAN instances, CSW servers, XML metadata files, XLSX with metadata records or Web Accessible Folder (WAF).
+        Harvest sources allow importing remote metadata into this catalog.
+        Remote sources can be other catalogs such as other CKAN instances, CSW
+        servers or Web Accessible Folders (WAF) (depending on the actual
+        harvesters enabled for this instance).
         {% endtrans %}
       </p>
-
-      <p>
-        {{ _('Depending on the actual harvesters enabled for this instance. eg: ') }}
-        <ul>
-          <li><a href="https://github.com/mjanez/ckanext-schemingdcat?tab=readme-ov-file#harvesters" target="_blank">ckanext-schemingdcat</a></li>
-          <li><a href="https://github.com/ckan/ckanext-dcat?tab=readme-ov-file#rdf-dcat-harvester" target="_blank">ckanext-dcat</a></li>
-          <li><a href="https://docs.ckan.org/projects/ckanext-spatial/en/latest/harvesters.html" target="_blank">ckanext-scheming_spatial</a></li>
-        </ul>
-      </p>
     </div>
   </section>
 {% endblock %}
diff --git a/ckanext/harvest/templates/source/read.html b/ckanext/harvest/templates/source/read.html
@@ -3,6 +3,6 @@
 {% block primary_content_inner %}
   <section class="module-content">
     <h1 class="hide-heading">{{ _('Datasets') }}</h1>
-    {{ h.schemingdcat_package_list_for_source(harvest_source.id)  }}
+    {{ h.package_list_for_source(harvest_source.id)  }}
   </section>
 {% endblock %}
diff --git a/ckanext/harvest/templates/source/read_base.html b/ckanext/harvest/templates/source/read_base.html
@@ -15,7 +15,7 @@ <h1 class="heading">{{ harvest_source.title }}</h1>
       <div class="nums">
         <dl>
             <dt>{{ _('Datasets') }}</dt>
-            <dd>{{ h.schemingdcat_package_count_for_source(harvest_source.id) }}</dd>
+            <dd>{{ h.package_count_for_source(harvest_source.id) }}</dd>
         </dl>
       </div>
     </section>

diff --git a/ckanext/harvest/templates/source/search.html b/ckanext/harvest/templates/source/search.html
@@ -44,26 +44,7 @@
 
 
 
-    {% block secondary_content %}
-    <section class="module module-narrow">
-      <h2 class="module-heading"><i class="fa fa-lg fa-info-circle icon-large icon-info-sign"></i> {{ _('Harvest sources') }}</h2>
-      <div class="module-content">
-        <p>
-          {% trans %}
-          Harvest sources allow importing remote metadata into this catalog.   Remote sources can be other catalogs such as other CKAN instances, CSW servers, XML metadata files, XLSX with metadata records or Web Accessible Folder (WAF).
-          {% endtrans %}
-        </p>
-
-        <p>
-          {{ _('Depending on the actual harvesters enabled for this instance. eg: ') }}
-          <ul>
-            <li><a href="https://github.com/mjanez/ckanext-schemingdcat?tab=readme-ov-file#harvesters" target="_blank">ckanext-schemingdcat</a></li>
-            <li><a href="https://github.com/ckan/ckanext-dcat?tab=readme-ov-file#rdf-dcat-harvester" target="_blank">ckanext-dcat</a></li>
-            <li><a href="https://docs.ckan.org/projects/ckanext-spatial/en/latest/harvesters.html" target="_blank">ckanext-scheming_spatial</a></li>
-          </ul>
-        </p>
-      </div>
-    </section>
+{% block secondary_content %}
   {% for facet in c.facet_titles %}
       {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, alternative_url=h.url_for('{0}.search'.format(c.dataset_type))) }}
   {% endfor %}