diff --git a/app/Http/Controllers/Admin/helpdesk/PriorityController.php b/app/Http/Controllers/Admin/helpdesk/PriorityController.php index b1fb5ba2b..625a44fd9 100644 --- a/app/Http/Controllers/Admin/helpdesk/PriorityController.php +++ b/app/Http/Controllers/Admin/helpdesk/PriorityController.php @@ -91,9 +91,9 @@ class PriorityController extends Controller }) ->addColumn('action', function ($model) { if ($model->is_default > 0) { - return 'priority_id.'/edit')." class='btn btn-info btn-xs' disabled='disabled'>Edit delete "; + return ' '; } else { - return 'priority_id.'/edit')." class='btn btn-info btn-xs'>Edit Delete "; + return 'priority_id.'/edit')." class='btn btn-primary btn-xs'>Edit Delete "; } }) ->searchColumns('priority') diff --git a/app/Http/Controllers/Admin/helpdesk/WorkflowController.php b/app/Http/Controllers/Admin/helpdesk/WorkflowController.php index 44eab8b0d..982461107 100644 --- a/app/Http/Controllers/Admin/helpdesk/WorkflowController.php +++ b/app/Http/Controllers/Admin/helpdesk/WorkflowController.php @@ -132,7 +132,7 @@ class WorkflowController extends Controller ->addColumn('Actions', function ($model) { $confirmation = 'Are you sure?'; - return "id)."'> Edit id)."'> Delete"; + return "id)."'> Edit id)."'> Delete"; }) ->make(); } diff --git a/resources/views/themes/default1/admin/helpdesk/manage/form/add-child.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/form/add-child.blade.php index b1c7c460b..ee7b7e15c 100644 --- a/resources/views/themes/default1/admin/helpdesk/manage/form/add-child.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/manage/form/add-child.blade.php @@ -1,15 +1,19 @@ @extends('themes.default1.admin.layout.admin') @section('Manage') -active +class="nav-link active" @stop -@section('manage-bar') -active +@section('manage-menu-parent') +class="nav-item menu-open" +@stop + +@section('manage-menu-open') +class="nav nav-treeview menu-open" @stop @section('forms') -class="active" +class="nav-link active" @stop @section('HeadInclude') @@ -20,8 +24,14 @@ class="active" @stop @section('content') -
{!! Lang::get('lang.label') !!} | -{!! Lang::get('lang.name') !!} | -{!! Lang::get('lang.type') !!} | -{!! Lang::get('lang.values(selected_fields)') !!} | -{!! Lang::get('lang.required') !!} | -{!! Lang::get('lang.action') !!} | - - + +
---|---|---|---|---|---|
- | - - | {!! Form::select('type[]',['text'=>'text','email'=>'email','password'=>'password','textarea'=>'textarea','select'=>'select','radio'=>'radio','checkbox'=>'checkbox','hidden'=>'hidden'],$field->type,['class'=>'form-control']) !!} | -- - | {!! Lang::get("lang.yes") !!} {!! Form::radio('required['.$key.']',1,true) !!} {!! Lang::get("lang.no") !!} {!! Form::radio('required['.$key.']',0,$field->nonRequiredFieldForCheck()) !!} | -- |
{!! Lang::get('lang.label') !!} | +{!! Lang::get('lang.name') !!} | +{!! Lang::get('lang.type') !!} | +{!! Lang::get('lang.values(selected_fields)') !!} | +{!! Lang::get('lang.required') !!} | +{!! Lang::get('lang.action') !!} | + + - @endforelse + @forelse($fields as $key=>$field) - -
---|
{!! Lang::get('lang.label') !!} | -{!! Lang::get('lang.name') !!} | -{!! Lang::get('lang.type') !!} | -{!! Lang::get('lang.values(selected_fields)') !!} | -{!! Lang::get('lang.required') !!} | -{!! Lang::get('lang.action') !!} | - - - -
---|---|---|---|---|---|
- | - | - - | -- | {!! Lang::get("lang.yes") !!} {!! Lang::get("lang.no") !!} | -- |
{!! Lang::get('lang.label') !!} | +{!! Lang::get('lang.name') !!} | +{!! Lang::get('lang.type') !!} | +{!! Lang::get('lang.values(selected_fields)') !!} | +{!! Lang::get('lang.required') !!} | +{!! Lang::get('lang.action') !!} | + + + +
---|---|---|---|---|---|
+ | + | + + | ++ | {!! Lang::get("lang.yes") !!} {!! Lang::get("lang.no") !!} | ++ |
{{Lang::get('lang.topic')}} | @@ -118,13 +127,19 @@ class="active"{!! Form::open(['route'=>['helptopic.destroy', $topic->id],'method'=>'DELETE']) !!} - {!! Lang::get('lang.edit') !!} + {!! Lang::get('lang.edit') !!} - {!! Form::button(' '.Lang::get('lang.delete'), - ['type' => 'submit', - 'class'=> 'btn btn-warning btn-xs btn-flat '.$disable, - 'onclick'=>'return confirm("Are you sure?")']) - !!} + @if($topic->id == $default_helptopic) + {!! Form::button(' '.Lang::get('lang.delete'), + ['class'=> 'btn btn-danger btn-xs '.$disable]) + !!} + @else + {!! Form::button(' '.Lang::get('lang.delete'), + ['type' => 'submit', + 'class'=> 'btn btn-danger btn-xs', + 'onclick'=>'return confirm("Are you sure?")']) + !!} + @endif {!! Form::close() !!} | diff --git a/resources/views/themes/default1/admin/helpdesk/manage/sla/create.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/sla/create.blade.php index 23498bcf0..e64975d3c 100644 --- a/resources/views/themes/default1/admin/helpdesk/manage/sla/create.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/manage/sla/create.blade.php @@ -1,15 +1,19 @@ @extends('themes.default1.admin.layout.admin') @section('Manage') -active +class="nav-link active" @stop -@section('manage-bar') -active +@section('manage-menu-parent') +class="nav-item menu-open" +@stop + +@section('manage-menu-open') +class="nav nav-treeview menu-open" @stop @section('sla') -class="active" +class="nav-link active" @stop @section('HeadInclude') @@ -29,48 +33,48 @@ class="active" @section('content') {!! Form::open(['action' => 'Admin\helpdesk\SlaController@store', 'method' => 'post']) !!} -
---|
{{Lang::get('lang.name')}} | -{{Lang::get('lang.status')}} | -{{Lang::get('lang.grace_period')}} | -{{Lang::get('lang.created')}} | -{{Lang::get('lang.last_updated')}} | -{{Lang::get('lang.action')}} | -
---|
{{Lang::get('lang.name')}} | +{{Lang::get('lang.status')}} | +{{Lang::get('lang.grace_period')}} | +{{Lang::get('lang.created')}} | +{{Lang::get('lang.last_updated')}} | +{{Lang::get('lang.action')}} | +{!! Form::open(['route'=>['sla.destroy', $sla->id],'method'=>'DELETE']) !!} - Edit + Edit - {!! Form::button(' Delete', - ['type' => 'submit', - 'class'=> 'btn btn-warning btn-xs btn-flat '.$disable, - 'onclick'=>'return confirm("Are you sure?")']) - !!} + @if($sla->id == $default_sla) + {!! Form::button(' Delete', + ['class'=> 'btn btn-danger btn-xs '.$disable]) + !!} + @else + {!! Form::button(' Delete', + ['type' => 'submit', + 'class'=> 'btn btn-danger btn-xs', + 'onclick'=>'return confirm("Are you sure?")']) + !!} + @endif + {!! Form::close() !!} | @endforeach @@ -120,8 +135,6 @@ $default_sla = $default_sla->sla;
---|