[ckan-dev] 2375-demo-theme -> master
Toby Dacre
toby.okfn at gmail.com
Mon Sep 3 10:55:50 UTC 2012
Hi,
There is lot's of pressure to merge the 2375-demo-theme-development branch
into master asap.
Update on progress
1) I still would like responses to the `Fanstatic resources` email of Aug
29 especially any objections
2) Cleaner translations for jinja2 templates - this has been done it is
essentially about removing extra whitespace and newlines from {% trans %}
tags
3) Tests - These now mainly pass there are 5 fails remaining, 4 of these
are about revisions that kindly is going to look into the other is around
activity streams @sean maybe this is something you're best placed to look
at (see email HELP REQUEST: Tests on 2375-demo-theme-development Aug 31)
To do
a) people are advised to merge any template fixes into master prior to the
merge to avoid messy merges
b) Review of demo branch - This is going to be difficult due to the size
see below for some idea of the size areas of change
I'm not really happy about ignoring our pull request process as it's been
really good but I'm not sure that the way we have been doing those ie one
person reviewing and merging is the most appropriate for this merge - how
do people feel we should deal with this?
Toby
Please note: there are outstanding merges to the demo branch so the actual
merge will be slightly different.
a recent diff gives
git diff --shortstat master 2375-demo-theme-development
629 files changed, 123119 insertions(+), 10148 deletions(-)
git diff --dirstat master 2375-demo-theme-development
17.3% ckan/public/base/css/
3.0% ckan/public/base/datapreview/vendor/flot/0.7/
3.1% ckan/public/base/datapreview/vendor/recline/
4.2% ckan/public/base/datapreview/vendor/slickgrid/2.0.1/
7.3% ckan/public/base/datapreview/vendor/
8.8% ckan/public/base/test/vendor/
3.3% ckan/public/base/vendor/bootstrap/
5.8% ckan/public/base/vendor/font-awesome/fonts/
12.8% ckan/public/base/vendor/
8.1% ckan/public/base/
7.5% ckan/templates/
3.5% ckan/templates_legacy/
7.9% ckan/
3.0% ckanext/stats/public/ckanext/stats/vendor/
If we exclude
public as this is mainly all new javascript/css
templates_legacy - the old templates which should be identical
templates - the new templates
ckanext - changes to extensions
it becomes more manageable - not that these do not need a review
git diff master 2375-demo-theme-development --name-only | grep -v
'^ckan/public/\|^ckan/templates\|ckanext' | xargs git diff --shortstat
master 2375-demo-theme-development --
92 files changed, 7684 insertions(+), 430 deletions(-)
git diff master 2375-demo-theme-development --name-only | grep -v
'^ckan/public/\|^ckan/templates\|ckanext' | xargs git diff --dirstat master
2375-demo-theme-development --
18.0% ckan/controllers/
3.5% ckan/html_resources/
8.1% ckan/include/
22.3% ckan/lib/
3.2% ckan/logic/
4.0% ckan/model/
13.2% ckan/tests/functional/
4.5% ckan/tests/
4.0% ckan/
17.6% doc/
git diff master 2375-demo-theme-development --name-only | grep -v
'^ckan/public/\|^ckan/templates\|ckanext' | xargs git diff --stat master
2375-demo-theme-development --
.gitignore | 3 +
LICENSE.txt | 24 +
bin/less | 43 ++
ckan/__init__.py | 3 +-
ckan/authz.py | 61 ++-
ckan/config/deployment.ini_tmpl | 4 +-
ckan/config/environment.py | 49 +-
ckan/config/middleware.py | 31 +-
ckan/config/routing.py | 39 +-
ckan/controllers/admin.py | 222 ++++++--
ckan/controllers/api.py | 40 ++
ckan/controllers/authorization_group.py | 216 ++++++++
ckan/controllers/error.py | 1 -
ckan/controllers/group.py | 54 +-
ckan/controllers/home.py | 88 ++-
ckan/controllers/package.py | 429 ++++++++++++++-
ckan/controllers/related.py | 144 ++++-
ckan/controllers/user.py | 29 +-
ckan/controllers/util.py | 32 ++
ckan/forms/__init__.py | 1 +
ckan/forms/authorization_group.py | 40 ++
ckan/forms/authz.py | 35 +-
ckan/html_resources/.gitignore | 1 +
ckan/html_resources/__init__.py | 285 ++++++++++
ckan/include/README.txt | 37 ++
ckan/include/rcssmin.py | 360 +++++++++++++
ckan/include/rjsmin.py | 290 ++++++++++
ckan/lib/app_globals.py | 160 +++++-
ckan/lib/authztool.py | 32 +-
ckan/lib/base.py | 116 +++-
ckan/lib/cli.py | 426 ++++++++++++++-
ckan/lib/create_test_data.py | 28 +-
ckan/lib/dictization/model_dictize.py | 26 +
ckan/lib/extract.py | 51 ++
ckan/lib/formatters.py | 122 +++++
ckan/lib/helpers.py | 480 +++++++++++++++--
ckan/lib/jinja_extensions.py | 341 ++++++++++++
ckan/lib/maintain.py | 69 ++-
ckan/lib/render.py | 48 ++
ckan/logic/action/__init__.py | 4 +
ckan/logic/action/delete.py | 21 +
ckan/logic/action/get.py | 20 +-
ckan/logic/action/update.py | 51 +-
ckan/logic/auth/__init__.py | 3 +
ckan/logic/auth/create.py | 25 +-
ckan/logic/auth/delete.py | 23 +
ckan/logic/auth/get.py | 11 +
ckan/logic/auth/publisher/create.py | 3 +
ckan/logic/auth/publisher/delete.py | 23 +
ckan/logic/auth/publisher/update.py | 10 +-
ckan/logic/auth/update.py | 26 +-
ckan/logic/validators.py | 4 +
.../versions/025_add_authorization_groups.py | 6 +-
.../versions/060_add_system_info_table.py | 27 +
ckan/model/__init__.py | 18 +
ckan/model/authorization_group.py | 85 +++
ckan/model/authz.py | 139 ++++-
ckan/model/resource.py | 3 +
ckan/model/system_info.py | 58 ++
ckan/plugins/interfaces.py | 5 +
ckan/tests/__init__.py | 30 +-
.../ckantestplugin/ckantestplugin/__init__.py | 3 +
.../api/test_authorization_group.py | 58 ++
ckan/tests/functional/test_admin.py | 81 ++-
.../functional/test_authorization_group.py | 440 +++++++++++++++
ckan/tests/functional/test_authz.py | 2 +-
ckan/tests/functional/test_edit_authz.py | 140 ++++-
.../functional/test_package_edit_authz.py | 93 +++-
ckan/tests/functional/test_related.py | 57 +-
ckan/tests/lib/test_dictization.py | 4 +-
ckan/tests/lib/test_dictization.py | 4 +-
.gitignore | 3 +
LICENSE.txt | 24 +
bin/less | 43 ++
ckan/__init__.py | 3 +-
ckan/authz.py | 61 ++-
ckan/config/deployment.ini_tmpl | 4 +-
ckan/config/environment.py | 49 +-
ckan/config/middleware.py | 31 +-
ckan/config/routing.py | 39 +-
ckan/controllers/admin.py | 222 ++++++--
ckan/controllers/api.py | 40 ++
ckan/controllers/authorization_group.py | 216 ++++++++
ckan/controllers/error.py | 1 -
ckan/controllers/group.py | 54 +-
ckan/controllers/home.py | 88 ++-
ckan/controllers/package.py | 429 ++++++++++++++-
ckan/controllers/related.py | 144 ++++-
ckan/controllers/user.py | 29 +-
ckan/controllers/util.py | 32 ++
ckan/forms/__init__.py | 1 +
ckan/forms/authorization_group.py | 40 ++
ckan/forms/authz.py | 35 +-
ckan/html_resources/.gitignore | 1 +
ckan/html_resources/__init__.py | 285 ++++++++++
ckan/include/README.txt | 37 ++
ckan/include/rcssmin.py | 360 +++++++++++++
ckan/include/rjsmin.py | 290 ++++++++++
ckan/lib/app_globals.py | 160 +++++-
ckan/lib/authztool.py | 32 +-
ckan/lib/base.py | 116 +++-
ckan/lib/cli.py | 426 ++++++++++++++-
ckan/lib/create_test_data.py | 28 +-
ckan/lib/dictization/model_dictize.py | 26 +
ckan/lib/extract.py | 51 ++
ckan/lib/formatters.py | 122 +++++
ckan/lib/helpers.py | 480 +++++++++++++++--
ckan/lib/jinja_extensions.py | 341 ++++++++++++
ckan/lib/maintain.py | 69 ++-
ckan/lib/render.py | 48 ++
ckan/logic/action/__init__.py | 4 +
ckan/logic/action/delete.py | 21 +
ckan/logic/action/get.py | 20 +-
ckan/logic/action/update.py | 51 +-
ckan/logic/auth/__init__.py | 3 +
ckan/logic/auth/create.py | 25 +-
ckan/logic/auth/delete.py | 23 +
ckan/logic/auth/get.py | 11 +
ckan/logic/auth/publisher/create.py | 3 +
ckan/logic/auth/publisher/delete.py | 23 +
ckan/logic/auth/publisher/update.py | 10 +-
ckan/logic/auth/update.py | 26 +-
ckan/logic/validators.py | 4 +
.../versions/025_add_authorization_groups.py | 6 +-
.../versions/060_add_system_info_table.py | 27 +
ckan/model/__init__.py | 18 +
ckan/model/authorization_group.py | 85 +++
ckan/model/authz.py | 139 ++++-
ckan/model/resource.py | 3 +
ckan/model/system_info.py | 58 ++
ckan/plugins/interfaces.py | 5 +
ckan/tests/__init__.py | 30 +-
.../ckantestplugin/ckantestplugin/__init__.py | 3 +
.../api/test_authorization_group.py | 58 ++
ckan/tests/functional/test_admin.py | 81 ++-
.../functional/test_authorization_group.py | 440 +++++++++++++++
ckan/tests/functional/test_authz.py | 2 +-
ckan/tests/functional/test_edit_authz.py | 140 ++++-
.../functional/test_package_edit_authz.py | 93 +++-
ckan/tests/functional/test_related.py | 57 +-
ckan/tests/lib/test_dictization.py | 4 +-
ckan/tests/lib/test_dictization_schema.py | 2 +-
ckan/tests/lib/test_helpers.py | 32 +-
ckan/tests/logic/test_action.py | 53 +-
ckan/tests/misc/test_auth_profiles.py | 24 +-
ckan/tests/models/test_authz.py | 46 +-
ckan/tests/models/test_repo.py | 13 +-
ckan/tests/pylons_controller.py | 2 +-
ckan/tests/test_authz.py | 119 +++-
doc/_themes/sphinx-theme-okfn | 2 +-
doc/coding-standards.rst | 146 +++--
doc/extension-templating.rst | 131 +++++
doc/frontend-development.rst | 491 +++++++++++++++++
doc/install-from-source.rst | 6 +-
doc/javascript-module-tutorial.rst | 255 +++++++++
doc/template-blocks.rst | 219 ++++++++
doc/template-tutorial.rst | 107 ++++
doc/templating.rst | 506 ++++++++++++++++++
jshint.json | 1 +
pip-requirements.txt | 2 +
setup.cfg | 3 +-
setup.py | 17 +-
test-core.ini | 4 +
92 files changed, 7684 insertions(+), 430 deletions(-)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.okfn.org/pipermail/ckan-dev/attachments/20120903/8cbd87b6/attachment.html>
More information about the ckan-dev
mailing list