[ckan-changes] [okfn/ckan] 46cd94: Merge branch 'feature-2375-demo-theme' of https://...

• Previous message: [ckan-changes] [okfn/ckan] 9a8d9f: [2375] Add some very basic template documentation
• Next message: [ckan-changes] [okfn/ckanjs] c7a4eb: Work in progess switch to Handlebars.js.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/feature-2375-demo-theme
  Home:   https://github.com/okfn/ckan
  Commit: 46cd94bcf927ffe07950d41fc153b94b4d03b005
      https://github.com/okfn/ckan/commit/46cd94bcf927ffe07950d41fc153b94b4d03b005
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/html_resources/__init__.py
    M ckan/lib/dictization/model_dictize.py
    A ckan/lib/extract.py
    M ckan/lib/helpers.py
    M ckan/lib/render.py
    A ckan/public/base/images/ckan.ico
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/templates/base.html
    M ckan/templates/header.html
    M ckan/templates/package/new.html
    A ckan/templates/package/new_package_form.html
    M ckan/templates/package/read.html
    M ckan/templates/package/search.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/package_list.html
    A ckan/templates/snippets/popular.html
    M ckan/templates/snippets/social.html
    A ckan/templates/snippets/sort_by.html
    M setup.py

  Log Message:
  -----------
  Merge branch 'feature-2375-demo-theme' of https://github.com/okfn/ckan into feature-2375-demo-theme


  Commit: 259065e07e286b50436b56ddbaa984abb768bf92
      https://github.com/okfn/ckan/commit/259065e07e286b50436b56ddbaa984abb768bf92
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/related.py
    M ckan/logic/schema.py
    A ckan/templates/related/edit.html
    A ckan/templates/related/edit_form.html
    A ckan/templates/related/new.html

  Log Message:
  -----------
  Updated the related controller to provide a /new and /edit url

Merged most of the new/edit code to save duplication


  Commit: 8d15ebbc70613a1309ab3dc51f089d59f88db1b8
      https://github.com/okfn/ckan/commit/8d15ebbc70613a1309ab3dc51f089d59f88db1b8
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  Added i18n import


  Commit: b30801453bdafde0f99aec582f90a8b6eed7274b
      https://github.com/okfn/ckan/commit/b30801453bdafde0f99aec582f90a8b6eed7274b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/templates/related/edit.html
    M ckan/templates/related/new.html

  Log Message:
  -----------
  Added text to sidebar for new/edit pages


  Commit: 1beea24720504dca0028d1ad4cd73a7c1a246afc
      https://github.com/okfn/ckan/commit/1beea24720504dca0028d1ad4cd73a7c1a246afc
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  Tests for the new url/page


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/related.py
    M ckan/logic/schema.py
    A ckan/templates/related/edit.html
    A ckan/templates/related/edit_form.html
    A ckan/templates/related/new.html
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  Merge branch 'feature-2445-add-related-new' into feature-2375-demo-theme


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

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

  Log Message:
  -----------
  [2445] Converted new related template to use Jinja


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

  Changed paths:
    M ckan/templates/related/new.html
    A ckan/templates/related/pages/related_form_page.html

  Log Message:
  -----------
  [2445] Move new related code into a template page

This allows us to share the same code between the add and edit pages.


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

  Changed paths:
    M ckan/templates/related/edit.html

  Log Message:
  -----------
  [2445] Update the related edit page to share the templates


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

  Changed paths:
    A ckan/templates/related/pages/form_page.html
    R ckan/templates/related/pages/related_form_page.html

  Log Message:
  -----------
  [2445] Rename related_form_page.html to form_page.html


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

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

  Log Message:
  -----------
  [2445] Fix links on the related list page


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

  Changed paths:
    M ckan/templates/related/edit.html
    M ckan/templates/related/new.html

  Log Message:
  -----------
  [2445] Update extends path in new/edit related templates


  Commit: 69fc41026d73758b296a432a6c47ecf592183b00
      https://github.com/okfn/ckan/commit/69fc41026d73758b296a432a6c47ecf592183b00
  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:
  -----------
  [2445] Deprecate passing form data and errors objects into macros


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

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  [2445] Converted related types into a dictionary


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

  Changed paths:
    M ckan/templates/related/pages/form_page.html

  Log Message:
  -----------
  [2445] Allow HTML in related form content


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

  Changed paths:
    M ckan/templates/related/edit_form.html

  Log Message:
  -----------
  [2445] Convert related/edit_form.html to Jinja


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

  Changed paths:
    M ckan/templates/related/edit_form.html
    A ckan/templates/related/pages/form.html

  Log Message:
  -----------
  [2445] Move related/edit_form.html into a page template


Compare: https://github.com/okfn/ckan/compare/9a8d9f4...47ea43c

• Previous message: [ckan-changes] [okfn/ckan] 9a8d9f: [2375] Add some very basic template documentation
• Next message: [ckan-changes] [okfn/ckanjs] c7a4eb: Work in progess switch to Handlebars.js.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]