X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/3286f29a61833327b5701b28db626d0a480b07f9..refs/pull/1755/head:/resources/views/settings/index.blade.php

diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index b72e462bf..a52774186 100644
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -1,59 +1,47 @@
 @extends('simple-layout')
 
-{{--TODO - Reorder--}}
-
 @section('body')
     <div class="container small">
 
-
-        <div class="grid left-focus v-center">
+        <div class="grid left-focus v-center no-row-gap">
             <div class="py-m">
-                @include('settings/navbar', ['selected' => 'settings'])
+                @include('settings.navbar', ['selected' => 'settings'])
             </div>
-            <div class="text-right mb-l px-m">
-                <br>
-                BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
+            <div class="text-right p-m">
+                <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>
 
-        <div class="card content-wrap">
-            <h2 class="list-heading">{{ trans('settings.app_settings') }}</h2>
-            <form action="{{ baseUrl("/settings") }}" method="POST">
+        <div class="card content-wrap auto-height">
+            <h2 class="list-heading">{{ trans('settings.app_features_security') }}</h2>
+            <form action="{{ url("/http/source.bookstackapp.com/settings") }}" method="POST">
                 {!! csrf_field() !!}
 
                 <div class="setting-list">
 
-                    <div class="grid half large-gap">
-                        <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>
-                            <input type="text" value="{{ setting('app-name', 'BookStack') }}" name="setting-app-name" id="setting-app-name">
-                            @include('components.toggle-switch', [
-                                'name' => 'setting-app-name-header',
-                                'value' => setting('app-name-header'),
-                                'label' => trans('settings.app_name_header'),
-                            ])
-                        </div>
-                    </div>
 
-                    <div class="grid half large-gap">
+                    <div class="grid half gap-xl">
                         <div>
-                            <label for="setting-app-public" class="setting-list-label">{{ trans('settings.app_public_viewing') }}</label>
-                            {{--<p class="small">{{ trans('settings.app_name_desc') }}</p>--}}
+                            <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('components.toggle-switch', [
                                 'name' => 'setting-app-public',
                                 'value' => setting('app-public'),
-                                'label' => trans('settings.app_public_viewing'),
+                                'label' => trans('settings.app_public_access_toggle'),
                             ])
-                            {{--TODO - Text --}}
                         </div>
                     </div>
 
-                    <div class="grid half large-gap">
+                    <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>
@@ -62,28 +50,57 @@
                             @include('components.toggle-switch', [
                                 'name' => 'setting-app-secure-images',
                                 'value' => setting('app-secure-images'),
-                                'label' => trans('settings.app_secure_images'),
+                                'label' => trans('settings.app_secure_images_toggle'),
                             ])
-                            {{--TODO - Text --}}
                         </div>
                     </div>
 
-                    <div class="grid half large-gap">
+                    <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>
+                            <p class="small">{!! trans('settings.app_disable_comments_desc') !!}</p>
                         </div>
                         <div>
                             @include('components.toggle-switch', [
                                 'name' => 'setting-app-disable-comments',
                                 'value' => setting('app-disable-comments'),
-                                'label' => trans('settings.app_disable_comments'),
+                                'label' => trans('settings.app_disable_comments_toggle'),
                             ])
-                            {{--TODO - Text --}}
                         </div>
                     </div>
 
