From dab03ac9df2b83665fbbd03f223439a10f8c7289 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 21 Mar 2017 15:35:33 -0600
Subject: [PATCH] Ordering is now working

---
 classes/admincontroller.php           | 18 +++++++++++-------
 themes/grav/templates/pages.html.twig |  8 ++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/classes/admincontroller.php b/classes/admincontroller.php
index 1e5b8786..a0442287 100644
--- a/classes/admincontroller.php
+++ b/classes/admincontroller.php
@@ -514,6 +514,10 @@ class AdminController extends AdminBaseController
                 $obj->order($original_order + 1);
             }
 
+            if (isset($data['order'])) {
+                $reorder = explode(',', $data['order']);
+            }
+
             // add or remove numeric prefix based on ordering value
             if (isset($data['ordering'])) {
                 if ($data['ordering'] && !$obj->order()) {
@@ -1773,13 +1777,13 @@ class AdminController extends AdminBaseController
     {
         $input = (array)$this->data;
 
-        if (isset($input['order'])) {
-            $order    = max(0,
-                ((int)isset($input['order']) && $input['order']) ? $input['order'] : $page->value('order'));
-            $ordering = $order ? sprintf('%02d.', $order) : '';
-            $slug     = empty($input['folder']) ? $page->value('folder') : (string)$input['folder'];
-            $page->folder($ordering . $slug);
-        }
+//        if (isset($input['order'])) {
+//            $order    = max(0,
+//                ((int)isset($input['order']) && $input['order']) ? $input['order'] : $page->value('order'));
+//            $ordering = $order ? sprintf('%02d.', $order) : '';
+//            $slug     = empty($input['folder']) ? $page->value('folder') : (string)$input['folder'];
+//            $page->folder($ordering . $slug);
+//        }
 
         if (isset($input['name']) && !empty($input['name'])) {
             $type = (string)strtolower($input['name']);
diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index 5c01f05b..73566a4a 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -53,11 +53,11 @@
     {% set warn = twig_vars['warn'] %}
     {% set uri = twig_vars['uri'] %}
 
-    {% if '@self' in page.header.content.items and page.header.content.order.by %}
-        {% set pcol = page.children().order(page.header.content.order.by, page.header.content.order.dir) %}
-    {% else %}
+    {#{% if '@self' in page.header.content.items and page.header.content.order.by %}#}
+        {#{% set pcol = page.children().order(page.header.content.order.by, page.header.content.order.dir) %}#}
+    {#{% else %}#}
         {% set pcol = page.children() %}
-    {% endif %}
+    {#{% endif %}#}
 
     {% for p in pcol %}
         {% set description = (not p.page ? "PLUGIN_ADMIN.FOLDER"|tu ~ ' &bull; ' : "PLUGIN_ADMIN.PAGE"|tu ~ ' &bull; ') ~