[ckan-changes] [okfn/ckan] 6ffe69: [2474] Convert base templates into Jinja templates

Tue Jun 5 12:17:19 UTC 2012

  Branch: refs/heads/feature-2375-demo-theme
  Home:   https://github.com/okfn/ckan
  Commit: 6ffe69e517457253a7b67601c5e8966f44a83877
      https://github.com/okfn/ckan/commit/6ffe69e517457253a7b67601c5e8966f44a83877
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-29 (Tue, 29 May 2012)

  Changed paths:
    A ckan/templates/base.jinja.html
    A ckan/templates/footer.jinja.html
    A ckan/templates/header.jinja.html
    A ckan/templates/page.jinja.html

  Log Message:
  -----------
  [2474] Convert base templates into Jinja templates

  Commit: 9124f5614222191dd1d3dcffff0de808686a6143
      https://github.com/okfn/ckan/commit/9124f5614222191dd1d3dcffff0de808686a6143
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-29 (Tue, 29 May 2012)

  Changed paths:
    A ckan/templates/package/related_item.html
    A ckan/templates/package/related_list.html

  Log Message:
  -----------
  [2474] Create dataset related template as part of the Jinja test

  Commit: d11642f4501a189ea2ae30ac2fbac0d8752e7f5f
      https://github.com/okfn/ckan/commit/d11642f4501a189ea2ae30ac2fbac0d8752e7f5f
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-29 (Tue, 29 May 2012)

  Changed paths:
    M ckan/templates/base.jinja.html
    M ckan/templates/page.jinja.html

  Log Message:
  -----------
  [2474] Document the base.html and page.html files

  Commit: e8fca86c79f67934f42463d0aab201623841339b
      https://github.com/okfn/ckan/commit/e8fca86c79f67934f42463d0aab201623841339b
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M ckan/templates/base.jinja.html

  Log Message:
  -----------
  [2474] Fix bug with title block in base Jinja template

  Commit: d6ab19bd9a15fafab2c7887a08f19b9e7a04b125
      https://github.com/okfn/ckan/commit/d6ab19bd9a15fafab2c7887a08f19b9e7a04b125
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    A ckan/public/base/images/placeholder-group.png
    A ckan/templates/group/index.html

  Log Message:
  -----------
  [2474] Add base html for group index page

  Commit: 906b5264c07c4369edf58b1715ca90ba2a98915b
      https://github.com/okfn/ckan/commit/906b5264c07c4369edf58b1715ca90ba2a98915b
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M ckan/templates/group/index.html
    A ckan/templates/group/partials/group_item.html
    A ckan/templates/group/partials/group_list.html

  Log Message:
  -----------
  [2474] Move group items and item templates into partials

  Commit: 0de6c88e8568a2b5f3085bf8b23b12d43ae97e82
      https://github.com/okfn/ckan/commit/0de6c88e8568a2b5f3085bf8b23b12d43ae97e82
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/less/icons.less

  Log Message:
  -----------
  [2474] Add plus icon to the icon sprite sheet

  Commit: 133b5287723ab0c59ecfd110645152f63811f6e3
      https://github.com/okfn/ckan/commit/133b5287723ab0c59ecfd110645152f63811f6e3
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/media.less

  Log Message:
  -----------
  [2474] Add a media module for images and text

  Commit: b0a1775ad98ababee418dd8104c459c57b6cfee9
      https://github.com/okfn/ckan/commit/b0a1775ad98ababee418dd8104c459c57b6cfee9
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M ckan/templates/group/index.html
    M ckan/templates/group/partials/group_item.html
    M ckan/templates/group/partials/group_list.html

  Log Message:
  -----------
  [2474] Style the group index page and moved templates into partials

  Commit: 20302d6bdbbcbe9bdd3be4f3f744e93126cdf419
      https://github.com/okfn/ckan/commit/20302d6bdbbcbe9bdd3be4f3f744e93126cdf419
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M ckan/templates/group/index.html

  Log Message:
  -----------
  [2474] Add "Add Group" button

  Commit: 1729eda45a7bb03e0cf0cf748a3535499e604c0a
      https://github.com/okfn/ckan/commit/1729eda45a7bb03e0cf0cf748a3535499e604c0a
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    A ckan/templates/macros/form.html

  Log Message:
  -----------
  [2474] Added some form macros

