Merge branch 'develop' into feature/fix-nested-metadata

languages.yaml

@@ -311,7 +311,7 @@ en:
     HOME_REDIRECT_INCLUDE_LANGUAGE: Home redirect include language
     HOME_REDIRECT_INCLUDE_LANGUAGE_HELP : "Include language in home redirect (/en)"
     HOME_REDIRECT_INCLUDE_ROUTE: Home redirect include route
-    HOME_REDIRECT_INCLUDE_ROUTE: "Include route in home redirect (/blog)"
+    HOME_REDIRECT_INCLUDE_ROUTE_HELP: "Include route in home redirect (/blog)"
     HTTP_HEADERS: HTTP Headers
     EXPIRES: Expires
     EXPIRES_HELP: "Sets the expires header. The value is in seconds."
@@ -424,6 +424,14 @@ en:
     DEFAULT_DATE_FORMAT: Page date format
     DEFAULT_DATE_FORMAT_HELP: Page date format used by Grav. By default, Grav attempts to guess your date format, however you can specifiy a format using PHP's date syntax (e.g.: Y-m-d H:i)
     DEFAULT_DATE_FORMAT_PLACEHOLDER: Guess automatically if blank
+    IGNORE_FILES: Ignore files
+    IGNORE_FILES_HELP: Files to ignore when processing pages
+    IGNORE_FOLDERS: Ignore folders
+    IGNORE_FOLDERS_HELP: Folders to ignore when processing pages
+    HTTP_ACCEPT_LANGUAGE: Set language from browser
+    HTTP_ACCEPT_LANGUAGE_HELP: You can opt to try to set the language based on `http_accept_language` header tag in the browser
+    OVERRIDE_LOCALE: Override locale
+    OVERRIDE_LOCALE_HELP: Override the locale setting in PHP based on the current language
 es:
   PLUGIN_ADMIN:
     ADMIN_BETA_MSG: ¡Está es una versión Beta! Utilízala bajo tu propio riesgo...

themes/grav/js/admin-all.js

@@ -18,6 +18,8 @@ var bytesToSize = function(bytes) {
     return Math.round(bytes / Math.pow(1024, i), 2) + ' ' + sizes[i];
 };
 
+var isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+
 $(function () {
     jQuery.substitute = function(str, sub) {
         return str.replace(/\{(.+?)\}/g, function($0, $1) {
@@ -71,7 +73,8 @@ $(function () {
           startAngle: 0,
           total: 100,
           showLabel: false,
-          height: 150
+          height: 150,
+          chartPadding: !isFirefox ? 5 : 10
         };
 
         UpdatesChart = Chartist.Pie('.updates-chart .ct-chart', data, options);
@@ -436,10 +439,13 @@ $(function () {
             template = el.find('[data-collection-template="new"]').html();
 
         // make sortable
-        new Sortable(holder[0], { onUpdate: function () {
+        new Sortable(holder[0], {
-            if (isArray)
+            filter: '.form-input-wrapper',
-                reIndex(el);
+            onUpdate: function () {
-        } });
+                if (isArray)
+                    reIndex(el);
+            }
+        });
 
         // hook up delete
         el.on('click', '[data-action="delete"]', function (e) {

themes/grav/js/pages-all.js

@@ -163,8 +163,14 @@ $(function(){
 
 
     $('input[name="folder"]').on('input', function(e){
+        var start = this.selectionStart,
+            end = this.selectionEnd;
+
         value = $(this).val().toLowerCase().replace(/\s/g, '-').replace(/[^a-z0-9_\-]/g, '');
         $(this).val(value);
+
+        // restore cursor position
+        this.setSelectionRange(start, end);
     });
 
     childrenToggles.on('click', function () {

themes/grav/templates/dashboard.html.twig

@@ -52,7 +52,8 @@
                                   startAngle: 0,
                                   total: 100,
                                   showLabel: false,
-                                  height: 150
+                                  height: 150,
+                                  chartPadding: !isFirefox ? 5 : 10
                                 };
                                 Chartist.Pie('.backups-chart .ct-chart', data, options);
                             </script>
@@ -80,7 +81,7 @@
                     };
                     var options = {
                         height: 164,
-                        chartPadding:5,
+                        chartPadding: !isFirefox ? 5 : 25,
 
                         axisX: {
                             showGrid: false,

themes/grav/templates/partials/plugins-list.html.twig

@@ -23,7 +23,7 @@
                 <span class="gpm-version">v{{ plugin.version }}</span>
             </td>
             <td class="gpm-actions">
-                {% if (not installing and plugin.form.fields.enabled and (plugin.form.fields.enabled.type != 'hidden')) %}
+                {% if (not installing and (plugin.form.fields.enabled.type != 'hidden')) %}
                     <a class="{{ data.get('enabled') ? 'enabled' : 'disabled' }}" href="{{ base_url_relative }}/plugins/{{ slug }}/task{{ config.system.param_sep }}{{ data.get('enabled') ? 'disable' : 'enable' }}">
                         <i class="fa fa-fw fa-toggle-{{ data.get('enabled') ? 'on' : 'off' }}"></i>
                     </a>