[ckan-changes] [okfn/ckan] aa90b1: [view/resource][s]: reorganize resource read/view ...

Mon Nov 28 13:25:39 UTC 2011

  Branch: refs/heads/feature-1450-dataset-view
  Home:   https://github.com/okfn/ckan

  Commit: aa90b19588b60dc38be860483a8828cd6aba5b3d
      https://github.com/okfn/ckan/commit/aa90b19588b60dc38be860483a8828cd6aba5b3d
  Author: rgrp <rufus.pollock at okfn.org>
  Date:   2011-11-24 (Thu, 24 Nov 2011)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/public/css/style.css
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [view/resource][s]: reorganize resource read/view page.

* Add some relevant helper functions along the way.

  Commit: b4e395b3c19429fd233da50b79ea8b0e0daf6aaf
      https://github.com/okfn/ckan/commit/b4e395b3c19429fd233da50b79ea8b0e0daf6aaf
  Author: rgrp <rufus.pollock at okfn.org>
  Date:   2011-11-24 (Thu, 24 Nov 2011)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/templates/package/layout.html

  Log Message:
  -----------
  [view/resource][s]: reintroduce nav bar on resource view page and add tab on nav bar for resources.

  Commit: 61798168e01912804917826226a4bdcb3ffe8e92
      https://github.com/okfn/ckan/commit/61798168e01912804917826226a4bdcb3ffe8e92
  Author: rgrp <rufus.pollock at okfn.org>
  Date:   2011-11-24 (Thu, 24 Nov 2011)

  Changed paths:
    A ckan/public/scripts/dataexplorer/icon-sprite.png
  A ckan/public/scripts/dataexplorer/loading.gif
  A ckan/public/scripts/dataexplorer/table-view-template.js
  A ckan/public/scripts/dataexplorer/table-view.css
  A ckan/public/scripts/dataexplorer/table-view.js
  A ckan/public/scripts/dataexplorer/table-view.ui.js
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [js,resource/view][s]: include dataexplorer js locally and update references in resource view.

* Have not updated package (dataset) view yet as about to remove the dataexplorer code from there.

  Commit: b77a36af407345e178ca7045ccb28dc183800b49
      https://github.com/okfn/ckan/commit/b77a36af407345e178ca7045ccb28dc183800b49
  Author: rgrp <rufus.pollock at okfn.org>
  Date:   2011-11-25 (Fri, 25 Nov 2011)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/templates/package/read_core.html

  Log Message:
  -----------
  [package/view][s]: resource entries now link to resource page rather than resource url.

* Introduce new helper function resource_link for use here and improve resource_display_name function to use description and then id if no name.

  Commit: 1579f0c7305e5a97a91f2ebd1f156d0553166dc1
      https://github.com/okfn/ckan/commit/1579f0c7305e5a97a91f2ebd1f156d0553166dc1
  Author: rgrp <rufus.pollock at okfn.org>
  Date:   2011-11-25 (Fri, 25 Nov 2011)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/public/scripts/application.js
  M ckan/templates/package/read.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/resources.html

  Log Message:
  -----------
  [resource/view,js][s]: wire data preview into resource view and disconnect from dataset view.

* NB: not working yet very well (e.g. need to change from creating a floating dialog to in page preview).

  Commit: 14562ae3db32f77ffa730c741603d2dd928ddb38
      https://github.com/okfn/ckan/commit/14562ae3db32f77ffa730c741603d2dd928ddb38
  Author: rgrp <rufus.pollock at okfn.org>
  Date:   2011-11-25 (Fri, 25 Nov 2011)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/dataexplorer/table-view-template.js
  M ckan/public/scripts/dataexplorer/table-view.css
  M ckan/public/scripts/dataexplorer/table-view.js

  Log Message:
  -----------
  [js/dataexplorer][s]: tweaking and refactoring of dataexplorer to have it work in page rather than in dialog.

* Now working pretty well though further minor improvements that could be made.

  Commit: 75ef7461f6e4c22620103bf5872e17f442313faf
      https://github.com/okfn/ckan/commit/75ef7461f6e4c22620103bf5872e17f442313faf
  Author: rgrp <rufus.pollock at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/lib/helpers.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  A ckan/public/scripts/dataexplorer/icon-sprite.png
  A ckan/public/scripts/dataexplorer/loading.gif
  A ckan/public/scripts/dataexplorer/table-view-template.js
  A ckan/public/scripts/dataexplorer/table-view.css
  A ckan/public/scripts/dataexplorer/table-view.js
  A ckan/public/scripts/dataexplorer/table-view.ui.js
  M ckan/templates/package/layout.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/resources.html

  Log Message:
  -----------
  Merge branch 'feature-1445-resource-view' into feature-1450-dataset-view

Conflicts:
	ckan/public/css/style.css
	ckan/public/scripts/application.js
	ckan/templates/package/read.html
	ckan/templates/package/read_core.html
	ckan/templates/package/resource_read.html
[merge,from-branch][m]: merge feature-1445-resource-view into feature-1450-dataset-view.

Compare: https://github.com/okfn/ckan/compare/b25de12...75ef746