From 69d96906945b00127874be987d88ca2a3d6fe14c Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 5 Feb 2014 12:49:18 +0000
Subject: [PATCH] removal of orphaned merge files. tidying final references to
 verdant name

---
 .../css/components/formatters.less            |  4 +-
 .../templates/wagtailadmin/home.html          |  2 +-
 .../wagtailadmin/pages/add_subpage.html       |  2 +-
 .../wagtailadmin/pages/select_type.html       |  2 +-
 .../templates/wagtailadmin/skeleton.html      |  2 +-
 .../templates/wagtaildocs/documents/list.html |  8 ++--
 .../templates/wagtailredirects/index.html     |  2 +-
 .../templates/wagtailredirects/list.html      | 38 +++++++++++++++++++
 .../templates/wagtailredirects/results.html   | 15 ++++++++
 .../wagtailsearch/editorspicks/add.html       |  2 +-
 .../editorspicks/confirm_delete.html          |  2 +-
 .../wagtailsearch/editorspicks/edit.html      |  2 +-
 .../wagtailsearch/editorspicks/index.html     |  4 +-
 .../wagtailsearch/editorspicks/list.html      | 29 ++++++++++++++
 .../wagtailsearch/editorspicks/results.html   | 15 ++++++++
 .../queries/chooser/chooser.html              |  2 +-
 .../snippets/confirm_delete.html              |  2 +-
 .../wagtailsnippets/snippets/index.html       |  2 +-
 .../templates/wagtailusers/index.html         |  2 +-
 19 files changed, 118 insertions(+), 19 deletions(-)
 create mode 100644 wagtail/wagtailredirects/templates/wagtailredirects/list.html
 create mode 100644 wagtail/wagtailredirects/templates/wagtailredirects/results.html
 create mode 100644 wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/list.html
 create mode 100644 wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/results.html

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 @@
                 </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>
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 %}
 
     <div class="nice-padding">
         <p>Choose which type of page you'd like to create.</p>
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" %}
 
     <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>
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 @@
 <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" />
     
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" %}
-                        <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>
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 @@
+<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>
\ 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 %}
+        <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 %}
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" %}
 
     <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>
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 %}
 
     <div class="nice-padding">       
         <p>Are you sure you want to delete all editors picks for this search term?</p>
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 %}
 
     <form action="{% url 'wagtailsearch_editorspicks_edit' query.id %}" method="POST" class="nice-padding">
         {% 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 @@
 
      <div class="nice-padding">
         <div id="editorspicks-results" class="redirects">
-            {% include "verdantsearch/editorspicks/results.html" %}
+            {% include "wagtailsearch/editorspicks/results.html" %}
         </div>
     </div>
 {% 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 @@
+<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>
\ 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 %}
+        <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 %}
\ 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" %}
 
 <form class="query-search search-bar full-width" action="{% url 'wagtailsearch_queries_chooserresults' %}" method="GET" autocomplete="off">
     <ul class="fields">
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 %}
 
     <div class="nice-padding">
         <p>Are you sure you want to delete this {{ snippet_type_name }}?</p>
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" %}
 
     <div class="nice-padding">
         <ul class="listing">
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" %}
 
     <div class="nice-padding">
         <table class="listing">