Started playing with new settings view layout

diff --git a/resources/icons/palette.svg b/resources/icons/palette.svg
new file mode 100644 (file)
index 0000000..1143863
--- /dev/null
+++ b/resources/icons/palette.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12,2C6.49,2,2,6.49,2,12s4.49,10,10,10c1.38,0,2.5-1.12,2.5-2.5c0-0.61-0.23-1.2-0.64-1.67c-0.08-0.1-0.13-0.21-0.13-0.33 c0-0.28,0.22-0.5,0.5-0.5H16c3.31,0,6-2.69,6-6C22,6.04,17.51,2,12,2z M17.5,13c-0.83,0-1.5-0.67-1.5-1.5c0-0.83,0.67-1.5,1.5-1.5 s1.5,0.67,1.5,1.5C19,12.33,18.33,13,17.5,13z M14.5,9C13.67,9,13,8.33,13,7.5C13,6.67,13.67,6,14.5,6S16,6.67,16,7.5 C16,8.33,15.33,9,14.5,9z M5,11.5C5,10.67,5.67,10,6.5,10S8,10.67,8,11.5C8,12.33,7.33,13,6.5,13S5,12.33,5,11.5z M11,7.5 C11,8.33,10.33,9,9.5,9S8,8.33,8,7.5C8,6.67,8.67,6,9.5,6S11,6.67,11,7.5z"/></svg>
\ No newline at end of file

diff --git a/resources/sass/_layout.scss b/resources/sass/_layout.scss
index 69882d40deb4c5eafe551c8cd0835dfc066b3ad1..b1c80cb53eb7e95b3e3d3ceb023392ffad54a644 100644 (file)
--- a/resources/sass/_layout.scss
+++ b/resources/sass/_layout.scss
@@ -8,6 +8,9 @@
   margin-inline-end: auto;
   padding-inline-start: $-m;
   padding-inline-end: $-m;
   margin-inline-end: auto;
   padding-inline-start: $-m;
   padding-inline-end: $-m;

+  &.medium {
+    max-width: 1100px;
+  }

   &.small {
     max-width: 840px;
   }
   &.small {
     max-width: 840px;
   }

diff --git a/resources/sass/_lists.scss b/resources/sass/_lists.scss
index 8febdcffcd4f681d4ba5b2b57ccc2ea37b56608c..ea10f66bfaa38f3cc0f015797a4c20bc5a7b7a86 100644 (file)
--- a/resources/sass/_lists.scss
+++ b/resources/sass/_lists.scss
@@ -681,7 +681,17 @@ ul.pagination {
   }
   a:hover {
     @include lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));
   }
   a:hover {
     @include lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));

-    border-radius: 3px;
+    border-radius: 4px;

     text-decoration: none;
   }
     text-decoration: none;
   }

+  &.in-sidebar {
+    a {
+      display: block;
+      margin-bottom: $-xs;
+    }
+    a.active {
+      border-radius: 4px;
+      @include lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));
+    }
+  }

 }
 }

diff --git a/resources/views/settings/audit.blade.php b/resources/views/settings/audit.blade.php
index 48e46a59de254940a3336023367faf3317c6af14..ca5dba527cb46cfe89ff191aa4d3148e122e7477 100644 (file)
--- a/resources/views/settings/audit.blade.php
+++ b/resources/views/settings/audit.blade.php
@@ -3,11 +3,7 @@
 @section('body')
 <div class="container">
 
 @section('body')
 <div class="container">
 

-    <div class="grid left-focus v-center no-row-gap">
-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'audit'])
-        </div>
-    </div>
+    @include('settings.parts.navbar', ['selected' => 'audit'])

 
     <div class="card content-wrap auto-height">
         <h1 class="list-heading">{{ trans('settings.audit') }}</h1>
 
     <div class="card content-wrap auto-height">
         <h1 class="list-heading">{{ trans('settings.audit') }}</h1>

diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 8b561565853d18c89204504fd42023d65ea5e5fd..d22da360c7b528147c9c977f50e8d1dbdeb26da3 100644 (file)
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -1,275 +1,297 @@
 @extends('layouts.simple')
 
 @section('body')
 @extends('layouts.simple')
 
 @section('body')

-    <div class="container small">
+    <div class="container medium">

 
 

