diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 9de4c1a0a..c6f07a55e 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -27,7 +27,7 @@ class AuthServiceProvider extends ServiceProvider * @var array */ protected $policies = [ - 'Lara\Model' => 'Lara\Policies\ModelPolicy', + //'Lara\Model' => 'Lara\Policies\ModelPolicy', User::class => UserPolicy::class, Role::class => RolePolicy::class, ClubEvent::class => ClubEventPolicy::class, @@ -61,6 +61,6 @@ public function boot() return true; }); - + } } diff --git a/app/Status.php b/app/Status.php index 0d98148c3..2249a826d 100644 --- a/app/Status.php +++ b/app/Status.php @@ -50,17 +50,17 @@ public static function style($status, $section = NULL) } switch ($status) { case STATUS::CANDIDATE: - return ["status" => "fas fa-adjust", "style" => "color:yellowgreen;", "title" => "Kandidat"]; + return ["status" => "fa-solid fa-adjust", "style" => "color:yellowgreen;", "title" => "Kandidat"]; case STATUS::VETERAN: - return ["status" => "fas fa-star", "style" => "color:gold;", "title" => "Veteran"]; + return ["status" => "fa-solid fa-star", "style" => "color:gold;", "title" => "Veteran"]; case STATUS::MEMBER: - return ["status" => "fas fa-circle", "style" => "color:forestgreen;", "title" => "Aktiv"]; + return ["status" => "fa-solid fa-circle", "style" => "color:forestgreen;", "title" => "Aktiv"]; case STATUS::EXMEMBER: - return ["status" => "fas fa-user-times", "style" => "color:#CD7F32;", "title" => "ex-Mitglied"]; + return ["status" => "fa-solid fa-user-times", "style" => "color:#CD7F32;", "title" => "ex-Mitglied"]; case STATUS::EXCANDIDATE: - return ["status"=>"fas fa-circle", "style"=>"color:lightgrey;", "title"=>"ex-Kandidat"]; + return ["status"=>"fa-solid fa-circle", "style"=>"color:lightgrey;", "title"=>"ex-Kandidat"]; default: - return ["status" => "fas fa-circle", "style" => "color:lightgrey;", "title" => "Extern"]; + return ["status" => "fa-solid fa-circle", "style" => "color:lightgrey;", "title" => "Extern"]; } } diff --git a/resources/assets/sass/imports.scss b/resources/assets/sass/imports.scss index c0537ccad..e5e2b2701 100644 --- a/resources/assets/sass/imports.scss +++ b/resources/assets/sass/imports.scss @@ -1,7 +1,7 @@ @import "~bootstrap-select/sass/variables"; @import "~bootstrap-select/sass/bootstrap-select"; @import "~bootstrap-table/dist/bootstrap-table"; -@import "~tempusdominus-bootstrap-4/src/sass/tempusdominus-bootstrap-4"; +//@import "~tempusdominus-bootstrap-4/src/sass/tempusdominus-bootstrap-4"; $fa-font-path: '~@fortawesome/fontawesome-free/webfonts'; @import "~@fortawesome/fontawesome-free/scss/fontawesome"; diff --git a/resources/assets/sass/nav/navbar.scss b/resources/assets/sass/nav/navbar.scss index bdf1df77d..4bc13b7cb 100644 --- a/resources/assets/sass/nav/navbar.scss +++ b/resources/assets/sass/nav/navbar.scss @@ -2,7 +2,7 @@ @media screen and (max-height: 720px) { max-height: 200px; - overflow: scroll; + // overflow: scroll; } - overflow: visible; + //overflow: visible; } diff --git a/resources/assets/ts/ShiftType.ts b/resources/assets/ts/ShiftType.ts index c854a5332..d300168fe 100644 --- a/resources/assets/ts/ShiftType.ts +++ b/resources/assets/ts/ShiftType.ts @@ -38,11 +38,11 @@ $('.shiftTypeReplaceSelector').change((event) => { message: '

' + translate('replaceShiftTypeConfirmation') + '

' + shiftName + '

', buttons: { confirm: { - label: '' + translate('replaceAll'), + label: '' + translate('replaceAll'), className: 'btn-success' }, cancel: { - label: '', + label: '', className: 'btn-secondary' } }, diff --git a/resources/assets/ts/shifts/autocomplete.ts b/resources/assets/ts/shifts/autocomplete.ts index 92d9c3867..d33fc93a4 100644 --- a/resources/assets/ts/shifts/autocomplete.ts +++ b/resources/assets/ts/shifts/autocomplete.ts @@ -286,16 +286,16 @@ $(() => { // Switch comment icon in week view if ($commentInput.val() == "") { - $commentInput.parent().children().children("button").children("i").removeClass().addClass("fas fa-comment-alt"); + $commentInput.parent().children().children("button").children("i").removeClass().addClass("fa-solid fa-comment-alt"); } else { $commentInput.parent().children().children("button").children("i").removeClass().addClass("fa fa-comment"); } // Switch comment in event view if ($commentInput.val() == "") { - $commentInput.parent().children("span").children("i").removeClass().addClass("fas fa-comment-alt"); + $commentInput.parent().children("span").children("i").removeClass().addClass("fa-solid fa-comment-alt"); } else { - $commentInput.parent().children("span").children("i").removeClass().addClass("fas fa-comment"); + $commentInput.parent().children("span").children("i").removeClass().addClass("fa-solid fa-comment"); } let $colorDiv = $userNameInput.closest('.shiftRow').find("div.shift_title"); diff --git a/resources/assets/ts/statistics/StatisticsView.ts b/resources/assets/ts/statistics/StatisticsView.ts index 8be1011a2..415684259 100644 --- a/resources/assets/ts/statistics/StatisticsView.ts +++ b/resources/assets/ts/statistics/StatisticsView.ts @@ -162,7 +162,7 @@ $('[name^=show-stats-person]').click(function(e) { const dialog = bootbox.dialog({ title: translate('listOfShiftsDone') + chosenPerson, size: 'large', - message: '

' + translate('loading') + '

', + message: '

' + translate('loading') + '

', onEscape: () => {} }); diff --git a/resources/assets/ts/template/templateOverView.ts b/resources/assets/ts/template/templateOverView.ts index 0a8c264ee..f6b449a09 100644 --- a/resources/assets/ts/template/templateOverView.ts +++ b/resources/assets/ts/template/templateOverView.ts @@ -21,11 +21,11 @@ $(()=>{ message: '

' + translate('deleteTemplateMessage') + '

'+ templateName + '

', buttons: { confirm: { - label:'', + label:'', className:'btn-danger' }, cancel: { - label:'', + label:'', className: 'btn-success' } }, diff --git a/resources/assets/ts/usersOverview.ts b/resources/assets/ts/usersOverview.ts index 9059288c6..d4ac4f647 100644 --- a/resources/assets/ts/usersOverview.ts +++ b/resources/assets/ts/usersOverview.ts @@ -26,16 +26,16 @@ $(() => { const selectedValue = $(target).val(); bootbox.confirm({ - title: '

' + translate('changeUserStatusHeader') + ' 

', + title: '

' + translate('changeUserStatusHeader') + ' 

', size: 'large', message: '

' + translate('changeUserStatus') + '

' + userName + '

' + selectedValue + '

', buttons: { confirm: { - label: '', + label: '', className: 'btn-danger' }, cancel: { - label: '', + label: '', className: 'btn-success' } }, @@ -54,16 +54,16 @@ $(() => { const userName = $(target).data('name'); bootbox.confirm({ - title: '

' + translate('deleteUserHeader') + ' 

', + title: '

' + translate('deleteUserHeader') + ' 

', size: 'large', message: '

' + translate('deleteUser') + '

' + userName + '

', buttons: { confirm: { - label: '', + label: '', className: 'btn-danger' }, cancel: { - label: '', + label: '', className: 'btn-success' } }, diff --git a/resources/views/clubevent/createClubEventView.blade.php b/resources/views/clubevent/createClubEventView.blade.php index e1605933a..046a61b34 100644 --- a/resources/views/clubevent/createClubEventView.blade.php +++ b/resources/views/clubevent/createClubEventView.blade.php @@ -171,43 +171,43 @@ class="col-form-label col-12 col-md-2">{{ trans('mainLang.template') }}:
-     +     {{ trans('mainLang.normalProgramm') }}
-     +     {{ trans('mainLang.special') }}
-     +     {{ trans('mainLang.LiveBandDJ') }}
-     +     {{ trans('mainLang.utilization') }}
 {!! Form::radio('type', "4", ["checked"=>"checked" , "class"=>'form-check']) !!} {{ trans('mainLang.internalEvent') }}
-     +     {{ trans('mainLang.flooding') }}
-     +     {{ trans('mainLang.flyersPlacard') }}
-     +     {{ trans('mainLang.preSale') }}
 {!! Form::radio('type', "9", [$type == 9 ? "checked" : "", "class"=>'form-check']) !!} {{ trans('mainLang.others') }}
-     +     {{ trans('mainLang.outsideEvent') }}
-     +     {{ trans('mainLang.buffet') }}
 {!! Form::radio('type', "1", [$type == 1 ? "checked" : "", "class"=>'form-check'] ) !!} {{ trans('mainLang.information') }}
-     +     {{ trans('mainLang.survey') }}
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index fd85584d9..9a5147b73 100755 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -62,7 +62,7 @@ class="btn btn-primary btn-lg back-to-top hidden-print d-md-none d-lg-none d-sm- title="{{ trans("mainLang.backToTop") }}" data-toggle="tooltip" data-placement="right"> - +
diff --git a/resources/views/monthView.blade.php b/resources/views/monthView.blade.php index 2fab3e347..53f083c24 100644 --- a/resources/views/monthView.blade.php +++ b/resources/views/monthView.blade.php @@ -16,7 +16,7 @@ - +
- +
diff --git a/resources/views/partials/event-marker.blade.php b/resources/views/partials/event-marker.blade.php index cf6cc00c0..20785202e 100644 --- a/resources/views/partials/event-marker.blade.php +++ b/resources/views/partials/event-marker.blade.php @@ -4,28 +4,28 @@ class="{{\Lara\utilities\ViewUtility::getEventPaletteClass($clubEvent)}}" title="{{ trans('mainLang.addToCalendar')}}"> @if( $clubEvent->evnt_type == 0) - + @elseif( $clubEvent->evnt_type == 1) -    +    @elseif( $clubEvent->evnt_type == 2) - + @elseif( $clubEvent->evnt_type == 3) - + @elseif( $clubEvent->evnt_type == 4) - + @elseif( $clubEvent->evnt_type == 5) -    +    @elseif( $clubEvent->evnt_type == 6) - + @elseif( $clubEvent->evnt_type == 7) - + @elseif( $clubEvent->evnt_type == 8) - + @elseif( $clubEvent->evnt_type == 9) - + @elseif( $clubEvent->evnt_type == 10) - + @elseif( $clubEvent->evnt_type == 11) - + @endif diff --git a/resources/views/partials/events/editOptions.blade.php b/resources/views/partials/events/editOptions.blade.php index f3f7f1760..17d0431dd 100644 --- a/resources/views/partials/events/editOptions.blade.php +++ b/resources/views/partials/events/editOptions.blade.php @@ -36,7 +36,7 @@ class="btn btn-primary" data-toggle="tooltip" data-placement="bottom" title="{{ trans('mainLang.changeEvent') }}"> - +    - +
diff --git a/resources/views/partials/events/shift.blade.php b/resources/views/partials/events/shift.blade.php index bf83b4750..4d18a0aac 100644 --- a/resources/views/partials/events/shift.blade.php +++ b/resources/views/partials/events/shift.blade.php @@ -1,5 +1,5 @@
-
+
@@ -57,7 +57,7 @@ class="input form-control" @if(!is_null($shiftId) && $shiftId!='' && \Lara\Utilities::requirePermission('admin','marketing','clubleitung'))    + class="btn btn-primary btn-small" title="{{trans("mainLang.editShiftType")}}"> @endif
diff --git a/resources/views/partials/legend.blade.php b/resources/views/partials/legend.blade.php index 4269d0b9b..6964e128f 100644 --- a/resources/views/partials/legend.blade.php +++ b/resources/views/partials/legend.blade.php @@ -1,61 +1,61 @@
- + - {{ trans('mainLang.normalProgramm') }}         
-    +    - {{ trans('mainLang.information') }}         
- + - {{ trans('mainLang.special') }}         
- + - {{ trans('mainLang.LiveBandDJ') }}         
- + - {{ trans('mainLang.utilization') }}         
- + - {{ trans('mainLang.internalEvent') }}         
- + - {{ trans('mainLang.flooding') }}         
- + - {{ trans('mainLang.marketingFlyersPlacard') }}         
- + - {{ trans('mainLang.preSale') }}         
- + - {{ trans('mainLang.outsideEvent') }}         
- + - {{ trans('mainLang.buffet') }}         
- + - {{ trans('mainLang.others') }}          diff --git a/resources/views/partials/month/monthCell.blade.php b/resources/views/partials/month/monthCell.blade.php index d29e0b502..f93d89276 100644 --- a/resources/views/partials/month/monthCell.blade.php +++ b/resources/views/partials/month/monthCell.blade.php @@ -19,7 +19,7 @@ {{--if so show a grey placeholder for the guest--}}
- +    {{--and show him thats a private survey(=Interne Umfrage in german) only for users--}} diff --git a/resources/views/partials/personStatusMarker.blade.php b/resources/views/partials/personStatusMarker.blade.php index 3ea1afbaf..adc04303f 100644 --- a/resources/views/partials/personStatusMarker.blade.php +++ b/resources/views/partials/personStatusMarker.blade.php @@ -9,7 +9,7 @@ data-placement="top" title="{{ Lara\Status::localize($status, $section)}}"> @else - ', @@ -9,7 +9,7 @@ @if( is_null($shift->getPerson) ) -
+ class="far fa-comment"> @else @endif
{{-- COMMENT SECTION --}}
@@ -115,7 +115,7 @@ class="far fa-comment"> @else @endif see filter-scripts "Show/hide comments" function --}}
+ class="far fa-comment"> @else @endif
@include('partials.shifts.updateShiftFormOpener',['shift'=>$shift, 'autocomplete'=>$autocomplete]) diff --git a/resources/views/partials/statisticsMembers.blade.php b/resources/views/partials/statisticsMembers.blade.php index 0dd306019..b442d8f30 100644 --- a/resources/views/partials/statisticsMembers.blade.php +++ b/resources/views/partials/statisticsMembers.blade.php @@ -32,13 +32,13 @@ - {{trans('mainLang.name')}} + {{trans('mainLang.name')}} - {{trans('mainLang.totalShifts')}} + {{trans('mainLang.totalShifts')}} - {{ trans('mainLang.flooding') }} + {{ trans('mainLang.flooding') }}   diff --git a/resources/views/partials/weekCellFull.blade.php b/resources/views/partials/weekCellFull.blade.php index e2821655d..ebaa26eff 100644 --- a/resources/views/partials/weekCellFull.blade.php +++ b/resources/views/partials/weekCellFull.blade.php @@ -41,7 +41,7 @@ - {{ date("H:i", strtotime($clubEvent->evnt_time_end)) }}   -  {{ $clubEvent->section->title }} +  {{ $clubEvent->section->title }}
diff --git a/resources/views/partials/weekCellHidden.blade.php b/resources/views/partials/weekCellHidden.blade.php index 2716ec39e..87b191aa2 100644 --- a/resources/views/partials/weekCellHidden.blade.php +++ b/resources/views/partials/weekCellHidden.blade.php @@ -4,8 +4,8 @@

  {{ trans('mainLang.internalEventP') }}

- - {{ utf8_encode(strftime("%a, %d. %b", strtotime($clubEvent->evnt_date_start))) }} + + {{ utf8_encode(strftime("%a, %d. %b", strtotime($clubEvent->evnt_date_start))) }}   DV: {{ date("H:i", strtotime($clubEvent->getSchedule->schdl_time_preparation_start)) }}   @@ -13,12 +13,12 @@ - {{ date("H:i", strtotime($clubEvent->evnt_time_end)) }}   -  {{ $clubEvent->section->title }} +  {{ $clubEvent->section->title }}
- {{ trans('mainLang.moreDetailsAfterLogInMessage') }} + {{ trans('mainLang.moreDetailsAfterLogInMessage') }}
- + diff --git a/resources/views/partials/weekCellProtected.blade.php b/resources/views/partials/weekCellProtected.blade.php index 81b999d19..df9602f6d 100644 --- a/resources/views/partials/weekCellProtected.blade.php +++ b/resources/views/partials/weekCellProtected.blade.php @@ -27,7 +27,7 @@ - {{ date("H:i", strtotime($clubEvent->evnt_time_end)) }}   -  {{ $clubEvent->section->title }} +  {{ $clubEvent->section->title }}
diff --git a/resources/views/partials/weekCellSurvey.blade.php b/resources/views/partials/weekCellSurvey.blade.php index 33985fb25..7948ae411 100644 --- a/resources/views/partials/weekCellSurvey.blade.php +++ b/resources/views/partials/weekCellSurvey.blade.php @@ -5,7 +5,7 @@

- +   {{ trans('mainLang.internalSurvey') }}

@@ -23,12 +23,12 @@

- +   {{ $survey->title }}

- + {{ utf8_encode(strftime("%a, %d. %b", strtotime($survey->deadline))) }}
diff --git a/resources/views/surveyView.blade.php b/resources/views/surveyView.blade.php index 82fb32e31..2673304fe 100644 --- a/resources/views/surveyView.blade.php +++ b/resources/views/surveyView.blade.php @@ -123,7 +123,7 @@ style="float: right" class="btn btn-secondary btn-sm" data-placement="bottom"> - + @endif @@ -281,10 +281,10 @@ class="editButton btn btn-primary editSurveyAnswerBtn" data-token="{{csrf_token()}}" data-id="{{$answer->id}}" > - + + class="fa-solid fa-spinner fa-spin fa-2x d-none"> - + @endif diff --git a/resources/views/templateManagement.blade.php b/resources/views/templateManagement.blade.php index fba79c52b..2ecd1cc65 100644 --- a/resources/views/templateManagement.blade.php +++ b/resources/views/templateManagement.blade.php @@ -79,7 +79,7 @@
{{ trans('mainLang.editUser') }} - +
@@ -148,7 +148,7 @@ {{ trans('mainLang.roleManagement') }} - +
diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php index 4305710c6..0096c2bb7 100644 --- a/resources/views/user/index.blade.php +++ b/resources/views/user/index.blade.php @@ -135,7 +135,7 @@ @canEditUser($user) {{Form::open(['route'=>['user.delete',$user->id]])}} - + {{ Form::close() }} @endcanEditUser diff --git a/resources/views/userpersonalpage/index.blade.php b/resources/views/userpersonalpage/index.blade.php index c7db3b784..289c4aded 100644 --- a/resources/views/userpersonalpage/index.blade.php +++ b/resources/views/userpersonalpage/index.blade.php @@ -150,7 +150,7 @@ class="btn btn-sm btn-success">{{ trans('mainLang.update') }}
+ class="btn btn-sm btn-danger"> {{ trans('mainLang.delete') }}
{{ Form::text("secret",$secret,['class'=>'hide']) }} diff --git a/resources/views/weekView.blade.php b/resources/views/weekView.blade.php index a97f74c04..67be0bf99 100644 --- a/resources/views/weekView.blade.php +++ b/resources/views/weekView.blade.php @@ -26,7 +26,7 @@
- +
@@ -49,7 +49,7 @@ - +