-                    <div class="grid half large-gap">
+
+                </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 class="list-heading">{{ trans('settings.app_customization') }}</h2>
+            <form action="{{ url("/http/source.bookstackapp.com/settings") }}" method="POST" enctype="multipart/form-data">
+                {!! csrf_field() !!}
+
+                <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>
+                            <input type="text" value="{{ setting('app-name', 'BookStack') }}" name="setting-app-name" id="setting-app-name">
+                            @include('components.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>
@@ -93,41 +110,40 @@
                                 <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>
-                            {{--TODO - Text --}}
                         </div>
                     </div>
 
-                    <div class="grid half large-gap">
+                    <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>
+                            <p class="small">{!! trans('settings.app_logo_desc') !!}</p>
                         </div>
                         <div>
                             @include('components.image-picker', [
-                                     'resizeHeight' => '43',
-                                     'resizeWidth' => '200',
-                                     'showRemove' => true,
-                                     'defaultImage' => baseUrl('/logo.png'),
+                                     'removeName' => 'setting-app-logo',
+                                     'removeValue' => 'none',
+                                     'defaultImage' => url('/http/source.bookstackapp.com/logo.png'),
                                      'currentImage' => setting('app-logo'),
-                                     'name' => 'setting-app-logo',
+                                     'name' => 'app_logo',
                                      'imageClass' => 'logo-image',
-                                     'currentId' => false
                                  ])
                         </div>
                     </div>
 
-                    <div class="grid half large-gap">
+                    <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>
-                            <input type="text" value="{{ setting('app-color') }}" name="setting-app-color" id="setting-app-color" placeholder="#0288D1">
+                        <div setting-app-color-picker class="text-m-right">
+                            <input type="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">
+                            <br>
+                            <button type="button" class="text-button text-muted mt-s mx-s" setting-app-color-picker-reset>{{ trans('common.reset') }}</button>
                         </div>
                     </div>
 
-                    <div homepage-control id="homepage-control" class="grid half large-gap">
+                    <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>
@@ -151,45 +167,37 @@
                         <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>
 
                 <div class="form-group text-right">
-                    <button type="submit" class="button primary">{{ trans('settings.settings_save') }}</button>
+                    <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
                 </div>
             </form>
         </div>
 
-
-        <div class="card content-wrap">
+        <div class="card content-wrap auto-height">
             <h2 class="list-heading">{{ trans('settings.reg_settings') }}</h2>
-            <form action="{{ baseUrl("/settings") }}" method="POST">
+            <form action="{{ url("/http/source.bookstackapp.com/settings") }}" method="POST">
                 {!! csrf_field() !!}
 
                 <div class="setting-list">
-                    <div class="grid half large-gap">
+                    <div class="grid half gap-xl">
                         <div>
-                            <label class="setting-list-label">{{ trans('settings.reg_allow') }}</label>
-                            {{--<p class="small">{!! trans('settings.app_primary_color_desc') !!}</p>--}}{{-- TODO--}}
+                            <label class="setting-list-label">{{ trans('settings.reg_enable') }}</label>
+                            <p class="small">{!! trans('settings.reg_enable_desc') !!}</p>
                         </div>
                         <div>
                             @include('components.toggle-switch', [
                                 'name' => 'setting-registration-enabled',
                                 'value' => setting('registration-enabled'),
-                                'label' => trans('settings.reg_allow')
+                                'label' => trans('settings.reg_enable_toggle')
                             ])
-                            {{--TODO - label --}}
-                        </div>
-                    </div>
 
-                    <div class="grid half large-gap">
-                        <div>
-                            <label for="setting-registration-role" class="setting-list-label">{{ trans('settings.reg_default_role') }}</label>
-                            {{--<p class="small">{!! trans('settings.app_primary_color_desc') !!}</p>--}}{{-- TODO--}}
-                        </div>
-                        <div>
+                            <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>
                                 @foreach(\BookStack\Auth\Role::all() as $role)
                                     <option value="{{$role->id}}" data-role-name="{{ $role->name }}"
@@ -202,34 +210,34 @@
                         </div>
                     </div>
 
-                    <div class="grid half large-gap">
+                    <div class="grid half gap-xl">
                         <div>
-                            <label class="setting-list-label">{{ trans('settings.reg_confirm_email') }}</label>
-                            <p class="small">{{ trans('settings.reg_confirm_email_desc') }}</p>
+                            <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>
-                            @include('components.toggle-switch', [
-                                'name' => 'setting-registration-confirmation',
-                                'value' => setting('registration-confirmation'),
-                                'label' => trans('settings.reg_confirm_email')
-                            ])
-                            {{--TODO - label --}}
+                            <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 large-gap">
+                    <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>
+                            <label class="setting-list-label">{{ trans('settings.reg_email_confirmation') }}</label>
+                            <p class="small">{{ trans('settings.reg_confirm_email_desc') }}</p>
                         </div>
                         <div>
-                            <input type="text" id="setting-registration-restrict" name="setting-registration-restrict" placeholder="{{ trans('settings.reg_confirm_restrict_domain_placeholder') }}" value="{{ setting('registration-restrict', '') }}">
+                            @include('components.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 primary">{{ trans('settings.settings_save') }}</button>
+                    <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
                 </div>
             </form>
         </div>
@@ -238,34 +246,4 @@
 
     @include('components.image-manager', ['imageType' => 'system'])
     @include('components.entity-selector-popup', ['entityTypes' => 'page'])
-@stop
-
-@section('scripts')
-    {{--TODO - Merge into JS--}}
-    <script src="{{ baseUrl("/libs/jq-color-picker/tiny-color-picker.min.js?version=1.0.0") }}"></script>
-    <script type="text/javascript">
-        $('#setting-app-color').colorPicker({
-            opacity: false,
-            renderCallback: function($elm, toggled) {
-                var hexVal = '#' + this.color.colors.HEX;
-                var rgb = this.color.colors.RND.rgb;
-                var rgbLightVal = 'rgba('+ [rgb.r, rgb.g, rgb.b, '0.15'].join(',') +')';
-
-                // Set textbox color to hex color code.
-                var isEmpty = $.trim($elm.val()).length === 0;
-                if (!isEmpty) $elm.val(hexVal);
-                $('#setting-app-color-light').val(isEmpty ? '' : rgbLightVal);
-
-                var customStyles = document.getElementById('custom-styles');
-                var oldColor = customStyles.getAttribute('data-color');
-                var oldColorLight = customStyles.getAttribute('data-color-light');
-
-                customStyles.innerHTML = customStyles.innerHTML.split(oldColor).join(hexVal);
-                customStyles.innerHTML = customStyles.innerHTML.split(oldColorLight).join(rgbLightVal);
-
-                customStyles.setAttribute('data-color', hexVal);
-                customStyles.setAttribute('data-color-light', rgbLightVal);
-            }
-        });
-    </script>
 @stop
\ No newline at end of file