-        @include('settings.parts.navbar-with-version', ['selected' => 'settings'])
-
-        <div class="card content-wrap auto-height">
-            <h2 id="features" class="list-heading">{{ trans('settings.app_features_security') }}</h2>
-            <form action="{{ url("/settings") }}" method="POST">
-                {!! csrf_field() !!}
-                <input type="hidden" name="section" value="features">
-
-                <div class="setting-list">
-
-
-                    <div class="grid half gap-xl">
-                        <div>
-                            <label for="setting-app-public" class="setting-list-label">{{ trans('settings.app_public_access') }}</label>
-                            <p class="small">{!! trans('settings.app_public_access_desc') !!}</p>
-                            @if(userCan('users-manage'))
-                                <p class="small mb-none">
-                                    <a href="{{ url($guestUser->getEditUrl()) }}">{!! trans('settings.app_public_access_desc_guest') !!}</a>
-                                </p>
-                            @endif
-                        </div>
-                        <div>
-                            @include('form.toggle-switch', [
-                                'name' => 'setting-app-public',
-                                'value' => setting('app-public'),
-                                'label' => trans('settings.app_public_access_toggle'),
-                            ])
-                        </div>
-                    </div>
-
-                    <div class="grid half gap-xl">
-                        <div>
-                            <label class="setting-list-label">{{ trans('settings.app_secure_images') }}</label>
-                            <p class="small">{{ trans('settings.app_secure_images_desc') }}</p>
-                        </div>
-                        <div>
-                            @include('form.toggle-switch', [
-                                'name' => 'setting-app-secure-images',
-                                'value' => setting('app-secure-images'),
-                                'label' => trans('settings.app_secure_images_toggle'),
-                            ])
-                        </div>
-                    </div>
-
-                    <div class="grid half gap-xl">
-                        <div>
-                            <label class="setting-list-label">{{ trans('settings.app_disable_comments') }}</label>
-                            <p class="small">{!! trans('settings.app_disable_comments_desc') !!}</p>
-                        </div>
-                        <div>
-                            @include('form.toggle-switch', [
-                                'name' => 'setting-app-disable-comments',
-                                'value' => setting('app-disable-comments'),
-                                'label' => trans('settings.app_disable_comments_toggle'),
-                            ])
-                        </div>
-                    </div>
+        @include('settings.parts.navbar', ['selected' => 'settings'])

 
 

+        <div class="grid gap-xxl right-focus">

 
 

+            <div>
+                <h5>Categories</h5>
+                <div class="active-link-list in-sidebar">
+                    <a href="#" class=" active">@icon('star') Features & Security</a>
+                    <a href="#">@icon('palette') Customization</a>
+                    <a href="#">@icon('lock') Registration</a>

                 </div>
 
                 </div>
 

-                <div class="form-group text-right">
-                    <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
+                <h5>Version</h5>
+                <div class="">
+                    <a target="_blank" rel="noopener noreferrer" href="https://github.com/BookStackApp/BookStack/releases">
+                        BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
+                    </a>

                 </div>
                 </div>

-            </form>
-        </div>
+            </div>
+
+            <div>
+                <div class="card content-wrap auto-height">
+                    <h2 id="features" class="list-heading">{{ trans('settings.app_features_security') }}</h2>
+                    <form action="{{ url("/settings") }}" method="POST">
+                        {!! csrf_field() !!}
+                        <input type="hidden" name="section" value="features">
+
+                        <div class="setting-list">
+
+
+                            <div class="grid half gap-xl">
+                                <div>
+                                    <label for="setting-app-public" class="setting-list-label">{{ trans('settings.app_public_access') }}</label>
+                                    <p class="small">{!! trans('settings.app_public_access_desc') !!}</p>
+                                    @if(userCan('users-manage'))
+                                        <p class="small mb-none">
+                                            <a href="{{ url($guestUser->getEditUrl()) }}">{!! trans('settings.app_public_access_desc_guest') !!}</a>
+                                        </p>
+                                    @endif
+                                </div>
+                                <div>
+                                    @include('form.toggle-switch', [
+                                        'name' => 'setting-app-public',
+                                        'value' => setting('app-public'),
+                                        'label' => trans('settings.app_public_access_toggle'),
+                                    ])
+                                </div>
+                            </div>

 
 

-        <div class="card content-wrap auto-height">
-            <h2 id="customization" class="list-heading">{{ trans('settings.app_customization') }}</h2>
-            <form action="{{ url("/settings") }}" method="POST" enctype="multipart/form-data">
-                {!! csrf_field() !!}
-                <input type="hidden" name="section" value="customization">
+                            <div class="grid half gap-xl">
+                                <div>
+                                    <label class="setting-list-label">{{ trans('settings.app_secure_images') }}</label>
+                                    <p class="small">{{ trans('settings.app_secure_images_desc') }}</p>
+                                </div>
+                                <div>
+                                    @include('form.toggle-switch', [
+                                        'name' => 'setting-app-secure-images',
+                                        'value' => setting('app-secure-images'),
+                                        'label' => trans('settings.app_secure_images_toggle'),
+                                    ])
+                                </div>
+                            </div>

 
 

-                <div class="setting-list">
+                            <div class="grid half gap-xl">
+                                <div>
+                                    <label class="setting-list-label">{{ trans('settings.app_disable_comments') }}</label>
+                                    <p class="small">{!! trans('settings.app_disable_comments_desc') !!}</p>
+                                </div>
+                                <div>
+                                    @include('form.toggle-switch', [
+                                        'name' => 'setting-app-disable-comments',
+                                        'value' => setting('app-disable-comments'),
+                                        'label' => trans('settings.app_disable_comments_toggle'),
+                                    ])
+                                </div>
+                            </div>

 
 

-                    <div class="grid half gap-xl">
-                        <div>
-                            <label for="setting-app-name" class="setting-list-label">{{ trans('settings.app_name') }}</label>
-                            <p class="small">{{ trans('settings.app_name_desc') }}</p>
-                        </div>
-                        <div class="pt-xs">
-                            <input type="text" value="{{ setting('app-name', 'BookStack') }}" name="setting-app-name" id="setting-app-name">
-                            @include('form.toggle-switch', [
-                                'name' => 'setting-app-name-header',
-                                'value' => setting('app-name-header'),
-                                'label' => trans('settings.app_name_header'),
-                            ])
-                        </div>
-                    </div>

 
 

