Merge branch '4.13' into 4

client/src/legacy/SilverStripeNavigator.js

@@ -1,29 +1,69 @@
-import $ from 'jquery';
+(function() {
+  function windowName(suffix) {
+    const base = document.getElementsByTagName('base')[0].href.replace('http://','').replace(/\//g,'_').replace(/\./g,'_');
+    return base + suffix;
+  }
 
-function windowName(suffix) {
-	var base = document.getElementsByTagName('base')[0].href.replace('http://','').replace(/\//g,'_').replace(/\./g,'_');
-	return base + suffix;
-}
+  function displayHide(elem) {
+    const displayComputed = getComputedStyle(elem).display;
+    elem.style.display = 'none';
+    elem.dataset.__toggle_display = displayComputed;
+  }
 
+  function displayShow(elem) {
+    elem.style.display = elem.dataset.__toggle_display ? elem.dataset.__toggle_display : 'block';
+  }
 
-$(document).ready(function() {
-	$('#switchView a.newWindow').on('click', function(e) {
-		var w = window.open(this.href, windowName(this.target));
-		w.focus();
-		return false;
-	});
+  function displayToggle(elem) {
+    const displayComputed = getComputedStyle(elem).display;
+    if (displayComputed !== 'none') {
+      displayHide(elem);
+    } else {
+      displayShow(elem);
+    }
+  }
 
-	$('#SilverStripeNavigatorLink').on('click', function(e) {
-		$('#SilverStripeNavigatorLinkPopup').toggle();
-		return false;
-	});
-
-	$('#SilverStripeNavigatorLinkPopup a.close').on('click', function(e) {
-		$('#SilverStripeNavigatorLinkPopup').hide();
-		return false;
-	});
-
-	$('#SilverStripeNavigatorLinkPopup input').on('focus',function(e) {
-		this.select();
-	});
-});
+  const newWindowLinks = document.querySelectorAll('#switchView a.newWindow');
+  if (newWindowLinks.length > 0) {
+    for (const link of newWindowLinks.values()) {
+      link.addEventListener('click', function(e) {
+        e.preventDefault();
+        const w = window.open(link.href, windowName(link.target));
+        w.focus();
+        return false;
+      });
+    }
+  }
+
+  const popup = document.getElementById('SilverStripeNavigatorLinkPopup');
+  if (popup) {
+    const navigatorLink = document.getElementById('SilverStripeNavigatorLink');
+    if (navigatorLink) {
+      navigatorLink.addEventListener('click', function(e) {
+        e.preventDefault();
+        displayToggle(popup);
+        return false;
+      });
+    }
+
+    const closeLinks = popup.querySelectorAll('a.close');
+    if (closeLinks.length > 0) {
+      for (const link of closeLinks.values()) {
+        link.addEventListener('click', function(e) {
+          e.preventDefault();
+          displayHide(popup);
+          return false;
+        });
+      }
+    }
+
+    const inputs = popup.querySelectorAll('input');
+    if (inputs.length > 0) {
+      for (const input of inputs.values()) {
+        input.addEventListener('focus', function(e) {
+          input.select();
+        });
+      }
+    }
+  }
+})();

code/Controllers/ContentController.php

@@ -352,7 +352,6 @@ public function SilverStripeNavigator()
         if (Director::isDev() || Permission::check('CMS_ACCESS_CMSMain') || Permission::check('VIEW_DRAFT_CONTENT')) {
             if ($this->dataRecord) {
                 Requirements::css('silverstripe/cms: client/dist/styles/SilverStripeNavigator.css');
-                Requirements::javascript('silverstripe/admin: thirdparty/jquery/jquery.js');
                 Requirements::javascript('silverstripe/cms: client/dist/js/SilverStripeNavigator.js');
 
                 $return = $nav = SilverStripeNavigator::get_for_record($this->dataRecord);

lang/eo.yml

@@ -271,6 +271,7 @@ eo:
     many_many_BackLinkTracking: 'Spuri retroligilojn'
     many_many_ImageTracking: 'Spuri Bildojn'
     many_many_LinkTracking: 'Spuri Ligilojn'
+    InvalidExtraMeta: 'Propraj meta-etikedoj ne enhavas validan HTML'
   SilverStripe\CMS\Model\SiteTreeFileExtension:
     TITLE_INDEX: '#'
     TITLE_TYPE: Tipo

lang/nl.yml

@@ -81,7 +81,7 @@ nl:
     COMPAREMODE: 'Vergelijken (selecteer 2)'
     COMPARINGVERSION: 'U vergelijkt versie {version1} en {version2}.'
     MENUTITLE: Geschiedenis
-    MULTISELECT: 'Meervoudige acties'
+    MULTISELECT: 'Bulk acties'
     NOTPUBLISHED: 'Niet gepubliceerd'
     NO_PREVIEW: 'Geen voorbeeld beschikbaar'
     PUBLISHER: 'Gepubliceerd door'
@@ -270,6 +270,7 @@ nl:
     many_many_BackLinkTracking: 'Backlinks traceren'
     many_many_ImageTracking: 'Afbeeldingen traceren'
     many_many_LinkTracking: 'Links traceren'
+    InvalidExtraMeta: 'De HTML bij Andere meta-tags is incorrect'
   SilverStripe\CMS\Model\SiteTreeFileExtension:
     TITLE_INDEX: '#'
     TITLE_TYPE: Type