mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-10-01 01:36:00 -04:00
Merge branch 'v0.9'
This commit is contained in:
commit
1903422113
@ -15,7 +15,14 @@ class SettingController extends Controller
|
|||||||
{
|
{
|
||||||
$this->checkPermission('settings-manage');
|
$this->checkPermission('settings-manage');
|
||||||
$this->setPageTitle('Settings');
|
$this->setPageTitle('Settings');
|
||||||
return view('settings/index');
|
|
||||||
|
// Get application version
|
||||||
|
$version = false;
|
||||||
|
if (function_exists('exec')) {
|
||||||
|
$version = exec('git describe --always --tags ');
|
||||||
|
}
|
||||||
|
|
||||||
|
return view('settings/index', ['version' => $version]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -4,11 +4,11 @@
|
|||||||
|
|
||||||
@include('settings/navbar', ['selected' => 'settings'])
|
@include('settings/navbar', ['selected' => 'settings'])
|
||||||
|
|
||||||
<div class="container small">
|
<div class="container small settings-container">
|
||||||
|
|
||||||
<h1>Settings</h1>
|
<h1>Settings</h1>
|
||||||
|
|
||||||
<form action="/settings" method="POST">
|
<form action="/settings" method="POST" ng-cloak>
|
||||||
{!! csrf_field() !!}
|
{!! csrf_field() !!}
|
||||||
|
|
||||||
<h3>App Settings</h3>
|
<h3>App Settings</h3>
|
||||||
@ -94,6 +94,9 @@
|
|||||||
<hr class="margin-top">
|
<hr class="margin-top">
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
<span class="float right muted">
|
||||||
|
BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
|
||||||
|
</span>
|
||||||
<button type="submit" class="button pos">Save Settings</button>
|
<button type="submit" class="button pos">Save Settings</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
Loading…
Reference in New Issue
Block a user