-                    <div class="grid half gap-xl">
-                        <div>
-                            <label class="setting-list-label">{{ trans('settings.app_editor') }}</label>
-                            <p class="small">{{ trans('settings.app_editor_desc') }}</p>
-                        </div>
-                        <div class="pt-xs">
-                            <select name="setting-app-editor" id="setting-app-editor">
-                                <option @if(setting('app-editor') === 'wysiwyg') selected @endif value="wysiwyg">WYSIWYG</option>
-                                <option @if(setting('app-editor') === 'markdown') selected @endif value="markdown">Markdown</option>
-                            </select>

                         </div>
                         </div>

-                    </div>

 
 

-                    <div class="grid half gap-xl">
-                        <div>
-                            <label class="setting-list-label">{{ trans('settings.app_logo') }}</label>
-                            <p class="small">{!! trans('settings.app_logo_desc') !!}</p>
-                        </div>
-                        <div class="pt-xs">
-                            @include('form.image-picker', [
-                                     'removeName' => 'setting-app-logo',
-                                     'removeValue' => 'none',
-                                     'defaultImage' => url('/logo.png'),
-                                     'currentImage' => setting('app-logo'),
-                                     'name' => 'app_logo',
-                                     'imageClass' => 'logo-image',
-                                 ])
+                        <div class="form-group text-right">
+                            <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>

                         </div>
                         </div>

-                    </div>
+                    </form>
+                </div>

 
 

-                    <!-- Primary Color -->
-                    <div class="grid half gap-xl">
-                        <div>
-                            <label class="setting-list-label">{{ trans('settings.app_primary_color') }}</label>
-                            <p class="small">{!! trans('settings.app_primary_color_desc') !!}</p>
-                        </div>
-                        <div setting-app-color-picker class="text-m-right pt-xs">
-                            <input type="color" data-default="#206ea7" data-current="{{ setting('app-color') }}" value="{{ setting('app-color') }}" name="setting-app-color" id="setting-app-color" placeholder="#206ea7">
-                            <input type="hidden" value="{{ setting('app-color-light') }}" name="setting-app-color-light" id="setting-app-color-light">
-                            <div class="pr-s">
-                                <button type="button" class="text-button text-muted mt-s" setting-app-color-picker-default>{{ trans('common.default') }}</button>
-                                <span class="sep">|</span>
-                                <button type="button" class="text-button text-muted mt-s" setting-app-color-picker-reset>{{ trans('common.reset') }}</button>
+                <div class="card content-wrap auto-height">
+                    <h2 id="customization" class="list-heading">{{ trans('settings.app_customization') }}</h2>
+                    <form action="{{ url("/settings") }}" method="POST" enctype="multipart/form-data">
+                        {!! csrf_field() !!}
+                        <input type="hidden" name="section" value="customization">
+
+                        <div class="setting-list">
+
+                            <div class="grid half gap-xl">
+                                <div>
+                                    <label for="setting-app-name" class="setting-list-label">{{ trans('settings.app_name') }}</label>
+                                    <p class="small">{{ trans('settings.app_name_desc') }}</p>
+                                </div>
+                                <div class="pt-xs">
+                                    <input type="text" value="{{ setting('app-name', 'BookStack') }}" name="setting-app-name" id="setting-app-name">
+                                    @include('form.toggle-switch', [
+                                        'name' => 'setting-app-name-header',
+                                        'value' => setting('app-name-header'),
+                                        'label' => trans('settings.app_name_header'),
+                                    ])
+                                </div>

                             </div>
 
                             </div>
 

-                        </div>
-                    </div>
-
-                    <!-- Entity Color -->
-                    <div class="pb-l">
-                        <div>
-                            <label class="setting-list-label">{{ trans('settings.content_colors') }}</label>
-                            <p class="small">{!! trans('settings.content_colors_desc') !!}</p>
-                        </div>
-                        <div class="grid half pt-m">
-                            <div>
-                                @include('settings.parts.setting-entity-color-picker', ['type' => 'bookshelf'])
-                                @include('settings.parts.setting-entity-color-picker', ['type' => 'book'])
-                                @include('settings.parts.setting-entity-color-picker', ['type' => 'chapter'])
+                            <div class="grid half gap-xl">
+                                <div>
+                                    <label class="setting-list-label">{{ trans('settings.app_editor') }}</label>
+                                    <p class="small">{{ trans('settings.app_editor_desc') }}</p>
+                                </div>
+                                <div class="pt-xs">
+                                    <select name="setting-app-editor" id="setting-app-editor">
+                                        <option @if(setting('app-editor') === 'wysiwyg') selected @endif value="wysiwyg">WYSIWYG</option>
+                                        <option @if(setting('app-editor') === 'markdown') selected @endif value="markdown">Markdown</option>
+                                    </select>
+                                </div>

                             </div>
                             </div>

-                            <div>
-                                @include('settings.parts.setting-entity-color-picker', ['type' => 'page'])
-                                @include('settings.parts.setting-entity-color-picker', ['type' => 'page-draft'])
+
+                            <div class="grid half gap-xl">
+                                <div>
+                                    <label class="setting-list-label">{{ trans('settings.app_logo') }}</label>
+                                    <p class="small">{!! trans('settings.app_logo_desc') !!}</p>
+                                </div>
+                                <div class="pt-xs">
+                                    @include('form.image-picker', [
+                                             'removeName' => 'setting-app-logo',
+                                             'removeValue' => 'none',
+                                             'defaultImage' => url('/logo.png'),
+                                             'currentImage' => setting('app-logo'),
+                                             'name' => 'app_logo',
+                                             'imageClass' => 'logo-image',
+                                         ])
+                                </div>

                             </div>
                             </div>

