]> BookStack Code Mirror - bookstack/commitdiff
Fixed some label casing and fixed incorrect notifications
authorDan Brown <redacted>
Sun, 3 Apr 2016 11:19:44 +0000 (12:19 +0100)
committerDan Brown <redacted>
Sun, 3 Apr 2016 11:19:44 +0000 (12:19 +0100)
Fixed the book & chapter permission update notification stating the 'page permissions' have been updated.

app/Http/Controllers/BookController.php
app/Http/Controllers/ChapterController.php
resources/views/settings/index.blade.php

index 5b2b510c9ce279ba80728c8584b0ffbf97a6907a..3390b41c0fac74edec52124d5ee2410e4ddd2710 100644 (file)
@@ -267,7 +267,7 @@ class BookController extends Controller
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);
         $this->bookRepo->updateRestrictionsFromRequest($request, $book);
-        session()->flash('success', 'Page Restrictions Updated');
+        session()->flash('success', 'Book Restrictions Updated');
         return redirect($book->getUrl());
     }
 }
index 6b8a2f18fc8aa9af8a1fb15f0decb239754f49ad..4641ddbdbc910c1a59e8e674e10f57c316a5d689 100644 (file)
@@ -187,7 +187,7 @@ class ChapterController extends Controller
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
         $this->chapterRepo->updateRestrictionsFromRequest($request, $chapter);
-        session()->flash('success', 'Page Restrictions Updated');
+        session()->flash('success', 'Chapter Restrictions Updated');
         return redirect($chapter->getUrl());
     }
 }
index eb580bb8b68ff451fd5df1ae59d705dac195e55f..7e38154d5f00e33f25bafc325f8aefcbdac56e79 100644 (file)
@@ -29,7 +29,7 @@
                     <toggle-switch name="setting-app-secure-images" value="{{ setting('app-secure-images') }}"></toggle-switch>
                 </div>
                 <div class="form-group">
-                    <label for="setting-app-editor">Page Editor</label>
+                    <label for="setting-app-editor">Page editor</label>
                     <p class="small">Select which editor will be used by all users to edit pages.</p>
                     <select name="setting-app-editor" id="setting-app-editor">
                         <option @if(setting('app-editor') === 'wysiwyg') selected @endif value="wysiwyg">WYSIWYG</option>
             </div>
             <div class="col-md-6">
                 <div class="form-group" id="logo-control">
-                    <label for="setting-app-logo">Application Logo</label>
+                    <label for="setting-app-logo">Application logo</label>
                     <p class="small">This image should be 43px in height. <br>Large images will be scaled down.</p>
                     <image-picker resize-height="43" show-remove="true" resize-width="200" current-image="{{ setting('app-logo', '') }}" default-image="/logo.png" name="setting-app-logo" image-class="logo-image"></image-picker>
                 </div>
                 <div class="form-group" id="color-control">
-                    <label for="setting-app-color">Application Primary Color</label>
+                    <label for="setting-app-color">Application primary color</label>
                     <p class="small">This should be a hex value. <br> Leave empty to reset to the default color.</p>
                     <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)">