Revert "merge 1"

This reverts commit 0bc6c20a6d.
This commit is contained in:
2022-10-24 01:03:43 +01:00
parent 0bc6c20a6d
commit 0c463d1f10
166 changed files with 1849 additions and 4266 deletions

View File

@@ -14,7 +14,7 @@
@section('content')
<x-modal id="confirmForceEventDispatch" modal-label="confirmForceEventDispatch" modal-title="{{__('Choose an application to override')}}" include-close-button="true">
<x-modal id="confirmForceEventDispatch" modal-label="confirmForceEventDispatch" modal-title="{{__('messages.choose_app')}}" include-close-button="true">
<p>{{__('Please choose an application to force approve')}}</p>
<p>{{ __('Note that this process overrides users\'s votes.') }}</p>
@@ -35,7 +35,7 @@
</form>
<x-slot name="modalFooter">
<button type="button" class="btn btn-danger" onclick="document.getElementById('forceEval').submit()">{{__('Override now')}}</button>
<button type="button" class="btn btn-danger" onclick="document.getElementById('forceEval').submit()">{{__('messages.dispatch_event')}}</button>
</x-slot>
</x-modal>
@@ -70,64 +70,45 @@
<div class="col">
<div class="alert alert-warning">
<i class="fa fa-exclamation-triangle"></i> <b>{{__('Warning')}}</b>
<p>{{__('These tools were intended for development purposes. Unless you know exactly what each command does, we recommend you don\'t use any of them.')}}</p>
<i class="fa fa-exclamation-triangle"></i> <b>{{__('Warning')}}</b>
</div>
</div>
</div>
<div class="row mt-5">
<div class="col">
<x-card id="appCommands" card-title="{{ __('Application-specific commands') }}" footer-style="text-muted">
<div class="row">
<div class="col text-center">
<x-card id="tools" card-title="Commands & Actions" footer-style="text-center">
<x-slot name="cardHeader">
</x-slot>
<button data-toggle="tooltip" data-placement="top" title="{{ __('Dispatches an approval event for the selected application') }}" type="button" class="btn btn-primary" onclick="$('#confirmForceEventDispatch').modal('show')"><i class="fas fa-bullhorn"></i> {{ __('Dispatch approval event') }}</button>
<div class="form-group d-block">
<button type="button" class="mb-3 btn btn-info" onclick="$('#confirmForceEventDispatch').modal('show')"><i class="fas fa-check-circle"></i> {{ __('Application Override: Approve') }}</button>
<button type="button" class="mt-3 btn btn-info" onclick="$('#confirmDispatchRejection').modal('show')"><i class="fas fa-ban"></i> {{ __('Application Override: Decline') }}</button>
</div>
<button data-toggle="tooltip" data-placement="top" title="{{ __('Dispatches a rejection event for the selected application') }}" type="button" class="btn btn-primary ml-2" onclick="$('#confirmDispatchRejection').modal('show')"><i class="fas fa-bullhorn"></i> {{ __('Dispatch rejection event') }}</button>
<x-slot name="cardFooter">
<p><i class="fas fa-info-circle"></i> {{ __('This panel allows you to override statuses for specific applications. Overriding them will trigger the correct events as well. Note that this system entirely ignores the voting system because these statuses ignore all other logic.') }}</p>
</x-slot>
</x-card>
</div>
<div class="col">
<x-card id="appCleaning" card-title="{{ __('Housekeeping') }}" footer-style="text-muted">
<x-slot name="cardHeader">
</x-slot>
<div class="form-group d-block">
<form method="post" action="{{ route('devForceEvaluateVotes') }}">
<form name="evalvotes" method="post" action="{{ route('devForceEvaluateVotes') }}" class="d-inline">
@csrf
<button type="submit" class="mb-3 btn btn-info"><i class="fas fa-vote-yea"></i> {{ __('Run task: process pending votes') }}</button>
<button data-toggle="tooltip" data-placement="top" title="{{ __('Counts and processes all backlogged votes, for all applications.') }}" type="submit" class="btn btn-primary ml-3"><i class="fas fa-redo"></i> {{ __('Count all votes now') }}</button>
</form>
<form method="post" action="{{ route('devPurgeExpiredSuspensions') }}">
<form name="purgebans" method="post" action="{{ route('devPurgeExpired') }}" class="d-inline">
@csrf
@method('DELETE')
<button type="submit" class="mb-3 btn btn-info"><i class="fas fa-users-cog"></i> {{ __('Run task: lift expired suspensions') }}</button>
<button data-toggle="tooltip" data-placement="top" title="{{ __('Cleans the database of old, expired suspensions, therefore unbanning certain users.') }}" type="submit" class="btn btn-primary ml-3"><i class="far fa-trash-alt"></i> {{ __('Purge expired bans') }}</button>
</form>
<form method="post" action="{{ route('devPurgeExpiredAbsences') }}">
@csrf
@method('DELETE')
<button type="submit" class="mb-3 d-block btn btn-info"><i class="fas fa-calendar-minus"></i> {{ __('Run task: end expired absence requests') }}</button>
</form>
</div>
<x-slot name="cardFooter">
<p><i class="fas fa-info-circle"></i> {{ __('Housekeeping jobs usually run once every day, but if one of them has failed for some reason, you can manually run them here.') }}</p>
<p class="text-muted"> .</p>
</x-slot>
</x-card>
</div>
</div>
@stop