-                        </div>
-                    </div>

 
 

-                    <div homepage-control id="homepage-control" class="grid half gap-xl">
-                        <div>
-                            <label for="setting-app-homepage" class="setting-list-label">{{ trans('settings.app_homepage') }}</label>
-                            <p class="small">{{ trans('settings.app_homepage_desc') }}</p>
-                        </div>
-                        <div class="pt-xs">
-                            <select name="setting-app-homepage-type" id="setting-app-homepage-type">
-                                <option @if(setting('app-homepage-type') === 'default') selected @endif value="default">{{ trans('common.default') }}</option>
-                                <option @if(setting('app-homepage-type') === 'books') selected @endif value="books">{{ trans('entities.books') }}</option>
-                                <option @if(setting('app-homepage-type') === 'bookshelves') selected @endif value="bookshelves">{{ trans('entities.shelves') }}</option>
-                                <option @if(setting('app-homepage-type') === 'page') selected @endif value="page">{{ trans('entities.pages_specific') }}</option>
-                            </select>
-
-                            <div page-picker-container style="display: none;" class="mt-m">
-                                @include('settings.parts.page-picker', ['name' => 'setting-app-homepage', 'placeholder' => trans('settings.app_homepage_select'), 'value' => setting('app-homepage')])
+                            <!-- Primary Color -->
+                            <div class="grid half gap-xl">
+                                <div>
+                                    <label class="setting-list-label">{{ trans('settings.app_primary_color') }}</label>
+                                    <p class="small">{!! trans('settings.app_primary_color_desc') !!}</p>
+                                </div>
+                                <div setting-app-color-picker class="text-m-right pt-xs">
+                                    <input type="color" data-default="#206ea7" data-current="{{ setting('app-color') }}" value="{{ setting('app-color') }}" name="setting-app-color" id="setting-app-color" placeholder="#206ea7">
+                                    <input type="hidden" value="{{ setting('app-color-light') }}" name="setting-app-color-light" id="setting-app-color-light">
+                                    <div class="pr-s">
+                                        <button type="button" class="text-button text-muted mt-s" setting-app-color-picker-default>{{ trans('common.default') }}</button>
+                                        <span class="sep">|</span>
+                                        <button type="button" class="text-button text-muted mt-s" setting-app-color-picker-reset>{{ trans('common.reset') }}</button>
+                                    </div>
+
+                                </div>

                             </div>
                             </div>

-                        </div>
-                    </div>

 
 

-                    <div>
-                        <label for="setting-app-privacy-link" class="setting-list-label">{{ trans('settings.app_footer_links') }}</label>
-                        <p class="small mb-m">{{ trans('settings.app_footer_links_desc') }}</p>
-                        @include('settings.parts.footer-links', ['name' => 'setting-app-footer-links', 'value' => setting('app-footer-links', [])])
-                    </div>
+                            <!-- Entity Color -->
+                            <div class="pb-l">
+                                <div>
+                                    <label class="setting-list-label">{{ trans('settings.content_colors') }}</label>
+                                    <p class="small">{!! trans('settings.content_colors_desc') !!}</p>
+                                </div>
+                                <div class="grid half pt-m">
+                                    <div>
+                                        @include('settings.parts.setting-entity-color-picker', ['type' => 'bookshelf'])
+                                        @include('settings.parts.setting-entity-color-picker', ['type' => 'book'])
+                                        @include('settings.parts.setting-entity-color-picker', ['type' => 'chapter'])
+                                    </div>
+                                    <div>
+                                        @include('settings.parts.setting-entity-color-picker', ['type' => 'page'])
+                                        @include('settings.parts.setting-entity-color-picker', ['type' => 'page-draft'])
+                                    </div>
+                                </div>
+                            </div>

 
 

+                            <div homepage-control id="homepage-control" class="grid half gap-xl">
+                                <div>
+                                    <label for="setting-app-homepage" class="setting-list-label">{{ trans('settings.app_homepage') }}</label>
+                                    <p class="small">{{ trans('settings.app_homepage_desc') }}</p>
+                                </div>
+                                <div class="pt-xs">
+                                    <select name="setting-app-homepage-type" id="setting-app-homepage-type">
+                                        <option @if(setting('app-homepage-type') === 'default') selected @endif value="default">{{ trans('common.default') }}</option>
+                                        <option @if(setting('app-homepage-type') === 'books') selected @endif value="books">{{ trans('entities.books') }}</option>
+                                        <option @if(setting('app-homepage-type') === 'bookshelves') selected @endif value="bookshelves">{{ trans('entities.shelves') }}</option>
+                                        <option @if(setting('app-homepage-type') === 'page') selected @endif value="page">{{ trans('entities.pages_specific') }}</option>
+                                    </select>
+
+                                    <div page-picker-container style="display: none;" class="mt-m">
+                                        @include('settings.parts.page-picker', ['name' => 'setting-app-homepage', 'placeholder' => trans('settings.app_homepage_select'), 'value' => setting('app-homepage')])
+                                    </div>
+                                </div>
+                            </div>

 
 

