diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less index 2f14e0660..cfa290484 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less @@ -1,3 +1,5 @@ + + .avatar{ .border-radius(100%); position:relative; @@ -116,7 +118,7 @@ -webkit-font-smoothing: auto; font-size:0.80em; margin:0 0.5em; - background:white url(/static/verdantadmin/images/bg-dark-diag.svg); + background:white url(@{static-root}bg-dark-diag.svg); &.primary{ color:@color-grey-2; diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home.html b/wagtail/wagtailadmin/templates/wagtailadmin/home.html index d6c4de364..bcd68d2e0 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/home.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/home.html @@ -18,7 +18,7 @@ {% endif %}
-

Welcome to the Verdant CMS for {{ site_name }}

+

Welcome to the {{ site_name }} Wagtail CMS

{{ user.get_full_name|default:user.username }}

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html index c2cd5a7c3..31ea431a9 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html @@ -5,7 +5,7 @@ {% block titletag %}Create a page in {{ parent_page.title }}{% endblock %} {% block content %} - {% include "verdantadmin/shared/header.html" with title="Create a page in" subtitle=parent_page.title %} + {% include "wagtailadmin/shared/header.html" with title="Create a page in" subtitle=parent_page.title %}

Choose which type of page you'd like to create.

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html index 3935807a7..c3e6a7cf6 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/select_type.html @@ -3,7 +3,7 @@ {% block bodyclass %}menu-explorer{% endblock %} {% block content %} - {% include "verdantadmin/shared/header.html" with title="Create a new page" %} + {% include "wagtailadmin/shared/header.html" with title="Create a new page" %}

Your new page will be saved in the top level of your website. You can move it after saving.

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html index f2100e997..365b29055 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html @@ -7,7 +7,7 @@ - Verdant - {% block titletag %}{% endblock %} + Wagtail - {% block titletag %}{% endblock %} diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html index 147c131ca..d025a68c6 100644 --- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html +++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html @@ -8,9 +8,9 @@ Title {% if not is_searching %} {% if ordering == "title" %} - + {% else %} - + {% endif %} {% endif %} @@ -19,9 +19,9 @@ Uploaded {% if not is_searching %} {% if ordering == "-created_at" %} - + {% else %} - + {% endif %} {% endif %} diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/index.html b/wagtail/wagtailredirects/templates/wagtailredirects/index.html index 168209eab..76c25a930 100644 --- a/wagtail/wagtailredirects/templates/wagtailredirects/index.html +++ b/wagtail/wagtailredirects/templates/wagtailredirects/index.html @@ -17,7 +17,7 @@ search_next_index++; var index = search_next_index; $.ajax({ - url: "{%url 'verdantredirects_index' %}", + url: "{%url 'wagtailredirects_index' %}", data: {q: $('#id_q').val()}, success: function(data, status) { console.log('here') diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/list.html b/wagtail/wagtailredirects/templates/wagtailredirects/list.html new file mode 100644 index 000000000..f7e1545f0 --- /dev/null +++ b/wagtail/wagtailredirects/templates/wagtailredirects/list.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + {% for redirect in redirects %} + + + + + + {% endfor %} + +
+ From + {% if not is_searching %} + {% if ordering == "old_path" %} + + {% else %} + + {% endif %} + {% endif %} + ToType
+

{{ redirect.title }}

+ 		+ {% if redirect.redirect_page %} + {{ redirect.redirect_page.title }} + {% else %} + {{ redirect.link }} + {% endif %} +
{{ redirect.get_is_permanent_display }}
\ No newline at end of file diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/results.html b/wagtail/wagtailredirects/templates/wagtailredirects/results.html new file mode 100644 index 000000000..ff6e6ca9f --- /dev/null +++ b/wagtail/wagtailredirects/templates/wagtailredirects/results.html @@ -0,0 +1,15 @@ +{% if redirects %} + {% if is_searching %} +

{{ redirects|length }} match{{ redirects|pluralize:"es" }}

+ {% endif %} + + {% include "wagtailredirects/list.html" %} + + {% include "wagtailadmin/shared/pagination_nav.html" with items=redirects is_searching=is_searching linkurl="wagtailredirects_index" %} +{% else %} + {% if is_searching %} +

Sorry, no redirects match "{{ search_query }}" + {% else %} +

No redirects have been created. Why not add one?

+ {% endif %} +{% endif %} diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html index e358c9dcb..327124b4c 100644 --- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html +++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html @@ -1,7 +1,7 @@ {% extends "wagtailadmin/base.html" %} {% block titletag %}Add editors pick{% endblock %} {% block content %} - {% include "verdantadmin/shared/header.html" with title="Add editor's pick" %} + {% include "wagtailadmin/shared/header.html" with title="Add editor's pick" %}

Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like "giving".

diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/confirm_delete.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/confirm_delete.html index ae949af73..96124f752 100644 --- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/confirm_delete.html +++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/confirm_delete.html @@ -3,7 +3,7 @@ {% block titletag %}Delete {{ query.query_string }}{% endblock %} {% block content %} - {% include "verdantadmin/shared/header.html" with title="Delete" subtitle=query.query_string %} + {% include "wagtailadmin/shared/header.html" with title="Delete" subtitle=query.query_string %}

Are you sure you want to delete all editors picks for this search term?

diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/edit.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/edit.html index 45ef7d336..222dfea5f 100644 --- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/edit.html +++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/edit.html @@ -2,7 +2,7 @@ {% block titletag %}Editing {{ query.query_string }}{% endblock %} {% block content %} - {% include "verdantadmin/shared/header.html" with title="Editing" subtitle=query.query_string %} + {% include "wagtailadmin/shared/header.html" with title="Editing" subtitle=query.query_string %}
{% csrf_token %} diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html index 2466fdcbf..1628b60f9 100644 --- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html +++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html @@ -17,7 +17,7 @@ search_next_index++; var index = search_next_index; $.ajax({ - url: "{%url 'verdantsearch_editorspicks_index' %}", + url: "{%url 'wagtailsearch_editorspicks_index' %}", data: {q: $('#id_q').val()}, success: function(data, status) { console.log('here') @@ -36,7 +36,7 @@
- {% include "verdantsearch/editorspicks/results.html" %} + {% include "wagtailsearch/editorspicks/results.html" %}
{% endblock %} \ No newline at end of file diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/list.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/list.html new file mode 100644 index 000000000..0118c57a8 --- /dev/null +++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/list.html @@ -0,0 +1,29 @@ + + + + + + + + + + + + + {% for query in queries %} + + + + + + {% endfor %} + +
Search term(s)Editors picksViews (past week)
+

{{ query.query_string }}

+ 		+ {% for editors_pick in query.editors_picks.all %} + {{ editors_pick.page.title }}{% if not forloop.last %}, {% endif %} + {% empty %} + None + {% endfor %} + {{ query.hits }}
\ No newline at end of file diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/results.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/results.html new file mode 100644 index 000000000..1b8e3620a --- /dev/null +++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/results.html @@ -0,0 +1,15 @@ +{% if queries %} + {% if is_searching %} +

{{ queries|length }} match{{ queries|pluralize:"es" }}

+ {% endif %} + + {% include "wagtailsearch/editorspicks/list.html" %} + + {% include "wagtailadmin/shared/pagination_nav.html" with items=queries is_searching=is_searching linkurl="wagtailsearch_editorspicks_index" %} +{% else %} + {% if is_searching %} +

Sorry, no editor's picks match "{{ search_query }}" + {% else %} +

No editor's picks have been created. Why not add one?

+ {% endif %} +{% endif %} \ No newline at end of file diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html index f3be61182..b62a4b528 100644 --- a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html +++ b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html @@ -1,4 +1,4 @@ -{% include "verdantadmin/shared/header.html" with title="Popular search terms" %} +{% include "wagtailadmin/shared/header.html" with title="Popular search terms" %}
    diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/confirm_delete.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/confirm_delete.html index fe67288ce..2f62300fb 100644 --- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/confirm_delete.html +++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/confirm_delete.html @@ -3,7 +3,7 @@ {% block bodyclass %}menu-snippets{% endblock %} {% block content %} - {% include "verdantadmin/shared/header.html" with title="Delete" subtitle=instance %} + {% include "wagtailadmin/shared/header.html" with title="Delete" subtitle=instance %}

    Are you sure you want to delete this {{ snippet_type_name }}?

    diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/index.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/index.html index 5eae53972..21f27b8e9 100644 --- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/index.html +++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/index.html @@ -4,7 +4,7 @@ {% block bodyclass %}menu-snippets{% endblock %} {% block content %} - {% include "verdantadmin/shared/header.html" with title="Snippets" %} + {% include "wagtailadmin/shared/header.html" with title="Snippets" %}
      diff --git a/wagtail/wagtailusers/templates/wagtailusers/index.html b/wagtail/wagtailusers/templates/wagtailusers/index.html index e259bccee..12e7f193d 100644 --- a/wagtail/wagtailusers/templates/wagtailusers/index.html +++ b/wagtail/wagtailusers/templates/wagtailusers/index.html @@ -4,7 +4,7 @@ {% block bodyclass %}menu-users{% endblock %} {% block content %} - {% include "wagtailadmin/shared/header.html" with title="Users" add_link="verdantusers_create" add_text="Add a user" %} + {% include "wagtailadmin/shared/header.html" with title="Users" add_link="wagtailusers_create" add_text="Add a user" %}