View File

@@ -47,7 +47,7 @@
<div class="card-header">
<h4>{{__('Editing :formTitle...', ['formTitle' => $title])}}</h4>
<h4>{{__('messages.edt_action')}} {{ $title }}...</h4>
</div>

View File

@@ -93,7 +93,15 @@
<div class="col">
<label for="discordRoleID">{{__('Comma-separated list of Discord role IDs')}}</label>
<!-- DEPRECATED! -->
<label for="permissionGroupName">{{__('Permission group')}}</label>
<input type="text" class="form-control" value="{{ $vacancy->permissionGroupName }}" id="permissionGroupName" disabled />
</div>
<div class="col">
<label for="discordRoleID">{{__('Discord role ID')}}</label>
<input type="text" class="form-control" value="{{ $vacancy->discordRoleID }}" id="discordRoleID" disabled />
@@ -110,18 +118,6 @@
<label for="remainingSlots">{{__('Remaining slots')}}</label>
<input type="text" class="form-control" value="{{ $vacancy->vacancyCount }}" id="remainingSlots" name="vacancyCount" />
<label for="requiredAge">{{__('Minimum age')}}</label>
<input type="number" min="13" max="100" class="form-control" value="{{ $vacancy->requiredAge }}" id="requiredAge" name="requiredAge" />
<div class="form-check mt-4">
<input type="hidden" value="off" name="requireDiscordAccount">
<input class="form-check-input" type="checkbox" id="requireDiscordAccount" name="requireDiscordAccount" @if($vacancy->requiresDiscord) checked @endif>
<label class="text-bold form-check-label" for="requireDiscordAccount">
{{ __('Require a Discord account for users to apply') }}
</label>
<p class="text-muted"><i class="fas fa-info-circle"> </i> {{ __('This will redirect users to sign in with Discord before they are allowed to submit the form.') }}</p>
</div>
</div>

View File

@@ -78,7 +78,8 @@
<thead>
<tr>
<th>{{__('Name')}}</th>
<th>{{ __('Role') }}</th>
<th>{{ __('Rank') }}</th>
<th>{{__('Status')}}</th>
<th>{{__('Registration date')}}</th>
<th>{{__('Actions')}}</th>
</tr>
@@ -97,10 +98,12 @@
<span class="badge-warning badge"><i class="fas fa-user"></i> {{ __('Member') }}</span>
@endif
</td>
<td>
<x-account-status user-id="{{ $user->id }}"></x-account-status>
</td>
<td>{{$user->created_at}}</td>
<td>
<button type="button" class="btn btn-sm btn-success" onclick="window.location.href='{{route('showSingleProfile', ['user' => $user->id])}}'"><i class="fa fa-eye"></i> {{ __('View') }}</button>
<a class="ml-2 btn btn-sm btn-warning" href="{{ route('manageUser', ['user' => $user->id]) }}"><i class="fas fa-wrench"></i> {{ __('Manage') }}</a>
<button type="button" class="btn btn-sm btn-success" onclick="window.location.href='{{route('showSingleProfile', ['user' => $user->id])}}'"><i class="fa fa-eye"></i></button>
</td>
</tr>

View File

@@ -65,8 +65,13 @@
<div class="row mt-3">
<div class="col">
<label for="discordrole">{{__('Discord Role ID(s) (optional)')}}</label>
<input rel="txtTooltip" title="{{__("Enter one or more comma-separated role IDs to be given to successful candidates")}}" data-toggle="tooltip" data-placement="bottom" type="text" id="discordrole" name="discordRole" class="form-control">
<label for="pgroup">{{__('Permission group')}}</label>
<input rel="txtTooltip" title="{{__("The permission group from your server/network's permissions manager. Compatible with Luckperms and PEX (This feature is deprecated and will be removed on a future version).")}}" data-toggle="tooltip" data-placement="bottom" type="text" id="pgroup" name="permissionGroup" class="form-control">
</div>
<div class="col">
<label for="discordrole">{{__('Discord Role ID')}} (*)</label>
<input rel="txtTooltip" title="{{__("Discord Desktop: Go to your Account Settings > Appearance -> Advanced and toggle Developer Mode. On your server's roles tab, right click any role to copy it's ID.")}}" data-toggle="tooltip" data-placement="bottom" type="text" id="discordrole" name="discordRole" class="form-control">
</div>
</div>
@@ -88,17 +93,7 @@
<label for="vacancyCount">{{__('Free slots')}}</label>
<input rel="txtTooltip" title="{{__('The number of free slots decreases each time an applicant is approved for this vacancy.')}}" data-toggle="tooltip" data-placement="bottom" type="text" id="vacancyCount" name="vacancyCount" class="form-control">
<label for="requiredAge">{{__('Minimum age')}}</label>
<input rel="txtTooltip" title="{{__('How old must users be to apply for this vacancy?')}}" data-toggle="tooltip" data-placement="bottom" type="number" min="13" max="100" id="requiredAge" name="requiredAge" class="form-control">
<div class="form-check mt-4">
<input type="hidden" value="off" name="requireDiscordAccount">
<input class="form-check-input" type="checkbox" id="requireDiscordAccount" name="requireDiscordAccount">
<label class="text-bold form-check-label" for="requireDiscordAccount">
{{ __('Require a Discord account for users to apply') }}
</label>
</div>
</div>
</form>