From d3efa4226ab826abc1bb3773d1fd59dc60881375 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 26 Aug 2016 14:32:11 -0600
Subject: [PATCH] unified JSON twig templates

---
 pages/admin/ajax.md                           |   1 +
 pages/admin/backup.md                         |   2 +-
 pages/admin/cache.md                          |   1 +
 pages/admin/media.md                          |   1 +
 pages/admin/notifications.md                  |   1 +
 pages/admin/pages-filter.md                   |   1 +
 pages/admin/update.md                         |   1 +
 themes/grav/templates/cache.json.twig         |   5 -
 .../{ajax.json.twig => default.json.twig}     |   0
 themes/grav/templates/media.json.twig         |   5 -
 themes/grav/templates/notifications.json.twig |   5 -
 themes/grav/templates/pages-filter.json.twig  |   5 -
 themes/grav/templates/partials/base.html.twig | 140 +++++++++---------
 themes/grav/templates/plugins.json.twig       |   5 -
 themes/grav/templates/themes.json.twig        |   5 -
 themes/grav/templates/update.json.twig        |   5 -
 16 files changed, 78 insertions(+), 105 deletions(-)
 delete mode 100644 themes/grav/templates/cache.json.twig
 rename themes/grav/templates/{ajax.json.twig => default.json.twig} (100%)
 delete mode 100644 themes/grav/templates/media.json.twig
 delete mode 100644 themes/grav/templates/notifications.json.twig
 delete mode 100644 themes/grav/templates/pages-filter.json.twig
 delete mode 100644 themes/grav/templates/plugins.json.twig
 delete mode 100644 themes/grav/templates/themes.json.twig
 delete mode 100644 themes/grav/templates/update.json.twig

diff --git a/pages/admin/ajax.md b/pages/admin/ajax.md
index ef8b0fd0..0692fd8c 100644
--- a/pages/admin/ajax.md
+++ b/pages/admin/ajax.md
@@ -1,5 +1,6 @@
 ---
 title: Generic Ajax
+template: default
 
 access:
     admin.login: true
diff --git a/pages/admin/backup.md b/pages/admin/backup.md
index 37a26a4e..0e092d7a 100644
--- a/pages/admin/backup.md
+++ b/pages/admin/backup.md
@@ -1,6 +1,6 @@
 ---
 title: Backup
-template: ajax
+template: default
 
 access:
     admin.maintenance: true
diff --git a/pages/admin/cache.md b/pages/admin/cache.md
index fc2ca498..af7f42bd 100644
--- a/pages/admin/cache.md
+++ b/pages/admin/cache.md
@@ -1,5 +1,6 @@
 ---
 title: Cache
+template: default
 
 access:
     admin.cache: true
diff --git a/pages/admin/media.md b/pages/admin/media.md
index c0e358b8..e3c11183 100644
--- a/pages/admin/media.md
+++ b/pages/admin/media.md
@@ -1,5 +1,6 @@
 ---
 title: Media
+template: default
 
 access:
     admin.pages: true
diff --git a/pages/admin/notifications.md b/pages/admin/notifications.md
index ce1f6f41..df8aff43 100644
--- a/pages/admin/notifications.md
+++ b/pages/admin/notifications.md
@@ -1,5 +1,6 @@
 ---
 title: Notifications
+template: default
 
 access:
     admin.login: true
diff --git a/pages/admin/pages-filter.md b/pages/admin/pages-filter.md
index 7a7463e1..f196f0df 100644
--- a/pages/admin/pages-filter.md
+++ b/pages/admin/pages-filter.md
@@ -1,5 +1,6 @@
 ---
 title: Pages Filter
+template: default
 
 access:
     admin.pages: true
diff --git a/pages/admin/update.md b/pages/admin/update.md
index b5437c46..caad79ba 100644
--- a/pages/admin/update.md
+++ b/pages/admin/update.md
@@ -1,5 +1,6 @@
 ---
 title: Cache
+template: default
 
 access:
     admin.maintenance: true
