0
0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00

Removed all {% compress %} tags

This commit is contained in:
Karl Hobley 2016-01-19 17:12:42 +00:00
parent c663ed7ff4
commit c928338cec
20 changed files with 102 additions and 145 deletions

View File

@ -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 %}
<link rel="stylesheet" href="{% static 'wagtailstyleguide/css/styleguide.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailstyleguide/css/styleguide.css' %}" type="text/css" />
{% endblock %}
{% block titletag %}{% trans 'Styleguide' %}{% endblock %}
@ -65,7 +63,7 @@
<li class="color-green">color-green</li>
<li class="color-blue">color-blue</li>
</ul>
</section>
<section id="typography">
@ -155,7 +153,7 @@
<li><div class="title"><h2><a href="">List item</a></h2></div></li>
<li><div class="title"><h2><a href="">List item</a></h2></div></li>
<li><div class="title"><h2><a href="">List item</a></h2></div></li>
</ul>
</ul>
<h3><code>ul</code> listings with multiple columns</h3>
@ -286,12 +284,12 @@
<h4>Positive</h4>
<a href="#" class="button yes">yes</a>
<a href="#" class="button button-small yes">yes</a>
<a href="#" class="button button-small yes">yes</a>
<h4>Negative</h4>
<a href="#" class="button no">No</a>
<a href="#" class="button button-small no">No</a>
<a href="#" class="button button-small no">No</a>
<h3>Buttons with internal loading indicators (currently only <code>button</code> supported)</h3>
<p class="help-block help-warning">Note that in some browsers, clicking these buttons minutely affects the appearance of Dropdown buttons, below. This is yet to be resolved.</p>
@ -302,7 +300,7 @@
<h4>Small</h4>
<button class="button-small button-longrunning"><span class="icon icon-spinner"></span>Click me</button>
<h4>Buttons where the text is replaced on click</h4>
<button class="button-longrunning" data-clicked-text="Test"><span class="icon icon-spinner"></span><em>Click me</em></button>
@ -322,7 +320,7 @@
<a href="#" class="button icon text-replace white icon-cog">A link button</a>
<span class="button icon text-replace no icon-bin">A non-link button</span>
<a href="#" class="button bicolor disabled icon icon-tick">button link</a>
</section>
<section id="button-groups">
@ -433,7 +431,7 @@
</ul>
</form>
<h3>TODO: Rich text input</h3>
<h3>TODO: Rich text input</h3>
<h3>TODO: Snippet chooser</h3>
</section>
@ -480,7 +478,7 @@
<section id="progress">
<h2>Progress indicators</h2>
<div id="progress-example" class="progress active">
<div class="bar">60%</div>
</div>
@ -603,7 +601,7 @@
</section>
</div>
{% 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%');
})();

View File

@ -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 %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
{% endblock %}
{% block furniture %}

View File

@ -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 %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
{% endblock %}
{% block furniture %}
@ -21,7 +19,7 @@
</ul>
</div>
{% endif %}
<form method="post">
{% csrf_token %}
<h1>{% trans "Set your new password" %}</h1>

View File

@ -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 %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
{% endblock %}
{% block furniture %}

View File

@ -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 %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
{% endblock %}
{% block furniture %}

View File

