mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'master' of https://github.com/m-sanders/wagtail into m-sanders-master 

Conflicts:
	wagtail/wagtailusers/templates/wagtailusers/groups/create.html
	wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
pull/1797/head
Matt Westcott 2015-10-06 16:41:00 +01:00
rodzic 490ecff007 eaaeabb959
commit f502e31dd7
35 zmienionych plików z 67 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/add.html
Wyświetl plik

@ -32,9 +32,11 @@
{% endblock %}
{% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_css.html" %}
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %}
<script type="text/javascript">

2
wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/edit.html
Wyświetl plik

@ -24,9 +24,11 @@
{% endblock %}
{% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_css.html" %}
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %}
<script type="text/javascript">

1
wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/index.html
Wyświetl plik

@ -3,6 +3,7 @@
{% block titletag %}{% trans "Search Terms" %}{% endblock %}
{% block extra_js %}
{{ block.super }}
<script>
window.headerSearch = {
url: "{% url 'wagtailsearchpromotions:index' %}",

4
wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
Wyświetl plik

@ -2,6 +2,8 @@
{% load wagtailadmin_tags compress i18n static gravatar %}
{% block extra_css %}
{{ block.super }}
{% compress css %}
<link rel="stylesheet" href="{% static 'wagtailstyleguide/css/styleguide.css' %}" type="text/css" />
{% endcompress %}
@ -605,6 +607,8 @@
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %}
<script>
$(function(){

2
wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
Wyświetl plik

@ -4,6 +4,8 @@
{% 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 %}

2
wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
Wyświetl plik

@ -4,6 +4,8 @@
{% 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 %}

2
wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
Wyświetl plik

@ -4,6 +4,8 @@
{% 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 %}

2
wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
Wyświetl plik

@ -4,6 +4,8 @@
{% 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 %}

2
wagtail/wagtailadmin/templates/wagtailadmin/home.html
Wyświetl plik

@ -4,6 +4,8 @@
{% 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 %}

3
wagtail/wagtailadmin/templates/wagtailadmin/login.html
Wyświetl plik

@ -4,6 +4,8 @@
{% 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 %}
@ -64,6 +66,7 @@
{% endblock %}
{% block extra_js %}
{{ block.super }}
<script>
$(function(){
$('form input[name=username]').focus();

1
wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html
Wyświetl plik

@ -29,5 +29,6 @@
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %}
{% endblock %}

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
Wyświetl plik

@ -64,9 +64,11 @@
{% endblock %}
{% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_css.html" %}
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %}
<script>

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
Wyświetl plik

@ -93,8 +93,10 @@
{% endblock %}
{% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_css.html" %}
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %}
{% endblock %}

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
Wyświetl plik

@ -22,6 +22,8 @@
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% comment %} modal-workflow is required by the view restrictions interface {% endcomment %}
<script src="{% static 'wagtailadmin/js/modal-workflow.js' %}"></script>
<script src="{% static 'wagtailadmin/js/privacy-switch.js' %}"></script>

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html
Wyświetl plik

@ -2,6 +2,8 @@
{% load i18n %}
{% block titletag %}{% trans 'Search' %}{% endblock %}
{% block extra_js %}
{{ block.super }}
<script>
window.headerSearch = {
url: "{% url 'wagtailadmin_pages:search' %}",

2
wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
Wyświetl plik

@ -3,10 +3,12 @@
{% load wagtailimages_tags %}
{% block titletag %}{% trans "Add a document" %}{% endblock %}
{% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/shared/tag_field_css.html" %}
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/shared/tag_field_js.html" %}
{% endblock %}

2
wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
Wyświetl plik

@ -3,10 +3,12 @@
{% load wagtailimages_tags %}
{% block titletag %}{% blocktrans with title=document.title %}Editing {{ title }}{% endblocktrans %}{% endblock %}
{% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/shared/tag_field_css.html" %}
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/shared/tag_field_js.html" %}
{% endblock %}

1
wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
Wyświetl plik

@ -2,6 +2,7 @@
{% load i18n %}
{% block titletag %}Documents{% endblock %}
{% block extra_js %}
{{ block.super }}
<script>
window.headerSearch = {
url: "{% url 'wagtaildocs:index' %}",

1
wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
Wyświetl plik

@ -2,6 +2,7 @@
{% load i18n %}
{% block titletag %}{% blocktrans with form_title=form_page.title|capfirst %}Submissions of {{ form_title }}{% endblocktrans %}{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/shared/datetimepicker_translations.html" %}
<script>

2
wagtail/wagtailimages/templates/wagtailimages/images/add.html
Wyświetl plik

@ -3,10 +3,12 @@
{% load i18n %}
{% block titletag %}{% trans "Add an image" %}{% endblock %}
{% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/shared/tag_field_css.html" %}
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/shared/tag_field_js.html" %}
{% endblock %}

4
wagtail/wagtailimages/templates/wagtailimages/images/edit.html
Wyświetl plik

@ -2,6 +2,8 @@
{% load wagtailimages_tags compress static i18n %}
{% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %}
{% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/shared/tag_field_css.html" %}
<!-- Focal point chooser -->
@ -12,6 +14,8 @@
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/shared/tag_field_js.html" %}
<!-- Focal point chooser -->

1
wagtail/wagtailimages/templates/wagtailimages/images/index.html
Wyświetl plik

@ -4,6 +4,7 @@
{% block titletag %}{% trans "Images" %}{% endblock %}
{% block extra_js %}
{{ block.super }}
<script>
window.headerSearch = {
url: "{% url 'wagtailimages:index' %}",

1
wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html
Wyświetl plik

@ -35,6 +35,7 @@
{% endblock %}
{% 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>

4
wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
Wyświetl plik

@ -2,6 +2,8 @@
{% load wagtailimages_tags i18n compress 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 %}
@ -53,6 +55,8 @@
{% endblock %}
{% 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>

3
wagtail/wagtailredirects/templates/wagtailredirects/add.html
Wyświetl plik

@ -17,5 +17,6 @@
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %}
{% endblock %}
{% endblock %}

3
wagtail/wagtailredirects/templates/wagtailredirects/edit.html
Wyświetl plik

@ -18,5 +18,6 @@
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %}
{% endblock %}
{% endblock %}

1
wagtail/wagtailredirects/templates/wagtailredirects/index.html
Wyświetl plik

@ -3,6 +3,7 @@
{% block titletag %}{% trans "Redirects" %}{% endblock %}
{% block extra_js %}
{{ block.super }}
<script>
window.headerSearch = {
url: "{% url 'wagtailredirects:index' %}",

1
wagtail/wagtailsites/templates/wagtailsites/create.html
Wyświetl plik

@ -1,5 +1,6 @@
{% extends "wagtailadmin/generic/create.html" %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %}
{% endblock %}

1
wagtail/wagtailsites/templates/wagtailsites/edit.html
Wyświetl plik

@ -1,5 +1,6 @@
{% extends "wagtailadmin/generic/edit.html" %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %}
{% endblock %}

2
wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
Wyświetl plik

@ -23,8 +23,10 @@
{% endblock %}
{% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_css.html" %}
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %}
{% endblock %}

2
wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
Wyświetl plik

@ -27,8 +27,10 @@
{% endblock %}
{% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_css.html" %}
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %}
{% endblock %}

3
wagtail/wagtailusers/templates/wagtailusers/groups/create.html
Wyświetl plik

@ -4,6 +4,8 @@
{% 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 %}
@ -33,5 +35,6 @@
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailusers/groups/includes/group_form_js.html" %}
{% endblock %}

2
wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
Wyświetl plik

@ -4,6 +4,7 @@
{% 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 %}
@ -41,5 +42,6 @@
{% endblock %}
{% block extra_js %}
{{ block.super }}
{% include "wagtailusers/groups/includes/group_form_js.html" %}
{% endblock %}

1
wagtail/wagtailusers/templates/wagtailusers/groups/index.html
Wyświetl plik

@ -3,6 +3,7 @@
{% load gravatar %}
{% block titletag %}{% trans "groups" %}{% endblock %}
{% block extra_js %}
{{ block.super }}
<script>
window.headerSearch = {
url: "{% url 'wagtailusers_groups:index' %}",

1
wagtail/wagtailusers/templates/wagtailusers/users/index.html
Wyświetl plik

@ -3,6 +3,7 @@
{% load gravatar %}
{% block titletag %}{% trans "Users" %}{% endblock %}
{% block extra_js %}
{{ block.super }}
<script>
window.headerSearch = {
url: "{% url 'wagtailusers_users:index' %}",