Merge branch 'master' of https://github.com/Laravel-Backpack/CRUD

Author: tabacitu

src/resources/views-elfinder/ckeditor4.php

@@ -22,6 +22,7 @@
         <!-- elFinder translation (OPTIONAL) -->
         <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script>
     <?php
+
 } ?>
 
     <!-- elFinder initialization (REQUIRED) -->
@@ -44,6 +45,7 @@ function getUrlParam(paramName) {
     ?>
                     lang: '<?= $locale ?>', // locale
                 <?php
+
 } ?>
                 customData: {
                     _token: '<?= csrf_token() ?>'

src/resources/views-elfinder/filepicker.php

@@ -22,6 +22,7 @@
         <!-- elFinder translation (OPTIONAL) -->
         <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script>
     <?php
+
 } ?>
     <!-- Include jQuery, jQuery UI, elFinder (REQUIRED) -->
 
@@ -40,6 +41,7 @@
         ?>
                     lang: '<?= $locale ?>', // locale
                 <?php
+
     } ?>
                 customData: {
                     _token: '<?= csrf_token() ?>'

src/resources/views-elfinder/standalonepopup.php

@@ -10,31 +10,34 @@
     <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
 
     <!-- elFinder CSS (REQUIRED) -->
-    <link rel="stylesheet" type="text/css" href="<?= asset($dir . '/css/elfinder.min.css') ?>">
-    <!-- <link rel="stylesheet" type="text/css" href="<?= asset($dir . '/css/theme.css') ?>"> -->
+    <link rel="stylesheet" type="text/css" href="<?= asset($dir.'/css/elfinder.min.css') ?>">
+    <!-- <link rel="stylesheet" type="text/css" href="<?= asset($dir.'/css/theme.css') ?>"> -->
     <link rel="stylesheet" type="text/css" href="<?= asset('vendor/backpack/elfinder/elfinder.backpack.theme.css') ?>">
 
     <!-- elFinder JS (REQUIRED) -->
-    <script src="<?= asset($dir . '/js/elfinder.min.js') ?>"></script>
+    <script src="<?= asset($dir.'/js/elfinder.min.js') ?>"></script>
 
-    <?php if ($locale)
-    { ?>
+    <?php if ($locale) {
+    ?>
         <!-- elFinder translation (OPTIONAL) -->
-        <script src="<?= asset($dir . "/js/i18n/elfinder.$locale.js") ?>"></script>
-    <?php } ?>
+        <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script>
+    <?php 
+} ?>
     <!-- Include jQuery, jQuery UI, elFinder (REQUIRED) -->
 
     <script type="text/javascript">
         $().ready(function () {
             var elf = $('#elfinder').elfinder({
                 // set your elFinder options here
-                <?php if($locale){ ?>
+                <?php if ($locale) {
+    ?>
                     lang: '<?= $locale ?>', // locale
-                <?php } ?>
+                <?php 
+} ?>
                 customData: {
                     _token: '<?= csrf_token() ?>'
                 },
-                url: '<?= route("elfinder.connector") ?>',  // connector URL
+                url: '<?= route('elfinder.connector') ?>',  // connector URL
                 dialog: {width: 900, modal: true, title: 'Select a file'},
                 resizable: false,
                 commandsOptions: {

src/resources/views-elfinder/tinymce.php

@@ -26,6 +26,7 @@
         <!-- elFinder translation (OPTIONAL) -->
         <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script>
     <?php
+
 } ?>
 
 
@@ -67,6 +68,7 @@
     ?>
                     lang: '<?= $locale ?>', // locale
                 <?php
+
 } ?>
                 customData: {
                     _token: '<?= csrf_token() ?>'

src/resources/views-elfinder/tinymce4.php

@@ -22,6 +22,7 @@
         <!-- elFinder translation (OPTIONAL) -->
         <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script>
     <?php
+
 } ?>
 
     <!-- elFinder initialization (REQUIRED) -->
@@ -47,6 +48,7 @@
     ?>
                     lang: '<?= $locale ?>', // locale
                 <?php
+
 } ?>
                 customData: {
                     _token: '<?= csrf_token() ?>'