Skip to content

Commit

Permalink
👽️ anpassungen für fontawsome
Browse files Browse the repository at this point in the history
  • Loading branch information
@P1tt187
P1tt187 committed Mar 13, 2023
1 parent 9c9cc64 commit da787b8
Show file tree
Hide file tree
Showing 31 changed files with 96 additions and 96 deletions.
4 changes: 2 additions & 2 deletions app/Providers/AuthServiceProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -61,6 +61,6 @@ public function boot()

return true;
});

}
}
12 changes: 6 additions & 6 deletions app/Status.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
}
}

Expand Down
2 changes: 1 addition & 1 deletion resources/assets/sass/imports.scss
View file
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
4 changes: 2 additions & 2 deletions resources/assets/sass/nav/navbar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

@media screen and (max-height: 720px) {
max-height: 200px;
overflow: scroll;
// overflow: scroll;
}
overflow: visible;
//overflow: visible;
}
4 changes: 2 additions & 2 deletions resources/assets/ts/ShiftType.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ $('.shiftTypeReplaceSelector').change((event) => {
message: '<p>' + translate('replaceShiftTypeConfirmation') + '</p><p class="text-danger">' + shiftName + '</p>',
buttons: {
confirm: {
label: '<span class="fas fa-check" ></span>' + translate('replaceAll'),
label: '<span class="fa-solid fa-check" ></span>' + translate('replaceAll'),
className: 'btn-success'
},
cancel: {
label: '<span class="fas fa-window-close" ></span>',
label: '<span class="fa-solid fa-window-close" ></span>',
className: 'btn-secondary'
}
},
Expand Down
6 changes: 3 additions & 3 deletions resources/assets/ts/shifts/autocomplete.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion resources/assets/ts/statistics/StatisticsView.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ $('[name^=show-stats-person]').click(function(e) {
const dialog = <any> bootbox.dialog({
title: translate('listOfShiftsDone') + chosenPerson,
size: 'large',
message: '<p><i class="fas fa-spin fa-spinner"></i>' + translate('loading') + '</p>',
message: '<p><i class="fa-solid fa-spin fa-spinner"></i>' + translate('loading') + '</p>',
onEscape: () => {}
});

Expand Down
4 changes: 2 additions & 2 deletions resources/assets/ts/template/templateOverView.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ $(()=>{
message: '<p>' + translate('deleteTemplateMessage') + '</p><p class="text-danger">'+ templateName + '</p>',
buttons: {
confirm: {
label:'<i class="fas fa-check"></i>',
label:'<i class="fa-solid fa-check"></i>',
className:'btn-danger'
},
cancel: {
label:'<i class="fas fa-times"></i>',
label:'<i class="fa-solid fa-times"></i>',
className: 'btn-success'
}
},
Expand Down
12 changes: 6 additions & 6 deletions resources/assets/ts/usersOverview.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ $(() => {
const selectedValue = $(target).val();

bootbox.confirm({
title: '<h4 class="alert alert-warning text-center"> <i class="fas fa-exclamation-triangle"></i> ' + translate('changeUserStatusHeader') + '&nbsp;<i class="fas fa-exclamation-triangle"></i></h4>',
title: '<h4 class="alert alert-warning text-center"> <i class="fa-solid fa-exclamation-triangle"></i> ' + translate('changeUserStatusHeader') + '&nbsp;<i class="fa-solid fa-exclamation-triangle"></i></h4>',
size: 'large',
message: '<p>' + translate('changeUserStatus') + '</p><p class="text-warning">' + userName + '</p><p class="text-warning">' + selectedValue + '</p>',
buttons: {
confirm: {
label: '<i class="fas fa-check"></i>',
label: '<i class="fa-solid fa-check"></i>',
className: 'btn-danger'
},
cancel: {
label: '<i class="fas fa-times"></i>',
label: '<i class="fa-solid fa-times"></i>',
className: 'btn-success'
}
},
Expand All @@ -54,16 +54,16 @@ $(() => {
const userName = $(target).data('name');

bootbox.confirm({
title: '<h4 class="alert alert-danger text-center"> <i class="fas fa-exclamation-triangle"></i> ' + translate('deleteUserHeader') + '&nbsp;<i class="fas fa-exclamation-triangle"></i></h4>',
title: '<h4 class="alert alert-danger text-center"> <i class="fa-solid fa-exclamation-triangle"></i> ' + translate('deleteUserHeader') + '&nbsp;<i class="fa-solid fa-exclamation-triangle"></i></h4>',
size: 'large',
message: '<p>' + translate('deleteUser') + '</p><p class="text-warning">' + userName + '</p>',
buttons: {
confirm: {
label: '<i class="fas fa-check"></i>',
label: '<i class="fa-solid fa-check"></i>',
className: 'btn-danger'
},
cancel: {
label: '<i class="fas fa-times"></i>',
label: '<i class="fa-solid fa-times"></i>',
className: 'btn-success'
}
},
Expand Down
20 changes: 10 additions & 10 deletions resources/views/clubevent/createClubEventView.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,43 +171,43 @@ class="col-form-label col-12 col-md-2">{{ trans('mainLang.template') }}:
<div class="form-group col-12 p-0">
<label for="evnt_type" class="col-form-label {{$labelClass}}">Typ:</label>
<div class="col-9">
&nbsp;<i class="fas fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
&nbsp;<i class="fa-solid fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
{{ trans('mainLang.normalProgramm') }}
<br>
&nbsp;<i class="fas fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
&nbsp;<i class="fa-solid fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
{{ trans('mainLang.special') }}
<br>
&nbsp;<i class="fas fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
&nbsp;<i class="fa-solid fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
{{ trans('mainLang.LiveBandDJ') }}
<br>
&nbsp;<i class="fas fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
&nbsp;<i class="fa-solid fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
{{ trans('mainLang.utilization') }}
<br>
&nbsp;{!! Form::radio('type', "4", ["checked"=>"checked" , "class"=>'form-check']) !!}
{{ trans('mainLang.internalEvent') }}
<br>
&nbsp;<i class="fas fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
&nbsp;<i class="fa-solid fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
{{ trans('mainLang.flooding') }}
<br>
&nbsp;<i class="fas fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
&nbsp;<i class="fa-solid fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
{{ trans('mainLang.flyersPlacard') }}
<br>
&nbsp;<i class="fas fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
&nbsp;<i class="fa-solid fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
{{ trans('mainLang.preSale') }}
<br>
&nbsp;{!! Form::radio('type', "9", [$type == 9 ? "checked" : "", "class"=>'form-check']) !!}
{{ trans('mainLang.others') }}
<br>
&nbsp;<i class="fas fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
&nbsp;<i class="fa-solid fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
{{ trans('mainLang.outsideEvent') }}
<br>
&nbsp;<i class="fas fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
&nbsp;<i class="fa-solid fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
{{ trans('mainLang.buffet') }}
<br>
&nbsp;{!! Form::radio('type', "1", [$type == 1 ? "checked" : "", "class"=>'form-check'] ) !!}
{{ trans('mainLang.information') }}
<br>
&nbsp;<i class="fas fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
&nbsp;<i class="fa-solid fa-times-circle form-checked" aria-hidden="true"></i>&nbsp;&nbsp;
{{ trans('mainLang.survey') }}
<br>

Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/master.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<i class="fas fa-chevron-up"></i>
<i class="fa-solid fa-chevron-up"></i>
</a>

<br>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/monthView.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<a class="btn hidden-print"
href="{{ Request::getBasePath() }}/calendar/{{ date("Y/m",
strtotime("previous month", $date['startStamp'])) }}">
<i class="fas fa-chevron-left"></i>
<i class="fa-solid fa-chevron-left"></i>
</a>
<div class="dropdown">
<button class="btn btn-secondary dropdown-toggle text-center" type="button" data-toggle="dropdown" aria-haspopup="true">
Expand All @@ -43,7 +43,7 @@
</div>
<a class="btn hidden-print"
href="{{ Request::getBasePath() }}/calendar/{{ date("Y/m", strtotime("next month", $date['startStamp'])) }}">
<i class="fas fa-chevron-right"></i>
<i class="fa-solid fa-chevron-right"></i>
</a>
</div>

Expand Down
24 changes: 12 additions & 12 deletions resources/views/partials/event-marker.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
class="{{\Lara\utilities\ViewUtility::getEventPaletteClass($clubEvent)}}"
title="{{ trans('mainLang.addToCalendar')}}">
@if( $clubEvent->evnt_type == 0)
<i class="fas fa-calendar-alt text"></i>
<i class="fa-solid fa-calendar-alt text"></i>
@elseif( $clubEvent->evnt_type == 1)
<small>&nbsp;</small><i class="fas fa-info text"></i><small>&nbsp;</small>
<small>&nbsp;</small><i class="fa-solid fa-info text"></i><small>&nbsp;</small>
@elseif( $clubEvent->evnt_type == 2)
<i class="fas fa-star"></i>
<i class="fa-solid fa-star"></i>
@elseif( $clubEvent->evnt_type == 3)
<i class="fas fa-music text"></i>
<i class="fa-solid fa-music text"></i>
@elseif( $clubEvent->evnt_type == 4)
<i class="fas fa-eye-slash text"></i>
<i class="fa-solid fa-eye-slash text"></i>
@elseif( $clubEvent->evnt_type == 5)
<small>&nbsp;</small><i class="fas fa-money-bill-alt text"></i><small>&nbsp;</small>
<small>&nbsp;</small><i class="fa-solid fa-money-bill-alt text"></i><small>&nbsp;</small>
@elseif( $clubEvent->evnt_type == 6)
<i class="fas fa-life-ring text"></i>
<i class="fa-solid fa-life-ring text"></i>
@elseif( $clubEvent->evnt_type == 7)
<i class="fas fa-building text"></i>
<i class="fa-solid fa-building text"></i>
@elseif( $clubEvent->evnt_type == 8)
<i class="fas fa-ticket-alt text"></i>
<i class="fa-solid fa-ticket-alt text"></i>
@elseif( $clubEvent->evnt_type == 9)
<i class="fas fa-list-alt text"></i>
<i class="fa-solid fa-list-alt text"></i>
@elseif( $clubEvent->evnt_type == 10)
<i class="fas fa-tree text"></i>
<i class="fa-solid fa-tree text"></i>
@elseif( $clubEvent->evnt_type == 11)
<i class="fas fa-utensils text"></i>
<i class="fa-solid fa-utensils text"></i>
@endif
</a>
4 changes: 2 additions & 2 deletions resources/views/partials/events/editOptions.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class="btn btn-primary"
data-toggle="tooltip"
data-placement="bottom"
title="{{ trans('mainLang.changeEvent') }}">
<i class="fas fa-pencil-alt"></i>
<i class="fa-solid fa-pencil-alt"></i>
</a>
&nbsp;&nbsp;
<a href="{{ $event->id }}"
Expand All @@ -48,7 +48,7 @@ class="btn btn-secondary"
data-token="{{csrf_token()}}"
rel="nofollow"
data-confirm="{{ trans('mainLang.confirmDeleteEvent') }}">
<i class="fas fa-trash"></i>
<i class="fa-solid fa-trash"></i>
</a>
</span>
</div>
4 changes: 2 additions & 2 deletions resources/views/partials/events/shift.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="box row">
<div class="fas fa-bars"></div>
<div class="fa-solid fa-bars"></div>
<div class="form-inline input-group">

<div class="form-group">
Expand Down Expand Up @@ -57,7 +57,7 @@ class="input form-control"
@if(!is_null($shiftId) && $shiftId!='' && \Lara\Utilities::requirePermission('admin','marketing','clubleitung'))
&nbsp;&nbsp;
<a href="{{ route('shiftType.show',[$shiftTypeId]) }}" target="_blank"
class="btn btn-primary btn-small" title="{{trans("mainLang.editShiftType")}}"> <i class="fas fa-pencil-alt"></i> </a>
class="btn btn-primary btn-small" title="{{trans("mainLang.editShiftType")}}"> <i class="fa-solid fa-pencil-alt"></i> </a>
@endif
<br class="d-block d-sm-none">
</div>
Expand Down
24 changes: 12 additions & 12 deletions resources/views/partials/legend.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
<br>
<div class="col-12 col-md-12 text-center hidden-print">
<i class="fas fa-calendar-alt"></i>
<i class="fa-solid fa-calendar-alt"></i>
- {{ trans('mainLang.normalProgramm') }}

<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><br class="d-block d-sm-none">

<small>&nbsp;</small><i class="fas fa-info"></i><small>&nbsp;</small>
<small>&nbsp;</small><i class="fa-solid fa-info"></i><small>&nbsp;</small>
- {{ trans('mainLang.information') }}

<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><br class="d-block d-sm-none">

<i class="fas fa-star"></i>
<i class="fa-solid fa-star"></i>
- {{ trans('mainLang.special') }}

<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><br class="d-block d-sm-none">

<i class="fas fa-music"></i>
<i class="fa-solid fa-music"></i>
- {{ trans('mainLang.LiveBandDJ') }}

<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><br>

<i class="fas fa-money-bill-alt"></i>
<i class="fa-solid fa-money-bill-alt"></i>
- {{ trans('mainLang.utilization') }}

<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><br class="d-block d-sm-none">

<i class="fas fa-eye-slash"></i>
<i class="fa-solid fa-eye-slash"></i>
- {{ trans('mainLang.internalEvent') }}

<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><br class="d-block d-sm-none">

<i class="fas fa-life-ring"></i>
<i class="fa-solid fa-life-ring"></i>
- {{ trans('mainLang.flooding') }}

<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><br class="d-block d-sm-none">

<i class="fas fa-building"></i>
<i class="fa-solid fa-building"></i>
- {{ trans('mainLang.marketingFlyersPlacard') }}

<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><br class="d-block d-sm-none">

<i class="fas fa-ticket-alt"></i>
<i class="fa-solid fa-ticket-alt"></i>
- {{ trans('mainLang.preSale') }}

<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><br>

<i class="fas fa-tree"></i>
<i class="fa-solid fa-tree"></i>
- {{ trans('mainLang.outsideEvent') }}

<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><br class="d-block d-sm-none">

<i class="fas fa-utensils"></i>
<i class="fa-solid fa-utensils"></i>
- {{ trans('mainLang.buffet') }}

<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><br class="d-block d-sm-none">

<i class="fas fa-list-alt"></i>
<i class="fa-solid fa-list-alt"></i>
- {{ trans('mainLang.others') }}

<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/partials/month/monthCell.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

{{--if so show a grey placeholder for the guest--}}
<div class="cal-event {{$classString}} palette-Grey-500 bg word-break section-filter section-survey">
<i class="fas fa-chart-bar"></i>
<i class="fa-solid fa-chart-bar"></i>
&nbsp;&nbsp;
{{--and show him thats a private survey(=Interne Umfrage in german) only for users--}}
<span class="event-name">
Expand Down
Loading

0 comments on commit da787b8

Please sign in to comment.