From 72e664ad0d83842279deb969e5ac808a24a9e778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sun, 27 Jun 2021 14:47:59 +0300 Subject: [PATCH] Notification widgets styling.. --- .../common/notifications/index.blade.php | 2 +- .../common/notifications/exports.blade.php | 156 ++++--- .../common/notifications/imports.blade.php | 195 ++++---- .../common/notifications/new-apps.blade.php | 4 +- .../common/notifications/recurring.blade.php | 431 +++++++++--------- .../common/notifications/reminder.blade.php | 394 ++++++++-------- 6 files changed, 613 insertions(+), 569 deletions(-) diff --git a/resources/views/common/notifications/index.blade.php b/resources/views/common/notifications/index.blade.php index 0b84b4d0c..7b00ca720 100644 --- a/resources/views/common/notifications/index.blade.php +++ b/resources/views/common/notifications/index.blade.php @@ -31,7 +31,7 @@ @stack('bills_recurring') - + @stack('bills_reminder') diff --git a/resources/views/livewire/common/notifications/exports.blade.php b/resources/views/livewire/common/notifications/exports.blade.php index 0cd3e8055..4d67615d6 100644 --- a/resources/views/livewire/common/notifications/exports.blade.php +++ b/resources/views/livewire/common/notifications/exports.blade.php @@ -1,83 +1,95 @@ -@if ($notifications->total()) -
-
+
+
+ -
- - - @foreach ($notifications as $notification) - - +
+ @if ($notifications->total()) +
+
- @if (empty($notification->message)) - {!! trans('notifications.messages.export', [ - 'type' => $notification->translation, - 'file_name' => $notification->file_name, - 'url' => $notification->download_url - ]) !!} - @else - {!! $notification->message !!} - @endif -
+ + @foreach ($notifications as $notification) + + - - - @endforeach - -
+ @if (empty($notification->message)) + {!! trans('notifications.messages.export', [ + 'type' => $notification->translation, + 'file_name' => $notification->file_name, + 'url' => $notification->download_url + ]) !!} + @else + {!! $notification->message !!} + @endif + - -
-
- - @if ($notifications->total() > 5) -
-
- @if ($notifications->count()) -
- {!! Form::select('limit', ['5' => '5'], request('limit', 5), ['class' => 'disabled form-control form-control-sm d-inline-block w-auto d-none d-md-block', 'disabled' => 'disabled']) !!} - - {{ trans('pagination.page') }} - {{ trans('pagination.showing', ['first' => $notifications->firstItem(), 'last' => $notifications->lastItem(), 'total' => $notifications->total()]) }} - -
- -
- -
- @else -
- {{ trans('general.no_records') }} -
- @endif + + + + + @endforeach + +
-
- @endif + + @if ($notifications->total() > 5) +
+
+ @if ($notifications->count()) +
+ {!! Form::select('limit', ['5' => '5'], request('limit', 5), ['class' => 'disabled form-control form-control-sm d-inline-block w-auto d-none d-md-block', 'disabled' => 'disabled']) !!} + + {{ trans('pagination.page') }} + {{ trans('pagination.showing', ['first' => $notifications->firstItem(), 'last' => $notifications->lastItem(), 'total' => $notifications->total()]) }} + +
+ +
+ +
+ @else +
+ {{ trans('general.no_records') }} +
+ @endif +
+
+ @endif + @else +
+ {{ trans('general.no_records') }} +
+ @endif +
+
@push('body_js') @endpush - -@endif diff --git a/resources/views/livewire/common/notifications/imports.blade.php b/resources/views/livewire/common/notifications/imports.blade.php index c1d1cffb7..184141f84 100644 --- a/resources/views/livewire/common/notifications/imports.blade.php +++ b/resources/views/livewire/common/notifications/imports.blade.php @@ -1,102 +1,113 @@ -@if ($notifications->total()) -
-
+
+
+ -
- - - @foreach ($notifications as $notification) - - +
+ @if ($notifications->total()) +
+
- @if (empty($notification->errors)) - {!! trans('notifications.messages.import', [ - 'type' => $notification->translation, - 'count' => $notification->total_rows - ]) !!} - @else - @foreach ($notification->errors as $error) - {!! $error !!} - @endforeach - @endif -
+ + @foreach ($notifications as $notification) + + - - - @endforeach - -
+ @if (empty($notification->errors)) + {!! trans('notifications.messages.import', [ + 'type' => $notification->translation, + 'count' => $notification->total_rows + ]) !!} + @else + @foreach ($notification->errors as $error) + {!! $error !!} + @endforeach + @endif + - -
-
- - @if ($notifications->total() > 5) -
-
- @if ($notifications->count()) -
- {!! Form::select('limit', ['5' => '5'], request('limit', 5), ['class' => 'disabled form-control form-control-sm d-inline-block w-auto d-none d-md-block', 'disabled' => 'disabled']) !!} - - {{ trans('pagination.page') }} - {{ trans('pagination.showing', ['first' => $notifications->firstItem(), 'last' => $notifications->lastItem(), 'total' => $notifications->total()]) }} - -
- -
- -
- @else -
- {{ trans('general.no_records') }} -
- @endif + + + + + @endforeach + +
-
- @endif + + @if ($notifications->total() > 5) +
+
+ @if ($notifications->count()) +
+ {!! Form::select('limit', ['5' => '5'], request('limit', 5), ['class' => 'disabled form-control form-control-sm d-inline-block w-auto d-none d-md-block', 'disabled' => 'disabled']) !!} + + {{ trans('pagination.page') }} + {{ trans('pagination.showing', ['first' => $notifications->firstItem(), 'last' => $notifications->lastItem(), 'total' => $notifications->total()]) }} + +
+ +
+ +
+ @else +
+ {{ trans('general.no_records') }} +
+ @endif +
+
+ @endif + @else +
+ {{ trans('general.no_records') }} +
+ @endif +
+
- @push('body_js') - - @endpush -@endif +@push('body_js') + +@endpush diff --git a/resources/views/livewire/common/notifications/new-apps.blade.php b/resources/views/livewire/common/notifications/new-apps.blade.php index 567034348..6fe7f040f 100644 --- a/resources/views/livewire/common/notifications/new-apps.blade.php +++ b/resources/views/livewire/common/notifications/new-apps.blade.php @@ -3,7 +3,9 @@
-