-                    <div>
-                        <label for="setting-app-custom-head" class="setting-list-label">{{ trans('settings.app_custom_html') }}</label>
-                        <p class="small">{{ trans('settings.app_custom_html_desc') }}</p>
-                        <textarea name="setting-app-custom-head" id="setting-app-custom-head" class="simple-code-input mt-m">{{ setting('app-custom-head', '') }}</textarea>
-                        <p class="small text-right">{{ trans('settings.app_custom_html_disabled_notice') }}</p>
-                    </div>
+                            <div>
+                                <label for="setting-app-privacy-link" class="setting-list-label">{{ trans('settings.app_footer_links') }}</label>
+                                <p class="small mb-m">{{ trans('settings.app_footer_links_desc') }}</p>
+                                @include('settings.parts.footer-links', ['name' => 'setting-app-footer-links', 'value' => setting('app-footer-links', [])])
+                            </div>

 
 
 
 

-                </div>
+                            <div>
+                                <label for="setting-app-custom-head" class="setting-list-label">{{ trans('settings.app_custom_html') }}</label>
+                                <p class="small">{{ trans('settings.app_custom_html_desc') }}</p>
+                                <textarea name="setting-app-custom-head" id="setting-app-custom-head" class="simple-code-input mt-m">{{ setting('app-custom-head', '') }}</textarea>
+                                <p class="small text-right">{{ trans('settings.app_custom_html_disabled_notice') }}</p>
+                            </div>

 
 

-                <div class="form-group text-right">
-                    <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
-                </div>
-            </form>
-        </div>

 
 

-        <div class="card content-wrap auto-height">
-            <h2 id="registration" class="list-heading">{{ trans('settings.reg_settings') }}</h2>
-            <form action="{{ url("/settings") }}" method="POST">
-                {!! csrf_field() !!}
-                <input type="hidden" name="section" value="registration">
-
-                <div class="setting-list">
-                    <div class="grid half gap-xl">
-                        <div>
-                            <label class="setting-list-label">{{ trans('settings.reg_enable') }}</label>
-                            <p class="small">{!! trans('settings.reg_enable_desc') !!}</p>
-                        </div>
-                        <div>
-                            @include('form.toggle-switch', [
-                                'name' => 'setting-registration-enabled',
-                                'value' => setting('registration-enabled'),
-                                'label' => trans('settings.reg_enable_toggle')
-                            ])
-
-                            @if(in_array(config('auth.method'), ['ldap', 'saml2', 'oidc']))
-                                <div class="text-warn text-small mb-l">{{ trans('settings.reg_enable_external_warning') }}</div>
-                            @endif
-
-                            <label for="setting-registration-role">{{ trans('settings.reg_default_role') }}</label>
-                            <select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
-                                <option value="0" @if(intval(setting('registration-role', '0')) === 0) selected @endif>-- {{ trans('common.none') }} --</option>
-                                @foreach(\BookStack\Auth\Role::all() as $role)
-                                    <option value="{{$role->id}}"
-                                            data-system-role-name="{{ $role->system_name ?? '' }}"
-                                            @if(intval(setting('registration-role', '0')) === $role->id) selected @endif
-                                    >
-                                        {{ $role->display_name }}
-                                    </option>
-                                @endforeach
-                            </select>

                         </div>
                         </div>

-                    </div>

 
 

-                    <div class="grid half gap-xl">
-                        <div>
-                            <label for="setting-registration-restrict" class="setting-list-label">{{ trans('settings.reg_confirm_restrict_domain') }}</label>
-                            <p class="small">{!! trans('settings.reg_confirm_restrict_domain_desc') !!}</p>
+                        <div class="form-group text-right">
+                            <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>

                         </div>
                         </div>