@ -1,12 +1,10 @@
{% extends "wagtailadmin/skeleton.html" %}
{% load compress static wagtailadmin_tags %}
{% load static wagtailadmin_tags %}
{% block css %}
{% compress css %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css' %}" />
<link rel="stylesheet" href="{% static 'wagtailadmin/css/vendor/jquery.tagit.css' %}">
<link rel="stylesheet" href="{% static 'wagtailadmin/css/core.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css' %}" />
<link rel="stylesheet" href="{% static 'wagtailadmin/css/vendor/jquery.tagit.css' %}">
<link rel="stylesheet" href="{% static 'wagtailadmin/css/core.css' %}" type="text/css" />
{% block extra_css %}{% endblock %}
{% endblock %}
@ -16,20 +14,17 @@
{% endblock %}
{% block js %}
{% compress js %}
<script src="{% static 'wagtailadmin/js/vendor/jquery-1.10.3.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/jquery-ui-1.10.3.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/jquery.datetimepicker.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/jquery.autosize.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/bootstrap-transition.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/bootstrap-modal.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/bootstrap-tab.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/jquery.dlmenu.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/tag-it.js' %}"></script>
<script src="{% static 'wagtailadmin/js/core.js' %}"></script>
{% main_nav_js %}
{% endcompress %}
<script src="{% static 'wagtailadmin/js/vendor/jquery-1.10.3.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/jquery-ui-1.10.3.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/jquery.datetimepicker.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/jquery.autosize.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/bootstrap-transition.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/bootstrap-modal.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/bootstrap-tab.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/jquery.dlmenu.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/tag-it.js' %}"></script>
<script src="{% static 'wagtailadmin/js/core.js' %}"></script>
{% main_nav_js %}
{% block extra_js %}{% endblock %}
{% endblock %}

View File

@ -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 %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/home.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/home.css' %}" type="text/css" />
{% endblock %}
{% block content %}

View File

@ -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 %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
{% endblock %}
{% block furniture %}

View File

@ -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 %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/page-editor.css' %}" type="text/css" />
<link rel="stylesheet" href="{% static 'wagtailadmin/css/panels/rich-text.css' %}" type="text/css" />
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/page-editor.css' %}" type="text/css" />
<link rel="stylesheet" href="{% static 'wagtailadmin/css/panels/rich-text.css' %}" type="text/css" />
{% hook_output 'insert_editor_css' %}
{% endcompress %}
{% hook_output 'insert_editor_css' %}
{{ edit_handler.form.media.css }}

View File

@ -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 @@
};
</script>
{% compress js %}
<script src="{% static 'wagtailadmin/js/vendor/rangy-core.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/hallo.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/mousetrap.min.js' %}"></script>
<script src="{% static 'wagtailadmin/js/expanding_formset.js' %}"></script>
<script src="{% static 'wagtailadmin/js/modal-workflow.js' %}"></script>
<script src="{% static 'wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js' %}"></script>
<script src="{% static 'wagtailadmin/js/hallo-plugins/hallo-hr.js' %}"></script>
<script src="{% static 'wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js' %}"></script>
<script src="{% static 'wagtailadmin/js/page-editor.js' %}"></script>
<script src="{% static 'wagtailadmin/js/page-chooser.js' %}"></script>
<script src="{% static 'admin/js/urlify.js' %}"></script>
<script src="{% static 'wagtailadmin/js/privacy-switch.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/rangy-core.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/hallo.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/mousetrap.min.js' %}"></script>
<script src="{% static 'wagtailadmin/js/expanding_formset.js' %}"></script>
<script src="{% static 'wagtailadmin/js/modal-workflow.js' %}"></script>
<script src="{% static 'wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js' %}"></script>
<script src="{% static 'wagtailadmin/js/hallo-plugins/hallo-hr.js' %}"></script>
<script src="{% static 'wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js' %}"></script>
<script src="{% static 'wagtailadmin/js/page-editor.js' %}"></script>
<script src="{% static 'wagtailadmin/js/page-chooser.js' %}"></script>
<script src="{% static 'admin/js/urlify.js' %}"></script>
<script src="{% static 'wagtailadmin/js/privacy-switch.js' %}"></script>
{% hook_output 'insert_editor_js' %}
{% endcompress %}
{% hook_output 'insert_editor_js' %}
{% include "wagtailadmin/shared/datetimepicker_translations.html" %}

View File

@ -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 %}

View File

@ -1,11 +1,9 @@
<!DOCTYPE HTML>
{% load static compress i18n %}
{% load static i18n %}
<html>
<head>
<title>{% trans "Preview" %}</title>
{% compress css %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/preview.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/preview.css' %}" type="text/css" />
</head>
<body class="ready">
<div id="loading-spinner-wrapper" class="loading-spinner-wrapper">

View File

@ -1,5 +1,5 @@
<!doctype html>
{% load compress static i18n %}
{% load static i18n %}
<html class="no-js" lang="{{ LANGUAGE_CODE|default:"en-gb" }}">
<head>
<meta charset="utf-8" />
@ -7,12 +7,10 @@
<title>Wagtail - {% block titletag %}{% endblock %}</title>
<meta name="description" content="" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script src="{% static 'wagtailadmin/js/vendor/modernizr-2.6.2.min.js' %}"></script>
{% compress css %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/normalize.css' %}" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/normalize.css' %}" />
{% block css %}{% endblock %}

View File

@ -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 %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/userbar.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/userbar.css' %}" type="text/css" />
{% endblock %}
{% block furniture %}
@ -22,7 +20,5 @@
{% endblock %}
{% block js %}
{% compress js %}
<script src="{% static 'wagtailadmin/js/userbar.js' %}"></script>
{% endcompress %}
<script src="{% static 'wagtailadmin/js/userbar.js' %}"></script>
{% endblock %}

View File

@ -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 }}
<!-- Focal point chooser -->
<link rel="stylesheet" href="{% static 'wagtailimages/css/vendor/jquery.Jcrop.min.css' %}" type="text/css">
{% compress css %}
<link rel="stylesheet" href="{% static 'wagtailimages/css/focal-point-chooser.css' %}" type="text/css">
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailimages/css/focal-point-chooser.css' %}" type="text/css">
{% endblock %}
{% block extra_js %}

View File

@ -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 %}
<script src="{% static 'wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js' %}"></script>
<script src="{% static 'wagtailimages/js/image-url-generator.js' %}"></script>
{% endcompress %}
<script src="{% static 'wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js' %}"></script>
<script src="{% static 'wagtailimages/js/image-url-generator.js' %}"></script>
{% endblock %}

View File