These are Jinja snippets for creating form fields. I'm currently trying
them out as an alternative to snippets as they are more explicit about
what can be passed into them.

  Commit: 419f5340352f6dd5072253d78f4bc56c473501b5
      https://github.com/okfn/ckan/commit/419f5340352f6dd5072253d78f4bc56c473501b5
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    A ckan/templates/group/new.html
    A ckan/templates/group/new_group_form.html
    A ckan/templates/group/partials/group_form.html

  Log Message:
  -----------
  [2474] Add a new group form

Currently doesn't work, also needs all additional items added to it
such as extras and datasets.

  Commit: 0547ea772e29b522919655fced9e843b99484fd0
      https://github.com/okfn/ckan/commit/0547ea772e29b522919655fced9e843b99484fd0
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/html_resources/__init__.py
    M ckan/lib/extract.py
    M ckan/lib/helpers.py
    M ckan/lib/render.py
    M ckan/templates/base.html
    M ckan/templates/package/read.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/popular.html
    M setup.py

  Log Message:
  -----------
  Merge branch 'feature-2375-demo-theme' into feature-2474-jinja

  Commit: 78c12fe5549190aef5baf43ab2db4304e4f7f439
      https://github.com/okfn/ckan/commit/78c12fe5549190aef5baf43ab2db4304e4f7f439
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  [2474] Tweak the style of the prepend form element

  Commit: 50f95d1cd50523ddd12ce030ccd1fff49edc9e24
      https://github.com/okfn/ckan/commit/50f95d1cd50523ddd12ce030ccd1fff49edc9e24
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M ckan/templates/group/partials/group_form.html
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [2474] Add form.prepend() macro and added it to add group form

Also added documentation to form macros.

  Commit: 5de26c2734eb972b834260db96374c37934043b1
      https://github.com/okfn/ckan/commit/5de26c2734eb972b834260db96374c37934043b1
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M ckan/templates/base.jinja.html
    M ckan/templates/page.jinja.html

  Log Message:
  -----------
  [2474] Attempt to remove some of the whitespace from the templates

  Commit: 5047fd0df59fbedb035eb111c52f646320f13a3e
      https://github.com/okfn/ckan/commit/5047fd0df59fbedb035eb111c52f646320f13a3e
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    A ckan/templates/group/read.html

  Log Message:
  -----------
  [2474] Add group read template

  Commit: 85edbe3f4c97bbb11f5ab8ae72776b990a82baa6
      https://github.com/okfn/ckan/commit/85edbe3f4c97bbb11f5ab8ae72776b990a82baa6
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/less/icons.less

  Log Message:
  -----------
  [2474] Add head icon to sprite sheet

  Commit: e7898774e99675d740655d3266ea0738e12d51c9
      https://github.com/okfn/ckan/commit/e7898774e99675d740655d3266ea0738e12d51c9
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    A ckan/templates/group/partials/feeds.html
    M ckan/templates/group/read.html

  Log Message:
  -----------
  [2474] Move group feeds into a partial

  Commit: 9d8e8aea6473ec0965ec471530628cfe3ef5de5a
      https://github.com/okfn/ckan/commit/9d8e8aea6473ec0965ec471530628cfe3ef5de5a
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/public/base/less/layout.less

  Log Message:
  -----------
  [2474] Add white bar at top/bottom of content

  Commit: 336a20ac3fbd95dfb105bc29be0617239e24208c
      https://github.com/okfn/ckan/commit/336a20ac3fbd95dfb105bc29be0617239e24208c
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/public/base/less/variables.less

  Log Message:
  -----------
  [2474] Tweak the background colour

  Commit: b731fb7140d18031e74b4eb7a15abe78d69e4ddd
      https://github.com/okfn/ckan/commit/b731fb7140d18031e74b4eb7a15abe78d69e4ddd
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/public/base/less/nav.less
    M ckan/templates/group/read.html

  Log Message:
  -----------
  [2474] Add admins to the group read page

  Commit: e65608bece27eb580038b349696ac5f1304e73c2
      https://github.com/okfn/ckan/commit/e65608bece27eb580038b349696ac5f1304e73c2
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/group.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/read.html

  Log Message:
  -----------
  [2474] Add group module to the group read page

  Commit: 76ae0fdeb465c6a1bdbedb8a210062e032365d08
      https://github.com/okfn/ckan/commit/76ae0fdeb465c6a1bdbedb8a210062e032365d08
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/templates/group/read.html

  Log Message:
  -----------
  [2474] Add search form to group read page

