diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html index 6f6055ae54..fcce642bc2 100644 --- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html +++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html @@ -1,12 +1,10 @@ {% extends "wagtailadmin/base.html" %} -{% load wagtailadmin_tags compress i18n static gravatar %} +{% load wagtailadmin_tags i18n static gravatar %} {% block extra_css %} {{ block.super }} - {% compress css %} - - {% endcompress %} + {% endblock %} {% block titletag %}{% trans 'Styleguide' %}{% endblock %} @@ -65,7 +63,7 @@
  • color-green
  • color-blue
  • - +
    @@ -155,7 +153,7 @@
  • - +

    ul listings with multiple columns

    @@ -286,12 +284,12 @@

    Positive

    yes - yes + yes

    Negative

    No - No + No

    Buttons with internal loading indicators (currently only button supported)

    Note that in some browsers, clicking these buttons minutely affects the appearance of Dropdown buttons, below. This is yet to be resolved.

    @@ -302,7 +300,7 @@

    Small

    - +

    Buttons where the text is replaced on click

    @@ -322,7 +320,7 @@ A link button A non-link button button link - +
    @@ -433,7 +431,7 @@ -

    TODO: Rich text input

    +

    TODO: Rich text input

    TODO: Snippet chooser

    @@ -480,7 +478,7 @@

    Progress indicators

    - +
    60%
    @@ -603,7 +601,7 @@
    - + {% endblock %} {% block extra_js %} @@ -641,8 +639,8 @@ runprogress(); clearTimeout(to); var to2 = setTimeout(function(){ - $('#progress-example .bar').css('width', '20%'); - }, 2000); + $('#progress-example .bar').css('width', '20%'); + }, 2000); }, 3000); $('#progress-example .bar').css('width', '80%'); })(); diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html index 5c56d0eae4..bf74cd2d71 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html @@ -1,14 +1,12 @@ {% extends "wagtailadmin/admin_base.html" %} -{% load compress static i18n %} +{% load static i18n %} {% block titletag %}{% trans "Reset password" %}{% endblock %} {% block bodyclass %}login{% endblock %} {% block extra_css %} {{ block.super }} - {% compress css %} - - {% endcompress %} + {% endblock %} {% block furniture %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html index b7014608fb..ca52faaefc 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html @@ -1,14 +1,12 @@ {% extends "wagtailadmin/admin_base.html" %} -{% load compress static i18n %} +{% load static i18n %} {% block titletag %}{% trans "Set your new password" %}{% endblock %} {% block bodyclass %}login{% endblock %} {% block extra_css %} {{ block.super }} - {% compress css %} - - {% endcompress %} + {% endblock %} {% block furniture %} @@ -21,7 +19,7 @@ {% endif %} - +
    {% csrf_token %}

    {% trans "Set your new password" %}

    diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html index 495006f1c4..2cffc5ce0e 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html @@ -1,14 +1,12 @@ {% extends "wagtailadmin/admin_base.html" %} -{% load compress static i18n %} +{% load static i18n %} {% block titletag %}{% trans "Reset password" %}{% endblock %} {% block bodyclass %}login{% endblock %} {% block extra_css %} {{ block.super }} - {% compress css %} - - {% endcompress %} + {% endblock %} {% block furniture %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html index 722327effc..e3e29b5206 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html @@ -1,14 +1,12 @@ {% extends "wagtailadmin/admin_base.html" %} -{% load compress static i18n %} +{% load static i18n %} {% block titletag %}{% trans "Reset password" %}{% endblock %} {% block bodyclass %}login{% endblock %} {% block extra_css %} {{ block.super }} - {% compress css %} - - {% endcompress %} + {% endblock %} {% block furniture %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html index 0e6f1753b8..f40ee1bd44 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html @@ -1,12 +1,10 @@ {% extends "wagtailadmin/skeleton.html" %} -{% load compress static wagtailadmin_tags %} +{% load static wagtailadmin_tags %} {% block css %} - {% compress css %} - - - - {% endcompress %} + + + {% block extra_css %}{% endblock %} {% endblock %} @@ -16,20 +14,17 @@ {% endblock %} {% block js %} - - {% compress js %} - - - - - - - - - - - {% main_nav_js %} - {% endcompress %} + + + + + + + + + + + {% main_nav_js %} {% block extra_js %}{% endblock %} {% endblock %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home.html b/wagtail/wagtailadmin/templates/wagtailadmin/home.html index f4a43b1865..06975994f2 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/home.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/home.html @@ -1,14 +1,12 @@ {% extends "wagtailadmin/base.html" %} -{% load gravatar static compress i18n %} +{% load gravatar static i18n %} {% block titletag %}{% trans "Dashboard" %}{% endblock %} {% block bodyclass %}homepage{% endblock %} {% block extra_css %} {{ block.super }} - {% compress css %} - - {% endcompress %} + {% endblock %} {% block content %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html index a3473c2242..ddb4a7e0cb 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html @@ -1,14 +1,12 @@ {% extends "wagtailadmin/admin_base.html" %} -{% load compress static i18n %} +{% load static i18n %} {% block titletag %}{% trans "Sign in" %}{% endblock %} {% block bodyclass %}login{% endblock %} {% block extra_css %} {{ block.super }} - {% compress css %} - - {% endcompress %} + {% endblock %} {% block furniture %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html index 6a9a9fcc3a..b39cb8bc75 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html @@ -1,14 +1,12 @@ -{% load wagtailadmin_tags compress static %} +{% load wagtailadmin_tags static %} {% comment %} CSS declarations to be included on the 'create page' and 'edit page' views {% endcomment %} -{% compress css %} - - + + - {% hook_output 'insert_editor_css' %} -{% endcompress %} +{% hook_output 'insert_editor_css' %} {{ edit_handler.form.media.css }} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html index 68e18e08bd..805287a815 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html @@ -1,4 +1,4 @@ -{% load wagtailadmin_tags compress static %} +{% load wagtailadmin_tags static %} {% comment %} Javascript declarations to be included on the 'create page' and 'edit page' views @@ -10,22 +10,20 @@ }; -{% compress js %} - - - - - - - - - - - - + + + + + + + + + + + + - {% hook_output 'insert_editor_js' %} -{% endcompress %} +{% hook_output 'insert_editor_js' %} {% include "wagtailadmin/shared/datetimepicker_translations.html" %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html index cdc5cdf851..c29a65a562 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html @@ -1,5 +1,5 @@ {% extends "wagtailadmin/base.html" %} -{% load wagtailadmin_tags static compress i18n %} +{% load wagtailadmin_tags static i18n %} {% block titletag %}{% blocktrans with title=parent_page.title %}Exploring {{ title }}{% endblocktrans %}{% endblock %} {% block bodyclass %}page-explorer {% if ordering == 'ord' %}reordering{% endif %}{% endblock %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html index 77043c0082..9cde079a9f 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html @@ -1,11 +1,9 @@ -{% load static compress i18n %} +{% load static i18n %} {% trans "Preview" %} - {% compress css %} - - {% endcompress %} +
    diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html index 51e45580cb..2dbbe50ef7 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html @@ -1,5 +1,5 @@ -{% load compress static i18n %} +{% load static i18n %} @@ -7,12 +7,10 @@ Wagtail - {% block titletag %}{% endblock %} - + - {% compress css %} - - {% endcompress %} + {% block css %}{% endblock %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html index d8f90e3a1f..f742f4f5a0 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html @@ -1,11 +1,9 @@ {% extends "wagtailadmin/skeleton.html" %} -{% load compress static i18n %} +{% load static i18n %} {% block titletag %}{% trans 'User bar' %}{% endblock %} {% block css %} - {% compress css %} - - {% endcompress %} + {% endblock %} {% block furniture %} @@ -22,7 +20,5 @@ {% endblock %} {% block js %} - {% compress js %} - - {% endcompress %} + {% endblock %} diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html index 2a6235cbe6..2d074da216 100644 --- a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html +++ b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html @@ -1,14 +1,12 @@ {% extends "wagtailadmin/base.html" %} -{% load wagtailimages_tags compress static i18n %} +{% load wagtailimages_tags static i18n %} {% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %} {% block extra_css %} {{ block.super }} - {% compress css %} - - {% endcompress %} + {% endblock %} {% block extra_js %} diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html b/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html index e72929c786..74faded5cf 100644 --- a/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html +++ b/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html @@ -1,5 +1,5 @@ {% extends "wagtailadmin/base.html" %} -{% load wagtailimages_tags static compress i18n %} +{% load wagtailimages_tags static i18n %} {% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %} @@ -36,8 +36,7 @@ {% block extra_js %} {{ block.super }} - {% compress js %} - - - {% endcompress %} + + + {% endblock %} diff --git a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html b/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html index 3e009f6562..66f1975322 100644 --- a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html +++ b/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html @@ -1,12 +1,10 @@ {% extends "wagtailadmin/base.html" %} -{% load wagtailimages_tags i18n compress static %} +{% load wagtailimages_tags i18n static %} {% block titletag %}{% trans "Add multiple images" %}{% endblock %} {% block extra_css %} {{ block.super }} - {% compress css %} - - {% endcompress %} + {% endblock %} {% block content %} @@ -57,20 +55,18 @@ {% block extra_js %} {{ block.super }} - {% compress js %} - - - - - - - - - + + + + + + + + + - - - {% endcompress %} + + {% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %} -{% compress js %} - - - - -{% endcompress %} + + + +