Merge branch 'feature/character-warnings-v3' of https://github.com/Ne…

…-wt/lorekeeper into feature/character-warnings-v3
ScuffedNewt · Aug 28, 2024 · 8aaad88 · 8aaad88
2 parents d9c9cb8 + c5149ed
commit 8aaad88
Show file tree

Hide file tree

Showing 7 changed files with 239 additions and 240 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/resources/views/account/settings.blade.php b/resources/views/account/settings.blade.php
@@ -98,18 +98,20 @@
         <h3>Character Warning Visibility</h3>
         <p>This setting will change how characters with content warnings are displayed to you.</p>
         {!! Form::open(['url' => 'account/warning']) !!}
-            <div class="form-group row">
-                <label class="col-md-2 col-form-label">Setting</label>
-                <div class="col-md-10">
-                    {!! Form::select('content_warning_visibility',
-                        ['0' => '0: Character has pop-up warning and censored icons.', '1' => '1: Character has pop-up warnings only.', '2' => '2: No warnings will appear on characters.'],
-                        Auth::user()->settings->content_warning_visibility, ['class' => 'form-control'])
-                    !!}
-                </div>
-            </div>
-            <div class="text-right">
-                {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+        <div class="form-group row">
+            <label class="col-md-2 col-form-label">Setting</label>
+            <div class="col-md-10">
+                {!! Form::select(
+                    'content_warning_visibility',
+                    ['0' => '0: Character has pop-up warning and censored icons.', '1' => '1: Character has pop-up warnings only.', '2' => '2: No warnings will appear on characters.'],
+                    Auth::user()->settings->content_warning_visibility,
+                    ['class' => 'form-control'],
+                ) !!}
             </div>
+        </div>
+        <div class="text-right">
+            {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+        </div>
         {!! Form::close() !!}
     </div>
 

diff --git a/resources/views/admin/masterlist/create_character.blade.php b/resources/views/admin/masterlist/create_character.blade.php
@@ -62,7 +62,7 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-{{ config('lorekeeper.settings.enable_character_content_warnings' ) ? 6 : 12 }}">
+                <div class="col-md-{{ config('lorekeeper.settings.enable_character_content_warnings') ? 6 : 12 }}">
                     <div class="form-group">
                         {!! Form::label('Character Code') !!} {!! add_help('This code identifies the character itself. You don\'t have to use the automatically generated code, but this must be unique among all characters (as it\'s used to generate the character\'s page URL).') !!}
                         {!! Form::text('slug', old('slug'), ['class' => 'form-control', 'id' => 'code']) !!}