-                        <div class="pt-xs">
-                            <input type="text" id="setting-registration-restrict" name="setting-registration-restrict" placeholder="{{ trans('settings.reg_confirm_restrict_domain_placeholder') }}" value="{{ setting('registration-restrict', '') }}">
-                        </div>
-                    </div>
+                    </form>
+                </div>
+
+                <div class="card content-wrap auto-height">
+                    <h2 id="registration" class="list-heading">{{ trans('settings.reg_settings') }}</h2>
+                    <form action="{{ url("/settings") }}" method="POST">
+                        {!! csrf_field() !!}
+                        <input type="hidden" name="section" value="registration">
+
+                        <div class="setting-list">
+                            <div class="grid half gap-xl">
+                                <div>
+                                    <label class="setting-list-label">{{ trans('settings.reg_enable') }}</label>
+                                    <p class="small">{!! trans('settings.reg_enable_desc') !!}</p>
+                                </div>
+                                <div>
+                                    @include('form.toggle-switch', [
+                                        'name' => 'setting-registration-enabled',
+                                        'value' => setting('registration-enabled'),
+                                        'label' => trans('settings.reg_enable_toggle')
+                                    ])
+
+                                    @if(in_array(config('auth.method'), ['ldap', 'saml2', 'oidc']))
+                                        <div class="text-warn text-small mb-l">{{ trans('settings.reg_enable_external_warning') }}</div>
+                                    @endif
+
+                                    <label for="setting-registration-role">{{ trans('settings.reg_default_role') }}</label>
+                                    <select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
+                                        <option value="0" @if(intval(setting('registration-role', '0')) === 0) selected @endif>-- {{ trans('common.none') }} --</option>
+                                        @foreach(\BookStack\Auth\Role::all() as $role)
+                                            <option value="{{$role->id}}"
+                                                    data-system-role-name="{{ $role->system_name ?? '' }}"
+                                                    @if(intval(setting('registration-role', '0')) === $role->id) selected @endif
+                                            >
+                                                {{ $role->display_name }}
+                                            </option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="grid half gap-xl">
+                                <div>
+                                    <label for="setting-registration-restrict" class="setting-list-label">{{ trans('settings.reg_confirm_restrict_domain') }}</label>
+                                    <p class="small">{!! trans('settings.reg_confirm_restrict_domain_desc') !!}</p>
+                                </div>
+                                <div class="pt-xs">
+                                    <input type="text" id="setting-registration-restrict" name="setting-registration-restrict" placeholder="{{ trans('settings.reg_confirm_restrict_domain_placeholder') }}" value="{{ setting('registration-restrict', '') }}">
+                                </div>
+                            </div>
+
+                            <div class="grid half gap-xl">
+                                <div>
+                                    <label class="setting-list-label">{{ trans('settings.reg_email_confirmation') }}</label>
+                                    <p class="small">{{ trans('settings.reg_confirm_email_desc') }}</p>
+                                </div>
+                                <div>
+                                    @include('form.toggle-switch', [
+                                        'name' => 'setting-registration-confirmation',
+                                        'value' => setting('registration-confirmation'),
+                                        'label' => trans('settings.reg_email_confirmation_toggle')
+                                    ])
+                                </div>
+                            </div>

 
 

-                    <div class="grid half gap-xl">
-                        <div>
-                            <label class="setting-list-label">{{ trans('settings.reg_email_confirmation') }}</label>
-                            <p class="small">{{ trans('settings.reg_confirm_email_desc') }}</p>
-                        </div>
-                        <div>
-                            @include('form.toggle-switch', [
-                                'name' => 'setting-registration-confirmation',
-                                'value' => setting('registration-confirmation'),
-                                'label' => trans('settings.reg_email_confirmation_toggle')
-                            ])

                         </div>
                         </div>

-                    </div>

 
 

+                        <div class="form-group text-right">
+                            <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
+                        </div>
+                    </form>

                 </div>
                 </div>

+            </div>

 
 

-                <div class="form-group text-right">
-                    <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
-                </div>
-            </form>

         </div>
 
     </div>
         </div>
 
     </div>

diff --git a/resources/views/settings/maintenance.blade.php b/resources/views/settings/maintenance.blade.php
index ea94413f2f7028673b9d80177f4f14f20d6b2d3e..a2a9ebc8181fa89c767d48068f3242e2555380bd 100644 (file)
--- a/resources/views/settings/maintenance.blade.php
+++ b/resources/views/settings/maintenance.blade.php
@@ -3,7 +3,7 @@
 @section('body')
 <div class="container small">
 
 @section('body')
 <div class="container small">
 

-    @include('settings.parts.navbar-with-version', ['selected' => 'maintenance'])
+    @include('settings.parts.navbar', ['selected' => 'maintenance'])

 
     <div class="card content-wrap auto-height pb-xl">
         <h2 class="list-heading">{{ trans('settings.recycle_bin') }}</h2>
 
     <div class="card content-wrap auto-height pb-xl">
         <h2 class="list-heading">{{ trans('settings.recycle_bin') }}</h2>

diff --git a/resources/views/settings/parts/navbar-with-version.blade.php b/resources/views/settings/parts/navbar-with-version.blade.php
deleted file mode 100644 (file)
index bec4114..0000000
--- a/resources/views/settings/parts/navbar-with-version.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-{{--
-$selected - String name of the selected tab
-$version - Version of bookstack to display
---}}
-<div class="flex-container-row v-center wrap">
-    <div class="py-m flex fit-content">
-        @include('settings.parts.navbar', ['selected' => $selected])
-    </div>
-</div>
-<div class="px-s">
-    <hr class="darker m-none">
-</div>
-<div class="py-l px-m flex fit-content">
-    <a target="_blank" rel="noopener noreferrer" href="https://github.com/BookStackApp/BookStack/releases">
-        BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
-    </a>
-</div>
\ No newline at end of file

diff --git a/resources/views/settings/parts/navbar.blade.php b/resources/views/settings/parts/navbar.blade.php
index f2fad378c2f476ae2f3c4756088aa361eb8970cc..e229f5e654fac31bab192421a5867a16bf436293 100644 (file)
--- a/resources/views/settings/parts/navbar.blade.php
+++ b/resources/views/settings/parts/navbar.blade.php
@@ -1,5 +1,5 @@
 
 

-<nav class="active-link-list">
+<nav class="active-link-list py-m flex-container-row justify-center wrap">

     @if(userCan('settings-manage'))
         <a href="{{ url('/settings') }}" @if($selected == 'settings') class="active" @endif>@icon('settings'){{ trans('settings.settings') }}</a>
         <a href="{{ url('/settings/maintenance') }}" @if($selected == 'maintenance') class="active" @endif>@icon('spanner'){{ trans('settings.maint') }}</a>
     @if(userCan('settings-manage'))
         <a href="{{ url('/settings') }}" @if($selected == 'settings') class="active" @endif>@icon('settings'){{ trans('settings.settings') }}</a>
         <a href="{{ url('/settings/maintenance') }}" @if($selected == 'maintenance') class="active" @endif>@icon('spanner'){{ trans('settings.maint') }}</a>

