[ckan-changes] [okfn/ckan] c30142: [#1797, resource][s]: minor tweaks to layout of res...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: c3014224a69a6b3f76befb4558d84bd6acf3d6fb
      https://github.com/okfn/ckan/commit/c3014224a69a6b3f76befb4558d84bd6acf3d6fb
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1797,resource][s]: minor tweaks to layout of resource read (not related to #1797 really).


  Commit: 96d978d8556aa4c8469e2cc5a991fd2a029899c4
      https://github.com/okfn/ckan/commit/96d978d8556aa4c8469e2cc5a991fd2a029899c4
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1797,resource/view][s]: small tweaks to existing download button and new Data API button.


  Commit: 0d1f8a68d7a040e9363c37b4fc16f13db8fe8787
      https://github.com/okfn/ckan/commit/0d1f8a68d7a040e9363c37b4fc16f13db8fe8787
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
  A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [vendor/jquery][xs]: upgrade to v1.7.1 of jquery in preparation for using bootstrap.


  Commit: ff7e102eb823981c4ac720486419a3cc69264916
      https://github.com/okfn/ckan/commit/ff7e102eb823981c4ac720486419a3cc69264916
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/public/css/bootstrap.css
  M ckan/public/css/style.css
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1797,#2223,css][m]: introduce full bootstrap v2.0.

* As far as I can tell most stuff still just works with some very minor tweaking (though I have put boostrap before blueprint)
* This is needed for use of bootstrap js for modals etc
* TODO: remove blueprint


  Commit: 0dc337098a3a07cb40a0613bf57a9bb061a0f80d
      https://github.com/okfn/ckan/commit/0dc337098a3a07cb40a0613bf57a9bb061a0f80d
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [vendor/bootstrap][s]: add bootstrap.js.


  Commit: 1d8e464f8542d4c33286bb93f4de50060665799f
      https://github.com/okfn/ckan/commit/1d8e464f8542d4c33286bb93f4de50060665799f
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/public/scripts/application.js
  A ckan/templates/_snippet/data-api-help.html
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1797,resource/view][m]: data API help in modal dialog on resource view page.


  Commit: 77eeee7f018d8d497fc3222d7e74a321af8b944a
      https://github.com/okfn/ckan/commit/77eeee7f018d8d497fc3222d7e74a321af8b944a
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js

  Log Message:
  -----------
  [#1797,js][xs]: add visualization to resource type list and add placeholder to format field (not really part of #1797).


  Commit: 3f1320cd92ae0e775fde1b5eada156260c55e0a6
      https://github.com/okfn/ckan/commit/3f1320cd92ae0e775fde1b5eada156260c55e0a6
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/js_strings.html

  Log Message:
  -----------
  [#1797,resource/edit][s]: checkbox for datastore enabled in resource form (uses webstore_url field).


  Commit: a8129fe570dba88df0a00a9aaf8cb95ccf1eb910
      https://github.com/okfn/ckan/commit/a8129fe570dba88df0a00a9aaf8cb95ccf1eb910
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/controllers/datastore.py
  M ckan/tests/functional/test_datastore.py

  Log Message:
  -----------
  [#1797,datastore/api][s]: check whether datastore is enabled for a given resource (whether webstore_url is set) and if not return error json.


  Commit: d533064faabdac9c39247752960ea933de9c4a84
      https://github.com/okfn/ckan/commit/d533064faabdac9c39247752960ea933de9c4a84
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  [#1797,doc/datastore][xs]: correct link for ckanext-datastorer.


  Commit: 476a5bd32a3fac5d2dd85614f5d86c79f4ff6547
      https://github.com/okfn/ckan/commit/476a5bd32a3fac5d2dd85614f5d86c79f4ff6547
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/controllers/datastore.py
  M ckan/controllers/package.py
  M ckan/public/css/bootstrap.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
  A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
  A ckan/templates/_snippet/data-api-help.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/functional/test_datastore.py
  M doc/datastore.rst

  Log Message:
  -----------
  [#1797,merge][m]: Merge branch 'feature-1797-webstore-v2' thereby fixes #1797.


Compare: https://github.com/okfn/ckan/compare/f8cf90c...476a5bd