Currently broken due to bad snippet import.

  Commit: d59370257686a31a6dee55986abc471a04cf519c
      https://github.com/okfn/ckan/commit/d59370257686a31a6dee55986abc471a04cf519c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  2474 fix facet list for groups

  Commit: 7f96ea83e2bd7b09773596cb43591ca1e984ba2f
      https://github.com/okfn/ckan/commit/7f96ea83e2bd7b09773596cb43591ca1e984ba2f
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/templates/group/partials/group_form.html

  Log Message:
  -----------
  2375 new group form allow save

  Commit: abf32904c8d0bf705c1b2bc609e7d828f6b2679e
      https://github.com/okfn/ckan/commit/abf32904c8d0bf705c1b2bc609e7d828f6b2679e
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/templates/group/read.html
    A ckan/templates/package/partials/search_form.html

  Log Message:
  -----------
  [2474] Move search form into a separate partial

  Commit: 1fb613cb06e0792d8ead6869e71737749e30b51c
      https://github.com/okfn/ckan/commit/1fb613cb06e0792d8ead6869e71737749e30b51c
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/templates/group/read.html

  Log Message:
  -----------
  [2474] Add edit buttons to group read page

  Commit: 00d552bab9d7f5e99b8d5c6667209cb1d0aec205
      https://github.com/okfn/ckan/commit/00d552bab9d7f5e99b8d5c6667209cb1d0aec205
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/templates/group/partials/group_form.html

  Log Message:
  -----------
  [2474] Start adding edit pages for groups

  Commit: d744dca9a35d183d939b8b4835559d5879030e6b
      https://github.com/okfn/ckan/commit/d744dca9a35d183d939b8b4835559d5879030e6b
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [2474] Add an action to the group new/edit template contexts

  Commit: 31fc3eca1a5fcda71d2271064ab483a6bb242bcb
      https://github.com/okfn/ckan/commit/31fc3eca1a5fcda71d2271064ab483a6bb242bcb
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [2474] Add a form macro for creating key/value fields

  Commit: 6e272c51ba41e6aa8a91a7e5eab53119f97939ed
      https://github.com/okfn/ckan/commit/6e272c51ba41e6aa8a91a7e5eab53119f97939ed
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    A ckan/templates/group/pages/form.html
    A ckan/templates/group/pages/form_page.html

  Log Message:
  -----------
  [2474] Add new form "pages" for group forms

This makes it easier for the new and edit forms to share the same
templates by simply overriding blocks.

  Commit: 4549d6e146badadc93396722dc0f7a4bf3eb12b5
      https://github.com/okfn/ckan/commit/4549d6e146badadc93396722dc0f7a4bf3eb12b5
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    A ckan/templates/group/edit.html
    M ckan/templates/group/new.html
    M ckan/templates/group/new_group_form.html

  Log Message:
  -----------
  [2474] Update group form templates to use new pages

  Commit: c1246e045436ce7f996386201f0ba2b43cedf095
      https://github.com/okfn/ckan/commit/c1246e045436ce7f996386201f0ba2b43cedf095
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M ckan/templates/group/pages/form.html
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [2474] Document form.custom() macro

Also renamed macro to "custom" from "keyvalue".

  Commit: 9951717cb0f0dbf4d38853cd1a597fc0c1f7509c
      https://github.com/okfn/ckan/commit/9951717cb0f0dbf4d38853cd1a597fc0c1f7509c
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  [2474] Style the custom key/value pairs on group edit form

  Commit: 6f48062777f2680f35ed645b13699ff975848150
      https://github.com/okfn/ckan/commit/6f48062777f2680f35ed645b13699ff975848150
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M ckan/templates/group/edit.html
    M ckan/templates/group/new_group_form.html
    M ckan/templates/group/pages/form.html
    M ckan/templates/group/pages/form_page.html

  Log Message:
  -----------
  [2474] Update title texts in group edit form

  Commit: 4162c8f41acfa4a620504529033eed64aee76464
      https://github.com/okfn/ckan/commit/4162c8f41acfa4a620504529033eed64aee76464
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M ckan/templates/group/new.html

  Log Message:
  -----------
  [2474] Update the new group template

  Commit: fa3e1a29998eafd612a0bc7f8924803add3870ad
      https://github.com/okfn/ckan/commit/fa3e1a29998eafd612a0bc7f8924803add3870ad
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/templates/package/read.html
    M ckan/templates_legacy/layout_base.html
    M ckan/tests/lib/test_helpers.py
    M ckanext/multilingual/plugin.py
    M doc/install-from-source.rst
    M pip-requirements-docs.txt
    M requires/lucid_present.txt

  Log Message:
  -----------
  Merge branch 'feature-2375-demo-theme' into feature-2474-jinja

Compare: https://github.com/okfn/ckan/compare/f442a9c...fa3e1a2