diff --git a/ckan/templates_legacy/_snippet/add-related.html b/ckan/templates_legacy/_snippet/add-related.html deleted file mode 100644 index e5b2a64a1a3..00000000000 --- a/ckan/templates_legacy/_snippet/add-related.html +++ /dev/null @@ -1,48 +0,0 @@ - - - diff --git a/ckan/templates_legacy/_util.html b/ckan/templates_legacy/_util.html index 6b266dfdfad..1c69831dc58 100644 --- a/ckan/templates_legacy/_util.html +++ b/ckan/templates_legacy/_util.html @@ -89,20 +89,6 @@ - - - - - - - - - -
TitleNumber of members
- ${authorization_group.name or authorization_group.id} - ${len(authorization_group.users)}
- ${h.markdown_extract(related.title, - - - - - - - - - - - - - - - - - -
User Group ${role}
- ${h.linked_authorization_group(user)} - - - - - - - - - - -
- @@ -267,27 +218,6 @@
${h.markdown_extract(related.title,
- - - - - - - - - - - - - - -
User Group ${role}
- - - - -
- ${revision_list_from_dict(h.convert_to_dict('revisions', revisions), allow_compare=allow_compare)} diff --git a/ckan/templates_legacy/admin/authz.html b/ckan/templates_legacy/admin/authz.html index edb2bc86413..82284e8387b 100644 --- a/ckan/templates_legacy/admin/authz.html +++ b/ckan/templates_legacy/admin/authz.html @@ -24,27 +24,6 @@

Add Roles for Any User

-
- - -

Existing Roles for Authorization Groups

- -
- ${authz_form_group_table('authzgroup_form', c.roles, c.authz_groups, c.authz_groups_role_dict)} - -
-
- -

Add Roles for Any Authorization Group

- -
- ${authz_add_group_table(c.roles)} - -
-
- - - diff --git a/ckan/templates_legacy/authorization_group/__init__.py b/ckan/templates_legacy/authorization_group/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ckan/templates_legacy/authorization_group/authz.html b/ckan/templates_legacy/authorization_group/authz.html deleted file mode 100644 index 1c5378cbdee..00000000000 --- a/ckan/templates_legacy/authorization_group/authz.html +++ /dev/null @@ -1,52 +0,0 @@ - - - ${c.authorization_group_name} - Authorization - AuthorizationGroups - Authorization: ${c.authorization_group_name} - -
- -
- Warning: Authorization groups are deprecated and no longer supported. They will be removed - completely on the next CKAN release. -
- -

Update Existing Roles

- -
- ${authz_form_table('theform', c.roles, c.users, c.user_role_dict)} - -
- -

Add Roles for Any User

- -
- ${authz_add_table(c.roles)} - -
- -
- -

Existing Roles for Authorization Groups

- -
- ${authz_form_group_table('authzgroup_form', c.roles, c.authz_groups, c.authz_groups_role_dict)} - -
- -

Add Roles for Any Authorization Group

- -
- ${authz_add_group_table(c.roles)} - -
- -
- - - diff --git a/ckan/templates_legacy/authorization_group/edit.html b/ckan/templates_legacy/authorization_group/edit.html deleted file mode 100644 index a404ce2318e..00000000000 --- a/ckan/templates_legacy/authorization_group/edit.html +++ /dev/null @@ -1,20 +0,0 @@ - - - ${c.authorization_group_name} - Edit - Authorization Groups - Edit: ${c.authorization_group.name if c.authorization_group else ''} - -
- -
- Warning: Authorization groups are deprecated and no longer supported. They will be removed - completely on the next CKAN release. -
- - ${Markup(c.form)} -
- - - - diff --git a/ckan/templates_legacy/authorization_group/edit_form.html b/ckan/templates_legacy/authorization_group/edit_form.html deleted file mode 100644 index 293428077ff..00000000000 --- a/ckan/templates_legacy/authorization_group/edit_form.html +++ /dev/null @@ -1,30 +0,0 @@ -
- - ${h.literal(c.fieldset.render())} - -
- Users -
- -
- -
-
-

There are no users currently in this group.

-
- - ${h.literal(c.fieldset2.render())} - -
- ${h.submit('save', _('Save'))} -
diff --git a/ckan/templates_legacy/authorization_group/index.html b/ckan/templates_legacy/authorization_group/index.html deleted file mode 100644 index 281f3d1772b..00000000000 --- a/ckan/templates_legacy/authorization_group/index.html +++ /dev/null @@ -1,24 +0,0 @@ - - - Authorization Groups - Authorization Groups - -
- -
- Warning: Authorization groups are deprecated and no longer supported. They will be removed - completely on the next CKAN release. -
- -

There are ${c.page.item_count} authorization groups.

- - ${c.page.pager()} - ${authorization_group_list(c.page.items)} - ${c.page.pager()} -
- - - diff --git a/ckan/templates_legacy/authorization_group/layout.html b/ckan/templates_legacy/authorization_group/layout.html deleted file mode 100644 index e575f8d8b98..00000000000 --- a/ckan/templates_legacy/authorization_group/layout.html +++ /dev/null @@ -1,43 +0,0 @@ - - - -
    -
  • ${h.subnav_link(h.icon('page_white_stack') + _('List'), controller='authorization_group', action='index')}
    • - -
  • |
    • -
  • ${h.subnav_link(h.icon('authorization_group') + _('View'), controller='authorization_group', action='read', id=c.authorization_group.name or c.authorization_group.id)}
    • -
  • - ${h.subnav_link(h.icon('authorization_group_edit') + _('Edit'), controller='authorization_group', action='edit', id=c.authorization_group.name or c.authorization_group.id)} -
    • -
  • - ${h.subnav_link(h.icon('lock') + _('Authorization'), controller='authorization_group', action='authz', id=c.authorization_group.name or c.authorization_group.id)} -
    • -     -
- - - -
  • -

    Authorization Groups

    -

    Instead of specifying the privileges of specific users on a dataset or group, - you can also specify a set of users that will share the same rights. To do that, an - authorization group can be set-up and users can be added to it.

    -

    - - - Create a new authorization group - -

    -
    • -     - - - diff --git a/ckan/templates_legacy/authorization_group/new.html b/ckan/templates_legacy/authorization_group/new.html deleted file mode 100644 index 1eb973b9282..00000000000 --- a/ckan/templates_legacy/authorization_group/new.html +++ /dev/null @@ -1,20 +0,0 @@ - - - New - Authorization Groups - New Authorization Group - -
    - -
    - Warning: Authorization groups are deprecated and no longer supported. They will be removed - completely on the next CKAN release. -
    - - ${Markup(c.form)} -
    - - - - diff --git a/ckan/templates_legacy/authorization_group/read.html b/ckan/templates_legacy/authorization_group/read.html deleted file mode 100644 index 3c2c7bad233..00000000000 --- a/ckan/templates_legacy/authorization_group/read.html +++ /dev/null @@ -1,26 +0,0 @@ - - - ${c.authorization_group.name} - Authorization Groups - ${c.authorization_group.name} - -
    - -
    - Warning: Authorization groups are deprecated and no longer supported. They will be removed - completely on the next CKAN release. -
    - -

    Members

    -

    There are ${c.page.item_count} users in this authorization group.

    - ${c.page.pager()} - ${user_list(c.page.items)} - ${c.page.pager()} -
    - - - - - diff --git a/ckan/templates_legacy/group/authz.html b/ckan/templates_legacy/group/authz.html index 77c34980cc4..63d955aa514 100644 --- a/ckan/templates_legacy/group/authz.html +++ b/ckan/templates_legacy/group/authz.html @@ -1,10 +1,10 @@ - + Authorization: ${c.group.display_name} Authorization: ${c.group.display_name} - +

    Update Existing Roles

    @@ -23,26 +23,6 @@

    Add Roles for Any User

    -
    - - -

    Update Existing Roles for Authorization Groups

    - -
    - ${authz_form_group_table('authzgroup_form', c.roles, c.authz_groups, c.authz_groups_role_dict)} - -
    -
    - -

    Add Roles for Any Authorization Group

    - -
    - ${authz_add_group_table(c.roles)} - -
    -
    -     -
    diff --git a/ckan/templates_legacy/package/authz.html b/ckan/templates_legacy/package/authz.html index 55132ec3985..97c6772194a 100644 --- a/ckan/templates_legacy/package/authz.html +++ b/ckan/templates_legacy/package/authz.html @@ -1,7 +1,7 @@ - + Authorization: ${c.pkgtitle or c.pkgname} Authorization: ${c.pkgtitle or c.pkgname} @@ -23,27 +23,7 @@

    Add Roles for Any User

    -
    - - -

    Update Existing Roles for Authorization Groups

    - -
    - ${authz_form_group_table('authzgroup_form', c.roles, c.authz_groups, c.authz_groups_role_dict)} - -
    -
    - -

    Add Roles for Any Authorization Group

    - -
    - ${authz_add_group_table(c.roles)} - -
    -
    -     - - + diff --git a/ckan/templates_legacy/package/layout.html b/ckan/templates_legacy/package/layout.html index d4b65e48aa7..d425e506884 100644 --- a/ckan/templates_legacy/package/layout.html +++ b/ckan/templates_legacy/package/layout.html @@ -38,7 +38,7 @@
  • ${h.subnav_link(h.icon('page_stack') + _('History'), controller='package', action='history', id=c.pkg.name)}
  • ${h.subnav_link( - h.icon('authorization_group') + _('Followers ({num_followers})').format(num_followers=h.follow_count('dataset', c.pkg_dict.id)), + h.icon('followers') + _('Followers ({num_followers})').format(num_followers=h.follow_count('dataset', c.pkg_dict.id)), controller='package', action='followers', id=c.pkg.name)} diff --git a/ckan/templates_legacy/package/new_package_form.html b/ckan/templates_legacy/package/new_package_form.html index 29b3c03797c..67a79f151dd 100644 --- a/ckan/templates_legacy/package/new_package_form.html +++ b/ckan/templates_legacy/package/new_package_form.html @@ -95,14 +95,10 @@

    Errors in form

    Member of: -
    - - - + + +
    @@ -172,7 +168,7 @@

    Errors in form

    - + diff --git a/ckan/templates_legacy/package/related_list.html b/ckan/templates_legacy/package/related_list.html deleted file mode 100644 index a917e559b8f..00000000000 --- a/ckan/templates_legacy/package/related_list.html +++ /dev/null @@ -1,71 +0,0 @@ - - - no-sidebar - - - ${c.pkg_dict.get('title', c.pkg_dict['name'])} - - Related - - ${c.pkg_dict['title']} - Related - - -
    - ${add_related(c.pkg)} -

    Related items Add related item

    -
    -
    - There are no related items here yet, why not add one? -
    -
      - - ${related_summary(related, False)} - -
    -
    - -
    - - - - - - - - - - - - - - - diff --git a/ckan/templates_legacy/user/layout.html b/ckan/templates_legacy/user/layout.html index e733d4df336..25140cac6f7 100644 --- a/ckan/templates_legacy/user/layout.html +++ b/ckan/templates_legacy/user/layout.html @@ -14,7 +14,7 @@
  • Log out
  • ${h.subnav_link( - h.icon('authorization_group') + _('My Followers ({num_followers})').format(num_followers=h.follow_count('user', c.user_dict.id)), + h.icon('followers') + _('My Followers ({num_followers})').format(num_followers=h.follow_count('user', c.user_dict.id)), controller='user', action='followers', id=c.user_dict.name)} @@ -25,7 +25,7 @@
  • View Profile
  • ${h.subnav_link( - h.icon('authorization_group') + _('Followers ({num_followers})').format(num_followers=h.follow_count('user', c.user_dict.id)), + h.icon('followers') + _('Followers ({num_followers})').format(num_followers=h.follow_count('user', c.user_dict.id)), controller='user', action='followers', id=c.user_dict.name)} @@ -41,7 +41,7 @@ - +