Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added app name header display setting + extracted setting text

Browse Source 
Closes #194
This commit is contained in:
Dan Brown 2016-09-22 18:53:22 +01:00
parent 24523cf31d
commit da10c50945
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
5 changed files with 77 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/setting-defaults.php
View File

@ -6,6 +6,7 @@
return [ return [
'app-name' => 'BookStack', 'app-name' => 'BookStack',
'app-name-header' => true,
'app-editor' => 'wysiwyg', 'app-editor' => 'wysiwyg',
'app-color' => '#0288D1', 'app-color' => '#0288D1',
'app-color-light' => 'rgba(21, 101, 192, 0.15)' 'app-color-light' => 'rgba(21, 101, 192, 0.15)'

39
resources/lang/en/settings.php Normal file
View File

@ -0,0 +1,39 @@
<?php
return [
/**
* Settings text strings
* Contains all text strings used in the general settings sections of BookStack
* including users and roles.
*/
'settings' => '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 <head> 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. <br>Large images will be scaled down.',
'app_primary_color' => 'Application primary color',
'app_primary_color_desc' => 'This should be a hex value. <br>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. <br> Note that users will be able to change their email addresses after successful registration.',
'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
];

2
resources/views/base.blade.php
View File

@ -39,7 +39,9 @@
@if(setting('app-logo', '') !== 'none') @if(setting('app-logo', '') !== 'none')
<img class="logo-image" src="{{ setting('app-logo', '') === '' ? baseUrl('/logo.png') : baseUrl(setting('app-logo', '')) }}" alt="Logo"> <img class="logo-image" src="{{ setting('app-logo', '') === '' ? baseUrl('/logo.png') : baseUrl(setting('app-logo', '')) }}" alt="Logo">
@endif @endif
@if (setting('app-name-header'))
<span class="logo-text">{{ setting('app-name') }}</span> <span class="logo-text">{{ setting('app-name') }}</span>
@endif
</a> </a>
</div> </div>
<div class="col-lg-4 col-sm-3 text-center"> <div class="col-lg-4 col-sm-3 text-center">

2
resources/views/public.blade.php
View File

@ -31,7 +31,9 @@
@if(setting('app-logo', '') !== 'none') @if(setting('app-logo', '') !== 'none')
<img class="logo-image" src="{{ setting('app-logo', '') === '' ? baseUrl('/logo.png') : baseUrl(setting('app-logo', '')) }}" alt="Logo"> <img class="logo-image" src="{{ setting('app-logo', '') === '' ? baseUrl('/logo.png') : baseUrl(setting('app-logo', '')) }}" alt="Logo">
@endif @endif
@if (setting('app-name-header'))
<span class="logo-text">{{ setting('app-name') }}</span> <span class="logo-text">{{ setting('app-name') }}</span>
@endif
</a> </a>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">

54
resources/views/settings/index.blade.php
View File

@ -6,7 +6,7 @@
<div class="container small settings-container"> <div class="container small settings-container">
<h1>Settings</h1> <h1>{{ trans('settings.settings') }}</h1>
<form action="{{ baseUrl("/settings") }}" method="POST" ng-cloak> <form action="{{ baseUrl("/settings") }}" method="POST" ng-cloak>
{!! csrf_field() !!} {!! csrf_field() !!}
@ -14,61 +14,70 @@
<h3>App Settings</h3> <h3>App Settings</h3>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="setting-app-name">Application name</label> <label for="setting-app-name">{{ trans('settings.app_name') }}</label>
<p class="small">{{ trans('settings.app_name_desc') }}</p>
<input type="text" value="{{ setting('app-name', 'BookStack') }}" name="setting-app-name" id="setting-app-name"> <input type="text" value="{{ setting('app-name', 'BookStack') }}" name="setting-app-name" id="setting-app-name">
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Allow public viewing?</label> <label>{{ trans('settings.app_name_header') }}</label>
<div toggle-switch name="setting-app-name-header" value="{{ setting('app-name-header') }}"></div>
</div>
<div class="form-group">
<label for="setting-app-public">{{ trans('settings.app_public_viewing') }}</label>
<div toggle-switch name="setting-app-public" value="{{ setting('app-public') }}"></div> <div toggle-switch name="setting-app-public" value="{{ setting('app-public') }}"></div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Enable higher security image uploads?</label> <label>{{ trans('settings.app_secure_images') }}</label>
<p class="small">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.</p> <p class="small">{{ trans('settings.app_secure_images_desc') }}</p>
<div toggle-switch name="setting-app-secure-images" value="{{ setting('app-secure-images') }}"></div> <div toggle-switch name="setting-app-secure-images" value="{{ setting('app-secure-images') }}"></div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="setting-app-editor">Page editor</label> <label for="setting-app-editor">{{ trans('settings.app_editor') }}</label>
<p class="small">Select which editor will be used by all users to edit pages.</p> <p class="small">{{ trans('settings.app_editor_desc') }}</p>
<select name="setting-app-editor" id="setting-app-editor"> <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') === 'wysiwyg') selected @endif value="wysiwyg">WYSIWYG</option>
<option @if(setting('app-editor') === 'markdown') selected @endif value="markdown">Markdown</option> <option @if(setting('app-editor') === 'markdown') selected @endif value="markdown">Markdown</option>
</select> </select>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group" id="logo-control"> <div class="form-group" id="logo-control">
<label for="setting-app-logo">Application logo</label> <label for="setting-app-logo">{{ trans('settings.app_logo') }}</label>
<p class="small">This image should be 43px in height. <br>Large images will be scaled down.</p> <p class="small">{!! trans('settings.app_logo_desc') !!}</p>
<image-picker resize-height="43" show-remove="true" resize-width="200" current-image="{{ setting('app-logo', '') }}" default-image="{{ baseUrl('/logo.png') }}" name="setting-app-logo" image-class="logo-image"></image-picker> <image-picker resize-height="43" show-remove="true" resize-width="200" current-image="{{ setting('app-logo', '') }}" default-image="{{ baseUrl('/logo.png') }}" name="setting-app-logo" image-class="logo-image"></image-picker>
</div> </div>
<div class="form-group" id="color-control"> <div class="form-group" id="color-control">
<label for="setting-app-color">Application primary color</label> <label for="setting-app-color">{{ trans('settings.app_primary_color') }}</label>
<p class="small">This should be a hex value. <br> Leave empty to reset to the default color.</p> <p class="small">{!! trans('settings.app_primary_color_desc') !!}</p>
<input type="text" value="{{ setting('app-color', '') }}" name="setting-app-color" id="setting-app-color" placeholder="#0288D1"> <input type="text" value="{{ setting('app-color', '') }}" name="setting-app-color" id="setting-app-color" placeholder="#0288D1">
<input type="hidden" value="{{ setting('app-color-light', '') }}" name="setting-app-color-light" id="setting-app-color-light" placeholder="rgba(21, 101, 192, 0.15)"> <input type="hidden" value="{{ setting('app-color-light', '') }}" name="setting-app-color-light" id="setting-app-color-light" placeholder="rgba(21, 101, 192, 0.15)">
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="setting-app-custom-head">Custom HTML head content</label> <label for="setting-app-custom-head">{{ trans('settings.app_custom_html') }}</label>
<p class="small">Any content added here will be inserted into the bottom of the &lt;head&gt; section of every page. This is handy for overriding styles or adding analytics code.</p> <p class="small">{{ trans('settings.app_custom_html_desc') }}</p>
<textarea name="setting-app-custom-head" id="setting-app-custom-head">{{ setting('app-custom-head', '') }}</textarea> <textarea name="setting-app-custom-head" id="setting-app-custom-head">{{ setting('app-custom-head', '') }}</textarea>
</div> </div>
<hr class="margin-top"> <hr class="margin-top">
<h3>Registration Settings</h3> <h3>{{ trans('settings.reg_settings') }}</h3>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="setting-registration-enabled">Allow registration?</label> <label for="setting-registration-enabled">{{ trans('settings.reg_allow') }}</label>
<div toggle-switch name="setting-registration-enabled" value="{{ setting('registration-enabled') }}"></div> <div toggle-switch name="setting-registration-enabled" value="{{ setting('registration-enabled') }}"></div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="setting-registration-role">Default user role after registration</label> <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> <select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
@foreach(\BookStack\Role::visible() as $role) @foreach(\BookStack\Role::visible() as $role)
<option value="{{$role->id}}" data-role-name="{{ $role->name }}" <option value="{{$role->id}}" data-role-name="{{ $role->name }}"
@ -80,17 +89,16 @@
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="setting-registration-confirmation">Require email confirmation?</label> <label for="setting-registration-confirmation">{{ trans('settings.reg_confirm_email') }}</label>
<p class="small">If domain restriction is used then email confirmation will be required and the below value will be ignored.</p> <p class="small">{{ trans('settings.reg_confirm_email_desc') }}</p>
<div toggle-switch name="setting-registration-confirmation" value="{{ setting('registration-confirmation') }}"></div> <div toggle-switch name="setting-registration-confirmation" value="{{ setting('registration-confirmation') }}"></div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="setting-registration-restrict">Restrict registration to domain</label> <label for="setting-registration-restrict">{{ trans('settings.reg_confirm_restrict_domain') }}</label>
<p class="small">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. <p class="small">{!! trans('settings.reg_confirm_restrict_domain_desc') !!}</p>
<br> Note that users will be able to change their email addresses after successful registration.</p> <input type="text" id="setting-registration-restrict" name="setting-registration-restrict" placeholder="{{ trans('settings.reg_confirm_restrict_domain_placeholder') }}" value="{{ setting('registration-restrict', '') }}">
<input type="text" id="setting-registration-restrict" name="setting-registration-restrict" placeholder="No restriction set" value="{{ setting('registration-restrict', '') }}">
</div> </div>
</div> </div>
</div> </div>
@ -101,7 +109,7 @@
<span class="float right muted"> <span class="float right muted">
BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }} BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
</span> </span>
<button type="submit" class="button pos">Save Settings</button> <button type="submit" class="button pos">{{ trans('settings.settings_save') }}</button>
</div> </div>
</form> </form>