From 8d09b92e2c0789b667d77020951b737ea59f3353 Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Fri, 23 Mar 2012 20:28:59 +0000 Subject: [PATCH 1/3] [master,#2226,doc][xs]: remove long obsolete .doc file. --- doc/ckan_form_guidance.doc | Bin 18944 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 doc/ckan_form_guidance.doc diff --git a/doc/ckan_form_guidance.doc b/doc/ckan_form_guidance.doc deleted file mode 100644 index c65bf618d59467cb07be88caca7a39ec58d46705..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18944 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 From fc3708010cab6a831ede6cea73b66184a4988f04 Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Sat, 24 Mar 2012 10:27:33 +0000 Subject: [PATCH 2/3] [master,doc/datastore][xs]: micro tweak to first paragraph. --- doc/datastore.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/datastore.rst b/doc/datastore.rst index d656d64ad51..395de84ce36 100644 --- a/doc/datastore.rst +++ b/doc/datastore.rst @@ -3,8 +3,8 @@ DataStore and the Data API ========================== The CKAN DataStore provides a database for structured storage of data together -with a powerful Web API, all seamlessly integrated into the CKAN interface and -authorization system. +with a powerful Web-accesible Data API, all seamlessly integrated into the CKAN +interface and authorization system. Overview ======== From 53991fcd65da1a23cec8062c4c1d99d4ad9632cc Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Sat, 24 Mar 2012 10:28:16 +0000 Subject: [PATCH 3/3] [#1828,#1797,resource/view][xs]: very minor tweaks to css for data explorer and data api modal info to make corretions post-bootstrapification. --- ckan/public/scripts/application.js | 2 +- ckan/templates/_snippet/data-api-help.html | 14 +++++++------- ckan/templates/package/resource_read.html | 4 ---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js index 8dbd95af994..245e3f0a1b5 100644 --- a/ckan/public/scripts/application.js +++ b/ckan/public/scripts/application.js @@ -16,7 +16,7 @@ var CKAN = CKAN || {}; }); CKAN.Utils.setupMarkdownEditor($('.markdown-editor')); // bootstrap collapse - $('.collapse').collapse(); + $('.collapse').collapse({toggle: false}); // set up ckan js var config = { endpoint: CKAN.SITE_URL + '/' diff --git a/ckan/templates/_snippet/data-api-help.html b/ckan/templates/_snippet/data-api-help.html index ddef8633078..e1655709b01 100644 --- a/ckan/templates/_snippet/data-api-help.html +++ b/ckan/templates/_snippet/data-api-help.html @@ -26,7 +26,13 @@

- +

The Data API builds directly on ElasticSearch, with a resource API + endpoint being equivalent to a single index 'type' in ElasticSearch. + This means you can directly re-use ElasticSearch + client libraries when connecting to the API endpoint.

+
@@ -53,12 +59,6 @@

-

The Data API builds directly on ElasticSearch, with a resource API - endpoint being equivalent to a single index 'type' in ElasticSearch. - This means you can directly re-use ElasticSearch - client libraries when connecting to the API endpoint.

diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html index 2c34db9af12..b1ed8ea9343 100644 --- a/ckan/templates/package/resource_read.html +++ b/ckan/templates/package/resource_read.html @@ -22,10 +22,6 @@ height: 28px; } - .header .recline-query-editor .text-query input { - height: 20px; - } - .recline-query-editor .pagination ul { margin: 0; padding: 0;