Skip to content

Commit

Permalink
changes-2
Browse files Browse the repository at this point in the history
  • Loading branch information
@KNaveenraj-ladybird
KNaveenraj-ladybird committed Oct 12, 2023
1 parent 431dd05 commit d2a8c82
Show file tree
Hide file tree
Showing 42 changed files with 1,046 additions and 1,000 deletions.
2 changes: 1 addition & 1 deletion app/FaveoLog/lang/ar/lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

return[
'logs' => 'مؤلف',
'system_logs '=> 'سجلات النظام',
'system_logs'=> 'سجلات النظام',

];
1 change: 1 addition & 0 deletions app/FaveoLog/lang/en/lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@

return [
'logs' => 'Logs',
'system_logs' => 'System logs',
];
8 changes: 4 additions & 4 deletions app/FaveoLog/views/log.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ class="nav-link active"
<div class="container-fluid">
<div class="card card-light">
<div class="card-header">
<h3 class="card-title">{{Lang::get('lang.system_logs')}}</h3>
<h3 class="card-title">{{Lang::get('log::lang.system_logs')}}</h3>
<div class="card-tools">
<a href="?dl={{ base64_encode($current_file) }}" class="btn btn-primary btn-sm text-white"><span class="fas fa-download"></span> Download file</a>
<a id="delete-log" href="?del={{ base64_encode($current_file) }}" class="btn btn-danger btn-sm text-white"><span class="fas fa-trash"></span> Delete file</a>
<a href="?dl={{ base64_encode($current_file) }}" class="btn btn-primary btn-sm text-white"><span class="fas fa-download"></span>{{trans('lang.download_file')}}</a>
<a id="delete-log" href="?del={{ base64_encode($current_file) }}" class="btn btn-danger btn-sm text-white"><span class="fas fa-trash"></span>{{trans('lang.delete_file')}}</a>
</div>
</div>
<div class="card-body">
Expand All @@ -61,7 +61,7 @@ class="nav-link active"
<div class="col-md-10 table-container">
@if ($logs === null)
<div>
Log file >50M, please download it.
{{trans('lang.log_file_50M_please_download_it.')}}
</div>
@else
<table id="table-log" class="table table-striped">
Expand Down
7 changes: 3 additions & 4 deletions app/Http/Controllers/Agent/helpdesk/OrganizationController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ public function index()
*/
public function org_list()
{
$modalTitle = __('lang.your_translation_key_here');
// chumper datable package call to display Advance datatable
return \Datatable::collection(Organization::all())
/* searchable name */
Expand Down Expand Up @@ -109,15 +108,15 @@ public function org_list()
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">{{ $modalTitle }}</h4>
<h4 class="modal-title">'.\Lang::get('lang.are_you_sure').'</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div>
<div class="modal-body">
'.$model->user_name.'
</div>
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">Close</button>
<a href="'.route('org.delete', $model->id).'"><button class="btn btn-danger">delete</button></a>
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">'.\Lang::get('lang.close').'</button>
<a href="'.route('org.delete', $model->id).'"><button class="btn btn-danger">'.\Lang::get('lang.delete').'</button></a>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
Expand Down
8 changes: 4 additions & 4 deletions app/Http/Controllers/Agent/kb/ArticleController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ public function getData()
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Delete</h4>
<h4 class="modal-title">'.Lang::get('lang.delete').'</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div>
<div class="modal-body">
Are you sure you want to delete <b> '.$model->name.' </b> ?
<span>'.Lang::get('lang.are_you_sure_you_want_to_delete').'</span>&nbsp; <b> '.$model->name.' </b> ?
</div>
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">Close</button>
<a href='.url("article/delete/$model->slug").'><button class="btn btn-danger">delete</button></a>
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">'.Lang::get('lang.close').'</button>
<a href='.url("article/delete/$model->slug").'><button class="btn btn-danger">'.Lang::get('lang.delete').'</button></a>
</div>
</div>
</div>
Expand Down
9 changes: 4 additions & 5 deletions app/Http/Controllers/Agent/kb/PageController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use App\Http\Controllers\Controller;
use App\Http\Requests\kb\PageRequest;
// request
use App\Http\Requests\kb\PageUpdate;
use App\Model\kb\Page;
use Datatable;
// Model
Expand Down Expand Up @@ -91,15 +90,15 @@ public function getData()
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Delete</h4>
<h4 class="modal-title">'.Lang::get('lang.delete').'</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div>
<div class="modal-body">
Are you sure you want to delete <b>'.$model->name.'</b> ?
<span>'.Lang::get('lang.are_you_sure_you_want_to_delete').'</span>&nbsp;<b>'.$model->name.'</b> ?
</div>
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">Close</button>
<a href="page/delete/'.$model->id.'"><button class="btn btn-danger">Delete</button></a>
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">'.Lang::get('lang.close').'</button>
<a href="page/delete/'.$model->id.'"><button class="btn btn-danger">'.Lang::get('lang.delete').'</button></a>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit d2a8c82

Please sign in to comment.