diff --git a/resources/views/settings/recycle-bin/destroy.blade.php b/resources/views/settings/recycle-bin/destroy.blade.php
index ab603498444c414213263bea440ea83bdee326cc..fffa961bfddac4701b294f0fb366fa3e22e89a6c 100644 (file)
--- a/resources/views/settings/recycle-bin/destroy.blade.php
+++ b/resources/views/settings/recycle-bin/destroy.blade.php
@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
 @section('body')
     <div class="container small">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'maintenance'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'maintenance'])

 
         <div class="card content-wrap auto-height">
             <h2 class="list-heading">{{ trans('settings.recycle_bin_permanently_delete') }}</h2>
 
         <div class="card content-wrap auto-height">
             <h2 class="list-heading">{{ trans('settings.recycle_bin_permanently_delete') }}</h2>

diff --git a/resources/views/settings/recycle-bin/index.blade.php b/resources/views/settings/recycle-bin/index.blade.php
index b31bf02e545e3ac0b4523772e4868918857dcaab..5f2ec333fce479ee1e2dfcb660e0db79eb06e3b8 100644 (file)
--- a/resources/views/settings/recycle-bin/index.blade.php
+++ b/resources/views/settings/recycle-bin/index.blade.php
@@ -3,9 +3,7 @@
 @section('body')
     <div class="container">
 
 @section('body')
     <div class="container">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'maintenance'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'maintenance'])

 
         <div class="card content-wrap auto-height">
             <h2 class="list-heading">{{ trans('settings.recycle_bin') }}</h2>
 
         <div class="card content-wrap auto-height">
             <h2 class="list-heading">{{ trans('settings.recycle_bin') }}</h2>

diff --git a/resources/views/settings/recycle-bin/restore.blade.php b/resources/views/settings/recycle-bin/restore.blade.php
index 5268bf0671cd3ad36ea492bdef3e3479cb5ac4f4..7811245b765cafb6c9ac7b6e95cdebefcb508aee 100644 (file)
--- a/resources/views/settings/recycle-bin/restore.blade.php
+++ b/resources/views/settings/recycle-bin/restore.blade.php
@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
 @section('body')
     <div class="container small">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'maintenance'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'maintenance'])

 
         <div class="card content-wrap auto-height">
             <h2 class="list-heading">{{ trans('settings.recycle_bin_restore') }}</h2>
 
         <div class="card content-wrap auto-height">
             <h2 class="list-heading">{{ trans('settings.recycle_bin_restore') }}</h2>

diff --git a/resources/views/settings/roles/create.blade.php b/resources/views/settings/roles/create.blade.php
index 72afc60a84f53368d564e20fc800bbd139130716..487f3a5c24b2f90d17c793476f2a6cb7da4d5e80 100644 (file)
--- a/resources/views/settings/roles/create.blade.php
+++ b/resources/views/settings/roles/create.blade.php
@@ -4,9 +4,7 @@
 
     <div class="container small">
 
 
     <div class="container small">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'roles'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'roles'])

 
         <div class="card content-wrap">
             <h1 class="list-heading">{{ trans('settings.role_create') }}</h1>
 
         <div class="card content-wrap">
             <h1 class="list-heading">{{ trans('settings.role_create') }}</h1>

diff --git a/resources/views/settings/roles/delete.blade.php b/resources/views/settings/roles/delete.blade.php
index 52362461d0295a91ea66f2135c0ee355b2943115..f36b4cc50b4293785569156d828878709963f39c 100644 (file)
--- a/resources/views/settings/roles/delete.blade.php
+++ b/resources/views/settings/roles/delete.blade.php
@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
 @section('body')
     <div class="container small">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'roles'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'roles'])

 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading"> {{ trans('settings.role_delete') }}</h1>
 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading"> {{ trans('settings.role_delete') }}</h1>

diff --git a/resources/views/settings/roles/edit.blade.php b/resources/views/settings/roles/edit.blade.php
index dda8db39d8a70bc7616fe45ef9859046524b0e47..bd1dbb7632258d48e1626f13c77d27694dc70d66 100644 (file)
--- a/resources/views/settings/roles/edit.blade.php
+++ b/resources/views/settings/roles/edit.blade.php
@@ -3,9 +3,7 @@
 @section('body')
 
     <div class="container small">
 @section('body')
 
     <div class="container small">

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'roles'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'roles'])

 
         <div class="card content-wrap">
             <h1 class="list-heading">{{ trans('settings.role_edit') }}</h1>
 
         <div class="card content-wrap">
             <h1 class="list-heading">{{ trans('settings.role_edit') }}</h1>

diff --git a/resources/views/settings/roles/index.blade.php b/resources/views/settings/roles/index.blade.php
index 6c2996787a68636aab38bc9c7fbfe2fbae9dc403..4c3b5625aa9e9ad3785218185595f33479b1973d 100644 (file)
--- a/resources/views/settings/roles/index.blade.php
+++ b/resources/views/settings/roles/index.blade.php
@@ -4,9 +4,7 @@
 
     <div class="container small">
 
 
     <div class="container small">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'roles'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'roles'])

 
         <div class="card content-wrap auto-height">
 
 
         <div class="card content-wrap auto-height">
 

