From b920f6812a5b37cf6cc02ca87880cfbe2fe0f6d4 Mon Sep 17 00:00:00 2001
From: Konstantin Sivakov <konstantin.sivakov@gmail.com>
Date: Wed, 20 Sep 2017 18:25:01 +0200
Subject: [PATCH 1/5] add download option from dump functionality

---
 ckan/templates/package/resource_read.html | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
index 960881810dc..2e36ac820ec 100644
--- a/ckan/templates/package/resource_read.html
+++ b/ckan/templates/package/resource_read.html
@@ -32,6 +32,7 @@
             {% endif %}
             {% if res.url and h.is_url(res.url) %}
               <li>
+                <div class="btn-group">
                 <a class="btn btn-primary resource-url-analytics resource-type-{{ res.resource_type }}" href="{{ res.url }}">
                   {% if res.resource_type in ('listing', 'service') %}
                     <i class="fa fa-eye"></i> {{ _('View') }}
@@ -43,6 +44,24 @@
                     <i class="fa fa-arrow-circle-o-down"></i> {{ _('Download') }}
                   {% endif %}
                 </a>
+                {%if res.url_type == 'upload' and res.datastore_active %}
+                <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                    <span class="caret"></span>
+                  </button>
+                  <ul class="dropdown-menu">
+                  <li>
+                    <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id) }}"
+                      target="_blank">CSV</a>
+                    <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='tsv') }}"
+                      target="_blank">TSV</a>
+                    <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='json') }}"
+                      target="_blank">JSON</a>
+                    <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='xml') }}"
+                      target="_blank">XML</a>
+                  </li>
+                  </ul>
+                {%endif%}
+                </div>
               </li>
             {% endif %}
             {% endblock %}

From 46e9c4b91ea556fe3b8a3428c1e801ae8d178508 Mon Sep 17 00:00:00 2001
From: Konstantin Sivakov <konstantin.sivakov@gmail.com>
Date: Thu, 21 Sep 2017 16:31:06 +0200
Subject: [PATCH 2/5] add block, remove check if the flag is upload

---
 ckan/templates/package/resource_read.html | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
index 2e36ac820ec..b2157b49832 100644
--- a/ckan/templates/package/resource_read.html
+++ b/ckan/templates/package/resource_read.html
@@ -44,23 +44,24 @@
                     <i class="fa fa-arrow-circle-o-down"></i> {{ _('Download') }}
                   {% endif %}
                 </a>
-                {%if res.url_type == 'upload' and res.datastore_active %}
+                 {% block donwload_resource_button %}
+                  {%if res.datastore_active %}
                 <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
                     <span class="caret"></span>
                   </button>
-                  <ul class="dropdown-menu">
+                <ul class="dropdown-menu">
                   <li>
                     <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id) }}"
-                      target="_blank">CSV</a>
+                      target="_blank"><span>CSV</span></a>
                     <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='tsv') }}"
-                      target="_blank">TSV</a>
+                      target="_blank"><span>TSV</span></a>
                     <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='json') }}"
-                      target="_blank">JSON</a>
+                      target="_blank"><span>JSON</span></a>
                     <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='xml') }}"
-                      target="_blank">XML</a>
+                      target="_blank"><span>XML</span></a>
                   </li>
-                  </ul>
-                {%endif%}
+                </ul>
+                {%endif%} {% endblock %}
                 </div>
               </li>
             {% endif %}

From 287f83d9fed3111c602585759a16ef4ed7584676 Mon Sep 17 00:00:00 2001
From: Konstantin Sivakov <konstantin.sivakov@gmail.com>
Date: Thu, 19 Oct 2017 14:33:13 +0200
Subject: [PATCH 3/5] fix typo

---
 ckan/templates/package/resource_read.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
index b2157b49832..6e6a812172c 100644
--- a/ckan/templates/package/resource_read.html
+++ b/ckan/templates/package/resource_read.html
@@ -44,16 +44,16 @@
                     <i class="fa fa-arrow-circle-o-down"></i> {{ _('Download') }}
                   {% endif %}
                 </a>
-                 {% block donwload_resource_button %}
+                 {% block download_resource_button %}
                   {%if res.datastore_active %}
                 <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
                     <span class="caret"></span>
                   </button>
                 <ul class="dropdown-menu">
                   <li>
-                    <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id) }}"
+                    <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, bom=True) }}"
                       target="_blank"><span>CSV</span></a>
-                    <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='tsv') }}"
+                    <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='tsv', bom=True) }}"
                       target="_blank"><span>TSV</span></a>
                     <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='json') }}"
                       target="_blank"><span>JSON</span></a>

From f0f52a9b3af3a2287cf1a3e7b5e8139cd9537a4e Mon Sep 17 00:00:00 2001
From: Jari Voutilainen <jari.voutilainen@iki.fi>
Date: Wed, 1 Nov 2017 12:18:27 +0200
Subject: [PATCH 4/5] Fix cors header when all origins are allowed

---
 ckan/views/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/views/__init__.py b/ckan/views/__init__.py
index cdaf109ac2e..a0057d05128 100644
--- a/ckan/views/__init__.py
+++ b/ckan/views/__init__.py
@@ -54,7 +54,7 @@ def set_cors_headers_for_response(response):
 
         cors_origin_allowed = None
         if asbool(config.get(u'ckan.cors.origin_allow_all')):
-            cors_origin_allowed = u'*'
+            cors_origin_allowed = b'*'
         elif config.get(u'ckan.cors.origin_whitelist') and \
                 request.headers.get(u'Origin') \
                 in config[u'ckan.cors.origin_whitelist'].split(u' '):

From 448be7e4e2b63e752f54b61739ad058ef9ce94db Mon Sep 17 00:00:00 2001
From: Konstantin Sivakov <konstantin.sivakov@gmail.com>
Date: Thu, 2 Nov 2017 14:20:14 +0100
Subject: [PATCH 5/5] add download selection for bootstrap2

---
 ckan/templates-bs2/package/resource_read.html | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/ckan/templates-bs2/package/resource_read.html b/ckan/templates-bs2/package/resource_read.html
index a7ffbc0b3b8..8e51e1862eb 100644
--- a/ckan/templates-bs2/package/resource_read.html
+++ b/ckan/templates-bs2/package/resource_read.html
@@ -32,6 +32,7 @@
             {% endif %}
             {% if res.url and h.is_url(res.url) %}
               <li>
+                <div class="btn-group">
                 <a class="btn btn-primary resource-url-analytics resource-type-{{ res.resource_type }}" href="{{ res.url }}">
                   {% if res.resource_type in ('listing', 'service') %}
                     <i class="fa fa-eye"></i> {{ _('View') }}
@@ -43,6 +44,31 @@
                     <i class="fa fa-arrow-circle-o-down"></i> {{ _('Download') }}
                   {% endif %}
                 </a>
+                 {% block download_resource_button %} {%if res.datastore_active %}
+                <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                  <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu">
+                  <li>
+                    <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, bom=True) }}"
+                      target="_blank">
+                      <span>CSV</span>
+                    </a>
+                    <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='tsv', bom=True) }}"
+                      target="_blank">
+                      <span>TSV</span>
+                    </a>
+                    <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='json') }}"
+                      target="_blank">
+                      <span>JSON</span>
+                    </a>
+                    <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='xml') }}"
+                      target="_blank">
+                      <span>XML</span>
+                    </a>
+                  </li>
+                </ul>
+                {%endif%} {% endblock %}
               </li>
             {% endif %}
             {% endblock %}