@ -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 %}
<link rel="stylesheet" href="{% static 'wagtailimages/css/add-multiple.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailimages/css/add-multiple.css' %}" type="text/css" />
{% endblock %}
{% block content %}
@ -57,20 +55,18 @@
{% block extra_js %}
{{ block.super }}
{% compress js %}
<!-- this exact order of plugins is vital -->
<script src="{% static 'wagtailimages/js/vendor/load-image.min.js' %}"></script>
<script src="{% static 'wagtailimages/js/vendor/canvas-to-blob.min.js' %}"></script>
<script src="{% static 'wagtailimages/js/vendor/jquery.iframe-transport.js' %}"></script>
<script src="{% static 'wagtailimages/js/vendor/jquery.fileupload.js' %}"></script>
<script src="{% static 'wagtailimages/js/vendor/jquery.fileupload-process.js' %}"></script>
<script src="{% static 'wagtailimages/js/vendor/jquery.fileupload-image.js' %}"></script>
<script src="{% static 'wagtailimages/js/vendor/jquery.fileupload-validate.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/tag-it.js' %}"></script>
<!-- this exact order of plugins is vital -->
<script src="{% static 'wagtailimages/js/vendor/load-image.min.js' %}"></script>
<script src="{% static 'wagtailimages/js/vendor/canvas-to-blob.min.js' %}"></script>
<script src="{% static 'wagtailimages/js/vendor/jquery.iframe-transport.js' %}"></script>
<script src="{% static 'wagtailimages/js/vendor/jquery.fileupload.js' %}"></script>
<script src="{% static 'wagtailimages/js/vendor/jquery.fileupload-process.js' %}"></script>
<script src="{% static 'wagtailimages/js/vendor/jquery.fileupload-image.js' %}"></script>
<script src="{% static 'wagtailimages/js/vendor/jquery.fileupload-validate.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/tag-it.js' %}"></script>
<!-- Main script -->
<script src="{% static 'wagtailimages/js/add-multiple.js' %}"></script>
{% endcompress %}
<!-- Main script -->
<script src="{% static 'wagtailimages/js/add-multiple.js' %}"></script>
{% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
<script>

View File

@ -1,25 +1,23 @@
{% extends "wagtailadmin/base.html" %}
{% load wagtailusers_tags wagtailimages_tags static compress i18n %}
{% load wagtailusers_tags wagtailimages_tags static i18n %}
{% block titletag %}{% trans "Add group" %}{% endblock %}
{% block extra_css %}
{{ block.super }}
{% compress css %}
<link rel="stylesheet" href="{% static 'wagtailusers/css/groups_edit.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailusers/css/groups_edit.css' %}" type="text/css" />
{% endblock %}
{% block content %}
{% trans "Add group" as add_group_str %}
{% include "wagtailadmin/shared/header.html" with title=add_group_str icon="group" %}
<div class="nice-padding">
<form action="{% url 'wagtailusers_groups:add' %}" method="POST">
{% csrf_token %}
<ul class="fields">
{% include "wagtailadmin/shared/field_as_li.html" with field=form.name %}
<li>

View File

@ -1,27 +1,26 @@
{% extends "wagtailadmin/base.html" %}
{% load wagtailusers_tags static compress i18n %}
{% load wagtailusers_tags static i18n %}
{% block titletag %}{% trans "Editing" %} {{ group.name }}{% endblock %}
{% block extra_css %}
{{ block.super }}
{% compress css %}
<link rel="stylesheet" href="{% static 'wagtailusers/css/groups_edit.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailusers/css/groups_edit.css' %}" type="text/css" />
{% endblock %}
{% block content %}
{% trans "Editing" as editing_str %}
{% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=group.name icon="group" %}
<div class="nice-padding">
<form action="{% url 'wagtailusers_groups:edit' group.id %}" method="POST">
{% csrf_token %}
<ul class="fields">
{% include "wagtailadmin/shared/field_as_li.html" with field=form.name %}
<li>
{% format_permissions permission_bound_field=form.permissions %}
</li>
@ -36,7 +35,7 @@
{% endif %}
</li>
</ul>
</form>
</div>
{% endblock %}

View File

@ -1,13 +1,11 @@
{% load static compress %}
{% load static %}
<script>
window.chooserUrls = {
'pageChooser': '{% url "wagtailadmin_choose_page" %}'
};
</script>
{% compress js %}
<script src="{% static 'wagtailadmin/js/page-chooser.js' %}"></script>
<script src="{% static 'wagtailadmin/js/expanding_formset.js' %}"></script>
<script src="{% static 'wagtailadmin/js/modal-workflow.js' %}"></script>
<script src="{% static 'wagtailusers/js/group-form.js' %}"></script>
{% endcompress %}
<script src="{% static 'wagtailadmin/js/page-chooser.js' %}"></script>
<script src="{% static 'wagtailadmin/js/expanding_formset.js' %}"></script>
<script src="{% static 'wagtailadmin/js/modal-workflow.js' %}"></script>
<script src="{% static 'wagtailusers/js/group-form.js' %}"></script>