Merge branch 'master' into release-v1.6.1

ckan · Mar 25, 2012 · 8223d10 · 8223d10
2 parents ecd4cb2 + 53991fc
commit 8223d10
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git 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
@@ -26,7 +26,13 @@ <h3>
     </div>
     <div class="collapse-endpoints in accordion-body collapse">
       <div class="accordion-inner">
-        <table class="table-condensed">
+        <p>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 <a
+          href="http://www.elasticsearch.org/guide/appendix/clients.html"
+          _target="blank">ElasticSearch
+          client libraries</a> when connecting to the API endpoint.</p>
+        <table class="table-condensed table-striped table-bordered">
           <thead></thead>
           <tbody>
             <tr>
@@ -53,12 +59,6 @@ <h3>
             </tr>
           </tbody>
         </table>
-        <p>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 <a
-          href="http://www.elasticsearch.org/guide/appendix/clients.html"
-          _target="blank">ElasticSearch
-          client libraries</a> when connecting to the API endpoint.</p>
       </div>
     </div>
   </div>

diff --git 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;

diff --git a/doc/ckan_form_guidance.doc b/doc/ckan_form_guidance.doc
diff --git 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
 ========