{{ trans_choice('notifications.new_apps', 2) }}

+

+ {{ trans_choice('notifications.new_apps', 2) }} +

diff --git a/resources/views/livewire/common/notifications/recurring.blade.php b/resources/views/livewire/common/notifications/recurring.blade.php index 951be61a2..a1e3c5979 100644 --- a/resources/views/livewire/common/notifications/recurring.blade.php +++ b/resources/views/livewire/common/notifications/recurring.blade.php @@ -1,245 +1,256 @@ -@if ($notifications->count()) -
-
+
+
+ -
- - - - @stack('document_number_th_start') - @if (!$hideDocumentNumber) - + @endif + + @endforeach + +
- @stack('document_number_th_inside_start') +
+ @if ($notifications->total()) +
+ + + + @stack('document_number_th_start') + @if (!$hideDocumentNumber) + - @endif - @stack('document_number_th_end') + @stack('document_number_th_inside_end') + + @endif + @stack('document_number_th_end') - @stack('contact_name_th_start') - @if (!$hideContactName) - - @endif - @stack('contact_name_th_end') + @stack('contact_name_th_inside_end') + + @endif + @stack('contact_name_th_end') - @stack('amount_th_start') - @if (!$hideAmount) - - @endif - @stack('amount_th_end') + @stack('amount_th_inside_end') + + @endif + @stack('amount_th_end') - @stack('issued_at_th_start') - @if (!$hideIssuedAt) - - @endif - @stack('issued_at_th_end') + @stack('issued_at_th_inside_end') + + @endif + @stack('issued_at_th_end') - @stack('due_at_th_start') - @if (!$hideDueAt) - - @endif - @stack('due_at_th_end') + @stack('due_at_th_inside_end') + + @endif + @stack('due_at_th_end') - @stack('status_th_start') - @if (!$hideStatus) - - @endif - @stack('status_th_end') + @stack('status_th_inside_end') + + @endif + @stack('status_th_end') - @if (!$hideActions) - - @endif - - + @if (!$hideActions) + + @endif + + - - @foreach($notifications as $item) - - @stack('document_number_td_start') - @if (!$hideDocumentNumber) - - @endif - @stack('document_number_td_end') - - @stack('contact_name_td_start') - @if (!$hideContactName) - - @endif - @stack('contact_name_td_end') - - @stack('amount_td_start') - @if (!$hideAmount) - - @endif - @stack('amount_td_end') - - @stack('issued_at_td_start') - @if (!$hideIssuedAt) - - @endif - @stack('issued_at_td_end') + + @foreach($notifications as $item) + + @stack('document_number_td_start') + @if (!$hideDocumentNumber) + + @endif + @stack('document_number_td_end') + + @stack('contact_name_td_start') + @if (!$hideContactName) + + @endif + @stack('contact_name_td_end') + + @stack('amount_td_start') + @if (!$hideAmount) + + @endif + @stack('amount_td_end') + + @stack('issued_at_td_start') + @if (!$hideIssuedAt) + + @endif + @stack('issued_at_td_end') - @stack('due_at_td_start') - @if (!$hideDueAt) - - @endif - @stack('due_at_td_end') + @stack('due_at_td_inside_end') + + @endif + @stack('due_at_td_end') - @stack('status_td_start') - @if (!$hideStatus) - - @endif - @stack('status_td_end') + @stack('status_td_inside_end') + + @endif + @stack('status_td_end') - @if (!$hideActions) - - @endif - - @endforeach - -
+ @stack('document_number_th_inside_start') - {{ trans_choice($textDocumentNumber, 1) }} + {{ trans_choice($textDocumentNumber, 1) }} - @stack('document_number_th_inside_end') - - @stack('contact_name_th_inside_start') + @stack('contact_name_th_start') + @if (!$hideContactName) + + @stack('contact_name_th_inside_start') - {{ trans_choice($textContactName, 1) }} + {{ trans_choice($textContactName, 1) }} - @stack('contact_name_th_inside_end') - - @stack('amount_th_inside_start') + @stack('amount_th_start') + @if (!$hideAmount) + + @stack('amount_th_inside_start') - {{ trans('general.amount') }} + {{ trans('general.amount') }} - @stack('amount_th_inside_end') - - @stack('issued_at_th_inside_start') + @stack('issued_at_th_start') + @if (!$hideIssuedAt) + + @stack('issued_at_th_inside_start') - {{ trans($textIssuedAt) }} + {{ trans($textIssuedAt) }} - @stack('issued_at_th_inside_end') - - @stack('due_at_th_inside_start') + @stack('due_at_th_start') + @if (!$hideDueAt) + + @stack('due_at_th_inside_start') - {{ trans($textDueAt) }} + {{ trans($textDueAt) }} - @stack('due_at_th_inside_end') - - @stack('status_th_inside_start') + @stack('status_th_start') + @if (!$hideStatus) + + @stack('status_th_inside_start') - {{ trans_choice('general.statuses', 1) }} + {{ trans_choice('general.statuses', 1) }} - @stack('status_th_inside_end') - - {{ trans_choice('notifications.reads', 1) }} -
+ {{ trans_choice('notifications.reads', 1) }} +
- @stack('document_number_td_inside_start') - - {{ $item->document_number }} - - @stack('document_number_td_inside_end') - - @stack('contact_name_td_inside_start') - - {{ $item->contact_name }} - - @stack('contact_name_td_inside_end') - - @stack('amount_td_inside_start') - - @money($item->amount, $item->currency_code, true) - - @stack('amount_td_inside_end') - - @stack('issued_at_td_inside_start') - - @date($item->issued_at) - - @stack('issued_at_td_inside_end') -
+ @stack('document_number_td_inside_start') + + {{ $item->document_number }} + + @stack('document_number_td_inside_end') + + @stack('contact_name_td_inside_start') + + {{ $item->contact_name }} + + @stack('contact_name_td_inside_end') + + @stack('amount_td_inside_start') + + @money($item->amount, $item->currency_code, true) + + @stack('amount_td_inside_end') + + @stack('issued_at_td_inside_start') + + @date($item->issued_at) + + @stack('issued_at_td_inside_end') + - @stack('due_at_td_inside_start') + @stack('due_at_td_start') + @if (!$hideDueAt) + + @stack('due_at_td_inside_start') - @date($item->due_at) + @date($item->due_at) - @stack('due_at_td_inside_end') - - @stack('status_td_inside_start') + @stack('status_td_start') + @if (!$hideStatus) + + @stack('status_td_inside_start') - {{ trans($textDocumentStatus . $item->status) }} + {{ trans($textDocumentStatus . $item->status) }} - @stack('status_td_inside_end') - - -
-
- - @if ($notifications->total() > 5) -
-
- @if ($notifications->count()) -
- {!! Form::select('limit', ['5' => '5'], request('limit', 5), ['class' => 'disabled form-control form-control-sm d-inline-block w-auto d-none d-md-block', 'disabled' => 'disabled']) !!} - - {{ trans('pagination.page') }} - {{ trans('pagination.showing', ['first' => $notifications->firstItem(), 'last' => $notifications->lastItem(), 'total' => $notifications->total()]) }} - -
- -
- -
- @else -
- {{ trans('general.no_records') }} -
- @endif + @if (!$hideActions) +
+ +
-
- @endif + + @if ($notifications->total() > 5) +
+
+ @if ($notifications->count()) +
+ {!! Form::select('limit', ['5' => '5'], request('limit', 5), ['class' => 'disabled form-control form-control-sm d-inline-block w-auto d-none d-md-block', 'disabled' => 'disabled']) !!} + + {{ trans('pagination.page') }} + {{ trans('pagination.showing', ['first' => $notifications->firstItem(), 'last' => $notifications->lastItem(), 'total' => $notifications->total()]) }} + +
+ +
+ +
+ @else +
+ {{ trans('general.no_records') }} +
+ @endif +
+
+ @endif + @else +
+ {{ trans('general.no_records') }} +
+ @endif +
+
- @push('body_js') - - @endpush -@endif +@push('body_js') + +@endpush diff --git a/resources/views/livewire/common/notifications/reminder.blade.php b/resources/views/livewire/common/notifications/reminder.blade.php index 0d29e6f85..e5a28fbea 100644 --- a/resources/views/livewire/common/notifications/reminder.blade.php +++ b/resources/views/livewire/common/notifications/reminder.blade.php @@ -1,227 +1,239 @@ -@if ($notifications->count()) -
-
+
+
+ -
- - - - @stack('document_number_th_start') - @if (!$hideDocumentNumber) - + @endif + + @endforeach + +
- @stack('document_number_th_inside_start') +
+ @if ($notifications->total()) +
+ + + + @stack('document_number_th_start') + @if (!$hideDocumentNumber) + - @endif - @stack('document_number_th_end') + @stack('document_number_th_inside_end') + + @endif + @stack('document_number_th_end') - @stack('contact_name_th_start') - @if (!$hideContactName) - - @endif - @stack('contact_name_th_end') + @stack('contact_name_th_inside_end') + + @endif + @stack('contact_name_th_end') - @stack('amount_th_start') - @if (!$hideAmount) - - @endif - @stack('amount_th_end') + @stack('amount_th_inside_end') + + @endif + @stack('amount_th_end') - @stack('issued_at_th_start') - @if (!$hideIssuedAt) - - @endif - @stack('issued_at_th_end') + @stack('issued_at_th_inside_end') + + @endif + @stack('issued_at_th_end') - @stack('due_at_th_start') - @if (!$hideDueAt) - - @endif - @stack('due_at_th_end') + @stack('due_at_th_inside_end') + + @endif + @stack('due_at_th_end') - @stack('status_th_start') - @if (!$hideStatus) - - @endif - @stack('status_th_end') + @stack('status_th_inside_end') + + @endif + @stack('status_th_end') - @if (!$hideActions) - - @endif - - + @if (!$hideActions) + + @endif + + - - @foreach($notifications as $item) - - @stack('document_number_td_start') - @if (!$hideDocumentNumber) - - @endif - @stack('document_number_td_end') - - @stack('contact_name_td_start') - @if (!$hideContactName) - - @endif - @stack('contact_name_td_end') - - @stack('amount_td_start') - @if (!$hideAmount) - - @endif - @stack('amount_td_end') - - @stack('issued_at_td_start') - @if (!$hideIssuedAt) - - @endif - @stack('issued_at_td_end') + + @foreach($notifications as $item) + + @stack('document_number_td_start') + @if (!$hideDocumentNumber) + + @endif + @stack('document_number_td_end') + + @stack('contact_name_td_start') + @if (!$hideContactName) + + @endif + @stack('contact_name_td_end') + + @stack('amount_td_start') + @if (!$hideAmount) + + @endif + @stack('amount_td_end') + + @stack('issued_at_td_start') + @if (!$hideIssuedAt) + + @endif + @stack('issued_at_td_end') - @stack('due_at_td_start') - @if (!$hideDueAt) - - @endif - @stack('due_at_td_end') + @stack('due_at_td_inside_end') + + @endif + @stack('due_at_td_end') - @stack('status_td_start') - @if (!$hideStatus) - - @endif - @stack('status_td_end') + @stack('status_td_inside_end') + + @endif + @stack('status_td_end') - @if (!$hideActions) - - @endif - - @endforeach - -
+ @stack('document_number_th_inside_start') - {{ trans_choice($textDocumentNumber, 1) }} + {{ trans_choice($textDocumentNumber, 1) }} - @stack('document_number_th_inside_end') - - @stack('contact_name_th_inside_start') + @stack('contact_name_th_start') + @if (!$hideContactName) + + @stack('contact_name_th_inside_start') - {{ trans_choice($textContactName, 1) }} + {{ trans_choice($textContactName, 1) }} - @stack('contact_name_th_inside_end') - - @stack('amount_th_inside_start') + @stack('amount_th_start') + @if (!$hideAmount) + + @stack('amount_th_inside_start') - {{ trans('general.amount') }} + {{ trans('general.amount') }} - @stack('amount_th_inside_end') - - @stack('issued_at_th_inside_start') + @stack('issued_at_th_start') + @if (!$hideIssuedAt) + + @stack('issued_at_th_inside_start') - {{ trans($textIssuedAt) }} + {{ trans($textIssuedAt) }} - @stack('issued_at_th_inside_end') - - @stack('due_at_th_inside_start') + @stack('due_at_th_start') + @if (!$hideDueAt) + + @stack('due_at_th_inside_start') - {{ trans($textDueAt) }} + {{ trans($textDueAt) }} - @stack('due_at_th_inside_end') - - @stack('status_th_inside_start') + @stack('status_th_start') + @if (!$hideStatus) + + @stack('status_th_inside_start') - {{ trans_choice('general.statuses', 1) }} + {{ trans_choice('general.statuses', 1) }} - @stack('status_th_inside_end') - - {{ trans_choice('notifications.reads', 1) }} -
+ {{ trans_choice('notifications.reads', 1) }} +
- @stack('document_number_td_inside_start') - - {{ $item->document_number }} - - @stack('document_number_td_inside_end') - - @stack('contact_name_td_inside_start') - - {{ $item->contact_name }} - - @stack('contact_name_td_inside_end') - - @stack('amount_td_inside_start') - - @money($item->amount, $item->currency_code, true) - - @stack('amount_td_inside_end') - - @stack('issued_at_td_inside_start') - - @date($item->issued_at) - - @stack('issued_at_td_inside_end') -
+ @stack('document_number_td_inside_start') + + {{ $item->document_number }} + + @stack('document_number_td_inside_end') + + @stack('contact_name_td_inside_start') + + {{ $item->contact_name }} + + @stack('contact_name_td_inside_end') + + @stack('amount_td_inside_start') + + @money($item->amount, $item->currency_code, true) + + @stack('amount_td_inside_end') + + @stack('issued_at_td_inside_start') + + @date($item->issued_at) + + @stack('issued_at_td_inside_end') + - @stack('due_at_td_inside_start') + @stack('due_at_td_start') + @if (!$hideDueAt) + + @stack('due_at_td_inside_start') - @date($item->due_at) + @date($item->due_at) - @stack('due_at_td_inside_end') - - @stack('status_td_inside_start') + @stack('status_td_start') + @if (!$hideStatus) + + @stack('status_td_inside_start') - {{ trans($textDocumentStatus . $item->status) }} + {{ trans($textDocumentStatus . $item->status) }} - @stack('status_td_inside_end') - - -
-
- - @if ($notifications->total() > 5) -
-
- @if ($notifications->count()) -
- {!! Form::select('limit', ['5' => '5'], request('limit', 5), ['class' => 'disabled form-control form-control-sm d-inline-block w-auto d-none d-md-block', 'disabled' => 'disabled']) !!} - - {{ trans('pagination.page') }} - {{ trans('pagination.showing', ['first' => $notifications->firstItem(), 'last' => $notifications->lastItem(), 'total' => $notifications->total()]) }} - -
- -
- -
- @else -
- {{ trans('general.no_records') }} -
- @endif + @if (!$hideActions) +
+ +
-
- @endif + + @if ($notifications->total() > 5) +
+
+ @if ($notifications->count()) +
+ {!! Form::select('limit', ['5' => '5'], request('limit', 5), ['class' => 'disabled form-control form-control-sm d-inline-block w-auto d-none d-md-block', 'disabled' => 'disabled']) !!} + + {{ trans('pagination.page') }} + {{ trans('pagination.showing', ['first' => $notifications->firstItem(), 'last' => $notifications->lastItem(), 'total' => $notifications->total()]) }} + +
+ +
+ +
+ @else +
+ {{ trans('general.no_records') }} +
+ @endif +
+
+ @endif + @else +
+ {{ trans('general.no_records') }} +
+ @endif +
+
@push('body_js') @endpush - -@endif