Skip to content

Commit

Permalink
Merge pull request #212 from nasirkhan/release
Browse files Browse the repository at this point in the history 
v7.8.0
  • Loading branch information
@nasirkhan
nasirkhan committed Jul 30, 2020
2 parents 347b282 + a48c570 commit aa49433
Show file tree
Hide file tree
Showing 17 changed files with 230 additions and 206 deletions.
10 changes: 10 additions & 0 deletions resources/lang/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"Deleted": "Deleted",
"Deleted at": "Deleted at",
"Trash": "Trash",
"Download": "Download",

"Activity Log": "Activity Log",
"Log": "Log",
Expand Down Expand Up @@ -76,6 +77,15 @@
"Browse": "Browse",
"Management": "Management",

"Log Viewer": "Log Viewer",
"Log Viewer Module": "Log Viewer Module",
"Logs by Date": "Logs by Date",
"Log Viewer Dashboard": "Log Viewer Dashboard",
"Delete Log File": "Delete Log File",
"Details": "Details",
"Levels": "Levels",
"Log Info": "Log Info",

"Select an option": "-- Select an option --",

"Draft": "Draft",
Expand Down
4 changes: 2 additions & 2 deletions resources/views/backend/includes/action_column.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="text-right">
@can('edit_'.$module_name)
<x-buttons.edit route='{!!route("backend.$module_name.edit", $data)!!}' title="{{__('Edit')}} {{ ucwords(Str::singular($module_name)) }}"/>
<x-buttons.edit route='{!!route("backend.$module_name.edit", $data)!!}' title="{{__('Edit')}} {{ ucwords(Str::singular($module_name)) }}" small="true" />
@endcan
<x-buttons.show route='{!!route("backend.$module_name.show", $data)!!}' title="{{__('Show')}} {{ ucwords(Str::singular($module_name)) }}"/>
<x-buttons.show route='{!!route("backend.$module_name.show", $data)!!}' title="{{__('Show')}} {{ ucwords(Str::singular($module_name)) }}" small="true" />
</div>
8 changes: 5 additions & 3 deletions resources/views/backend/roles/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<!--/.col-->
<div class="col-4">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
<button onclick="window.history.back();"class="btn btn-warning ml-1" data-toggle="tooltip" title="Return Back"><i class="fas fa-reply"></i></button>
<x-buttons.return-back />
</div>
</div>
<!--/.col-->
Expand All @@ -37,7 +37,7 @@

<hr>

<div class="row mt-4 mb-4">
<div class="row mt-4">
<div class="col">

{{ html()->form('POST', route('backend.roles.store'))->class('form-horizontal')->open() }}
Expand Down Expand Up @@ -87,7 +87,9 @@
<div class="row">
<div class="col-6">
<div class="form-group">
<x-buttons.create-submit />
<x-buttons.create title="{{__('Create')}} {{ ucwords(Str::singular($module_name)) }}">
{{__('Create')}}
</x-buttons.create>
</div>
</div>
<div class="col-6">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/backend/roles/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</div>
<div class="col-4">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
<button onclick="window.history.back();"class="btn btn-warning ml-1" data-toggle="tooltip" title="Return Back"><i class="fas fa-reply"></i></button>
<a href="{{route("backend.$module_name.show", $$module_name_singular)}}" class="btn btn-primary ml-1" data-toggle="tooltip" title="{{__('labels.backend.show')}}"><i class="fas fa-tv"></i></a>
<x-buttons.return-back />
<x-buttons.show route='{!!route("backend.$module_name.show", $$module_name_singular)!!}' title="{{__('Show')}} {{ ucwords(Str::singular($module_name)) }}" class="ml-1"/>
</div>
</div>
</div>
Expand Down
6 changes: 4 additions & 2 deletions resources/views/backend/roles/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@
@endforeach
</td>
<td class="text-right">
<a href="{{route("backend.$module_name.show", $module_name_singular)}}" class="btn btn-success btn-sm mt-1" data-toggle="tooltip" title="{{__('labels.backend.show')}}"><i class="fas fa-desktop"></i></a>
<a href="{{route("backend.$module_name.edit", $module_name_singular)}}" class="btn btn-primary btn-sm mt-1" data-toggle="tooltip" title="{{__('labels.backend.edit')}}"><i class="fas fa-pencil-alt"></i></a>
@can('edit_'.$module_name)
<x-buttons.edit route='{!!route("backend.$module_name.edit", $module_name_singular)!!}' title="{{__('Edit')}} {{ ucwords(Str::singular($module_name)) }}" small="true" />
@endcan
<x-buttons.show route='{!!route("backend.$module_name.show", $module_name_singular)!!}' title="{{__('Show')}} {{ ucwords(Str::singular($module_name)) }}" small="true" />
</td>
</tr>
@endforeach
Expand Down
6 changes: 3 additions & 3 deletions resources/views/backend/roles/show.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
</div>
<div class="col-4">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
<button onclick="window.history.back();"class="btn btn-warning ml-1" data-toggle="tooltip" title="Return Back"><i class="fas fa-reply"></i></button>
<a href="{{route("backend.$module_name.edit", $$module_name_singular)}}" class="btn btn-primary ml-1" data-toggle="tooltip" title="{{__('labels.backend.edit')}}"><i class="fas fa-pencil-alt"></i></a>
<x-buttons.return-back />
<x-buttons.edit route='{!!route("backend.$module_name.edit", $$module_name_singular)!!}' title="{{__('Edit')}} {{ ucwords(Str::singular($module_name)) }}" class="ml-1" />
</div>
</div>
</div>

