From 335d216c27293ec282a917368eadcd270ffa9ecc Mon Sep 17 00:00:00 2001 From: Sakthi002 Date: Tue, 19 Jan 2021 18:35:13 +0530 Subject: [PATCH] Bootstrap4 :: Issues updated --- .../Controllers/SettingsController.php | 5 +- app/FaveoStorage/views/settings.blade.php | 75 ++++++++++--------- resources/lang/en/lang.php | 2 +- .../default1/admin/helpdesk/setting.blade.php | 2 +- .../settings/social-media/settings.blade.php | 4 +- .../default1/admin/layout/admin.blade.php | 25 ++++++- .../helpdesk/organization/show.blade.php | 4 +- .../default1/agent/layout/agent.blade.php | 16 ++++ .../views/vendor/Chumper/template.blade.php | 2 +- 9 files changed, 91 insertions(+), 44 deletions(-) diff --git a/app/FaveoStorage/Controllers/SettingsController.php b/app/FaveoStorage/Controllers/SettingsController.php index 31d057b2e..f5637cc79 100644 --- a/app/FaveoStorage/Controllers/SettingsController.php +++ b/app/FaveoStorage/Controllers/SettingsController.php @@ -15,16 +15,17 @@ class SettingsController extends Controller { public function settingsIcon() { + return '
- +
-

'.Lang::get('storage::lang.storage').'

+
'.Lang::get('storage::lang.storage').'
'; } diff --git a/app/FaveoStorage/views/settings.blade.php b/app/FaveoStorage/views/settings.blade.php index ba5b0d5e9..e5372e139 100644 --- a/app/FaveoStorage/views/settings.blade.php +++ b/app/FaveoStorage/views/settings.blade.php @@ -1,15 +1,19 @@ @extends('themes.default1.admin.layout.admin') @section('Settings') -active +class="nav-link active" @stop -@section('settings-bar') -active +@section('settings-menu-parent') +class="nav-item menu-open" +@stop + +@section('settings-menu-open') +class="nav nav-treeview menu-open" @stop @section('storage') -class="active" +class="nav-link active" @stop @section('PageHeader') @@ -19,40 +23,43 @@ class="active" @section('HeadInclude') @stop @section('content') -
-
-

{{Lang::get('storage::lang.storage')}}

- @if (count($errors) > 0) -
- Whoops! There were some problems with your input.

-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif + @if (count($errors) > 0) +
+ Whoops! There were some problems with your input.

+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+@endif - @if(Session::has('success')) -
- - {{Session::get('success')}} -
- @endif - - @if(Session::has('fails')) -
- - {{Lang::get('message.alert')}}! {{Lang::get('message.failed')}}. - - {{Session::get('fails')}} -
- @endif +@if(Session::has('success')) +
+ + {{Session::get('success')}} +
+@endif + +@if(Session::has('fails')) +
+ + {{Lang::get('message.alert')}}! {{Lang::get('message.failed')}}. + + {{Session::get('fails')}} +
+@endif + +
+ +
+

{{Lang::get('storage::lang.storage')}}

+ {!! Form::open(['url'=>'storage','method'=>'post']) !!}
-
+
{!! Form::label('default',Lang::get('storage::lang.default')) !!} @@ -106,7 +113,7 @@ class="active"
-
+
{!! Form::submit('Save',['class'=>'btn btn-success']) !!} {!! Form::close() !!}
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 4719644db..cd02c98cc 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -533,7 +533,7 @@ return [ 'priority' => 'Priority', 'last_updated' => 'Last updated', 'create_help_topic' => 'Create help topic', - 'action' => 'Action', + 'action' => 'Actions', /* |-------------------------------------- | Help Topic Create Page diff --git a/resources/views/themes/default1/admin/helpdesk/setting.blade.php b/resources/views/themes/default1/admin/helpdesk/setting.blade.php index 0bccce185..8b92e02b8 100644 --- a/resources/views/themes/default1/admin/helpdesk/setting.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/setting.blade.php @@ -511,7 +511,7 @@
-
{!! Lang::get('lang.notification') !!}
+
{!! Lang::get('lang.notifications') !!}
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/social-media/settings.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/social-media/settings.blade.php index b970f0dbf..746172b99 100644 --- a/resources/views/themes/default1/admin/helpdesk/settings/social-media/settings.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/settings/social-media/settings.blade.php @@ -75,14 +75,14 @@ class="nav-link active"
- {!! Form::label('client_id',Lang::get('lang.client_id')) !!} + {!! Form::label('client_id',Lang::get('lang.client_id')) !!} * {!! Form::text('client_id',$social->getvalueByKey($provider,'client_id'),['class' => 'form-control']) !!} {!! $errors->first('client_id', ':message') !!}
- {!! Form::label('client_secret',Lang::get('lang.client_secret')) !!} + {!! Form::label('client_secret',Lang::get('lang.client_secret')) !!} * {!! Form::text('client_secret',$social->getvalueByKey($provider,'client_secret'),['class' => 'form-control']) !!} {!! $errors->first('client_secret', ':message') !!}
diff --git a/resources/views/themes/default1/admin/layout/admin.blade.php b/resources/views/themes/default1/admin/layout/admin.blade.php index a6b78ad70..645ee2354 100644 --- a/resources/views/themes/default1/admin/layout/admin.blade.php +++ b/resources/views/themes/default1/admin/layout/admin.blade.php @@ -66,6 +66,22 @@ .nav-sidebar .nav-header:not(:first-of-type) { padding: 0.5rem; } + + .has-error label { + color: #dd4b39 !important; + } + + .has-error .form-control { + border-color: #dd4b39 !important; + box-shadow: none; + } + + .btn.disabled, .btn[disabled], fieldset[disabled] .btn { + box-shadow: none; + cursor: not-allowed; + opacity: 0.65; + pointer-events: none; + } @@ -370,7 +386,7 @@
  • - +

    {!! Lang::get('lang.groups') !!}
    • @@ -593,6 +609,13 @@

    {!! Lang::get('lang.notifications') !!}

    + +
  • + + +

    {!! Lang::get('storage::lang.storage') !!}

    +     +
    • diff --git a/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php b/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php index 9bdc8ee8a..4d080e22d 100644 --- a/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php @@ -102,7 +102,7 @@ class="nav-link active"
    -
    {!! $orgs->address !!}
    + {!! $orgs->address !!} @endif @@ -111,7 +111,7 @@ class="nav-link active"
    -
    {!! $orgs->internal_notes !!}
    + {!! $orgs->internal_notes !!} @endif diff --git a/resources/views/themes/default1/agent/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php index a2da5c8c3..37ed45ea3 100644 --- a/resources/views/themes/default1/agent/layout/agent.blade.php +++ b/resources/views/themes/default1/agent/layout/agent.blade.php @@ -71,6 +71,22 @@ .nav-sidebar .nav-header:not(:first-of-type) { padding: 0.5rem; } + + .has-error label { + color: #dd4b39 !important; + } + + .has-error .form-control { + border-color: #dd4b39 !important; + box-shadow: none; + } + + .btn.disabled, .btn[disabled], fieldset[disabled] .btn { + box-shadow: none; + cursor: not-allowed; + opacity: 0.65; + pointer-events: none; + } diff --git a/resources/views/vendor/Chumper/template.blade.php b/resources/views/vendor/Chumper/template.blade.php index 00714902b..137e99d06 100644 --- a/resources/views/vendor/Chumper/template.blade.php +++ b/resources/views/vendor/Chumper/template.blade.php @@ -1,4 +1,4 @@ - +
    @for ($i = 0; $i < count($columns); $i++)