Implement download rdf pages for past versions

eea · Apr 24, 2017 · 35ae33a · 35ae33a
1 parent 453fe69
commit 35ae33a
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 15 deletions.
diff --git a/gemet/thesaurus/static/thesaurus/css/style.css b/gemet/thesaurus/static/thesaurus/css/style.css
@@ -2025,5 +2025,10 @@ a.search-button {
 
 .edit-page input,
 .edit-page textarea {
-        min-width: 630px;
+    min-width: 630px;
+}
+
+.version-details p {
+    word-wrap: break-word;
+    margin-bottom: 0;
 }
diff --git a/gemet/thesaurus/templates/changes.html b/gemet/thesaurus/templates/changes.html
@@ -12,7 +12,10 @@ <h1>History of Changes in GEMET</h1>
   <dl>
     {% for version in versions %}
       <dt>{{ version.identifier }} ({{ version.publication_date | date:"Y-m-d" }})</dt>
-      <dd style="word-wrap: break-word;"> {{ version.change_note | linebreaks }}</dd>
+      <dd class="version-details">
+        {{ version.change_note | linebreaks }}
+        <a href="{% url 'download' language.code version %}">Download exports</a>
+      </dd>
     {% endfor %}
 
     <dt>2012-12-11</dt>

diff --git a/gemet/thesaurus/templates/downloads/download.html b/gemet/thesaurus/templates/downloads/download.html
@@ -6,7 +6,6 @@
 {% endblock %}
 
 {% block content %}
-  {% include 'header.html' with view='download' %}
 
   <h1>Download GEMET</h1>
 
@@ -32,31 +31,31 @@ <h3 class="h6">Supergroups, groups and themes in RDF</h3>
   <h3 class="h3">General structure</h3>
   <ul class="listing">
     <li>
-      <a href="{% url 'export' 'latest' 'gemet-backbone.html'%}">
+      <a href="{% url 'export' version 'gemet-backbone.html'%}">
           Themes and groups relationships as simple HTML importable into MS-Access</a>
     </li>
     <li>
-      <a href="{% url 'export' 'latest' 'gemet-backbone.rdf' %}">
+      <a href="{% url 'export' version 'gemet-backbone.rdf' %}">
           Themes and groups relationships as RDF</a>
     </li>
     <li>
-      <a href="{% url 'export' 'latest' 'gemet-definitions.html'%}">
+      <a href="{% url 'export' version 'gemet-definitions.html'%}">
           Labels and definitions as simple HTML table importable into MS-Access</a>
     </li>
     <li>
-      <a href="{% url 'export' 'latest' 'gemet-groups.html'%}">
+      <a href="{% url 'export' version 'gemet-groups.html'%}">
           Supergroups, groups and themes as simple HTML tables importable into MS-Access</a>
     </li>
     <li>
-      <a href="{% url 'export' 'latest' 'gemet-relations.html' %}">
+      <a href="{% url 'export' version 'gemet-relations.html' %}">
           Relations in simple HTML importable into MS-Access</a>
      </li>
     <li>
-      <a href="{% url 'export' 'latest' 'gemet-skoscore.rdf' %}">
+      <a href="{% url 'export' version 'gemet-skoscore.rdf' %}">
           SKOS broader and narrower relations as RDF</a>
      </li>
     <li>
-      <a href="{% url 'export' 'latest' 'gemetThesaurus.rdf' %}">
+      <a href="{% url 'export' version 'gemetThesaurus.rdf' %}">
           An object for the Concept Scheme</a>
     </li>
   </ul>

diff --git a/gemet/thesaurus/templates/layout.html b/gemet/thesaurus/templates/layout.html
@@ -31,7 +31,7 @@
 
       <div class="footer-menu">
         {% block footer %}
-          <a href="{% url 'download' language.code %}">Download</a>
+          <a href="{% url 'download' language.code 'latest' %}">Download</a>
           &nbsp;|&nbsp;
           <a href="{% url 'alphabets' language.code %}">Alphabets</a>
           &nbsp;|&nbsp;

diff --git a/gemet/thesaurus/templates/layout_zope.html b/gemet/thesaurus/templates/layout_zope.html
@@ -37,7 +37,7 @@
 <div class="footer-menu">
 
   {% block footer %}
-    <a href="{% url 'download' language.code %}">Download</a>
+    <a href="{% url 'download' language.code 'latest' %}">Download</a>
     &nbsp;|&nbsp;
     <a href="{% url 'alphabets' language.code %}">Alphabets</a>
     &nbsp;|&nbsp;

diff --git a/gemet/thesaurus/urls.py b/gemet/thesaurus/urls.py
@@ -63,7 +63,8 @@
         url(r'^alphabets/$', views.AlphabetsView.as_view(), name='alphabets'),
 
         # Exports
-        url(r'^exports/rdf$', views.DownloadView.as_view(), name='download'),
+        url(r'^exports/rdf/(?P<version>[\d\.]+|latest)$',
+            views.DownloadView.as_view(), name='download'),
 
         # Search
         url(r'^search/$', views.SearchView.as_view(), name='search'),

diff --git a/gemet/thesaurus/views.py b/gemet/thesaurus/views.py
@@ -600,16 +600,27 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class DownloadView(HeaderMixin, VersionMixin, FormView):
+class DownloadView(HeaderMixin, FormView):
     template_name = "downloads/download.html"
     form_class = ExportForm
 
+    def dispatch(self, request, *args, **kwargs):
+        self.version = kwargs.pop("version")
+        return super(DownloadView, self).dispatch(request, *args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        context = super(DownloadView, self).get_context_data(**kwargs)
+        context.update({
+            'version': self.version,
+        })
+        return context
+
     def get_initial(self):
         return {'language_names': self.language}
 
     def get_success_url(self):
         return reverse('export_lang', kwargs={
-            'version': self.current_version,
+            'version': self.version,
             'langcode': self.langcode,
             'filename': self.filename,
         })