From 38e75dcf376477ed2a3c490e3e14b71ccf6b6684 Mon Sep 17 00:00:00 2001 From: itinerare Date: Fri, 22 May 2020 10:12:51 -0400 Subject: [PATCH 1/4] gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7de15a1e8b..160f291c6f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ Homestead.yaml npm-debug.log yarn-error.log /composer.lock +*.env From 0665f8e5f0be1bba6db2682c80daf8cdcc88e308 Mon Sep 17 00:00:00 2001 From: itinerare Date: Fri, 22 May 2020 16:03:41 -0400 Subject: [PATCH 2/4] Bugs fixed: - Adjust mobile header to reduce mobile menu vertical offset on smaller devices - Fix site being displayed wider than device on mobile - Change character description and image note editing to be inline rather than in a modal to resolve a bug around nested modals (courtesy of Speedy https://github.com/SpeedyD ) Misc: - Fix header on character change log - Change Characters section in Encyclopedia to use Characters image rather than Account image - Messy fix for the "Select Currenc" display issue in trades - Add link to character page to character slug text on submissions --- public/css/lorekeeper.css | 26 ++++++++++++++++++- .../views/character/_image_info.blade.php | 10 ++----- resources/views/character/_image_js.blade.php | 10 +++++-- .../views/character/_tab_notes.blade.php | 4 +-- .../views/character/character_logs.blade.php | 2 +- resources/views/home/_character.blade.php | 2 +- resources/views/pages/_dashboard.blade.php | 2 +- .../views/widgets/_bank_select.blade.php | 2 +- .../views/widgets/_bank_select_row.blade.php | 2 +- resources/views/world/index.blade.php | 2 +- 10 files changed, 43 insertions(+), 19 deletions(-) diff --git a/public/css/lorekeeper.css b/public/css/lorekeeper.css index 2239c95cad..7fdf729998 100644 --- a/public/css/lorekeeper.css +++ b/public/css/lorekeeper.css @@ -177,6 +177,12 @@ main > .row { padding: 10px 20px; } +@media (max-width: 767px) { + .site-mobile-header { + top: 54px !important; + } +} + @media (max-width: 991px) { .site-header-image { display: none; @@ -184,7 +190,7 @@ main > .row { .site-mobile-header { display: block; position: fixed; - top: 68px; + top: 68px; z-index: 2; width: 100%; } @@ -239,6 +245,24 @@ main > .row { box-shadow: none; } + + /*fix for screen being over-wide on mobile*/ + .row { + margin:0; max-width:100%; + } + + .container-fluid { + padding:0px; + } + + .site-footer .navbar .navbar-nav { + flex-wrap: wrap; justify-content: center; + } + + .timestamp { + margin-left: 1rem!important; + margin-right: 1rem!important; + } } /* Footer */ diff --git a/resources/views/character/_image_info.blade.php b/resources/views/character/_image_info.blade.php index ea836ffc98..dc1a22b374 100644 --- a/resources/views/character/_image_info.blade.php +++ b/resources/views/character/_image_info.blade.php @@ -76,15 +76,9 @@ {{-- Image notes --}}
@if($image->parsed_description) -
{!! $image->parsed_description !!}
+
{!! $image->parsed_description !!}
@else -
No additional notes given.
- @endif - - @if(Auth::check() && Auth::user()->hasPower('manage_characters')) -
- Edit -
+
No additional notes given.
@endif
diff --git a/resources/views/character/_image_js.blade.php b/resources/views/character/_image_js.blade.php index 9b448952ee..678dc833f1 100644 --- a/resources/views/character/_image_js.blade.php +++ b/resources/views/character/_image_js.blade.php @@ -6,7 +6,10 @@ }); $('.edit-notes').on('click', function(e) { e.preventDefault(); - loadModal("{{ url('admin/character/image') }}/"+$(this).data('id')+"/notes", 'Edit Image Notes'); + $( "div.imagenoteseditingparse" ).load("{{ url('admin/character/image') }}/"+$(this).data('id')+"/notes", 'Edit Image Notes'); + $( "div.imagenoteseditingparse" ).attr('id', 'modal'); + $( ".edit-notes" ).remove(); + //loadModal("{{ url('admin/character/image') }}/"+$(this).data('id')+"/notes", 'Edit Image Notes'); }); $('.edit-credits').on('click', function(e) { e.preventDefault(); @@ -34,7 +37,10 @@ }); $('.edit-description').on('click', function(e) { e.preventDefault(); - loadModal("{{ url($character->is_myo_slot ? 'admin/myo/' : 'admin/character/') }}/"+$(this).data('{{ $character->is_myo_slot ? 'id' : 'slug' }}')+"/description", 'Edit Description'); + $( "div.descriptioneditingparse" ).load("{{ url($character->is_myo_slot ? 'admin/myo/' : 'admin/character/') }}/"+$(this).data('{{ $character->is_myo_slot ? 'id' : 'slug' }}')+"/description", 'Edit Description'); + $( "div.descriptioneditingparse" ).attr('id', 'modal'); + $( ".edit-description" ).remove(); + //loadModal("{{ url($character->is_myo_slot ? 'admin/myo/' : 'admin/character/') }}/"+$(this).data('{{ $character->is_myo_slot ? 'id' : 'slug' }}')+"/description", 'Edit Description'); }); $('.delete-character').on('click', function(e) { e.preventDefault(); diff --git a/resources/views/character/_tab_notes.blade.php b/resources/views/character/_tab_notes.blade.php index adb9c85d04..74652aa3d0 100644 --- a/resources/views/character/_tab_notes.blade.php +++ b/resources/views/character/_tab_notes.blade.php @@ -1,7 +1,7 @@ @if($character->parsed_description) -
{!! $character->parsed_description !!}
+
{!! $character->parsed_description !!}
@else - No additional notes given. +
No additional notes given.
@endif @if(Auth::check() && Auth::user()->hasPower('manage_characters'))
diff --git a/resources/views/character/character_logs.blade.php b/resources/views/character/character_logs.blade.php index 3fd77ba752..b058b9c48b 100644 --- a/resources/views/character/character_logs.blade.php +++ b/resources/views/character/character_logs.blade.php @@ -7,7 +7,7 @@ @include('character._header', ['character' => $character]) -

Ownership History

+

Change Log

{!! $logs->render() !!} diff --git a/resources/views/home/_character.blade.php b/resources/views/home/_character.blade.php index 1bbeca9c3a..dfe9236901 100644 --- a/resources/views/home/_character.blade.php +++ b/resources/views/home/_character.blade.php @@ -1,6 +1,6 @@ @if($character)
-
{{ $character->slug }}
+
{{ $character->slug }}
@else
Character not found.
@endif \ No newline at end of file diff --git a/resources/views/pages/_dashboard.blade.php b/resources/views/pages/_dashboard.blade.php index 41dd518e92..a4723d4a01 100644 --- a/resources/views/pages/_dashboard.blade.php +++ b/resources/views/pages/_dashboard.blade.php @@ -1,5 +1,5 @@

Welcome, {!! Auth::user()->displayName !!}!

-
+
{!! format_date(Carbon\Carbon::now()) !!}
diff --git a/resources/views/widgets/_bank_select.blade.php b/resources/views/widgets/_bank_select.blade.php index d1007ce9ac..c170716529 100644 --- a/resources/views/widgets/_bank_select.blade.php +++ b/resources/views/widgets/_bank_select.blade.php @@ -16,7 +16,7 @@ getCurrencySelect(isset($isTransferrable) ? $isTransferrable : false); ?> @foreach($selected as $currencyId=>$quantity)
- + diff --git a/resources/views/widgets/_bank_select_row.blade.php b/resources/views/widgets/_bank_select_row.blade.php index c48035c34c..47dd35909c 100644 --- a/resources/views/widgets/_bank_select_row.blade.php +++ b/resources/views/widgets/_bank_select_row.blade.php @@ -4,7 +4,7 @@ @if($owner) - + diff --git a/resources/views/world/index.blade.php b/resources/views/world/index.blade.php index 5a4fa29f2b..5f162a0e2d 100644 --- a/resources/views/world/index.blade.php +++ b/resources/views/world/index.blade.php @@ -10,7 +10,7 @@
- +
Characters
    From 41bdd7184be5bc69c4e0536d0bb149bd843799f1 Mon Sep 17 00:00:00 2001 From: itinerare Date: Fri, 22 May 2020 18:06:00 -0400 Subject: [PATCH 3/4] Fix undefined variables in image upload notification. --- app/Services/CharacterManager.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Services/CharacterManager.php b/app/Services/CharacterManager.php index df3b255ffb..0f9c16cf81 100644 --- a/app/Services/CharacterManager.php +++ b/app/Services/CharacterManager.php @@ -370,9 +370,10 @@ public function createLog($senderId, $senderAlias, $recipientId, $recipientAlias * @param array $data * @param \App\Models\Character\Character $character * @param \App\Models\User\User $user + * @param \App\Models\User\User $staff * @return \App\Models\Character\Character|bool */ - public function createImage($data, $character, $user) + public function createImage($data, $character, $user, $staff) { DB::beginTransaction(); @@ -409,6 +410,9 @@ public function createImage($data, $character, $user) Notifications::create('IMAGE_UPLOAD', $character->user, [ 'character_url' => $character->url, 'character_slug' => $character->slug, + 'character_name' => $character->name, + 'sender_url' => $staff->url, + 'sender_name' => $staff->name ]); } From 1b9849b535c7d4a8ce98038ab0380472bcd964ba Mon Sep 17 00:00:00 2001 From: itinerare Date: Fri, 22 May 2020 22:15:39 -0400 Subject: [PATCH 4/4] Change wording on home > characters to "My Characters" for clarity/to further distinguish it from profile > characters/to match the home menu in the navbar, and edit the home sidebar to match. Likewise for MYO slots. --- resources/views/home/_sidebar.blade.php | 4 ++-- resources/views/home/characters.blade.php | 6 +++--- resources/views/home/myos.blade.php | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/home/_sidebar.blade.php b/resources/views/home/_sidebar.blade.php index 181a7cb3d0..b73bc7fa75 100644 --- a/resources/views/home/_sidebar.blade.php +++ b/resources/views/home/_sidebar.blade.php @@ -2,8 +2,8 @@
  • Home
  • Inventory
    -
    Characters
    -
    MYO Slots
    +
    My Characters
    +
    My MYO Slots
    Inventory
    Bank
    • diff --git a/resources/views/home/characters.blade.php b/resources/views/home/characters.blade.php index 1053167295..abb3bb98d3 100644 --- a/resources/views/home/characters.blade.php +++ b/resources/views/home/characters.blade.php @@ -1,12 +1,12 @@ @extends('home.layout') -@section('home-title') Characters @endsection +@section('home-title') My Characters @endsection @section('home-content') -{!! breadcrumbs(['Characters' => 'characters']) !!} +{!! breadcrumbs(['My Characters' => 'characters']) !!}

    - Characters + My Characters

    This is a list of characters you own. Drag and drop to rearrange them.

    diff --git a/resources/views/home/myos.blade.php b/resources/views/home/myos.blade.php index 77f44bcdf4..d9e55f9462 100644 --- a/resources/views/home/myos.blade.php +++ b/resources/views/home/myos.blade.php @@ -1,12 +1,12 @@ @extends('home.layout') -@section('home-title') MYO Slots @endsection +@section('home-title') My MYO Slots @endsection @section('home-content') -{!! breadcrumbs(['Characters' => 'characters', 'MYO Slots' => 'myos']) !!} +{!! breadcrumbs(['Characters' => 'characters', 'My MYO Slots' => 'myos']) !!}

    - MYO Slots + My MYO Slots

    This is a list of MYO slots you own - click on a slot to view details about it. MYO slots can be submitted for design approval from their respective pages.

{!! Form::select('currency_id['.strtolower($owner->logType).'-'.$owner->id.'][]', $currencySelect, $currencyId, ['class' => 'form-control selectize', 'placeholder' => 'Select Currency']) !!}{!! Form::select('currency_id['.strtolower($owner->logType).'-'.$owner->id.'][]', $currencySelect, $currencyId, ['class' => 'form-control selectize', 'placeholder' => 'Select Currency ']) !!} {!! Form::text('currency_quantity['.strtolower($owner->logType).'-'.$owner->id.'][]', $quantity, ['class' => 'form-control']) !!} Remove
{!! Form::select('currency_id['.strtolower($owner->logType).'-'.$owner->id.'][]', $owner->getCurrencySelect(isset($isTransferrable) ? $isTransferrable : false), null, ['class' => 'form-control selectize', 'placeholder' => 'Select Currency']) !!}{!! Form::select('currency_id['.strtolower($owner->logType).'-'.$owner->id.'][]', $owner->getCurrencySelect(isset($isTransferrable) ? $isTransferrable : false), null, ['class' => 'form-control selectize', 'placeholder' => 'Select Currency ']) !!} {!! Form::text('currency_quantity['.strtolower($owner->logType).'-'.$owner->id.'][]', 0, ['class' => 'form-control']) !!} Remove