diff --git a/CHANGELOG.md b/CHANGELOG.md index 02e63a11..6a6c27bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ 1. [](#improved) * Admin form fields improvements for `selectize` and `editor` field [#1083](https://github.com/getgrav/grav-plugin-admin/pull/1083) + * `base.html.twig` now extends `base-root.html.twig` 1. [](#bugfix) * Fixed issue with tab widths on Pages overlapping non-english toggle switch [#1089](https://github.com/getgrav/grav-plugin-admin/issues/1089) * Added `vendor` to ignores for direct install of Grav @@ -43,7 +44,7 @@ 1. [](#bugfix) * Fixed issue with parent not working with custom slug [#1068](https://github.com/getgrav/grav-plugin-admin/issues/1068) * Fixed issue with new page modal not remembering last choice [#1072](https://github.com/getgrav/grav-plugin-admin/issues/1072) - + # v1.3.3 ## 04/12/2017 diff --git a/themes/grav/templates/partials/base-root.html.twig b/themes/grav/templates/partials/base-root.html.twig new file mode 100644 index 00000000..b4b9f179 --- /dev/null +++ b/themes/grav/templates/partials/base-root.html.twig @@ -0,0 +1,104 @@ +{% if uri.extension() == 'json' %}{% include 'default.json.twig' %}{% else %} + + + + {% block head %} + + {% if title %}{{ title }} | {% else %}{% if header.title %}{{ header.title }} | {% endif %}{% endif %}{{ site.title }} + {% if header.description %} + + {% else %} + + {% endif %} + {% if header.robots %} + + {% else %} + + {% endif %} + + + + {% 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 %} + + {% block body %} + + {% block page %} +
+ + {% block navigation %} + {% include 'partials/nav.html.twig' %} + {% endblock %} + +
+ {% include 'partials/nav-toggle.html.twig' %} +
+ {% block titlebar %}{% endblock %} +
+ +
+
+ {% block messages %} + {% include 'partials/messages.html.twig' %} + {% endblock %} + + {% block widgets %}{% endblock %} +
+ {% block content_top %}{% endblock %} +
+ {%- block content %}{% endblock -%} +
+ {% if config.plugins.admin.show_github_msg %} +
{{ 'PLUGIN_ADMIN.ADMIN_REPORT_ISSUE'|tu }}
+ {% endif %} + {% block content_bottom %}{% endblock %} +
+ {% block footer %} +
+ Grav v{{ constant('GRAV_VERSION') }} - Admin v{{ admin_version }} - {{ "PLUGIN_ADMIN.WAS_MADE_WITH"|tu|lower }} {{ "PLUGIN_ADMIN.BY"|tu|lower }} RocketTheme. +
+ {% endblock %} +
+
+ +
+
+

{{ "PLUGIN_ADMIN.ERROR"|tu }}

+
+
+ {{ "PLUGIN_ADMIN.CLOSE"|tu }} +
+
+
+
+
+

{{ "PLUGIN_ADMIN.MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE"|tu }}

+

+ {{ "PLUGIN_ADMIN.MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_DESC"|tu }} +

+
+
+ + +
+
+
+ +
+
+
+ {% endblock page %} + {% block bottom %}{% endblock %} + + {% endblock body %} + +{% endif %} diff --git a/themes/grav/templates/partials/base.html.twig b/themes/grav/templates/partials/base.html.twig index d46e2361..4b40cd59 100644 --- a/themes/grav/templates/partials/base.html.twig +++ b/themes/grav/templates/partials/base.html.twig @@ -1,102 +1 @@ -{% if uri.extension() == 'json' %}{% include 'default.json.twig' %}{% else %} - - - - {% block head %} - - {% if title %}{{ title }} | {% else %}{% if header.title %}{{ header.title }} | {% endif %}{% endif %}{{ site.title }} - {% if header.description %} - - {% else %} - - {% endif %} - {% if header.robots %} - - {% else %} - - {% endif %} - - - - {% 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 %} - - {% block body %} - - {% block page %} -
- - {% block navigation %} - {% include 'partials/nav.html.twig' %} - {% endblock %} - -
- {% include 'partials/nav-toggle.html.twig' %} -
- {% block titlebar %}{% endblock %} -
- -
-
- {% block messages %} - {% include 'partials/messages.html.twig' %} - {% endblock %} - - {% block widgets %}{% endblock %} -
- {% block content_top %}{% endblock %} -
- {%- block content %}{% endblock -%} -
- {% if config.plugins.admin.show_github_msg %} -
{{ 'PLUGIN_ADMIN.ADMIN_REPORT_ISSUE'|tu }}
- {% endif %} - {% block content_bottom %}{% endblock %} -
-
- Grav v{{ constant('GRAV_VERSION') }} - Admin v{{ admin_version }} - {{ "PLUGIN_ADMIN.WAS_MADE_WITH"|tu|lower }} {{ "PLUGIN_ADMIN.BY"|tu|lower }} RocketTheme. -
-
-
- -
-
-

{{ "PLUGIN_ADMIN.ERROR"|tu }}

-
-
- {{ "PLUGIN_ADMIN.CLOSE"|tu }} -
-
-
-
-
-

{{ "PLUGIN_ADMIN.MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE"|tu }}

-

- {{ "PLUGIN_ADMIN.MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_DESC"|tu }} -

-
-
- - -
-
-
- -
-
-
- {% endblock page %} - {% block bottom %}{% endblock %} - - {% endblock body %} - -{% endif %} +{% extends 'partials/base-root.html.twig' %}