From: Dan Brown <redacted>
Date: Tue, 3 May 2016 20:30:55 +0000 (+0100)
Subject: Merge branch 'v0.9'
X-Git-Tag: v0.10.0~1^2~7
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/1903422113a3962faf29d60c6ddf240164af7d4a?ds=inline;hp=-c

Merge branch 'v0.9'
---

1903422113a3962faf29d60c6ddf240164af7d4a
diff --combined resources/views/settings/index.blade.php
index ce7a8d5d1,1d4f2ebda..ad0b6cbfb
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@@ -4,11 -4,11 +4,11 @@@
  
      @include('settings/navbar', ['selected' => 'settings'])
  
- <div class="container small">
+ <div class="container small settings-container">
  
      <h1>Settings</h1>
  
-     <form action="/http/source.bookstackapp.com/settings" method="POST">
+     <form action="/http/source.bookstackapp.com/settings" method="POST" ng-cloak>
          {!! csrf_field() !!}
  
          <h3>App Settings</h3>
@@@ -66,8 -66,8 +66,8 @@@
                  <div class="form-group">
                      <label for="setting-registration-role">Default user role after registration</label>
                      <select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
 -                        @foreach(\BookStack\Role::all() as $role)
 -                            <option value="{{$role->id}}"
 +                        @foreach(\BookStack\Role::visible() as $role)
 +                            <option value="{{$role->id}}" data-role-name="{{ $role->name }}"
                                      @if(setting('registration-role', \BookStack\Role::first()->id) == $role->id) selected @endif
                                      >
                                  {{ $role->display_name }}
@@@ -94,6 -94,9 +94,9 @@@
          <hr class="margin-top">
  
          <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>
          </div>
      </form>