Merge branch 'BookStackApp:development' into basic-pwa-support

[bookstack] / resources / views / layouts / base.blade.php
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php

index 4a0422dcd1af2cc73278eb38919ebf43352f5d3f..69a7e148efa88df4cf3cab299b7ca7d087720a75 100644 (file)
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -1,6 +1,6 @@
  <!DOCTYPE html>
-<html lang="{{ config('app.lang') }}"
-      dir="{{ config('app.rtl') ? 'rtl' : 'ltr' }}"
+<html lang="{{ isset($locale) ? $locale->htmlLang() : config('app.default_locale') }}"
+      dir="{{ isset($locale) ? $locale->htmlDirection() : 'auto' }}"
        class="{{ setting()->getForCurrentUser('dark-mode-enabled') ? 'dark-mode ' : '' }}">
  <head>
      <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name') }}</title>
@@ -69,7 +69,9 @@
      </div>
  
      @yield('bottom')
-    <script src="{{ versioned_asset('dist/app.js') }}" nonce="{{ $cspNonce }}"></script>
+    @if($cspNonce ?? false)
+        <script src="{{ versioned_asset('dist/app.js') }}" nonce="{{ $cspNonce }}"></script>
+    @endif
      @yield('scripts')
  
      @include('layouts.parts.base-body-end')