kopia lustrzana https://github.com/wagtail/wagtail
removal of orphaned merge files. tidying final references to verdant name
Dave Cranwell
rodzic
f9c9dac30a
commit
69d9690694
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
<div class="col10">
|
||||
<h1>Welcome to the Verdant CMS for {{ site_name }}</h1>
|
||||
<h1>Welcome to the {{ site_name }} Wagtail CMS</h1>
|
||||
<h2>{{ user.get_full_name|default:user.username }}</h2>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
||||
<div class="nice-padding">
|
||||
<p>Choose which type of page you'd like to create.</p>
|
||||
|
|
|
|||
|
|
@ -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" %}
|
||||
|
||||
<div class="nice-padding">
|
||||
<p>Your new page will be saved in the <em>top level</em> of your website. You can move it after saving.</p>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<title>Verdant - {% block titletag %}{% endblock %}</title>
|
||||
<title>Wagtail - {% block titletag %}{% endblock %}</title>
|
||||
<meta name="description" content="" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@
|
|||
Title
|
||||
{% if not is_searching %}
|
||||
{% if ordering == "title" %}
|
||||
<a href="{% url 'verdantdocs_index' %}" class="icon icon-arrow-down-after teal"></a>
|
||||
<a href="{% url 'wagtaildocs_index' %}" class="icon icon-arrow-down-after teal"></a>
|
||||
{% else %}
|
||||
<a href="{% url 'verdantdocs_index' %}?ordering=title" class="icon icon-arrow-down-after"></a>
|
||||
<a href="{% url 'wagtailddocs_index' %}?ordering=title" class="icon icon-arrow-down-after"></a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</th>
|
||||
|
|
@ -19,9 +19,9 @@
|
|||
Uploaded
|
||||
{% if not is_searching %}
|
||||
{% if ordering == "-created_at" %}
|
||||
<a href="{% url 'verdantdocs_index' %}" class="icon icon-arrow-down-after teal"></a>
|
||||
<a href="{% url 'wagtailddocs_index' %}" class="icon icon-arrow-down-after teal"></a>
|
||||
{% else %}
|
||||
<a href="{% url 'verdantdocs_index' %}?ordering=-created_at" class="icon icon-arrow-down-after"></a>
|
||||
<a href="{% url 'wagtailddocs_index' %}?ordering=-created_at" class="icon icon-arrow-down-after"></a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</th>
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
<table class="listing">
|
||||
<col width="50%"/>
|
||||
<col width="40%"/>
|
||||
<col />
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="title">
|
||||
From
|
||||
{% if not is_searching %}
|
||||
{% if ordering == "old_path" %}
|
||||
<a href="{% url 'wagtailredirects_index' %}" class="icon icon-arrow-down-after teal"></a>
|
||||
{% else %}
|
||||
<a href="{% url 'wagtailredirects_index' %}?ordering=old_path" class="icon icon-arrow-down-after"></a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</th>
|
||||
<th>To</th>
|
||||
<th class="type">Type</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for redirect in redirects %}
|
||||
<tr>
|
||||
<td class="title">
|
||||
<h2><a href="{% url 'wagtailredirects_edit_redirect' redirect.id %}" title="Edit this redirect">{{ redirect.title }}</a></h2>
|
||||
</td>
|
||||
<td>
|
||||
{% if redirect.redirect_page %}
|
||||
<a href="{% url 'wagtailadmin_pages_edit' redirect.redirect_page.id %}" class="nolink">{{ redirect.redirect_page.title }}</a>
|
||||
{% else %}
|
||||
{{ redirect.link }}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="type"><div class="status-tag {% if redirect.get_is_permanent_display = "permanent" %}primary{% endif %}">{{ redirect.get_is_permanent_display }}</div></td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{% if redirects %}
|
||||
{% if is_searching %}
|
||||
<h2>{{ redirects|length }} match{{ redirects|pluralize:"es" }}</h2>
|
||||
{% 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 %}
|
||||
<p>Sorry, no redirects match "<em>{{ search_query }}</em>"
|
||||
{% else %}
|
||||
<p>No redirects have been created. Why not <a href="{% url 'wagtailredirects_add_redirect' %}">add one</a>?</p>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
|
@ -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" %}
|
||||
|
||||
<div class="nice-padding">
|
||||
<p>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 "<em>giving</em>".</p>
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
||||
<div class="nice-padding">
|
||||
<p>Are you sure you want to delete all editors picks for this search term?</p>
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
||||
<form action="{% url 'wagtailsearch_editorspicks_edit' query.id %}" method="POST" class="nice-padding">
|
||||
{% csrf_token %}
|
||||
|
|
|
|||
|
|
@ -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 @@
|
|||
|
||||
<div class="nice-padding">
|
||||
<div id="editorspicks-results" class="redirects">
|
||||
{% include "verdantsearch/editorspicks/results.html" %}
|
||||
{% include "wagtailsearch/editorspicks/results.html" %}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
<table class="listing">
|
||||
<col width="40%" />
|
||||
<col width="40%"/>
|
||||
<col />
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="title">Search term(s)</th>
|
||||
<th>Editors picks</th>
|
||||
<th>Views (past week)</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for query in queries %}
|
||||
<tr>
|
||||
<td class="title">
|
||||
<h2><a href="{% url 'wagtailsearch_editorspicks_edit' query.id %}" title="Edit this pick">{{ query.query_string }}</a></h2>
|
||||
</td>
|
||||
<td>
|
||||
{% for editors_pick in query.editors_picks.all %}
|
||||
<a href="{% url 'wagtailadmin_pages_edit' editors_pick.page.id %}" class="nolink">{{ editors_pick.page.title }}</a>{% if not forloop.last %}, {% endif %}
|
||||
{% empty %}
|
||||
None
|
||||
{% endfor %}
|
||||
</td>
|
||||
<td>{{ query.hits }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{% if queries %}
|
||||
{% if is_searching %}
|
||||
<h2>{{ queries|length }} match{{ queries|pluralize:"es" }}</h2>
|
||||
{% 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 %}
|
||||
<p>Sorry, no editor's picks match "<em>{{ search_query }}</em>"
|
||||
{% else %}
|
||||
<p>No editor's picks have been created. Why not <a href="{% url 'wagtailsearch_editorspicks_add' %}">add one</a>?</p>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% include "verdantadmin/shared/header.html" with title="Popular search terms" %}
|
||||
{% include "wagtailadmin/shared/header.html" with title="Popular search terms" %}
|
||||
|
||||
<form class="query-search search-bar full-width" action="{% url 'wagtailsearch_queries_chooserresults' %}" method="GET" autocomplete="off">
|
||||
<ul class="fields">
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
||||
<div class="nice-padding">
|
||||
<p>Are you sure you want to delete this {{ snippet_type_name }}?</p>
|
||||
|
|
|
|||
|
|
@ -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" %}
|
||||
|
||||
<div class="nice-padding">
|
||||
<ul class="listing">
|
||||
|
|
|
|||
|
|
@ -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" %}
|
||||
|
||||
<div class="nice-padding">
|
||||
<table class="listing">
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue