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

Merge branch 'v0.9'

Browse Source
This commit is contained in:
Dan Brown 2016-05-03 21:30:55 +01:00
commit 1903422113
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/SettingController.php
View File

@ -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]);
} }
/** /**

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

@ -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>