diff --git a/resources/views/settings/webhooks/create.blade.php b/resources/views/settings/webhooks/create.blade.php
index f7a99c7259d05964e6147ea964596a2992c4fb56..f0aeaca36198f84cfc1e26acbe06187e8613d2ad 100644 (file)
--- a/resources/views/settings/webhooks/create.blade.php
+++ b/resources/views/settings/webhooks/create.blade.php
@@ -4,9 +4,7 @@
 
     <div class="container small">
 
 
     <div class="container small">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'webhooks'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'webhooks'])

 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ trans('settings.webhooks_create') }}</h1>
 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ trans('settings.webhooks_create') }}</h1>

diff --git a/resources/views/settings/webhooks/delete.blade.php b/resources/views/settings/webhooks/delete.blade.php
index 65560f65fc02e7f3e10725c6e27f37c864d3d4bc..dd81fd143416893c73c6c353802e75175ff8ff15 100644 (file)
--- a/resources/views/settings/webhooks/delete.blade.php
+++ b/resources/views/settings/webhooks/delete.blade.php
@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
 @section('body')
     <div class="container small">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'webhooks'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'webhooks'])

 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading"> {{ trans('settings.webhooks_delete') }}</h1>
 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading"> {{ trans('settings.webhooks_delete') }}</h1>

diff --git a/resources/views/settings/webhooks/edit.blade.php b/resources/views/settings/webhooks/edit.blade.php
index 27f3070ca653451d5f24bfc6a8571963fc868e9b..680fc1207b0d5cfadcdfef70d4ac83223fc94197 100644 (file)
--- a/resources/views/settings/webhooks/edit.blade.php
+++ b/resources/views/settings/webhooks/edit.blade.php
@@ -3,9 +3,7 @@
 @section('body')
 
     <div class="container small">
 @section('body')
 
     <div class="container small">

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'webhooks'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'webhooks'])

 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ trans('settings.webhooks_edit') }}</h1>
 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ trans('settings.webhooks_edit') }}</h1>

diff --git a/resources/views/settings/webhooks/index.blade.php b/resources/views/settings/webhooks/index.blade.php
index 296bbd7ed171df112b05c28462ca65f8540c73e6..bbe58453f38caa2d843e689d4861d994e595ff03 100644 (file)
--- a/resources/views/settings/webhooks/index.blade.php
+++ b/resources/views/settings/webhooks/index.blade.php
@@ -4,9 +4,7 @@
 
     <div class="container small">
 
 
     <div class="container small">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'webhooks'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'webhooks'])

 
         <div class="card content-wrap auto-height">
 
 
         <div class="card content-wrap auto-height">
 

diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index 7015b162acce75391afac50d6756819463e331dd..540d7bd6a202acd02133743b45b42d370c93aecc 100644 (file)
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -4,9 +4,7 @@
 
     <div class="container small">
 
 
     <div class="container small">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'users'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'users'])

 
         <main class="card content-wrap">
             <h1 class="list-heading">{{ trans('settings.users_add_new') }}</h1>
 
         <main class="card content-wrap">
             <h1 class="list-heading">{{ trans('settings.users_add_new') }}</h1>

diff --git a/resources/views/users/delete.blade.php b/resources/views/users/delete.blade.php
index 490e9d6c5aa979cf07f8267f043afddb066a1fb8..9ee5d4c056280c2aa78813247551be6672cf75cd 100644 (file)
--- a/resources/views/users/delete.blade.php
+++ b/resources/views/users/delete.blade.php
@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
 @section('body')
     <div class="container small">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'users'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'users'])

 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ trans('settings.users_delete') }}</h1>
 
         <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ trans('settings.users_delete') }}</h1>

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 41e64dbb9f8c86fa52054b55304db697dbbae1e8..4e31e785d3be984f75c2cf2e2825afc9747300dc 100644 (file)
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
 @section('body')
     <div class="container small">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'users'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'users'])

 
         <section class="card content-wrap">
             <h1 class="list-heading">{{ $user->id === user()->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}</h1>
 
         <section class="card content-wrap">
             <h1 class="list-heading">{{ $user->id === user()->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}</h1>

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 6c79169ca2dbc296857a487c4e376a66387080a1..953a12900a075022d801263b2e0afebaf2334368 100644 (file)
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -3,9 +3,7 @@
 @section('body')
     <div class="container small">
 
 @section('body')
     <div class="container small">
 

-        <div class="py-m">
-            @include('settings.parts.navbar', ['selected' => 'users'])
-        </div>
+        @include('settings.parts.navbar', ['selected' => 'users'])

 
         <main class="card content-wrap">
 
 
         <main class="card content-wrap">
 

diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php
index b59c80ec6a22c99ef23d210adec0ae9c741e1f05..a8be8a4c19825a52835d7d2bce6f78472b5ae24a 100644 (file)
--- a/resources/views/users/profile.blade.php
+++ b/resources/views/users/profile.blade.php
@@ -2,7 +2,7 @@
 
 @section('body')
 
 
 @section('body')
 

-    <div class="container pt-xl">
+    <div class="container medium pt-xl">

 
         <div class="grid right-focus reverse-collapse">
 
 
         <div class="grid right-focus reverse-collapse">