From 459a8c8b44440fff6ef04d4a0a9fc53850d2aa1d Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 7 Jul 2015 16:25:06 +0100 Subject: [PATCH] Renamed searchpicks app to searchpromotions --- docs/reference/contrib/index.rst | 6 +++--- .../{searchpicks.rst => searchpromotions.rst} | 12 ++++++------ docs/topics/search/searching.rst | 2 +- wagtail/contrib/wagtailsearchpicks/__init__.py | 1 - wagtail/contrib/wagtailsearchpicks/apps.py | 7 ------- wagtail/contrib/wagtailsearchpromotions/__init__.py | 1 + .../admin_urls.py | 2 +- wagtail/contrib/wagtailsearchpromotions/apps.py | 7 +++++++ .../forms.py | 2 +- .../migrations/0001_initial.py | 0 .../migrations/__init__.py | 0 .../models.py | 0 .../templates/wagtailsearchpromotions/add.html | 0 .../wagtailsearchpromotions/confirm_delete.html | 0 .../templates/wagtailsearchpromotions/edit.html | 0 .../includes/searchpromotion_form.html | 0 .../includes/searchpromotions_formset.html | 0 .../includes/searchpromotions_formset.js | 0 .../templates/wagtailsearchpromotions/index.html | 0 .../templates/wagtailsearchpromotions/list.html | 0 .../templates/wagtailsearchpromotions/results.html | 0 .../templatetags/__init__.py | 0 .../templatetags/wagtailsearchpromotions_tags.py} | 0 .../tests.py | 4 ++-- .../views.py | 2 +- .../wagtail_hooks.py | 2 +- wagtail/tests/settings.py | 2 +- 27 files changed, 25 insertions(+), 25 deletions(-) rename docs/reference/contrib/{searchpicks.rst => searchpromotions.rst} (71%) delete mode 100644 wagtail/contrib/wagtailsearchpicks/__init__.py delete mode 100644 wagtail/contrib/wagtailsearchpicks/apps.py create mode 100644 wagtail/contrib/wagtailsearchpromotions/__init__.py rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/admin_urls.py (80%) create mode 100644 wagtail/contrib/wagtailsearchpromotions/apps.py rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/forms.py (96%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/migrations/0001_initial.py (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/migrations/__init__.py (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/models.py (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/templates/wagtailsearchpromotions/add.html (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/templates/wagtailsearchpromotions/confirm_delete.html (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/templates/wagtailsearchpromotions/edit.html (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/templates/wagtailsearchpromotions/includes/searchpromotion_form.html (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/templates/wagtailsearchpromotions/includes/searchpromotions_formset.html (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/templates/wagtailsearchpromotions/includes/searchpromotions_formset.js (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/templates/wagtailsearchpromotions/index.html (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/templates/wagtailsearchpromotions/list.html (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/templates/wagtailsearchpromotions/results.html (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/templatetags/__init__.py (100%) rename wagtail/contrib/{wagtailsearchpicks/templatetags/wagtailsearchpicks_tags.py => wagtailsearchpromotions/templatetags/wagtailsearchpromotions_tags.py} (100%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/tests.py (98%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/views.py (99%) rename wagtail/contrib/{wagtailsearchpicks => wagtailsearchpromotions}/wagtail_hooks.py (92%) diff --git a/docs/reference/contrib/index.rst b/docs/reference/contrib/index.rst index f0a66755c8..7996d83dc5 100644 --- a/docs/reference/contrib/index.rst +++ b/docs/reference/contrib/index.rst @@ -13,7 +13,7 @@ Wagtail ships with a variety of extra optional modules. frontendcache routablepage api/index - searchpicks + searchpromotions :doc:`forms` @@ -52,7 +52,7 @@ Provides a way of embedding Django URLconfs into pages. A module for adding a read only, JSON based web API to your Wagtail site -:doc:`searchpicks` ------------------- +:doc:`searchpromotions` +----------------------- A module for managing "Promoted Search Results" diff --git a/docs/reference/contrib/searchpicks.rst b/docs/reference/contrib/searchpromotions.rst similarity index 71% rename from docs/reference/contrib/searchpicks.rst rename to docs/reference/contrib/searchpromotions.rst index 034137f887..2f888b81fa 100644 --- a/docs/reference/contrib/searchpicks.rst +++ b/docs/reference/contrib/searchpromotions.rst @@ -4,13 +4,13 @@ Promoted search results ======================= -.. module:: wagtail.contrib.wagtailsearchpicks +.. module:: wagtail.contrib.wagtailsearchpromotions .. versionchanged:: 1.1 Before Wagtail 1.1, promoted search results were implemented in the :mod:`wagtail.wagtailsearch` core module and called "editors picks". -The ``searchpicks`` module provides the models and user interface for managing "Promoted search results" and displaying them in a search results page. +The ``searchpromotions`` module provides the models and user interface for managing "Promoted search results" and displaying them in a search results page. "Promoted search results" allow editors to explicitly link relevant content to search terms, so results pages can contain curated content in addition to results from the search engine. @@ -18,7 +18,7 @@ The ``searchpicks`` module provides the models and user interface for managing " Installation ============ -The ``searchpicks`` module is not enabled by default. To install it, add ``wagtail.contrib.wagtailsearchpicks`` to ``INSTALLED_APPS`` in your project's Django settings file. +The ``searchpromotions`` module is not enabled by default. To install it, add ``wagtail.contrib.wagtailsearchpromotions`` to ``INSTALLED_APPS`` in your project's Django settings file. .. code-block:: python @@ -26,7 +26,7 @@ The ``searchpicks`` module is not enabled by default. To install it, add ``wagta INSTALLED_APPS = [ ... - 'wagtail.contrib.wagtailsearchpicks', + 'wagtail.contrib.wagtailsearchpromotions', ] This app contains migrations so make sure you run the ``migrate`` django-admin command after installing. @@ -41,11 +41,11 @@ Once installed, a new menu item called "Promoted search results" should appear i Displaying on a search results page ----------------------------------- -To retrieve a list of promoted search results for a particular search query, you can use the ``{% get_search_promotions %}`` template tag from the ``wagtailsearchpicks_tags`` templatetag library: +To retrieve a list of promoted search results for a particular search query, you can use the ``{% get_search_promotions %}`` template tag from the ``wagtailsearchpromotions_tags`` templatetag library: .. code-block:: HTML+Django - {% load wagtailcore_tags wagtailsearchpicks_tags %} + {% load wagtailcore_tags wagtailsearchpromotions_tags %} ... diff --git a/docs/topics/search/searching.rst b/docs/topics/search/searching.rst index 012201f9be..6475855c49 100644 --- a/docs/topics/search/searching.rst +++ b/docs/topics/search/searching.rst @@ -105,7 +105,7 @@ Promoted search results "Promoted search results" allow editors to explicitly link relevant content to search terms, so results pages can contain curated content in addition to results from the search engine. -This functionality is provided by the :mod:`~wagtail.contrib.wagtailsearchpicks` contrib module. +This functionality is provided by the :mod:`~wagtail.contrib.wagtailsearchpromotions` contrib module. Searching Images, Documents and custom models diff --git a/wagtail/contrib/wagtailsearchpicks/__init__.py b/wagtail/contrib/wagtailsearchpicks/__init__.py deleted file mode 100644 index 8820ef0971..0000000000 --- a/wagtail/contrib/wagtailsearchpicks/__init__.py +++ /dev/null @@ -1 +0,0 @@ -default_app_config = 'wagtail.contrib.wagtailsearchpicks.apps.WagtailSearchPicksAppConfig' diff --git a/wagtail/contrib/wagtailsearchpicks/apps.py b/wagtail/contrib/wagtailsearchpicks/apps.py deleted file mode 100644 index 06d5063d04..0000000000 --- a/wagtail/contrib/wagtailsearchpicks/apps.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.apps import AppConfig - - -class WagtailSearchPicksAppConfig(AppConfig): - name = 'wagtail.contrib.wagtailsearchpicks' - label = 'wagtailsearchpicks' - verbose_name = "Wagtail search picks" diff --git a/wagtail/contrib/wagtailsearchpromotions/__init__.py b/wagtail/contrib/wagtailsearchpromotions/__init__.py new file mode 100644 index 0000000000..e1fe20c622 --- /dev/null +++ b/wagtail/contrib/wagtailsearchpromotions/__init__.py @@ -0,0 +1 @@ +default_app_config = 'wagtail.contrib.wagtailsearchpromotions.apps.WagtailSearchPromotionsAppConfig' diff --git a/wagtail/contrib/wagtailsearchpicks/admin_urls.py b/wagtail/contrib/wagtailsearchpromotions/admin_urls.py similarity index 80% rename from wagtail/contrib/wagtailsearchpicks/admin_urls.py rename to wagtail/contrib/wagtailsearchpromotions/admin_urls.py index 32cf91f252..6b1a42fc5d 100644 --- a/wagtail/contrib/wagtailsearchpicks/admin_urls.py +++ b/wagtail/contrib/wagtailsearchpromotions/admin_urls.py @@ -1,5 +1,5 @@ from django.conf.urls import url -from wagtail.contrib.wagtailsearchpicks import views +from wagtail.contrib.wagtailsearchpromotions import views urlpatterns = [ diff --git a/wagtail/contrib/wagtailsearchpromotions/apps.py b/wagtail/contrib/wagtailsearchpromotions/apps.py new file mode 100644 index 0000000000..586ba34b80 --- /dev/null +++ b/wagtail/contrib/wagtailsearchpromotions/apps.py @@ -0,0 +1,7 @@ +from django.apps import AppConfig + + +class WagtailSearchPromotionsAppConfig(AppConfig): + name = 'wagtail.contrib.wagtailsearchpromotions' + label = 'wagtailsearchpromotions' + verbose_name = "Wagtail search promotions" diff --git a/wagtail/contrib/wagtailsearchpicks/forms.py b/wagtail/contrib/wagtailsearchpromotions/forms.py similarity index 96% rename from wagtail/contrib/wagtailsearchpicks/forms.py rename to wagtail/contrib/wagtailsearchpromotions/forms.py index 82de1bc141..b54b088743 100644 --- a/wagtail/contrib/wagtailsearchpicks/forms.py +++ b/wagtail/contrib/wagtailsearchpromotions/forms.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin.widgets import AdminPageChooser from wagtail.wagtailsearch.models import Query -from wagtail.contrib.wagtailsearchpicks.models import SearchPromotion +from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion class SearchPromotionForm(forms.ModelForm): diff --git a/wagtail/contrib/wagtailsearchpicks/migrations/0001_initial.py b/wagtail/contrib/wagtailsearchpromotions/migrations/0001_initial.py similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/migrations/0001_initial.py rename to wagtail/contrib/wagtailsearchpromotions/migrations/0001_initial.py diff --git a/wagtail/contrib/wagtailsearchpicks/migrations/__init__.py b/wagtail/contrib/wagtailsearchpromotions/migrations/__init__.py similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/migrations/__init__.py rename to wagtail/contrib/wagtailsearchpromotions/migrations/__init__.py diff --git a/wagtail/contrib/wagtailsearchpicks/models.py b/wagtail/contrib/wagtailsearchpromotions/models.py similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/models.py rename to wagtail/contrib/wagtailsearchpromotions/models.py diff --git a/wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/add.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/add.html similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/add.html rename to wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/add.html diff --git a/wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/confirm_delete.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/confirm_delete.html similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/confirm_delete.html rename to wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/confirm_delete.html diff --git a/wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/edit.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/edit.html similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/edit.html rename to wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/edit.html diff --git a/wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/includes/searchpromotion_form.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/includes/searchpromotion_form.html similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/includes/searchpromotion_form.html rename to wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/includes/searchpromotion_form.html diff --git a/wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/includes/searchpromotions_formset.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.html similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/includes/searchpromotions_formset.html rename to wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.html diff --git a/wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/includes/searchpromotions_formset.js b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.js similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/includes/searchpromotions_formset.js rename to wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.js diff --git a/wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/index.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/index.html similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/index.html rename to wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/index.html diff --git a/wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/list.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/list.html similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/list.html rename to wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/list.html diff --git a/wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/results.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/results.html similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/results.html rename to wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/results.html diff --git a/wagtail/contrib/wagtailsearchpicks/templatetags/__init__.py b/wagtail/contrib/wagtailsearchpromotions/templatetags/__init__.py similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/templatetags/__init__.py rename to wagtail/contrib/wagtailsearchpromotions/templatetags/__init__.py diff --git a/wagtail/contrib/wagtailsearchpicks/templatetags/wagtailsearchpicks_tags.py b/wagtail/contrib/wagtailsearchpromotions/templatetags/wagtailsearchpromotions_tags.py similarity index 100% rename from wagtail/contrib/wagtailsearchpicks/templatetags/wagtailsearchpicks_tags.py rename to wagtail/contrib/wagtailsearchpromotions/templatetags/wagtailsearchpromotions_tags.py diff --git a/wagtail/contrib/wagtailsearchpicks/tests.py b/wagtail/contrib/wagtailsearchpromotions/tests.py similarity index 98% rename from wagtail/contrib/wagtailsearchpicks/tests.py rename to wagtail/contrib/wagtailsearchpromotions/tests.py index ec80e6b4fa..15830d4d96 100644 --- a/wagtail/contrib/wagtailsearchpicks/tests.py +++ b/wagtail/contrib/wagtailsearchpromotions/tests.py @@ -3,8 +3,8 @@ from django.core.urlresolvers import reverse from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailsearch.models import Query -from wagtail.contrib.wagtailsearchpicks.models import SearchPromotion -from wagtail.contrib.wagtailsearchpicks.templatetags.wagtailsearchpicks_tags import get_search_promotions +from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion +from wagtail.contrib.wagtailsearchpromotions.templatetags.wagtailsearchpromotions_tags import get_search_promotions class TestSearchPromotions(TestCase): diff --git a/wagtail/contrib/wagtailsearchpicks/views.py b/wagtail/contrib/wagtailsearchpromotions/views.py similarity index 99% rename from wagtail/contrib/wagtailsearchpicks/views.py rename to wagtail/contrib/wagtailsearchpromotions/views.py index 3e8c45c51f..8b270d6142 100644 --- a/wagtail/contrib/wagtailsearchpicks/views.py +++ b/wagtail/contrib/wagtailsearchpromotions/views.py @@ -10,7 +10,7 @@ from wagtail.wagtailsearch.models import Query from wagtail.wagtailadmin.forms import SearchForm from wagtail.wagtailadmin import messages -from wagtail.contrib.wagtailsearchpicks import forms +from wagtail.contrib.wagtailsearchpromotions import forms @vary_on_headers('X-Requested-With') diff --git a/wagtail/contrib/wagtailsearchpicks/wagtail_hooks.py b/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py similarity index 92% rename from wagtail/contrib/wagtailsearchpicks/wagtail_hooks.py rename to wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py index d0f3e6faee..3d074feaa3 100644 --- a/wagtail/contrib/wagtailsearchpicks/wagtail_hooks.py +++ b/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py @@ -3,7 +3,7 @@ from django.conf.urls import include, url from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailcore import hooks -from wagtail.contrib.wagtailsearchpicks import admin_urls +from wagtail.contrib.wagtailsearchpromotions import admin_urls from wagtail.wagtailadmin.menu import MenuItem diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index 93971c8478..1423b20396 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -94,7 +94,7 @@ INSTALLED_APPS = ( 'wagtail.contrib.wagtailroutablepage', 'wagtail.contrib.wagtailfrontendcache', 'wagtail.contrib.wagtailapi', - 'wagtail.contrib.wagtailsearchpicks', + 'wagtail.contrib.wagtailsearchpromotions', 'wagtail.wagtailforms', 'wagtail.wagtailsearch', 'wagtail.wagtailembeds',