diff --git a/config/setting-defaults.php b/config/setting-defaults.php index 24a49c364..5482c1331 100644 --- a/config/setting-defaults.php +++ b/config/setting-defaults.php @@ -6,6 +6,7 @@ return [ 'app-name' => 'BookStack', + 'app-name-header' => true, 'app-editor' => 'wysiwyg', 'app-color' => '#0288D1', 'app-color-light' => 'rgba(21, 101, 192, 0.15)' diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php new file mode 100644 index 000000000..1b0bcad33 --- /dev/null +++ b/resources/lang/en/settings.php @@ -0,0 +1,39 @@ + 'Settings', + 'settings_save' => 'Save Settings', + + 'app_settings' => 'App Settings', + 'app_name' => 'Application name', + 'app_name_desc' => 'This name is shown in the header and any emails.', + 'app_name_header' => 'Show Application name in header?', + 'app_public_viewing' => 'Allow public viewing?', + 'app_secure_images' => 'Enable higher security image uploads?', + 'app_secure_images_desc' => 'For performance reasons, all images are public. This option adds a random, hard-to-guess string in front of image urls. Ensure directory indexes are not enabled to prevent easy access.', + 'app_editor' => 'Page editor', + 'app_editor_desc' => 'Select which editor will be used by all users to edit pages.', + 'app_custom_html' => 'Custom HTML head content', + 'app_custom_html_desc' => 'Any content added here will be inserted into the bottom of the section of every page. This is handy for overriding styles or adding analytics code.', + 'app_logo' => 'Application logo', + 'app_logo_desc' => 'This image should be 43px in height.
Large images will be scaled down.', + 'app_primary_color' => 'Application primary color', + 'app_primary_color_desc' => 'This should be a hex value.
Leave empty to reset to the default color.', + + 'reg_settings' => 'Registration Settings', + 'reg_allow' => 'Allow registration?', + 'reg_default_role' => 'Default user role after registration', + 'reg_confirm_email' => 'Require email confirmation?', + 'reg_confirm_email_desc' => 'If domain restriction is used then email confirmation will be required and the below value will be ignored.', + 'reg_confirm_restrict_domain' => 'Restrict registration to domain', + 'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application.
Note that users will be able to change their email addresses after successful registration.', + 'reg_confirm_restrict_domain_placeholder' => 'No restriction set', + +]; \ No newline at end of file diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index be47abdca..1deed0a3f 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -39,7 +39,9 @@ @if(setting('app-logo', '') !== 'none') Logo @endif - {{ setting('app-name') }} + @if (setting('app-name-header')) + {{ setting('app-name') }} + @endif
diff --git a/resources/views/public.blade.php b/resources/views/public.blade.php index 2de4d968a..542d5c867 100644 --- a/resources/views/public.blade.php +++ b/resources/views/public.blade.php @@ -31,7 +31,9 @@ @if(setting('app-logo', '') !== 'none') Logo @endif - {{ setting('app-name') }} + @if (setting('app-name-header')) + {{ setting('app-name') }} + @endif
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 222ff0f69..757729763 100644 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -6,7 +6,7 @@
-

Settings

+

{{ trans('settings.settings') }}

{!! csrf_field() !!} @@ -14,61 +14,70 @@

App Settings

+
- + +

{{ trans('settings.app_name_desc') }}

- + +
+
+
+
- -

For performance reasons, all images are public. This option adds a random, hard-to-guess string in front of image urls. Ensure directory indexes are not enabled to prevent easy access.

+ +

{{ trans('settings.app_secure_images_desc') }}

- -

Select which editor will be used by all users to edit pages.

+ +

{{ trans('settings.app_editor_desc') }}

+
- -

This image should be 43px in height.
Large images will be scaled down.

+ +

{!! trans('settings.app_logo_desc') !!}

- -

This should be a hex value.
Leave empty to reset to the default color.

+ +

{!! trans('settings.app_primary_color_desc') !!}

+
+
- -

Any content added here will be inserted into the bottom of the <head> section of every page. This is handy for overriding styles or adding analytics code.

+ +

{{ trans('settings.app_custom_html_desc') }}

-

Registration Settings

+

{{ trans('settings.reg_settings') }}

- +
- + + +

{!! trans('settings.reg_confirm_restrict_domain_desc') !!}

+
@@ -101,7 +109,7 @@ BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }} - +