From fa56b51c29d98068bb0860a2e77f6853f1e0b784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frivalszky=20P=C3=A9ter?= <freevo@gmail.com>
Date: Sun, 18 Mar 2018 18:31:48 +0100
Subject: [PATCH 1/5] Change count filter to length (#1391)

This fixes a bug: there's not twig filter named count, just one that's called length.
---
 themes/grav/templates/forms/fields/list/list.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/grav/templates/forms/fields/list/list.html.twig b/themes/grav/templates/forms/fields/list/list.html.twig
index 7b9079e6..d228219e 100644
--- a/themes/grav/templates/forms/fields/list/list.html.twig
+++ b/themes/grav/templates/forms/fields/list/list.html.twig
@@ -63,7 +63,7 @@
                     data-collection-nosort
                 {% endif %}>
                 {% if field.fields %}
-                {% set collapsible = field.fields|count > 1 and (field.collapsible is not defined or field.collapsible)  %}
+                {% set collapsible = field.fields|length > 1 and (field.collapsible is not defined or field.collapsible)  %}
                 {% for key, val in value %}
                     {% set itemName = name ? name ~ '.' ~ key : key %}
                     <li data-collection-item="{{ itemName }}" data-collection-key="{{ key }}" class="{{ not collapsible or field.collapsed ? 'collection-collapsed' : '' }}">

From a21f1c110e8eb1bdf303d3fae70f4b651abcdca8 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Alleaume <jbanety@gmail.com>
Date: Sun, 18 Mar 2018 18:32:15 +0100
Subject: [PATCH 2/5] Make "add_modals" button labels translatable (#1388)

---
 themes/grav/templates/pages.html.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index 395e47d9..6f112f4e 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -122,7 +122,7 @@
 
             {% for key, add_modal in config.plugins.admin.add_modals %}
                 {% if add_modal.show_in|defined('bar') == 'bar' %}
-                    <a class="button {{ add_modal.link_classes }}" href="#modal-add_modal-{{ key }}" data-remodal-target="modal-add_modal-{{ key }}"><i class="fa fa-plus"></i> {{ add_modal.label }}</a>
+                    <a class="button {{ add_modal.link_classes }}" href="#modal-add_modal-{{ key }}" data-remodal-target="modal-add_modal-{{ key }}"><i class="fa fa-plus"></i> {{ add_modal.label|tu }}</a>
                 {% endif %}
             {% endfor %}
 
@@ -141,7 +141,7 @@
                     {% endif %}
                     {% for key, add_modal in config.plugins.admin.add_modals %}
                         {% if add_modal.show_in|defined('bar') == 'dropdown' %}
-                            <li><a class="button {{ add_modal.link_classes }}" href="#modal-add_modal-{{ key }}" data-remodal-target="modal-add_modal-{{ key }}">{{ add_modal.label }}</a></li>
+                            <li><a class="button {{ add_modal.link_classes }}" href="#modal-add_modal-{{ key }}" data-remodal-target="modal-add_modal-{{ key }}">{{ add_modal.label|tu }}</a></li>
                         {% endif %}
                     {% endfor %}
                 </ul>

From ca4d1ca55c95b48bb094ce03e3b39dd75ac0c6f3 Mon Sep 17 00:00:00 2001
From: Flamenco <Flamenco@users.noreply.github.com>
Date: Sun, 18 Mar 2018 13:33:09 -0400
Subject: [PATCH 3/5] Check for absence of shift key in the save shortcut
 (#1383)

---
 themes/grav/app/forms/form.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/themes/grav/app/forms/form.js b/themes/grav/app/forms/form.js
index 81d1d5ea..17e9c963 100644
--- a/themes/grav/app/forms/form.js
+++ b/themes/grav/app/forms/form.js
@@ -37,8 +37,10 @@ export default class Form {
             $(global).on('keydown', function(event) {
                 var key = String.fromCharCode(event.which).toLowerCase();
                 if (((event.ctrlKey && !event.altKey) || event.metaKey) && key === 's') {
-                    event.preventDefault();
-                    saveTask.click();
+                    if (!event.shiftKey) {
+                        event.preventDefault();
+                        saveTask.click();
+                    }
                 }
             });
         }

From 343a4954efa6b4b8d984faed68a609e02933280c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Szab=C3=B3?= <david.szabo97@gmail.com>
Date: Sun, 18 Mar 2018 13:37:55 -0400
Subject: [PATCH 4/5] Fix permissions collapsing when editing a user (#1379)

The text field which shows the permission's name is capped at a specific width which prevents it from taking the remaining width.
This small change makes sure the floating elements are cleared.
---
 themes/grav/scss/preset.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/themes/grav/scss/preset.scss b/themes/grav/scss/preset.scss
index c9268b94..c8f6c421 100644
--- a/themes/grav/scss/preset.scss
+++ b/themes/grav/scss/preset.scss
@@ -1566,5 +1566,9 @@ body .bootstrap-datetimepicker-widget {
     }
 }
 
+.permission-container {
+    overflow: hidden;
+}
+
 // Range-field
 @import "template/modules/input-range";

From 7d1313a60fa1fea5dd39c995ebd4598996daf3a8 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 18 Mar 2018 21:18:52 -0600
Subject: [PATCH 5/5] optimization to stop admin from looking for pages in
 disabled plugins

---
 admin.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/admin.php b/admin.php
index 5c86bc2f..46abcbcc 100644
--- a/admin.php
+++ b/admin.php
@@ -421,6 +421,10 @@ class AdminPlugin extends Plugin
             $locator = $this->grav['locator'];
 
             foreach ($plugins as $plugin) {
+                if ($this->config->get("plugins.{$plugin->name}.enabled") !== true) {
+                    continue;
+                }
+
                 $path = $locator->findResource("user://plugins/{$plugin->name}/admin/pages/{$self->template}.md");
 
                 if ($path) {