Merge branch 'master' of github.com:torchbox/wagtail

.tx/config

@@ -60,3 +60,9 @@ file_filter = wagtail/wagtailforms/locale/<lang>/LC_MESSAGES/django.po
 source_file = wagtail/wagtailforms/locale/en/LC_MESSAGES/django.po
 source_lang = en
 type = PO
+
+[wagtail.wagtailsites]
+file_filter = wagtail/wagtailsites/locale/<lang>/LC_MESSAGES/django.po
+source_file = wagtail/wagtailsites/locale/en/LC_MESSAGES/django.po
+source_lang = en
+type = PO

CHANGELOG.txt

@@ -17,6 +17,7 @@ Changelog
  * Fix: 'wagtail start' command now works on Windows
  * Fix: The external image URL generator no longer stores generated images in Django's cache
  * Fix: Elasticsearch backend can now search querysets that have been filtered with an 'in' clause of a non-list type (such as a ValuesListQuerySet)
+ * Fix: It is now easier to move pages to the beginning and end of their section
 
 0.6 (11.09.2014)
 ~~~~~~~~~~~~~~~~

docs/releases/0.7.rst

@@ -39,6 +39,7 @@ Bug fixes
  * The 'wagtail start' command now works on Windows and other environments where the ``django-admin.py`` executable is not readily accessible.
  * The external image URL generator no longer stores generated images in Django's cache; this was an unintentional side-effect of setting cache control headers.
  * The Elasticsearch backend can now search querysets that have been filtered with an 'in' clause of a non-list type (such as a ``ValuesListQuerySet``).
+ * It is now easier to move pages to the beginning and end of their section
 
 
 Upgrade considerations

wagtail/wagtailadmin/static/wagtailadmin/scss/components/main-nav.scss

@@ -328,7 +328,6 @@ body.explorer-open {
         background:$submenu-color;
 
         > a{
-            border-left-color:$color-salmon;
             text-shadow:-1px -1px 0px rgba(0,0,0,0.3);
             
             &:hover{

wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html

@@ -9,12 +9,12 @@
 
         {% include "wagtailadmin/shared/breadcrumb.html" with page=parent_page %}
     </header>
-   
+
     <form id="page-reorder-form">
         {% csrf_token %}
 
         {% page_permissions parent_page as parent_page_perms %}
-        {% include "wagtailadmin/pages/list.html" with sortable=1 allow_navigation=1 full_width=1 parent_page=parent_page orderable=parent_page_perms.can_reorder_children %} 
+        {% include "wagtailadmin/pages/list.html" with sortable=1 allow_navigation=1 full_width=1 parent_page=parent_page orderable=parent_page_perms.can_reorder_children %}
     </form>
 {% endblock %}
 
@@ -30,9 +30,10 @@
                 var orderform = $('#page-reorder-form');
 
                 $('.listing tbody').sortable({
-                    cursor: "move", 
-                    containment: "parent", 
-                    handle: ".handle", 
+                    cursor: "move",
+                    tolerance: "pointer",
+                    containment: "parent",
+                    handle: ".handle",
                     items: "> tr",
                     axis: "y",
                     placeholder: "dropzone",

wagtail/wagtailadmin/views/pages.py

@@ -634,8 +634,13 @@ def set_page_position(request, page_to_move_id):
         # so don't bother to catch InvalidMoveToDescendant
 
         if position_page:
-            # Move page into this position
-            page_to_move.move(position_page, pos='left')
+            # If the page has been moved to the right, insert it to the
+            # right. If left, then left.
+            old_position = list(parent_page.get_children()).index(page_to_move)
+            if int(position) < old_position:
+                page_to_move.move(position_page, pos='left')
+            elif int(position) > old_position:
+                page_to_move.move(position_page, pos='right')
         else:
             # Move page to end
             page_to_move.move(parent_page, pos='last-child')

wagtail/wagtailsites/locale/en/LC_MESSAGES/django.po

@@ -0,0 +1,109 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-03 16:23+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: views.py:31
+msgid "Site '{0}' created."
+msgstr ""
+
+#: views.py:34
+msgid "The site could not be created due to errors."
+msgstr ""
+
+#: views.py:51
+msgid "Site '{0}' updated."
+msgstr ""
+
+#: views.py:54
+msgid "The site could not be saved due to errors."
+msgstr ""
+
+#: views.py:70
+msgid "Site '{0}' deleted."
+msgstr ""
+
+#: wagtail_hooks.py:24 templates/wagtailsites/index.html:3
+#: templates/wagtailsites/index.html:5
+msgid "Sites"
+msgstr ""
+
+#: templates/wagtailsites/confirm_delete.html:3
+#: templates/wagtailsites/confirm_delete.html:7
+#: templates/wagtailsites/edit.html:36
+msgid "Delete site"
+msgstr ""
+
+#: templates/wagtailsites/confirm_delete.html:11
+msgid "Are you sure you want to delete this site?"
+msgstr ""
+
+#: templates/wagtailsites/confirm_delete.html:14
+msgid "Yes, delete"
+msgstr ""
+
+#: templates/wagtailsites/create.html:4 templates/wagtailsites/create.html:9
+msgid "Add site"
+msgstr ""
+
+#: templates/wagtailsites/create.html:20
+msgid "Choose a different root page"
+msgstr ""
+
+#: templates/wagtailsites/create.html:21
+msgid "Choose a root page"
+msgstr ""
+
+#: templates/wagtailsites/create.html:31 templates/wagtailsites/edit.html:34
+msgid "Save"
+msgstr ""
+
+#: templates/wagtailsites/edit.html:4 templates/wagtailsites/edit.html.py:9
+msgid "Editing"
+msgstr ""
+
+#: templates/wagtailsites/edit.html:21
+msgid "Change page"
+msgstr ""
+
+#: templates/wagtailsites/edit.html:22
+msgid "Choose page"
+msgstr ""
+
+#: templates/wagtailsites/index.html:7
+msgid "Add a site"
+msgstr ""
+
+#: templates/wagtailsites/index.html:19
+msgid "Site"
+msgstr ""
+
+#: templates/wagtailsites/index.html:26
+msgid "Port"
+msgstr ""
+
+#: templates/wagtailsites/index.html:27
+msgid "Root page"
+msgstr ""
+
+#: templates/wagtailsites/index.html:28
+msgid "Default?"
+msgstr ""
+
+#: templates/wagtailsites/index.html:41
+msgid "Default"
+msgstr ""