diff --git a/themes/grav/templates/cache.json.twig b/themes/grav/templates/cache.json.twig
deleted file mode 100644
index b98dabca..00000000
--- a/themes/grav/templates/cache.json.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% if admin.json_response %}
-{{ admin.json_response|json_encode|raw }}
-{% else %}
-{}
-{% endif %}
diff --git a/themes/grav/templates/ajax.json.twig b/themes/grav/templates/default.json.twig
similarity index 100%
rename from themes/grav/templates/ajax.json.twig
rename to themes/grav/templates/default.json.twig
diff --git a/themes/grav/templates/media.json.twig b/themes/grav/templates/media.json.twig
deleted file mode 100644
index b98dabca..00000000
--- a/themes/grav/templates/media.json.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% if admin.json_response %}
-{{ admin.json_response|json_encode|raw }}
-{% else %}
-{}
-{% endif %}
diff --git a/themes/grav/templates/notifications.json.twig b/themes/grav/templates/notifications.json.twig
deleted file mode 100644
index 3572f752..00000000
--- a/themes/grav/templates/notifications.json.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% if admin.json_response %}
-{{ admin.json_response|json_encode|raw }}
-{% else %}
-[]
-{% endif %}
diff --git a/themes/grav/templates/pages-filter.json.twig b/themes/grav/templates/pages-filter.json.twig
deleted file mode 100644
index b98dabca..00000000
--- a/themes/grav/templates/pages-filter.json.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% if admin.json_response %}
-{{ admin.json_response|json_encode|raw }}
-{% else %}
-{}
-{% endif %}
diff --git a/themes/grav/templates/partials/base.html.twig b/themes/grav/templates/partials/base.html.twig
index a606dd18..6b072465 100644
--- a/themes/grav/templates/partials/base.html.twig
+++ b/themes/grav/templates/partials/base.html.twig
@@ -1,76 +1,78 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-{% block head %}
-    <meta charset="utf-8" />
-    <title>{% if title %}{{ title }} | {% else %}{% if header.title %}{{ header.title }} | {% endif %}{% endif %}{{ site.title }}</title>
-    {% if header.description %}
-        <meta name="description" content="{{ header.description }}">
-    {% else %}
-        <meta name="description" content="{{ site.description }}">
-    {% endif %}
-    {% if header.robots %}
-        <meta name="robots" content="{{ header.robots }}">
-    {% else %}
-        <meta name="robots" content="noindex, nofollow">
-    {% endif %}
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="icon" type="image/png" href="{{ base_url_simple }}{{ theme_url }}/images/favicon.png">
+{% if uri.extension() == 'json' %}{% include 'default.json.twig' %}{% else %}
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+    {% block head %}
+        <meta charset="utf-8" />
+        <title>{% if title %}{{ title }} | {% else %}{% if header.title %}{{ header.title }} | {% endif %}{% endif %}{{ site.title }}</title>
+        {% if header.description %}
+            <meta name="description" content="{{ header.description }}">
+        {% else %}
+            <meta name="description" content="{{ site.description }}">
+        {% endif %}
+        {% if header.robots %}
+            <meta name="robots" content="{{ header.robots }}">
+        {% else %}
+            <meta name="robots" content="noindex, nofollow">
+        {% endif %}
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <link rel="icon" type="image/png" href="{{ base_url_simple }}{{ theme_url }}/images/favicon.png">
 
-    {% block stylesheets %}
-        {% include 'partials/stylesheets.html.twig' %}
-        {{ assets.css()|raw }}
-    {% endblock %}
-
-    {% include 'partials/javascript-config.html.twig' %}
-    {% block javascripts %}
-        {% include 'partials/javascripts.html.twig' %}
-        {{ assets.js()|raw }}
-    {% endblock %}
-{% endblock %}
-</head>
-{% block body %}
-<body class="{{ config.plugins.admin.sidebar.size == 'small' ? 'sidebar-closed' : '' }} {{ config.plugins.admin.body_classes }}">
-    {% block page %}
-    <div class="remodal-bg">
-
-        {% block navigation %}
-            {% include 'partials/nav.html.twig' %}
+        {% block stylesheets %}
+            {% include 'partials/stylesheets.html.twig' %}
+            {{ assets.css()|raw }}
         {% endblock %}
 
-        <main id="admin-main" >
-            {% include 'partials/nav-toggle.html.twig' %}
-            <div id="titlebar" class="titlebar">
-                {% block titlebar %}{% endblock %}
-            </div>
+        {% include 'partials/javascript-config.html.twig' %}
+        {% block javascripts %}
+            {% include 'partials/javascripts.html.twig' %}
+            {{ assets.js()|raw }}
+        {% endblock %}
+    {% endblock %}
+    </head>
+    {% block body %}
+    <body class="{{ config.plugins.admin.sidebar.size == 'small' ? 'sidebar-closed' : '' }} {{ config.plugins.admin.body_classes }}">
+        {% block page %}
+        <div class="remodal-bg">
 
