Plumbing: changed gazetteer download from link to form with hidden field

pelagios · Jan 20, 2017 · 491d09b · 491d09b
1 parent 0eb6e19
commit 491d09b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/app/assets/javascripts/document/downloads/app.js b/app/assets/javascripts/document/downloads/app.js
@@ -91,20 +91,6 @@ require([
 
               // TODO geometry
 
-              /*
-              '<dl class="lat">' +
-                '<dt><label for="lat">Latitude</label></dt>' +
-                '<dd><select>' + '</select></dd>' +
-                '<dd class="info"></dd>' +
-              '</dl>' +
-
-              '<dl class="lon">' +
-                '<dt><label for="lon">Longitude</label></dt>' +
-                '<dd><select>' + '</select></dd>' +
-                '<dd class="info"></dd>' +
-              '</dl>' +
-              */
-
               '<div class="buttons">' +
                 '<button type="submit" class="btn">OK</button>' +
                 '<button class="btn outline cancel">Cancel</button>' +
@@ -213,7 +199,7 @@ require([
             btnSettings.addClass('outline');
             btnSettings.find('.icon').html('&#xf00c;');
 
-            btnDownload.removeClass('disabled');
+            btnDownload.prop('disabled', false);
           }
         },
 

diff --git a/app/assets/stylesheets/document/downloads/index.less b/app/assets/stylesheets/document/downloads/index.less
@@ -56,7 +56,12 @@ html, body {
       width:400px;
       text-align:right;
 
-      a.btn {
+      form {
+        display:inline;
+      }
+
+      .btn {
+        line-height:150%;
         text-align:center;
         position:relative;
         top:29%;

diff --git a/app/views/document/downloads/index.scala.html b/app/views/document/downloads/index.scala.html
@@ -148,7 +148,10 @@ <h3>Pelagios Gazetteer GeoJSON</h3>
                 </div>
                 <div class="button-container">
                   <a href="#" class="btn orange small settings"><span class="icon">&#xf06a;</span> Settings</a>
-                  <a @*href="@controllers.document.downloads.routes.DownloadsController.downloadGeoJSON(doc.id, true)"*@ class="btn small disabled download"><span class="icon">&#xf019;</span> GeoJSON</a>
+                  <form action="@controllers.document.downloads.routes.DownloadsController.downloadGeoJSON(doc.id, true)" method="POST">
+                    <input type="hidden" name="settings-json" />
+                    <button type="submit" class="btn small download" disabled="true"><span class="icon">&#xf019;</span> GeoJSON</button>
+                  </form>
                 </div>
               </li>
             </ul>

diff --git a/conf/routes b/conf/routes
@@ -60,6 +60,7 @@ GET     /document/:id/downloads/ttl                  controllers.document.downlo
 GET     /document/:id/downloads/rdf                  controllers.document.downloads.DownloadsController.downloadRDFXML(id: String)
 GET     /document/:id/downloads/jsonld               controllers.document.downloads.DownloadsController.downloadJSONLD(id: String)
 GET     /document/:id/downloads/geojson              controllers.document.downloads.DownloadsController.downloadGeoJSON(id: String, as_gazetteer: Boolean ?= false)
+POST    /document/:id/downloads/geojson              controllers.document.downloads.DownloadsController.downloadGeoJSON(id: String, as_gazetteer: Boolean ?= false)
 GET     /document/:id/downloads/tei                  controllers.document.downloads.DownloadsController.downloadTEI(id: String)
 
 GET     /document/:id/discussion                     controllers.document.discussion.DiscussionController.showDiscussionBoard(id: String)