<div class="row mt-4 mb-4">
<div class="row mt-4">
<div class="col">
<div class="table-responsive">
<table class="table table-hover">
Expand Down
128 changes: 66 additions & 62 deletions resources/views/backend/users/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@

<hr>

<div class="row mt-4 mb-4">
<div class="row mt-4">
<div class="col">

{{ html()->form('POST', route('backend.users.store'))->class('form-horizontal')->open() }}
{{ csrf_field() }}

<div class="form-group row">
{{ html()->label(__('labels.backend.users.fields.first_name'))->class('col-md-2 form-control-label')->for('first_name') }}
<div class="col-md-10">
{{ html()->label(__('labels.backend.users.fields.first_name'))->class('col-sm-2 form-control-label')->for('first_name') }}
<div class="col-sm-10">
{{ html()->text('first_name')
->class('form-control')
->placeholder(__('labels.backend.users.fields.first_name'))
Expand All @@ -54,8 +54,8 @@
</div>
</div><!--form-group-->
<div class="form-group row">
{{ html()->label(__('labels.backend.users.fields.last_name'))->class('col-md-2 form-control-label')->for('last_name') }}
<div class="col-md-10">
{{ html()->label(__('labels.backend.users.fields.last_name'))->class('col-sm-2 form-control-label')->for('last_name') }}
<div class="col-sm-10">
{{ html()->text('last_name')
->class('form-control')
->placeholder(__('labels.backend.users.fields.last_name'))
Expand All @@ -65,9 +65,9 @@
</div><!--form-group-->

<div class="form-group row">
{{ html()->label(__('labels.backend.users.fields.email'))->class('col-md-2 form-control-label')->for('email') }}
{{ html()->label(__('labels.backend.users.fields.email'))->class('col-sm-2 form-control-label')->for('email') }}

<div class="col-md-10">
<div class="col-sm-10">
{{ html()->email('email')
->class('form-control')
->placeholder(__('labels.backend.users.fields.email'))
Expand All @@ -77,9 +77,9 @@
</div><!--form-group-->

<div class="form-group row">
{{ html()->label(__('labels.backend.users.fields.password'))->class('col-md-2 form-control-label')->for('password') }}
{{ html()->label(__('labels.backend.users.fields.password'))->class('col-sm-2 form-control-label')->for('password') }}

<div class="col-md-10">
<div class="col-sm-10">
{{ html()->password('password')
->class('form-control')
->placeholder(__('labels.backend.users.fields.password'))
Expand All @@ -88,9 +88,9 @@
</div><!--form-group-->

<div class="form-group row">
{{ html()->label(__('labels.backend.users.fields.password_confirmation'))->class('col-md-2 form-control-label')->for('password_confirmation') }}
{{ html()->label(__('labels.backend.users.fields.password_confirmation'))->class('col-sm-2 form-control-label')->for('password_confirmation') }}

<div class="col-md-10">
<div class="col-sm-10">
{{ html()->password('password_confirmation')
->class('form-control')
->placeholder(__('labels.backend.users.fields.password_confirmation'))
Expand All @@ -99,81 +99,85 @@
</div><!--form-group-->

<div class="form-group row">
{{ html()->label(__('labels.backend.users.fields.status'))->class('col-md-2 form-control-label')->for('status') }}
{{ html()->label(__('labels.backend.users.fields.status'))->class('col-6 col-sm-2 form-control-label')->for('status') }}

<div class="col-md-10">
<div class="col-6 col-sm-10">
{{ html()->checkbox('status', true, '1') }}
</div>
</div><!--form-group-->

<div class="form-group row">
{{ html()->label(__('labels.backend.users.fields.confirmed'))->class('col-md-2 form-control-label')->for('confirmed') }}
{{ html()->label(__('labels.backend.users.fields.confirmed'))->class('col-6 col-sm-2 form-control-label')->for('confirmed') }}

<div class="col-md-10">
<div class="col-6 col-sm-10">
{{ html()->checkbox('confirmed', true, '1') }}
</div>
</div><!--form-group-->

<div class="form-group row">
{{ html()->label('Abilities')->class('col-md-2 form-control-label') }}
{{ html()->label('Abilities')->class('col-sm-2 form-control-label') }}

<div class="col">
<div class="table-responsive">
<table class="table">
<thead>
<tr>
<th>@lang('Roles')</th>
<th>@lang('Permissions')</th>
</tr>
</thead>
<tbody>
<tr>
<td>
@if ($roles->count())
@foreach($roles as $role)
<div class="card">
<div class="card-header">
<div class="checkbox">
{{ html()->label(html()->checkbox('roles[]', old('roles') && in_array($role->name, old('roles')) ? true : false, $role->name)->id('role-'.$role->id) . ' ' . ucwords($role->name))->for('role-'.$role->id) }}
</div>
<div class="row">
<div class="col-12 col-sm-7">
<div class="card card-accent-info">
<div class="card-header">
@lang('Roles')
</div>
<div class="card-body">
@if ($roles->count())
@foreach($roles as $role)
<div class="card">
<div class="card-header">
<div class="checkbox">
{{ html()->label(html()->checkbox('roles[]', old('roles') && in_array($role->name, old('roles')) ? true : false, $role->name)->id('role-'.$role->id) . "&nbsp;" . ucwords($role->name). "&nbsp;(".$role->name.")")->for('role-'.$role->id) }}
</div>
<div class="card-body">
@if ($role->id != 1)
@if ($role->permissions->count())
@foreach ($role->permissions as $permission)
<i class="far fa-check-circle mr-1"></i>{{ $permission->name }}
@endforeach
@else
None
@endif
</div>
<div class="card-body">
@if ($role->id != 1)
@if ($role->permissions->count())
@foreach ($role->permissions as $permission)
<i class="far fa-check-circle mr-1"></i>{{ $permission->name }}&nbsp;
@endforeach
@else
@lang('All Permissions')
None
@endif
</div>
</div><!--card-->
@endforeach
@endif
</td>
<td>
@if ($permissions->count())
@foreach($permissions as $permission)
<div class="checkbox">
{{ html()->label(html()->checkbox('permissions[]', old('permissions') && in_array($permission->name, old('permissions')) ? true : false, $permission->name)->id('permission-'.$permission->id) . ' ' . ucwords($permission->name))->for('permission-'.$permission->id) }}
</div>
@endforeach
@endif
</td>
</tr>
</tbody>
</table>
@else
@lang('All Permissions')
@endif
</div>
</div><!--card-->
@endforeach
@endif
</div>
</div>
</div>
<div class="col-12 col-sm-5">
<div class="card card-accent-primary">
<div class="card-header">
@lang('Permissions')
</div>
<div class="card-body">
@if ($permissions->count())
@foreach($permissions as $permission)
<div class="checkbox">
{{ html()->label(html()->checkbox('permissions[]', old('permissions') && in_array($permission->name, old('permissions')) ? true : false, $permission->name)->id('permission-'.$permission->id) . ' ' . $permission->name)->for('permission-'.$permission->id) }}
</div>
@endforeach
@endif
</div>
</div>
</div>
</div>
</div>
</div><!--form-group-->

<div class="row">
<div class="col-6">
<div class="form-group">
<x-buttons.create-submit />
<x-buttons.create title="{{__('Create')}} {{ ucwords(Str::singular($module_name)) }}">
{{__('Create')}}
</x-buttons.create>
</div>
</div>
<div class="col-6">
Expand Down
Loading

0 comments on commit aa49433

Please sign in to comment.