-            <div class="content-wrapper">
-                <div class="content-padding">
-                    {% block messages %}
-                        {% include 'partials/messages.html.twig' %}
-                    {% endblock %}
+            {% block navigation %}
+                {% include 'partials/nav.html.twig' %}
+            {% endblock %}
 
-                    {% block widgets %}{% endblock %}
-                    <div class="default-box-shadow">
-                        {% block content_top %}{% endblock %}
-                        <div class="admin-block">
-                            {%- block content %}{% endblock -%}
-                        </div>
-                        {% if config.plugins.admin.show_github_msg %}
-                        <div class="notice alert"><i class="fa fa-github"></i> <a href="https://github.com/getgrav/grav-plugin-admin/issues" target="_blank">{{ 'PLUGIN_ADMIN.ADMIN_REPORT_ISSUE'|tu }}</a></div>
-                        {% endif %}
-                        {% block content_bottom %}{% endblock %}
-                    </div>
-                     <footer id="footer">
-                         <a href="http://getgrav.org">Grav</a> v<span class="grav-version">{{ constant('GRAV_VERSION') }}</span> - Admin v{{ admin_version }} - {{ "PLUGIN_ADMIN.WAS_MADE_WITH"|tu|lower }} <i class="fa fa-heart"></i> {{ "PLUGIN_ADMIN.BY"|tu|lower }} <a href="http://www.rockettheme.com">RocketTheme</a>.
-                    </footer>
+            <main id="admin-main" >
+                {% include 'partials/nav-toggle.html.twig' %}
+                <div id="titlebar" class="titlebar">
+                    {% block titlebar %}{% endblock %}
                 </div>
-            </div>
 
-        </main>
-        <div id='overlay'></div>
-    </div>
-    {% endblock page %}
-</body>
-{% endblock body %}
-</html>
+                <div class="content-wrapper">
+                    <div class="content-padding">
+                        {% block messages %}
+                            {% include 'partials/messages.html.twig' %}
+                        {% endblock %}
+
+                        {% block widgets %}{% endblock %}
+                        <div class="default-box-shadow">
+                            {% block content_top %}{% endblock %}
+                            <div class="admin-block">
+                                {%- block content %}{% endblock -%}
+                            </div>
+                            {% if config.plugins.admin.show_github_msg %}
+                            <div class="notice alert"><i class="fa fa-github"></i> <a href="https://github.com/getgrav/grav-plugin-admin/issues" target="_blank">{{ 'PLUGIN_ADMIN.ADMIN_REPORT_ISSUE'|tu }}</a></div>
+                            {% endif %}
+                            {% block content_bottom %}{% endblock %}
+                        </div>
+                         <footer id="footer">
+                             <a href="http://getgrav.org">Grav</a> v<span class="grav-version">{{ constant('GRAV_VERSION') }}</span> - Admin v{{ admin_version }} - {{ "PLUGIN_ADMIN.WAS_MADE_WITH"|tu|lower }} <i class="fa fa-heart"></i> {{ "PLUGIN_ADMIN.BY"|tu|lower }} <a href="http://www.rockettheme.com">RocketTheme</a>.
+                        </footer>
+                    </div>
+                </div>
+
+            </main>
+            <div id='overlay'></div>
+        </div>
+        {% endblock page %}
+    </body>
+    {% endblock body %}
+    </html>
+{% endif %}
diff --git a/themes/grav/templates/plugins.json.twig b/themes/grav/templates/plugins.json.twig
deleted file mode 100644
index b98dabca..00000000
--- a/themes/grav/templates/plugins.json.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% if admin.json_response %}
-{{ admin.json_response|json_encode|raw }}
-{% else %}
-{}
-{% endif %}
diff --git a/themes/grav/templates/themes.json.twig b/themes/grav/templates/themes.json.twig
deleted file mode 100644
index b98dabca..00000000
--- a/themes/grav/templates/themes.json.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% if admin.json_response %}
-{{ admin.json_response|json_encode|raw }}
-{% else %}
-{}
-{% endif %}
diff --git a/themes/grav/templates/update.json.twig b/themes/grav/templates/update.json.twig
deleted file mode 100644
index b98dabca..00000000
--- a/themes/grav/templates/update.json.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% if admin.json_response %}
-{{ admin.json_response|json_encode|raw }}
-{% else %}
-{}
-{% endif %}