Click on a button to link a social media account to your {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} account. You must be logged into the account you want to link to be able to continue.
Accounts on sites that have the Primary label can be used as a primary account, but will not automatically switch your primary account once authenticated. Added accounts are not visible on your profile by default.
- @foreach (Config::get('lorekeeper.sites') as $provider => $site) + @foreach (config('lorekeeper.sites') as $provider => $site) @if (isset($site['auth']) && $site['auth'])| + @if (!$category->is_visible) + + @endif {!! $category->displayName !!} |
diff --git a/resources/views/admin/characters/create_edit_character_category.blade.php b/resources/views/admin/characters/create_edit_character_category.blade.php
index e04260d0d5..10f2958ccb 100644
--- a/resources/views/admin/characters/create_edit_character_category.blade.php
+++ b/resources/views/admin/characters/create_edit_character_category.blade.php
@@ -1,7 +1,7 @@
@extends('admin.layout')
@section('admin-title')
- Character Categories
+ {{ $category->id ? 'Edit' : 'Create' }} Character Category
@endsection
@section('admin-content')
@@ -11,7 +11,7 @@
($category->id ? 'Edit' : 'Create') . ' Category' => $category->id ? 'admin/data/character-categories/edit/' . $category->id : 'admin/data/character-categories/create',
]) !!}
- {{ $category->id ? 'Edit' : 'Create' }} Category
+
{!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
- {!! Form::file('image') !!}
+
+ {!! Form::label('image', 'Choose file...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('image', ['class' => 'custom-file-input']) !!}
+
Recommended size: 200px x 200px
@if ($category->has_image)
@@ -53,6 +56,11 @@
{!! Form::textarea('description', $category->description, ['class' => 'form-control wysiwyg']) !!}
+
+ {!! Form::checkbox('is_visible', 1, $category->id ? $category->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+ {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned off, the category will not be visible in the category list or available for selection in search. Permissioned staff will still be able to add characters to them, however.') !!}
+
+
{!! Form::submit($category->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
@@ -63,7 +71,13 @@
Preview
- @include('world._entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description])
+ @include('world._entry', [
+ 'imageUrl' => $category->categoryImageUrl,
+ 'name' => $category->displayName,
+ 'description' => $category->parsed_description,
+ 'searchUrl' => $category->searchUrl,
+ 'visible' => $category->is_visible,
+ ])
{!! Form::label('Icon Image (Optional)') !!} {!! add_help('This will be used to denote the currency. If not provided, the abbreviation will be used.') !!}
- {!! Form::file('icon') !!}
+
+ {!! Form::label('icon', 'Choose icon file...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('icon', ['class' => 'custom-file-input']) !!}
+
Recommended height: 16px
@if ($currency->has_icon)
@@ -48,7 +51,10 @@
{!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
- {!! Form::file('image') !!}
+
-@if (Config::get('lorekeeper.extensions.remove_myo_image') && $request->character->is_myo_slot)
+@if (config('lorekeeper.extensions.remove_myo_image') && $request->character->is_myo_slot)
+ {!! Form::label('image', 'Choose file...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('image', ['class' => 'custom-file-input']) !!}
+
Recommended size: 200px x 200px
@if ($currency->has_image)
diff --git a/resources/views/admin/designs/_approve_request_modal.blade.php b/resources/views/admin/designs/_approve_request_modal.blade.php
index 6644c93dd1..d6535a031d 100644
--- a/resources/views/admin/designs/_approve_request_modal.blade.php
+++ b/resources/views/admin/designs/_approve_request_modal.blade.php
@@ -60,7 +60,7 @@
{!! Form::label('On Transfer Cooldown Until (Optional)') !!}
- {!! Form::text('transferrable_at', $request->character->transferrable_at, ['class' => 'form-control', 'id' => 'datepicker']) !!}
+ {!! Form::text('transferrable_at', $request->character->transferrable_at, ['class' => 'form-control datepicker']) !!}
Image Settings@@ -73,7 +73,7 @@ {!! Form::checkbox('invalidate_old', 1, true, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!} {!! Form::label('invalidate_old', 'Invalidate Old Image', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will mark the last image attached to the character as an invalid reference.') !!}
{!! Form::label('Remove MYO Image') !!} {!! add_help('This will either hide or delete the MYO slot placeholder image if set.') !!}
{!! Form::select('remove_myo_image', [0 => 'Leave MYO Image', 1 => 'Hide MYO Image', 2 => 'Delete MYO Image'], null, ['class' => 'form-control']) !!}
@@ -87,3 +87,4 @@
@include('widgets._character_create_options_js')
@include('widgets._character_code_js')
+@include('widgets._datetimepicker_js')
diff --git a/resources/views/admin/designs/index.blade.php b/resources/views/admin/designs/index.blade.php
index 1e77459e42..6c72ce4d98 100644
--- a/resources/views/admin/designs/index.blade.php
+++ b/resources/views/admin/designs/index.blade.php
@@ -23,6 +23,27 @@
+
+ {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+
+
{!! $requests->render() !!}
+
+ {!! Form::close() !!}
+
+ {!! Form::select(
+ 'sort',
+ [
+ 'newest' => 'Newest First',
+ 'oldest' => 'Oldest First',
+ ],
+ Request::get('sort') ?: 'oldest',
+ ['class' => 'form-control'],
+ ) !!}
+
+
+ {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+
+
@@ -36,7 +57,7 @@
Submitted
Votes
@foreach ($requests as $r)
- @if (Config::get('lorekeeper.extensions.design_update_voting'))
+ @if (config('lorekeeper.extensions.design_update_voting'))
- @if (Config::get('lorekeeper.extensions.design_update_voting'))
+ @if (config('lorekeeper.extensions.design_update_voting'))
{!! $r->submitted_at ? pretty_date($r->submitted_at) : '---' !!}
diff --git a/resources/views/admin/features/_create_edit_feature_subtype.blade.php b/resources/views/admin/features/_create_edit_feature_subtype.blade.php
new file mode 100644
index 0000000000..2f571e001f
--- /dev/null
+++ b/resources/views/admin/features/_create_edit_feature_subtype.blade.php
@@ -0,0 +1,2 @@
+{!! Form::label('Subtype (Optional)') !!} {!! add_help('This is cosmetic and does not limit choice of traits in selections.') !!}
+{!! Form::select('subtype_id', $subtypes, $subtype_id, ['class' => 'form-control', 'id' => 'subtype']) !!}
diff --git a/resources/views/admin/features/create_edit_feature.blade.php b/resources/views/admin/features/create_edit_feature.blade.php
index e96da11b2d..847a803df3 100644
--- a/resources/views/admin/features/create_edit_feature.blade.php
+++ b/resources/views/admin/features/create_edit_feature.blade.php
@@ -1,7 +1,7 @@
@extends('admin.layout')
@section('admin-title')
- Traits
+ {{ $feature->id ? 'Edit' : 'Create' }} Trait
@endsection
@section('admin-content')
@@ -34,7 +34,10 @@
{!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
- {!! Form::file('image') !!}
+
+ {!! Form::label('image', 'Choose file...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('image', ['class' => 'custom-file-input']) !!}
+
Recommended size: 200px x 200px
@if ($feature->has_image)
@@ -54,13 +57,13 @@
+
{!! Form::label('Species Restriction (Optional)') !!}
- {!! Form::select('species_id', $specieses, $feature->species_id, ['class' => 'form-control']) !!}
+ {!! Form::select('species_id', $specieses, $feature->species_id, ['class' => 'form-control', 'id' => 'species']) !!}
-
@@ -69,6 +72,11 @@
{!! Form::textarea('description', $feature->description, ['class' => 'form-control wysiwyg']) !!}
+
{!! Form::label('Subtype (Optional)') !!} {!! add_help('This is cosmetic and does not limit choice of traits in selections.') !!}
- {!! Form::select('subtype_id', $subtypes, $feature->subtype_id, ['class' => 'form-control']) !!}
+ {!! Form::select('subtype_id', $subtypes, $feature->subtype_id, ['class' => 'form-control', 'id' => 'subtype']) !!}
+ {!! Form::checkbox('is_visible', 1, $feature->id ? $feature->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+ {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned off, the trait will not be visible in the trait list or available for selection in search and design updates. Permissioned staff will still be able to add them to characters, however.') !!}
+
+
{!! Form::submit($feature->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
@@ -93,6 +101,25 @@
e.preventDefault();
loadModal("{{ url('admin/data/traits/delete') }}/{{ $feature->id }}", 'Delete Trait');
});
+ refreshSubtype();
});
+
+ $("#species").change(function() {
+ refreshSubtype();
+ });
+
+ function refreshSubtype() {
+ var species = $('#species').val();
+ var subtype_id = {{ $feature->subtype_id ?: 'null' }};
+ $.ajax({
+ type: "GET",
+ url: "{{ url('admin/data/traits/check-subtype') }}?species=" + species + "&subtype_id=" + subtype_id,
+ dataType: "text"
+ }).done(function(res) {
+ $("#subtypes").html(res);
+ }).fail(function(jqXHR, textStatus, errorThrown) {
+ alert("AJAX call failed: " + textStatus + ", " + errorThrown);
+ });
+ };
@endsection
diff --git a/resources/views/admin/features/create_edit_feature_category.blade.php b/resources/views/admin/features/create_edit_feature_category.blade.php
index 1110faeba2..8ffeb20b2b 100644
--- a/resources/views/admin/features/create_edit_feature_category.blade.php
+++ b/resources/views/admin/features/create_edit_feature_category.blade.php
@@ -1,7 +1,7 @@
@extends('admin.layout')
@section('admin-title')
- Trait Categories
+ {{ $category->id ? 'Edit' : 'Create' }} Trait Category
@endsection
@section('admin-content')
@@ -11,7 +11,7 @@
($category->id ? 'Edit' : 'Create') . ' Category' => $category->id ? 'admin/data/trait-categories/edit/' . $category->id : 'admin/data/trait-categories/create',
]) !!}
- {{ $category->id ? 'Edit' : 'Create' }} Category
+
{!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
- {!! Form::file('image') !!}
+
+ {!! Form::label('image', 'Choose file...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('image', ['class' => 'custom-file-input']) !!}
+
Recommended size: 200px x 200px
@if ($category->has_image)
@@ -43,6 +46,11 @@
{!! Form::textarea('description', $category->description, ['class' => 'form-control wysiwyg']) !!}
+
+ {!! Form::checkbox('is_visible', 1, $category->id ? $category->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+ {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned off, the category will not be visible in the category list or available for selection in search. Permissioned staff will still be able to add traits to them, however.') !!}
+
+
{!! Form::submit($category->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
@@ -53,7 +61,13 @@
Preview
- @include('world._entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description])
+ @include('world._entry', [
+ 'imageUrl' => $category->categoryImageUrl,
+ 'name' => $category->displayName,
+ 'description' => $category->parsed_description,
+ 'searchUrl' => $category->searchUrl,
+ 'visible' => $category->is_visible,
+ ])
+ @if (!$category->is_visible)
+
+ @endif
{!! $category->displayName !!}
|
diff --git a/resources/views/admin/features/features.blade.php b/resources/views/admin/features/features.blade.php
index 7d45bcc81d..a3db2168bf 100644
--- a/resources/views/admin/features/features.blade.php
+++ b/resources/views/admin/features/features.blade.php
@@ -31,7 +31,7 @@
{!! Form::select('rarity_id', $rarities, Request::get('rarity_id'), ['class' => 'form-control']) !!}
|
- {!! Form::select('feature_category_id', $categories, Request::get('name'), ['class' => 'form-control']) !!}
+ {!! Form::select('feature_category_id', $categories, Request::get('feature_category_id'), ['class' => 'form-control']) !!}
{!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
@@ -68,7 +68,12 @@
-
{{ $feature->name }}
+
+ @if (!$feature->is_visible)
+
+ @endif
+ {{ $feature->name }}
+
{!! $feature->rarity->displayName !!}
diff --git a/resources/views/admin/files/images.blade.php b/resources/views/admin/files/images.blade.php
index d31734fc21..0f37a11b38 100644
--- a/resources/views/admin/files/images.blade.php
+++ b/resources/views/admin/files/images.blade.php
@@ -14,15 +14,18 @@
@foreach ($images as $key => $image)
-
@endif
- @if ($galleryRequireApproval)
-
+
@if ($folder && !count($files))
{{ $image['name'] }} View Current{{ $image['description'] }} {!! Form::open(['url' => 'admin/images/upload', 'files' => true]) !!}
- {!! Form::file('file', ['class' => 'form-control mr-2']) !!}
- {!! Form::submit('Upload', ['class' => 'btn btn-primary']) !!}
+
{!! Form::hidden('key', $key) !!}
{!! Form::close() !!}
@@ -42,8 +45,11 @@
+ {!! Form::label('file', 'Choose file...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('file', ['class' => 'custom-file-input']) !!}
+
+ {!! Form::submit('Upload', ['class' => 'ml-1 btn btn-primary']) !!}
CSS View Current{!! Form::open(['url' => 'admin/images/upload/css', 'files' => true]) !!}
- {!! Form::file('file', ['class' => 'form-control mr-2']) !!}
- {!! Form::submit('Upload', ['class' => 'btn btn-primary']) !!}
+
{!! Form::close() !!}
+ {!! Form::label('file', 'Choose CSS...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('file', ['class' => 'custom-file-input']) !!}
+
+ {!! Form::submit('Upload', ['class' => 'ml-1 btn btn-primary']) !!}
@@ -170,7 +178,10 @@
@@ -205,6 +217,7 @@ function addFileRow() {
$('#fileList').append($clone);
$clone.removeClass('hide file-row');
$clone.addClass('d-flex');
+ bsCustomFileInput.init();
}
/////////
diff --git a/resources/views/admin/galleries/create_edit_gallery.blade.php b/resources/views/admin/galleries/create_edit_gallery.blade.php
index df90da9632..4896f96af0 100644
--- a/resources/views/admin/galleries/create_edit_gallery.blade.php
+++ b/resources/views/admin/galleries/create_edit_gallery.blade.php
@@ -1,7 +1,7 @@
@extends('admin.layout')
@section('admin-title')
- Galleries
+ {{ $gallery->id ? 'Edit' : 'Create' }} Gallery
@endsection
@section('admin-content')
@@ -105,6 +105,7 @@
@section('scripts')
@parent
+ @include('widgets._datetimepicker_js')
@endsection
diff --git a/resources/views/admin/galleries/submissions_currency_index.blade.php b/resources/views/admin/galleries/submissions_currency_index.blade.php
index b65edd518c..cc6dc7d5f1 100644
--- a/resources/views/admin/galleries/submissions_currency_index.blade.php
+++ b/resources/views/admin/galleries/submissions_currency_index.blade.php
@@ -25,8 +25,21 @@
Select a file to upload. (Maximum size {{ min(ini_get('upload_max_filesize'), ini_get('post_max_size')) }}B.)
- {!! Form::file('files[]', ['class' => 'form-control']) !!}
+
+ {!! Form::label('files[]', 'No file selected.', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('files[]', ['class' => 'custom-file-input']) !!}
+
@@ -181,8 +192,9 @@
Add File
{!! Form::close() !!}
-
{!! Form::select('gallery_id', $galleries, Request::get('gallery_id'), ['class' => 'form-control']) !!}
-
- {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+
diff --git a/resources/views/admin/galleries/submissions_index.blade.php b/resources/views/admin/galleries/submissions_index.blade.php
index b308716e73..d4f923cd4e 100644
--- a/resources/views/admin/galleries/submissions_index.blade.php
+++ b/resources/views/admin/galleries/submissions_index.blade.php
@@ -28,8 +28,21 @@
+
{!! Form::close() !!}
+ {!! Form::select(
+ 'sort',
+ [
+ 'newest' => 'Newest First',
+ 'oldest' => 'Oldest First',
+ ],
+ Request::get('sort') ?: 'oldest',
+ ['class' => 'form-control'],
+ ) !!}
+
+
+ {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+
{!! Form::select('gallery_id', $galleries, Request::get('gallery_id'), ['class' => 'form-control']) !!}
-
- {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+
diff --git a/resources/views/admin/grants/item_search.blade.php b/resources/views/admin/grants/item_search.blade.php
index 4ca0110335..31201d3794 100644
--- a/resources/views/admin/grants/item_search.blade.php
+++ b/resources/views/admin/grants/item_search.blade.php
@@ -32,8 +32,9 @@
@foreach ($users as $user)
+
{!! Form::close() !!}
+ {!! Form::select(
+ 'sort',
+ [
+ 'newest' => 'Newest First',
+ 'oldest' => 'Oldest First',
+ ],
+ Request::get('sort') ?: 'oldest',
+ ['class' => 'form-control'],
+ ) !!}
+
+
+ {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+
-
-
- Gallery Submissions @if ($gallerySubmissionCount) - {{ $gallerySubmissionCount }} - @endif --- @if ($gallerySubmissionCount) - {{ $gallerySubmissionCount }} gallery submission{{ $gallerySubmissionCount == 1 ? '' : 's' }} awaiting processing. - @else - The gallery submission queue is clear. Hooray! - @endif - -
- View Queue
+ @if (Auth::user()->hasPower('manage_submissions'))
+ @if ($galleryRequireApproval)
+
- @endif
- @if ($galleryCurrencyAwards)
-
+
-
+
+
Gallery Submissions @if ($gallerySubmissionCount) + {{ $gallerySubmissionCount }} + @endif +++ @if ($gallerySubmissionCount) + {{ $gallerySubmissionCount }} gallery submission{{ $gallerySubmissionCount == 1 ? '' : 's' }} awaiting processing. + @else + The gallery submission queue is clear. Hooray! + @endif + +
+ View Queue
+
-
-
-
@endsection
diff --git a/resources/views/admin/items/create_edit_item.blade.php b/resources/views/admin/items/create_edit_item.blade.php
index 0b43242920..fe0b6fd531 100644
--- a/resources/views/admin/items/create_edit_item.blade.php
+++ b/resources/views/admin/items/create_edit_item.blade.php
@@ -1,7 +1,7 @@
@extends('admin.layout')
@section('admin-title')
- Items
+ {{ $item->id ? 'Edit' : 'Create' }} Item
@endsection
@section('admin-content')
@@ -24,7 +24,10 @@
Gallery Currency Awards @if ($galleryAwardCount) - {{ $galleryAwardCount }} - @endif --- @if ($galleryAwardCount) - {{ $galleryAwardCount }} gallery submission{{ $galleryAwardCount == 1 ? '' : 's' }} awaiting currency rewards. - @else - The gallery currency award queue is clear. Hooray! - @endif - -
- View Queue
+ @endif
+ @if ($galleryCurrencyAwards)
+
+ @endif
@endif
+
-
+
+
Gallery Currency Awards @if ($galleryAwardCount) + {{ $galleryAwardCount }} + @endif +++ @if ($galleryAwardCount) + {{ $galleryAwardCount }} gallery submission{{ $galleryAwardCount == 1 ? '' : 's' }} awaiting currency rewards. + @else + The gallery currency award queue is clear. Hooray! + @endif + +
+ View Queue
+
{!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-
- @if (Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+ @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
{!! Form::file('image') !!}
+
+ {!! Form::label('image', 'Choose file...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('image', ['class' => 'custom-file-input']) !!}
+
Recommended size: 100px x 100px
@if ($item->has_image)
@@ -41,7 +44,7 @@
{!! Form::select('item_category_id', $categories, $item->item_category_id, ['class' => 'form-control']) !!}
{!! Form::label('Item Rarity (Optional)') !!} {!! add_help('This should be a number.') !!}
@@ -51,7 +54,7 @@
@endif
- @if (Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+ @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
@@ -82,7 +85,7 @@
{!! Form::textarea('description', $item->description, ['class' => 'form-control wysiwyg']) !!}
- @if (Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+ @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
{!! Form::label('Uses (Optional)') !!} {!! add_help('A short description of the item\'s use(s). Supports raw HTML if need be, but keep it brief.') !!}
{!! Form::text('uses', $item && $item->uses ? $item->uses : '', ['class' => 'form-control']) !!}
@@ -94,7 +97,7 @@
{!! Form::checkbox('allow_transfer', 1, $item->id ? $item->allow_transfer : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
{!! Form::label('allow_transfer', 'Allow User → User Transfer', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is off, users will not be able to transfer this item to other users. Non-account-bound items can be account-bound when granted to users directly.') !!}
- @if (Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+ @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
{!! Form::checkbox('is_released', 1, $item->id ? $item->is_released : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
{!! Form::label('is_released', 'Is Released', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is off, users will not be able to view information for the item/it will be hidden from view. This is overridden by the item being owned at any point by anyone on the site.') !!}
@@ -102,7 +105,7 @@
@endif
- @if (Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+ @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
Availability Information
@@ -120,7 +123,7 @@
@endif
- @if (Config::get('lorekeeper.extensions.item_entry_expansion.resale_function'))
+ @if (config('lorekeeper.extensions.item_entry_expansion.resale_function'))
Resale InformationThe currency and amount users will be able to sell this item from their inventory for. If quantity is not set, the item will be unable to be sold.
diff --git a/resources/views/admin/items/create_edit_item_category.blade.php b/resources/views/admin/items/create_edit_item_category.blade.php
index 24b2317b8c..b3ca92923b 100644
--- a/resources/views/admin/items/create_edit_item_category.blade.php
+++ b/resources/views/admin/items/create_edit_item_category.blade.php
@@ -1,7 +1,7 @@
@extends('admin.layout')
@section('admin-title')
- Item Categories
+ {{ $category->id ? 'Edit' : 'Create' }} Item Category
@endsection
@section('admin-content')
@@ -11,7 +11,7 @@
($category->id ? 'Edit' : 'Create') . ' Category' => $category->id ? 'admin/data/item-categories/edit/' . $category->id : 'admin/data/item-categories/create',
]) !!}
- {{ $category->id ? 'Edit' : 'Create' }} Category
+
{!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
- {!! Form::file('image') !!}
+
+ {!! Form::label('image', 'Choose file...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('image', ['class' => 'custom-file-input']) !!}
+
Recommended size: 200px x 200px
@if ($category->has_image)
@@ -43,6 +46,11 @@
{!! Form::textarea('description', $category->description, ['class' => 'form-control wysiwyg']) !!}
+
+ {!! Form::checkbox('is_visible', 1, $category->id ? $category->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+ {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned off, the category will not be visible in the category list or available for selection in search. Permissioned staff will still be able to add items to them, however.') !!}
+
+
diff --git a/resources/views/admin/items/item_categories.blade.php b/resources/views/admin/items/item_categories.blade.php
index 7884fbcde2..a441c74cbc 100644
--- a/resources/views/admin/items/item_categories.blade.php
+++ b/resources/views/admin/items/item_categories.blade.php
@@ -22,6 +22,9 @@
+ @if (!$category->is_visible)
+
+ @endif
{!! $category->displayName !!}
|
diff --git a/resources/views/admin/items/items.blade.php b/resources/views/admin/items/items.blade.php
index 426243b54b..73e0da2c18 100644
--- a/resources/views/admin/items/items.blade.php
+++ b/resources/views/admin/items/items.blade.php
@@ -26,7 +26,7 @@
{!! Form::text('name', Request::get('name'), ['class' => 'form-control', 'placeholder' => 'Name']) !!}
|
- {!! Form::select('item_category_id', $categories, Request::get('name'), ['class' => 'form-control']) !!}
+ {!! Form::select('item_category_id', $categories, Request::get('item_category_id'), ['class' => 'form-control']) !!}
{!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
@@ -54,7 +54,12 @@
-
{{ $item->name }}
+
+ @if (!$item->is_released)
+
+ @endif
+ {{ $item->name }}
+
{{ $item->category ? $item->category->name : '' }}
diff --git a/resources/views/admin/layout.blade.php b/resources/views/admin/layout.blade.php
index df42903da1..619127e616 100644
--- a/resources/views/admin/layout.blade.php
+++ b/resources/views/admin/layout.blade.php
@@ -1,8 +1,7 @@
@extends('layouts.app')
@section('title')
- Admin ::
- @yield('admin-title')
+ Admin{!! View::hasSection('admin-title') ? ' :: ' . trim(View::getSection('admin-title')) : '' !!}
@endsection
@section('sidebar')
diff --git a/resources/views/admin/logs.blade.php b/resources/views/admin/logs.blade.php
index 80c206445a..babdd352d6 100644
--- a/resources/views/admin/logs.blade.php
+++ b/resources/views/admin/logs.blade.php
@@ -9,24 +9,58 @@
Admin Logs+
+ {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+
+
{!! $logs->render() !!}
-
+ {!! Form::select('action', $actions, Request::get('action'), ['class' => 'form-control', 'placeholder' => 'Select Action']) !!}
+
+
+ {!! Form::select('user_id', $staff, Request::get('user_id'), ['class' => 'form-control', 'placeholder' => 'Select Staff']) !!}
+
+
+ {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+
+ {!! Form::close() !!}
+
You rolled {{ $quantity }} time{{ $quantity != 1 ? 's' : '' }} for the following: -
Note: "None" results are not shown in this table. diff --git a/resources/views/admin/loot_tables/create_edit_loot_table.blade.php b/resources/views/admin/loot_tables/create_edit_loot_table.blade.php index 636cfc6828..02f1e18b50 100644 --- a/resources/views/admin/loot_tables/create_edit_loot_table.blade.php +++ b/resources/views/admin/loot_tables/create_edit_loot_table.blade.php @@ -1,7 +1,7 @@ @extends('admin.layout') @section('admin-title') - Loot Tables + {{ $table->id ? 'Edit' : 'Create' }} Loot Table @endsection @section('admin-content') @@ -56,7 +56,7 @@{!! Form::select(
'rewardable_type[]',
- Config::get('lorekeeper.extensions.item_entry_expansion.loot_tables.enable')
+ config('lorekeeper.extensions.item_entry_expansion.loot_tables.enable')
? ['Item' => 'Item', 'ItemRarity' => 'Item Rarity', 'Currency' => 'Currency', 'LootTable' => 'Loot Table', 'ItemCategory' => 'Item Category', 'ItemCategoryRarity' => 'Item Category (Conditional)', 'None' => 'None']
: ['Item' => 'Item', 'Currency' => 'Currency', 'LootTable' => 'Loot Table', 'ItemCategory' => 'Item Category', 'None' => 'None'],
$loot->rewardable_type,
@@ -77,8 +77,8 @@
@elseif($loot->rewardable_type == 'ItemCategoryRarity')
|
{!! Form::select('rewardable_id[]', $categories, $loot->rewardable_id, ['class' => 'form-control selectize', 'placeholder' => 'Category']) !!}
- {!! Form::select('criteria[]', ['=' => '=', '<' => '<', '>' => '>', '<=' => '<=', '>=' => '>='], isset($loot->data['criteria']) ? $loot->data['criteria'] : null, ['class' => 'form-control', 'placeholder' => 'Criteria']) !!}
- {!! Form::select('rarity[]', $rarities, isset($loot->data['rarity']) ? $loot->data['rarity'] : null, ['class' => 'form-control', 'placeholder' => 'Rarity']) !!}
+ {!! Form::select('criteria[' . $loop->index . ']', ['=' => '=', '<' => '<', '>' => '>', '<=' => '<=', '>=' => '>='], isset($loot->data['criteria']) ? $loot->data['criteria'] : null, ['class' => 'form-control', 'placeholder' => 'Criteria']) !!}
+ {!! Form::select('rarity[' . $loop->index . ']', $rarities, isset($loot->data['rarity']) ? $loot->data['rarity'] : null, ['class' => 'form-control', 'placeholder' => 'Rarity']) !!}
@elseif($loot->rewardable_type == 'ItemCategory')
{!! Form::select('rewardable_id[]', $categories, $loot->rewardable_id, ['class' => 'form-control item-select selectize', 'placeholder' => 'Select Item']) !!}
@@ -108,7 +108,7 @@
{!! Form::select(
'rewardable_type[]',
- Config::get('lorekeeper.extensions.item_entry_expansion.loot_tables.enable')
+ config('lorekeeper.extensions.item_entry_expansion.loot_tables.enable')
? ['Item' => 'Item', 'ItemRarity' => 'Item Rarity', 'Currency' => 'Currency', 'LootTable' => 'Loot Table', 'ItemCategory' => 'Item Category', 'ItemCategoryRarity' => 'Item Category (Conditional)', 'None' => 'None']
: ['Item' => 'Item', 'Currency' => 'Currency', 'LootTable' => 'Loot Table', 'ItemCategory' => 'Item Category', 'None' => 'None'],
null,
@@ -208,6 +208,11 @@
$cell.html('');
$cell.append($clone);
if (val != 'ItemCategoryRarity' && val != 'ItemRarity') $clone.selectize();
+ else {
+ var row_num = $(this).parent().parent().index();
+ $clone.find('[name="rarity[]"]').attr('name', `rarity[${row_num}]`);
+ $clone.find('[name="criteria[]"]').attr('name', `criteria[${row_num}]`);
+ }
});
function attachRewardTypeListener(node) {
@@ -227,6 +232,11 @@ function attachRewardTypeListener(node) {
$cell.html('');
$cell.append($clone);
if (val != 'ItemCategoryRarity' && val != 'ItemRarity') $clone.selectize();
+ else {
+ var row_num = $(this).parent().parent().index();
+ $clone.find('[name="rarity[]"]').attr('name', `rarity[${row_num}]`);
+ $clone.find('[name="criteria[]"]').attr('name', `criteria[${row_num}]`);
+ }
});
}
diff --git a/resources/views/admin/masterlist/character_transfers.blade.php b/resources/views/admin/masterlist/character_transfers.blade.php
index e6dd4a107a..cfeacd8f28 100644
--- a/resources/views/admin/masterlist/character_transfers.blade.php
+++ b/resources/views/admin/masterlist/character_transfers.blade.php
@@ -13,6 +13,27 @@
@include('admin.masterlist._header', ['tradeCount' => $tradeCount, 'transferCount' => $transferCount])
+ |
+ {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+
+
{!! $transfers->render() !!}
@foreach ($transfers as $transfer)
@include('admin.masterlist._transfer', ['transfer' => $transfer])
diff --git a/resources/views/admin/masterlist/create_character.blade.php b/resources/views/admin/masterlist/create_character.blade.php
index 5bbca6227a..956b01d60a 100644
--- a/resources/views/admin/masterlist/create_character.blade.php
+++ b/resources/views/admin/masterlist/create_character.blade.php
@@ -122,7 +122,7 @@
+
+ {!! Form::close() !!}
+
+ {!! Form::select(
+ 'sort',
+ [
+ 'newest' => 'Newest First',
+ 'oldest' => 'Oldest First',
+ ],
+ Request::get('sort') ?: 'oldest',
+ ['class' => 'form-control'],
+ ) !!}
+
+
+ {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+
+
{!! Form::label('On Transfer Cooldown Until (Optional)') !!}
- {!! Form::text('transferrable_at', old('transferrable_at'), ['class' => 'form-control', 'id' => 'datepicker']) !!}
+ {!! Form::text('transferrable_at', old('transferrable_at'), ['class' => 'form-control datepicker']) !!}
Image Upload@@ -134,9 +134,12 @@ @else {!! add_help('This is the full masterlist image. Note that the image is not protected in any way, so take precautions to avoid art/design theft.') !!} @endif -{!! Form::file('image', ['id' => 'mainImage']) !!}
+
+ {!! Form::label('image', 'Choose file...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('image', ['class' => 'custom-file-input', 'id' => 'mainImage']) !!}
+
- @if (Config::get('lorekeeper.settings.masterlist_image_automation') === 1)
+ @if (config('lorekeeper.settings.masterlist_image_automation') === 1)
{!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
{!! Form::label('use_cropper', 'Use Thumbnail Automation', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the Thumbnail Automation, or upload a custom thumbnail.') !!}
@@ -169,8 +172,11 @@
{!! Form::label('Thumbnail Image') !!} {!! add_help('This image is shown on the masterlist page.') !!}
-
{!! Form::file('thumbnail') !!}
- Recommended size: {{ Config::get('lorekeeper.settings.masterlist_thumbnails.width') }}px x {{ Config::get('lorekeeper.settings.masterlist_thumbnails.height') }}px
+
+ {!! Form::label('thumbnail', 'Choose thumbnail...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('thumbnail', ['class' => 'custom-file-input']) !!}
+
+ Recommended size: {{ config('lorekeeper.settings.masterlist_thumbnails.width') }}px x {{ config('lorekeeper.settings.masterlist_thumbnails.height') }}px
@@ -244,9 +250,9 @@ 'These traits will be listed as required traits for the slot. The user will still be able to add on more traits, but not be able to remove these. This is allowed to conflict with the rarity above; you may add traits above the character\'s specified rarity.', ) !!} @endif + {{ $page->id ? 'Edit' : 'Create' }} Page
- @if ($page->id && !Config::get('lorekeeper.text_pages.' . $page->key))
+ @if ($page->id && !config('lorekeeper.text_pages.' . $page->key))
Delete Page
@endif
@if ($page->id)
diff --git a/resources/views/admin/prompts/create_edit_prompt.blade.php b/resources/views/admin/prompts/create_edit_prompt.blade.php
index 1ce916c4e7..92edce4be2 100644
--- a/resources/views/admin/prompts/create_edit_prompt.blade.php
+++ b/resources/views/admin/prompts/create_edit_prompt.blade.php
@@ -1,7 +1,7 @@
@extends('admin.layout')
@section('admin-title')
- Prompts
+ {{ $prompt->id ? 'Edit' : 'Create' }} Prompts
@endsection
@section('admin-content')
@@ -34,7 +34,10 @@
{!! Form::file('image') !!}
+
+ {!! Form::label('image', 'Choose file...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('image', ['class' => 'custom-file-input']) !!}
+
Recommended size: 100px x 100px
@if ($prompt->has_image)
@@ -132,17 +135,13 @@
@section('scripts')
@parent
@include('js._loot_js', ['showLootTables' => true, 'showRaffles' => true])
+ @include('widgets._datetimepicker_js')
@endsection
diff --git a/resources/views/admin/prompts/create_edit_prompt_category.blade.php b/resources/views/admin/prompts/create_edit_prompt_category.blade.php
index dbb69f3fbd..6db2e538de 100644
--- a/resources/views/admin/prompts/create_edit_prompt_category.blade.php
+++ b/resources/views/admin/prompts/create_edit_prompt_category.blade.php
@@ -1,7 +1,7 @@
@extends('admin.layout')
@section('admin-title')
- Prompt Categories
+ {{ $category->id ? 'Edit' : 'Create' }} Prompt Category
@endsection
@section('admin-content')
@@ -11,7 +11,7 @@
($category->id ? 'Edit' : 'Create') . ' Category' => $category->id ? 'admin/data/prompt-categories/edit/' . $category->id : 'admin/data/prompt-categories/create',
]) !!}
- {{ $category->id ? 'Edit' : 'Create' }} Category
+
{!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-
{!! Form::file('image') !!}
+
+ {!! Form::label('image', 'Choose file...', ['class' => 'custom-file-label']) !!}
+ {!! Form::file('image', ['class' => 'custom-file-input']) !!}
+
Recommended size: 200px x 200px
@if ($category->has_image)
diff --git a/resources/views/admin/prompts/prompts.blade.php b/resources/views/admin/prompts/prompts.blade.php
index 7d076ffd8d..988ed3eccf 100644
--- a/resources/views/admin/prompts/prompts.blade.php
+++ b/resources/views/admin/prompts/prompts.blade.php
@@ -22,7 +22,7 @@
{!! Form::text('name', Request::get('name'), ['class' => 'form-control', 'placeholder' => 'Name']) !!}
- {!! Form::select('prompt_category_id', $categories, Request::get('name'), ['class' => 'form-control']) !!}
+ {!! Form::select('prompt_category_id', $categories, Request::get('prompt_category_id'), ['class' => 'form-control']) !!}
{!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
{!! Form::close() !!}
diff --git a/resources/views/admin/raffle/_raffle_create_edit.blade.php b/resources/views/admin/raffle/_raffle_create_edit.blade.php
index 543977740b..7aed50c132 100644
--- a/resources/views/admin/raffle/_raffle_create_edit.blade.php
+++ b/resources/views/admin/raffle/_raffle_create_edit.blade.php
@@ -10,7 +10,7 @@
{!! Form::label('winner_count', 'Number of Winners to Draw') !!}
- {!! Form::text('winner_count', $raffle->winner_count, ['class' => 'form-control']) !!}
+ {!! Form::text('winner_count', $raffle->winner_count ?? 1, ['class' => 'form-control']) !!}
{!! Form::label('group_id', 'Raffle Group') !!} {!! add_help('Raffle groups must be created before you can select them here.') !!}
@@ -78,9 +78,4 @@
@include('js._modal_loot_js', ['showLootTables' => false, 'showRaffles' => false])
-
+@include('widgets._datetimepicker_js')
diff --git a/resources/views/admin/raffle/_ticket_reroll.blade.php b/resources/views/admin/raffle/_ticket_reroll.blade.php
index f911024ca9..5337e0f442 100644
--- a/resources/views/admin/raffle/_ticket_reroll.blade.php
+++ b/resources/views/admin/raffle/_ticket_reroll.blade.php
@@ -2,7 +2,7 @@
Are you sure you want to reroll ticket #{{ $ticket->id }}, {!! $ticket->displayHolderName !!}? -{!! Form::text('reason', null, ['placeholder' => 'Reason for reroll', 'class' => 'form-control']) !!} +{!! Form::text('reason', null, ['placeholder' => 'Reason for reroll (Required)', 'class' => 'form-control']) !!}
{!! Form::submit('Yes, reroll this winner', ['class' => 'btn btn-danger']) !!}
diff --git a/resources/views/admin/raffle/index.blade.php b/resources/views/admin/raffle/index.blade.php
index e649c68b64..92301fec86 100644
--- a/resources/views/admin/raffle/index.blade.php
+++ b/resources/views/admin/raffle/index.blade.php
@@ -31,64 +31,79 @@
@endif
-
-
- @endif
-
-
-
@elseif($raffle->is_active == 1)
{{ $groups[$raffle->group_id]->name }} {{ $groups[$raffle->group_id]->is_active ? 'Visible' : 'Hidden' }}+ @if ($raffles->count()) + @foreach ($raffles as $key => $raffle) +
+
+ @endforeach
+ @else
+
+
-
+ {{ $key }}
+ @if ($raffle->first()->group_id > 0)
+
+ {{ $raffle->first()->group->is_active ? 'Visible' : 'Hidden' }}
+
- @if ($raffle->is_active < 2)
-
+
+ Roll Group
+
+
+ Edit Group
+
+
+ @endif
+ @endif
+
|
No raffles found.
+ @endif +@endsection + +@section('scripts') + @parent + +@endsection diff --git a/resources/views/admin/raffle/ticket_index.blade.php b/resources/views/admin/raffle/ticket_index.blade.php index 090c8aa8c3..148ecc3e37 100644 --- a/resources/views/admin/raffle/ticket_index.blade.php +++ b/resources/views/admin/raffle/ticket_index.blade.php @@ -8,70 +8,79 @@ {!! breadcrumbs(['Admin Panel' => 'admin', 'Raffle Index' => 'admin/raffles', 'Raffle Tickets for ' . $raffle->name => 'admin/raffles/view/' . $raffle->id]) !!}- @if ($raffle->end_at) - @if ($raffle->end_at < Carbon\Carbon::now()) -
+ @if ($raffle->end_at) + @if ($raffle->end_at < Carbon\Carbon::now()) +
This raffle is currently hidden. (Number of winners to be drawn: {{ $raffle->winner_count }})
+This raffle has a cap of {{ $raffle->ticket_cap }} tickets per individual.
+ @endif +This raffle is currently open. (Number of winners to be drawn: {{ $raffle->winner_count }})
This raffle has a cap of {{ $raffle->ticket_cap }} tickets per individual.
@endif - -This raffle is closed. Rolled: {!! format_date($raffle->rolled_at) !!}
-| # | -User | -- - - @foreach ($raffle->tickets()->winners()->get() - as $winner) - |
|---|---|---|
| {{ $winner->position }} | -{!! $winner->displayHolderName !!} @if ($winner->reroll) - (Reroll) - @endif - | -
- Reroll?
- |
-
@@ -87,76 +96,100 @@
This raffle is closed. Rolled: {!! format_date($raffle->rolled_at) !!}
| # | -User | - - - @foreach ($raffle->tickets()->winners()->get() - as $winner) -
|---|---|
| {{ $winner->position }} | -{!! $winner->displayHolderName !!} | -
| # | -User | - @if ($raffle->is_active < 2) -- @endif - - - @foreach ($tickets as $count => $ticket) - |
|---|---|---|
| {{ $page * 200 + $count + 1 }} | -{!! $ticket->displayHolderName !!} | - @if ($raffle->is_active < 2) -{!! Form::open(['url' => 'admin/raffles/view/ticket/delete/' . $ticket->id]) !!}{!! Form::submit('Delete', ['class' => 'btn btn-danger btn-sm']) !!}{!! Form::close() !!} | - @endif -