From c1ec03c0d45b6668f4071692d61f6e62d9e166e1 Mon Sep 17 00:00:00 2001 From: Sakthi002 Date: Wed, 30 Dec 2020 13:30:40 +0530 Subject: [PATCH] Bootstrap4 :: Report UI updates --- .../Agent/kb/ArticleController.php | 8 +- .../Controllers/Agent/kb/PageController.php | 10 +- resources/lang/en/lang.php | 2 + resources/views/errors/404.blade.php | 2 +- resources/views/errors/500.blade.php | 4 +- .../agent/helpdesk/report/index.blade.php | 135 ++--- .../agent/kb/article/create.blade.php | 464 ++++++++-------- .../default1/agent/kb/article/edit.blade.php | 516 +++++++++--------- .../default1/agent/kb/article/index.blade.php | 68 ++- .../agent/kb/category/create.blade.php | 4 +- .../default1/agent/kb/category/edit.blade.php | 16 + .../default1/agent/kb/category/form.blade.php | 61 +-- .../agent/kb/category/index.blade.php | 4 +- .../default1/agent/kb/pages/create.blade.php | 201 ++++--- .../default1/agent/kb/pages/edit.blade.php | 207 ++++--- .../default1/agent/kb/pages/index.blade.php | 74 ++- .../default1/agent/layout/agent.blade.php | 8 + .../default1/agent/layout/sidebar.blade.php | 12 +- .../client/kb/article-list/show.blade.php | 6 - .../default1/client/layout/client.blade.php | 2 + 20 files changed, 989 insertions(+), 815 deletions(-) diff --git a/app/Http/Controllers/Agent/kb/ArticleController.php b/app/Http/Controllers/Agent/kb/ArticleController.php index 256be0448..863bcae66 100644 --- a/app/Http/Controllers/Agent/kb/ArticleController.php +++ b/app/Http/Controllers/Agent/kb/ArticleController.php @@ -90,14 +90,14 @@ class ArticleController extends Controller
+

Delete

-

Are You Sure ?

- '.$model->name.' + Are you sure you want to delete '.$model->name.' ?
-
- +
+
diff --git a/app/Http/Controllers/Agent/kb/PageController.php b/app/Http/Controllers/Agent/kb/PageController.php index 104290086..cbed458b3 100644 --- a/app/Http/Controllers/Agent/kb/PageController.php +++ b/app/Http/Controllers/Agent/kb/PageController.php @@ -90,15 +90,15 @@ class PageController extends Controller
+

Delete

-

Are You Sure ?

- '.$model->name.' + Are you sure you want to delete '.$model->name.' ?
-
- - +
+ +
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 38f068a95..501ebf099 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1290,9 +1290,11 @@ return [ 'article' => 'Article', 'articles' => 'Articles', 'addarticle' => 'Add article', + 'editarticle' => 'Edit article', 'allarticle' => 'All articles', 'pages' => 'Pages', 'addpages' => 'Add pages', + 'editpage' => 'Edit page', 'allpages' => 'All pages', 'widgets' => 'Widgets', 'widget-settings' => 'Widget settings', diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index 3643d89bd..86c43dcd4 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -2,7 +2,7 @@ @section('content')
-

404

+

44

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

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

diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php index b07588bb3..cd6f44180 100644 --- a/resources/views/errors/500.blade.php +++ b/resources/views/errors/500.blade.php @@ -1,8 +1,8 @@ @extends('themes.default1.client.layout.client') @section('content')
-
-

0

+
+

5

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

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

diff --git a/resources/views/themes/default1/agent/helpdesk/report/index.blade.php b/resources/views/themes/default1/agent/helpdesk/report/index.blade.php index c8806439c..7cee99df3 100644 --- a/resources/views/themes/default1/agent/helpdesk/report/index.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/report/index.blade.php @@ -1,19 +1,16 @@ @extends('themes.default1.agent.layout.agent') @section('sidebar') -
  • {!! Lang::get('lang.Report') !!}
    • -
  • - - {!! Lang::get('lang.help_topic') !!} +
  • {!! Lang::get('lang.Report') !!}
    • +
  • + +

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

     -
    • -
  • -
    • @stop @section('Report') -class="active" +class="nav-link active" @stop @section('dashboard-bar') @@ -33,7 +30,7 @@ class="active" {{-- Success message --}} @if(Session::has('success'))
    - + {{Session::get('success')}}
    @@ -41,25 +38,29 @@ class="active" {{-- failure message --}} @if(Session::has('fails'))
    - + {!! Lang::get('lang.alert') !!}! {{Session::get('fails')}}
    @endif - -{{-- --}} - -
    -
    -

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

    + +
    + +
    +

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

    -
    + +
    +
    +
    +
    +
    {!! Form::label('helptopic', Lang::get('lang.help_topic')) !!}
    +
    {!! Form::label('date', Lang::get('lang.start_date').':') !!} {!! Form::text('start_date',null,['class'=>'form-control','id'=>'datepicker4'])!!} @@ -95,6 +97,7 @@ class="active" }); }); +
    {!! Form::label('start_time', Lang::get('lang.end_date').':') !!} {!! Form::text('end_date',null,['class'=>'form-control','id'=>'datetimepicker3'])!!} @@ -110,38 +113,41 @@ class="active" }); }); -
    + +
    - - +
    +
    - {!! Form::label('filter', 'Filter:') !!}
    + {!! Form::label('filter', 'Filter:',['style' => 'visibility:hidden;']) !!}

    -
    - - - -
    -
    + + {!! Form::label('filter', 'Filter:',['style' => 'visibility:hidden;']) !!}
    + + {!! Lang::get('lang.generate_pdf') !!} + +
    @@ -152,9 +158,6 @@ class="active"
    -
    - -
    @@ -164,40 +167,54 @@ class="active"
    -
    -
    -
    +
    + +
    -
    +
    -

    +

    + + + + + +

    {!! Lang::get('lang.Currnet_In_Progress') !!}
    -
    +
    -

    +

    +

    + + +

    {!! Lang::get('lang.Total_Created') !!}
    -
    +
    -

    +

    + + +

    {!! Lang::get('lang.Total_Reopened') !!}
    -
    +
    -

    +

    + +

    {!! Lang::get('lang.Total_Closed') !!}
    @@ -207,11 +224,11 @@ class="active"
    -
    -
    -

    Tabular

    +
    +
    +

    Tabular

    -
    +
    @@ -226,7 +243,6 @@ class="active"
    - - - - - - @stop \ No newline at end of file diff --git a/resources/views/themes/default1/agent/kb/article/create.blade.php b/resources/views/themes/default1/agent/kb/article/create.blade.php index 5a69bc674..2fccab2d3 100644 --- a/resources/views/themes/default1/agent/kb/article/create.blade.php +++ b/resources/views/themes/default1/agent/kb/article/create.blade.php @@ -2,12 +2,32 @@ @extends('themes.default1.agent.layout.sidebar') -@section('article') -active +@section('Tools') +class="nav-link active" +@stop + +@section('tool') +class="active" +@stop + +@section('kb') +class="nav-link active" @stop @section('add-article') -class="active" +class="nav-link active" +@stop + +@section('article') +class="nav-link active" +@stop + +@section('article-menu-open') +class="nav nav-treeview menu-open" +@stop + +@section('article-menu-parent') +class="nav-item menu-open" @stop @section('PageHeader') @@ -15,237 +35,241 @@ class="active" @stop @section('content') - + {!! Form::open(array('action' => 'Agent\kb\ArticleController@store' , 'method' => 'post') )!!} + +@if(Session::has('success')) +
    + + + {{Session::get('success')}} +
    +@endif + +@if(Session::has('fails')) +
    + + {!! Lang::get('lang.alert') !!} ! + + {{Session::get('fails')}} +
    +@endif +@if(!$category) +
    + + + {!! Lang::get('lang.create_a_category') !!} +
    +@endif +@if(Session::has('errors')) + +
    + + {!! Lang::get('lang.alert') !!}! + +
    + @if($errors->first('name')) +
  • {!! $errors->first('name', ':message') !!}
    • + @endif + @if($errors->first('slug')) +
  • {!! $errors->first('slug', ':message') !!}
    • + @endif + @if($errors->first('description')) +
  • {!! $errors->first('description', ':message') !!}
    • + @endif + @if($errors->first('type')) +
  • {!! $errors->first('type', ':message') !!}
    • + @endif + @if($errors->first('status')) +
  • {!! $errors->first('status', ':message') !!}
    • + @endif + @if($errors->first('category_id')) +
  • {!! $errors->first('category_id', ':message') !!}
    • + @endif +
    +@endif +
    -
    - @if(Session::has('success')) -
    - - - {{Session::get('success')}} -
    - @endif - - @if(Session::has('fails')) -
    - - {!! Lang::get('lang.alert') !!} ! - - {{Session::get('fails')}} -
    - @endif - @if(!$category) -
    - - - {!! Lang::get('lang.create_a_category') !!} -
    - @endif - @if(Session::has('errors')) - -
    - - {!! Lang::get('lang.alert') !!}! - -
    - @if($errors->first('name')) -
  • {!! $errors->first('name', ':message') !!}
    • - @endif - @if($errors->first('slug')) -
  • {!! $errors->first('slug', ':message') !!}
    • - @endif - @if($errors->first('description')) -
  • {!! $errors->first('description', ':message') !!}
    • - @endif - @if($errors->first('type')) -
  • {!! $errors->first('type', ':message') !!}
    • - @endif - @if($errors->first('status')) -
  • {!! $errors->first('status', ':message') !!}
    • - @endif - @if($errors->first('category_id')) -
  • {!! $errors->first('category_id', ':message') !!}
    • - @endif -
    - @endif -
    -
    -
    -
    -

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

    + +
    + +
    + +
    + +

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

    -
    + +
    +
    +
    {!! Form::label('name',Lang::get('lang.name')) !!} * {!! Form::text('name',null,['class' => 'form-control']) !!}
    -
    -
    - {!! Form::label('description',Lang::get('lang.description')) !!} * -
    - {!! Form::textarea('description',null,['class' => 'form-control','id'=>'editor','size' => '128x20','placeholder'=>Lang::get('lang.enter_the_description')]) !!} + +
    + {!! Form::label('description',Lang::get('lang.description')) !!} * +
    + {!! Form::textarea('description',null,['class' => 'form-control article_desc','id'=>'editor','size' => '128x20','placeholder'=>Lang::get('lang.enter_the_description')]) !!} +
    -
    -
      -
    • -
      -
      -
      -

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

      -
      -
      -
      - {!! Form::label('type',Lang::get('lang.status')) !!} -
      -
      - {!! Form::radio('type','1',true) !!} -
      -
      - {{Lang::get('lang.published')}} -
      -
      - {!! Form::radio('type','0',null) !!} -
      -
      - {{Lang::get('lang.draft')}} -
      -
      -
      -
      - {!! Form::label('status',Lang::get('lang.visibility')) !!} - -
      -
      - {!! Form::radio('status','1',true) !!} -
      -
      - {{Lang::get('lang.public')}} -
      -
      -
      - {!! Form::radio('status','0',null) !!} -
      -
      - {{Lang::get('lang.private')}} -
      -
      -
      -
      - first()->date_time_format; - $format = \App\Model\helpdesk\Utility\Date_time_format::where('id', $format)->first()->format; - $tz = App\Model\helpdesk\Settings\System::where('id', '1')->first()->time_zone; - $tz = App\Model\helpdesk\Utility\Timezones::where('id', $tz)->first()->name; - date_default_timezone_set($tz); - $date = date($format); - $dateparse = date_parse_from_format($format, $date); - //dd($dateparse); - $month = $dateparse['month']; - $day = $dateparse['day']; - $year = $dateparse['year']; - $hour = $dateparse['hour']; - $minute = $dateparse['minute']; -// echo $date; - ?> -
      -
      - {!! Form::label('month',Lang::get('lang.publish_immediately')) !!} -
      -
      - - {!! Form::selectMonth('month', $month) !!} - {!! Form::selectRange('day', 1, 31, $day) !!} - {!! Form::text('year',date('Y'),['style'=>'width: 50px;']) !!}@ - : - -
      -
      -
      -
      - {!! Form::submit(Lang::get('lang.publish'),['class'=>'btn btn-primary'])!!} -
      -
      • -
    • -
      -
      -
      -

      {{Lang::get('lang.category')}} *

      -
      -
      -
      - {{-- {!! Form::label('category_id','Category') !!} --}} - - @foreach($category->toArray() as $key=>$val) -
      -
      -
      - -
      -
      - -
      -
      -
      - @endforeach -
      -
      - {!! Form::close() !!} -
      - {{Lang::get('lang.addcategory')}} - -
      -
      -
      -
      • -
    -
    - - - - @stop \ No newline at end of file +@stop \ No newline at end of file diff --git a/resources/views/themes/default1/agent/kb/article/edit.blade.php b/resources/views/themes/default1/agent/kb/article/edit.blade.php index 2dc93940d..1f3a95abe 100644 --- a/resources/views/themes/default1/agent/kb/article/edit.blade.php +++ b/resources/views/themes/default1/agent/kb/article/edit.blade.php @@ -2,12 +2,32 @@ @extends('themes.default1.agent.layout.sidebar') -@section('article') -active +@section('Tools') +class="nav-link active" +@stop + +@section('tool') +class="active" +@stop + +@section('kb') +class="nav-link active" @stop @section('all-article') -class="active" +class="nav-link active" +@stop + +@section('article') +class="nav-link active" +@stop + +@section('article-menu-open') +class="nav nav-treeview menu-open" +@stop + +@section('article-menu-parent') +class="nav-item menu-open" @stop @section('PageHeader') @@ -15,259 +35,261 @@ class="active" @stop @section('content') - + {!! Form::model($article,['url' => 'article/'.$article->id , 'method' => 'PATCH'] )!!} + +@if(Session::has('success')) +
    + + + {{Session::get('success')}} +
    +@endif + +@if(Session::has('fails')) +
    + + {!! Lang::get('lang.alert') !!}! + + {{Session::get('fails')}} +
    +@endif +@if(Session::has('errors')) + +
    + + {!! Lang::get('lang.alert') !!}! + +
    + @if($errors->first('name')) +
  • {!! $errors->first('name', ':message') !!}
    • + @endif + @if($errors->first('slug')) +
  • {!! $errors->first('slug', ':message') !!}
    • + @endif + @if($errors->first('description')) +
  • {!! $errors->first('description', ':message') !!}
    • + @endif + @if($errors->first('type')) +
  • {!! $errors->first('type', ':message') !!}
    • + @endif + @if($errors->first('status')) +
  • {!! $errors->first('status', ':message') !!}
    • + @endif + @if($errors->first('category_id')) +
  • {!! $errors->first('category_id', ':message') !!}
    • + @endif +
    +@endif +
    -
    - @if(Session::has('success')) -
    - - - {{Session::get('success')}} -
    - @endif - - @if(Session::has('fails')) -
    - - {!! Lang::get('lang.alert') !!}! - - {{Session::get('fails')}} -
    - @endif - @if(Session::has('errors')) - -
    - - {!! Lang::get('lang.alert') !!}! - -
    - @if($errors->first('name')) -
  • {!! $errors->first('name', ':message') !!}
    • - @endif - @if($errors->first('slug')) -
  • {!! $errors->first('slug', ':message') !!}
    • - @endif - @if($errors->first('description')) -
  • {!! $errors->first('description', ':message') !!}
    • - @endif - @if($errors->first('type')) -
  • {!! $errors->first('type', ':message') !!}
    • - @endif - @if($errors->first('status')) -
  • {!! $errors->first('status', ':message') !!}
    • - @endif - @if($errors->first('category_id')) -
  • {!! $errors->first('category_id', ':message') !!}
    • - @endif -
    - @endif -
    -
    -
    -
    -
    - {!! Form::label('name',Lang::get('lang.name')) !!} * - - {!! Form::text('name',null,['class' => 'form-control']) !!} -
    -
    - {!! Form::label('slug',Lang::get('lang.slug')) !!} * - - {!! Form::text('slug',null,['class' => 'form-control']) !!} -
    + +
    + +
    + +
    + +

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

    -
    - {!! Form::label('description',Lang::get('lang.description')) !!} * +
    + +
    + +
    + {!! Form::label('name',Lang::get('lang.name')) !!} * -
    - {!! Form::textarea('description',$article->description,['class' => 'form-control','id'=>'editor','size' => '128x20','placeholder'=>Lang::get('lang.enter_the_description')]) !!} + {!! Form::text('name',null,['class' => 'form-control']) !!} +
    +
    + {!! Form::label('slug',Lang::get('lang.slug')) !!} * + + {!! Form::text('slug',null,['class' => 'form-control']) !!} +
    +
    + +
    + {!! Form::label('description',Lang::get('lang.description')) !!} * + +
    + {!! Form::textarea('description',$article->description,['class' => 'form-control article_desc','id'=>'editor','size' => '128x20','placeholder'=>Lang::get('lang.enter_the_description')]) !!} +
    -
    -
      -
    • -
      -
      -
      -

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

      -
      -
      -
      - {!! Form::label('type',Lang::get('lang.status')) !!} -
      -
      - {!! Form::radio('type','1',true) !!} -
      -
      - {{Lang::get('lang.published')}} -
      -
      - {!! Form::radio('type','0',null) !!} -
      -
      - {{Lang::get('lang.draft')}} -
      -
      -
      -
      - {!! Form::label('status',Lang::get('lang.visibility')) !!} -
      -
      - {!! Form::radio('status','1',true) !!} -
      -
      - {{Lang::get('lang.public')}} -
      -
      -
      - {!! Form::radio('status','0',null) !!} -
      -
      - {{Lang::get('lang.private')}} -
      -
      -
      -
      - first()->date_time_format; - $format = \App\Model\helpdesk\Utility\Date_time_format::where('id', $format)->first()->format; - $tz = App\Model\helpdesk\Settings\System::where('id', '1')->first()->time_zone; - $tz = App\Model\helpdesk\Utility\Timezones::where('id', $tz)->first()->name; - date_default_timezone_set($tz); - $date = date($format); - $dateparse = date_parse_from_format('Y-m-d H:i:s', $article->publish_time); - $month = $dateparse['month']; - $day = $dateparse['day']; - $year = $dateparse['year']; - $hour = $dateparse['hour']; - $minute = $dateparse['minute']; - ?> -
      -
      - {!! Form::label('month',Lang::get('lang.publish_immediately')) !!} -
      -
      - - {!! Form::selectMonth('month', $month) !!} - {!! Form::selectRange('day', 1, 31, $day) !!} - {!! Form::text('year',$year,['style'=>'width: 50px;']) !!}@ - : - -
      -
      -
      - {!! Form::close() !!} -
      -
      -
      - {!! Form::submit(Lang::get('lang.publish'),['class'=>'btn btn-primary'])!!} -
      -
      - {{Lang::get('lang.delete')}} -
      -
      - {{Lang::get('lang.show')}} -
      -
      -
      -
      • -
    • -
      -
      -
      -

      {{Lang::get('lang.category')}} *

      -
      -
      -
      - {{-- {!! Form::label('category_id','Category') !!} --}} - @foreach($category->toArray() as $key=>$val) -
      -
      -
      - all())) { - echo ('checked'); - } - ?> >
      -
      - -
      -
      -
      - @endforeach -
      -
      -
      - {!! Lang::get('lang.addcategory') !!} - -
      -
      -
      -
      • -
    - - - @stop - +
    + +
    + +
    +

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

    +
    + +
    + +
    + {!! Form::label('type',Lang::get('lang.status')) !!} +
    +
    + {!! Form::radio('type','1',true) !!} +
    +
    + {{Lang::get('lang.published')}} +
    +
    + {!! Form::radio('type','0',null) !!} +
    +
    + {{Lang::get('lang.draft')}} +
    +
    +
    + +
    + {!! Form::label('status',Lang::get('lang.visibility')) !!} +
    +
    + {!! Form::radio('status','1',true) !!} +
    +
    + {{Lang::get('lang.public')}} +
    +
    + {!! Form::radio('status','0',null) !!} +
    +
    + {{Lang::get('lang.private')}} +
    +
    +
    + + first()->date_time_format; + $format = \App\Model\helpdesk\Utility\Date_time_format::where('id', $format)->first()->format; + $tz = App\Model\helpdesk\Settings\System::where('id', '1')->first()->time_zone; + $tz = App\Model\helpdesk\Utility\Timezones::where('id', $tz)->first()->name; + date_default_timezone_set($tz); + $date = date($format); + $dateparse = date_parse_from_format('Y-m-d H:i:s', $article->publish_time); + $month = $dateparse['month']; + $day = $dateparse['day']; + $year = $dateparse['year']; + $hour = $dateparse['hour']; + $minute = $dateparse['minute']; + ?> +
    +
    + {!! Form::label('month',Lang::get('lang.publish_immediately')) !!} +
    +
    + + {!! Form::selectMonth('month', $month,['class'=>'form-control mr-1','style'=>'width: 120px;']) !!} + {!! Form::selectRange('day', 1, 31, $day,['class'=>'form-control mr-1','style'=>'width: 65px;']) !!} + {!! Form::text('year',$year,['class'=>'form-control mr-1','style'=>'width: 58px;']) !!}@ +   :  + +
    +
    +
    + {!! Form::close() !!} +
    + + {!! Form::submit(Lang::get('lang.publish'),['class'=>'btn btn-primary'])!!} + + {{Lang::get('lang.show')}} + + {{Lang::get('lang.delete')}} + +
    +
    + +
    + +
    +

    {{Lang::get('lang.category')}} *

    +
    + +
    + +
    + {{-- {!! Form::label('category_id','Category') !!} --}} + @foreach($category->toArray() as $key=>$val) +
    +
    + all())) { + echo ('checked'); + } + ?> >  +
    +
    + @endforeach +
    +
    + +
    + + {!! Lang::get('lang.addcategory') !!} + + +
    +
    +
    +
    + + +@stop + + \ No newline at end of file diff --git a/resources/views/themes/default1/agent/kb/article/index.blade.php b/resources/views/themes/default1/agent/kb/article/index.blade.php index 4af288948..b23b9eeef 100644 --- a/resources/views/themes/default1/agent/kb/article/index.blade.php +++ b/resources/views/themes/default1/agent/kb/article/index.blade.php @@ -2,12 +2,32 @@ @extends('themes.default1.agent.layout.sidebar') -@section('article') -active +@section('Tools') +class="nav-link active" +@stop + +@section('tool') +class="active" +@stop + +@section('kb') +class="nav-link active" @stop @section('all-article') -class="active" +class="nav-link active" +@stop + +@section('article') +class="nav-link active" +@stop + +@section('article-menu-open') +class="nav nav-treeview menu-open" +@stop + +@section('article-menu-parent') +class="nav-item menu-open" @stop @section('PageHeader') @@ -15,28 +35,28 @@ class="active" @stop @section('content') -
    -
    -

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

    + +@if(Session::has('success')) +
    + + + {{Session::get('success')}} +
    +@endif + +@if(Session::has('fails')) +
    + + {!! Lang::get('lang.alert') !!}! + + {{Session::get('fails')}} +
    +@endif +
    +
    +

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

    -
    - - @if(Session::has('success')) -
    - - - {{Session::get('success')}} -
    - @endif - - @if(Session::has('fails')) -
    - - {!! Lang::get('lang.alert') !!}! - - {{Session::get('fails')}} -
    - @endif +
    {!! Datatable::table() ->addColumn(Lang::get('lang.name'), Lang::get('lang.publish_time'), diff --git a/resources/views/themes/default1/agent/kb/category/create.blade.php b/resources/views/themes/default1/agent/kb/category/create.blade.php index e501878db..7930ba786 100644 --- a/resources/views/themes/default1/agent/kb/category/create.blade.php +++ b/resources/views/themes/default1/agent/kb/category/create.blade.php @@ -21,11 +21,11 @@ class="nav-link active" class="nav-link active" @stop -@section('menu-open') +@section('category-menu-open') class="nav nav-treeview menu-open" @stop -@section('menu-parent') +@section('category-menu-parent') class="nav-item menu-open" @stop diff --git a/resources/views/themes/default1/agent/kb/category/edit.blade.php b/resources/views/themes/default1/agent/kb/category/edit.blade.php index 7153db14a..303f0a43b 100644 --- a/resources/views/themes/default1/agent/kb/category/edit.blade.php +++ b/resources/views/themes/default1/agent/kb/category/edit.blade.php @@ -2,6 +2,14 @@ @extends('themes.default1.agent.layout.sidebar') +@section('category-menu-open') +class="nav nav-treeview menu-open" +@stop + +@section('category-menu-parent') +class="nav-item menu-open" +@stop + @section('Tools') class="nav-link active" @stop @@ -14,6 +22,14 @@ class="active" class="nav-link active" @stop +@section('all-category') +class="nav-link active" +@stop + +@section('category') +class="nav-link active" +@stop + @section('PageHeader')

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

    @stop diff --git a/resources/views/themes/default1/agent/kb/category/form.blade.php b/resources/views/themes/default1/agent/kb/category/form.blade.php index c4ed5974a..6decb95bd 100644 --- a/resources/views/themes/default1/agent/kb/category/form.blade.php +++ b/resources/views/themes/default1/agent/kb/category/form.blade.php @@ -1,55 +1,52 @@ -
    -@if(Session::has('success')) -
    - - Success - - {{Session::get('success')}} -
    - @endif - - @if(Session::has('fails')) -
    - - Fail! - - {{Session::get('fails')}} -
    - @endif +
    + @if(Session::has('success')) +
    + + Success + + {{Session::get('success')}} +
    + @endif + + @if(Session::has('fails')) +
    + + Fail! + + {{Session::get('fails')}} +
    + @endif
    -
    +
    {!! Form::label('name',Lang::get('lang.name')) !!} {!! $errors->first('name', ':message') !!} {!! Form::text('name',null,['class' => 'form-control']) !!} -
    - {{-- --}} - -
    +
    {!! Form::label('status',Lang::get('lang.status')) !!} {!! $errors->first('status', ':message') !!} +
    -
    +
    {!! Form::radio('status','1',true) !!}{!! Lang::get('lang.active') !!}
    -
    +
    {!! Form::radio('status','0',null) !!}{!! Lang::get('lang.inactive') !!}
    -
    -
    -
    - {!! Form::label('description',Lang::get('lang.description')) !!} - {!! $errors->first('description', ':message') !!} - {!! Form::textarea('description',null,['class' => 'form-control','size' => '50x10','id'=>'myNicEditor','placeholder'=>Lang::get('lang.enter_the_description')]) !!} -
    +
    + {!! Form::label('description',Lang::get('lang.description')) !!} + {!! $errors->first('description', ':message') !!} + + {!! Form::textarea('description',null,['class' => 'form-control','size' => '50x10','id'=>'myNicEditor','placeholder'=>Lang::get('lang.enter_the_description')]) !!} +
    diff --git a/resources/views/themes/default1/agent/kb/category/index.blade.php b/resources/views/themes/default1/agent/kb/category/index.blade.php index 6d4f2896b..70f1c6390 100644 --- a/resources/views/themes/default1/agent/kb/category/index.blade.php +++ b/resources/views/themes/default1/agent/kb/category/index.blade.php @@ -6,11 +6,11 @@

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

    @stop -@section('menu-open') +@section('category-menu-open') class="nav nav-treeview menu-open" @stop -@section('menu-parent') +@section('category-menu-parent') class="nav-item menu-open" @stop diff --git a/resources/views/themes/default1/agent/kb/pages/create.blade.php b/resources/views/themes/default1/agent/kb/pages/create.blade.php index fe8ce1c8a..aed5cb65f 100644 --- a/resources/views/themes/default1/agent/kb/pages/create.blade.php +++ b/resources/views/themes/default1/agent/kb/pages/create.blade.php @@ -2,12 +2,32 @@ @extends('themes.default1.agent.layout.sidebar') -@section('pages') -active +@section('Tools') +class="nav-link active" +@stop + +@section('tool') +class="active" +@stop + +@section('kb') +class="nav-link active" @stop @section('add-pages') -class="active" +class="nav-link active" +@stop + +@section('pages') +class="nav-link active" +@stop + +@section('page-menu-open') +class="nav nav-treeview menu-open" +@stop + +@section('page-menu-parent') +class="nav-item menu-open" @stop @section('PageHeader') @@ -15,48 +35,53 @@ class="active" @stop @section('content') -{!! Form::open(array('action' => 'Agent\kb\PageController@store' , 'method' => 'post') )!!} -
    -
    - @if(Session::has('errors')) - -
    - - {!! Lang::get('lang.alert') !!}! - -
    - @if($errors->first('name')) -
  • {!! $errors->first('name', ':message') !!}
    • - @endif - @if($errors->first('slug')) -
  • {!! $errors->first('slug', ':message') !!}
    • - @endif - @if($errors->first('description')) -
  • {!! $errors->first('description', ':message') !!}
    • - @endif - @if($errors->first('status')) -
  • {!! $errors->first('status', ':message') !!}
    • - @endif - @if($errors->first('visibility')) -
  • {!! $errors->first('visibility', ':message') !!}
    • - @endif -
    - @endif -
    -
    -
    -

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

    -
    -
    -
    -
    - {!! Form::label('name',Lang::get('lang.name')) !!} * - {!! Form::text('name',null,['class' => 'form-control']) !!} -
    - +{!! Form::open(array('action' => 'Agent\kb\PageController@store' , 'method' => 'post') )!!} + +@if(Session::has('errors')) + +
    + + {!! Lang::get('lang.alert') !!}! + +
    + @if($errors->first('name')) +
  • {!! $errors->first('name', ':message') !!}
    • + @endif + @if($errors->first('slug')) +
  • {!! $errors->first('slug', ':message') !!}
    • + @endif + @if($errors->first('description')) +
  • {!! $errors->first('description', ':message') !!}
    • + @endif + @if($errors->first('status')) +
  • {!! $errors->first('status', ':message') !!}
    • + @endif + @if($errors->first('visibility')) +
  • {!! $errors->first('visibility', ':message') !!}
    • + @endif +
    +@endif + +
    + +
    + +
    + +
    +

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

    +
    + +
    +
    +
    + {!! Form::label('name',Lang::get('lang.name')) !!} * + + {!! Form::text('name',null,['class' => 'form-control']) !!}
    -
    + +
    {!! Form::label('description',Lang::get('lang.description')) !!}
    @@ -66,64 +91,60 @@ class="active"
    -
    -
    -
    -

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

    -
    -
    -
    - {!! Form::label('status',Lang::get('lang.status')) !!} +
    -
    -
    - {!! Form::radio('status','1',true) !!} {{ Lang::get('lang.published') }} -
    -
    - {!! Form::radio('status','0',null) !!} {{ Lang::get('lang.draft') }} -
    +
    + +
    + +
    +

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

    +
    + +
    +
    + {!! Form::label('status',Lang::get('lang.status')) !!} +
    +
    + {!! Form::radio('status','1',true) !!} {{ Lang::get('lang.published') }}
    -
    -
    - {!! Form::label('visibility',Lang::get('lang.visibility')) !!} - -
    -
    - {!! Form::radio('visibility','1',true) !!} {{Lang::get('lang.public')}} -
    -
    -
    - {!! Form::radio('visibility','0',null) !!} {{Lang::get('lang.private')}} -
    -
    +
    + {!! Form::radio('status','0',null) !!} {{ Lang::get('lang.draft') }}
    -
    - - {!! Form::submit(Lang::get('lang.publish'),['class'=>'btn btn-primary'])!!} - +
    + {!! Form::label('visibility',Lang::get('lang.visibility')) !!} +
    +
    + {!! Form::radio('visibility','1',true) !!} {{Lang::get('lang.public')}} +
    +
    + {!! Form::radio('visibility','0',null) !!} {{Lang::get('lang.private')}} +
    +
    +
    + {!! Form::submit(Lang::get('lang.publish'),['class'=>'btn btn-primary'])!!} +
    -
    +
    - - @stop \ No newline at end of file diff --git a/resources/views/themes/default1/agent/kb/pages/edit.blade.php b/resources/views/themes/default1/agent/kb/pages/edit.blade.php index 547477cea..3118d35a1 100644 --- a/resources/views/themes/default1/agent/kb/pages/edit.blade.php +++ b/resources/views/themes/default1/agent/kb/pages/edit.blade.php @@ -1,60 +1,86 @@ @extends('themes.default1.agent.layout.agent') @extends('themes.default1.agent.layout.sidebar') -@section('pages') -active +@section('Tools') +class="nav-link active" @stop -@section('all-pages') + +@section('tool') class="active" @stop +@section('kb') +class="nav-link active" +@stop + +@section('all-pages') +class="nav-link active" +@stop + +@section('pages') +class="nav-link active" +@stop + +@section('page-menu-open') +class="nav nav-treeview menu-open" +@stop + +@section('page-menu-parent') +class="nav-item menu-open" +@stop + @section('PageHeader')

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

    @stop @section('content') -{!! Form::model($page,['url' => 'page/'.$page->slug, 'method' => 'PATCH','files'=>true]) !!} -
    -
    - @if(Session::has('errors')) - -
    - - {!! Lang::get('lang.alert') !!}! - -
    - @if($errors->first('name')) -
  • {!! $errors->first('name', ':message') !!}
    • - @endif - @if($errors->first('slug')) -
  • {!! $errors->first('slug', ':message') !!}
    • - @endif - @if($errors->first('description')) -
  • {!! $errors->first('description', ':message') !!}
    • - @endif - @if($errors->first('status')) -
  • {!! $errors->first('status', ':message') !!}
    • - @endif - @if($errors->first('visibility')) -
  • {!! $errors->first('visibility', ':message') !!}
    • - @endif -
    - @endif -
    -
    -
    -

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

    -
    -
    -
    -
    - {!! Form::label('name',Lang::get('lang.name')) !!} * - {!! Form::text('name',null,['class' => 'form-control']) !!} -
    - +{!! Form::model($page,['url' => 'page/'.$page->slug, 'method' => 'PATCH','files'=>true]) !!} + +@if(Session::has('errors')) + +
    + + {!! Lang::get('lang.alert') !!}! + +
    + @if($errors->first('name')) +
  • {!! $errors->first('name', ':message') !!}
    • + @endif + @if($errors->first('slug')) +
  • {!! $errors->first('slug', ':message') !!}
    • + @endif + @if($errors->first('description')) +
  • {!! $errors->first('description', ':message') !!}
    • + @endif + @if($errors->first('status')) +
  • {!! $errors->first('status', ':message') !!}
    • + @endif + @if($errors->first('visibility')) +
  • {!! $errors->first('visibility', ':message') !!}
    • + @endif +
    +@endif + +
    + +
    + +
    + +
    +

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

    +
    + +
    +
    +
    + {!! Form::label('name',Lang::get('lang.name')) !!} * + + {!! Form::text('name',null,['class' => 'form-control']) !!}
    -
    + +
    {!! Form::label('description',Lang::get('lang.description')) !!}
    @@ -64,62 +90,67 @@ class="active"
    -
    -
    -
    -

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

    -
    -
    -
    - {!! Form::label('status',Lang::get('lang.status')) !!} +
    -
    -
    - {!! Form::radio('status',1,true) !!} {{Lang::get('lang.published')}} -
    -
    - {!! Form::radio('status',0,null) !!} {{Lang::get('lang.draft')}} -
    +
    + +
    + +
    +

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

    +
    + +
    + +
    + {!! Form::label('status',Lang::get('lang.status')) !!} + +
    +
    + {!! Form::radio('status',1,true) !!} {{Lang::get('lang.published')}}
    -
    -
    - {!! Form::label('visibility',Lang::get('lang.visibility')) !!} - -
    -
    - {!! Form::radio('visibility','1',true) !!} {{Lang::get('lang.public')}} -
    -
    -
    - {!! Form::radio('visibility','0',null) !!} {{Lang::get('lang.private')}} -
    -
    +
    + {!! Form::radio('status',0,null) !!} {{Lang::get('lang.draft')}}
    -
    - - {!! Form::submit(Lang::get('lang.publish'),['class'=>'btn btn-primary'])!!} - + +
    + {!! Form::label('visibility',Lang::get('lang.visibility')) !!} + +
    +
    + {!! Form::radio('visibility','1',true) !!} {{Lang::get('lang.public')}} +
    +
    + {!! Form::radio('visibility','0',null) !!} {{Lang::get('lang.private')}} +
    +
    + +
    + + {!! Form::submit(Lang::get('lang.publish'),['class'=>'btn btn-primary'])!!} +
    -
    +
    + @stop diff --git a/resources/views/themes/default1/agent/kb/pages/index.blade.php b/resources/views/themes/default1/agent/kb/pages/index.blade.php index 07d1f9170..37d90e715 100644 --- a/resources/views/themes/default1/agent/kb/pages/index.blade.php +++ b/resources/views/themes/default1/agent/kb/pages/index.blade.php @@ -2,12 +2,32 @@ @extends('themes.default1.agent.layout.sidebar') -@section('pages') -active +@section('Tools') +class="nav-link active" +@stop + +@section('tool') +class="active" +@stop + +@section('kb') +class="nav-link active" @stop @section('all-pages') -class="active" +class="nav-link active" +@stop + +@section('pages') +class="nav-link active" +@stop + +@section('page-menu-open') +class="nav nav-treeview menu-open" +@stop + +@section('page-menu-parent') +class="nav-item menu-open" @stop @section('PageHeader') @@ -15,27 +35,33 @@ class="active" @stop @section('content') -
    -
    -

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

    -
    - - @if(Session::has('success')) -
    - - - {{Session::get('success')}} -
    - @endif - - @if(Session::has('fails')) -
    - - {!! lang::get('lang.alert') !!}! - - {{Session::get('fails')}} -
    - @endif + + +@if(Session::has('success')) +
    + + + {{Session::get('success')}} +
    +@endif + +@if(Session::has('fails')) +
    + + {!! lang::get('lang.alert') !!}! + + {{Session::get('fails')}} +
    +@endif + +
    + +
    +

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

    +
    + +
    +
    {!! Datatable::table() diff --git a/resources/views/themes/default1/agent/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php index 316a27294..c65806362 100644 --- a/resources/views/themes/default1/agent/layout/agent.blade.php +++ b/resources/views/themes/default1/agent/layout/agent.blade.php @@ -63,6 +63,14 @@ .table { width: 100% !important;display: table !important; } .list-group-item{ margin-bottom: auto !important; } + + .help-block { color : #dd4b39; } + + .text-red { color: red; } + + .nav-sidebar .nav-header:not(:first-of-type) { + padding: 0.5rem; + } diff --git a/resources/views/themes/default1/agent/layout/sidebar.blade.php b/resources/views/themes/default1/agent/layout/sidebar.blade.php index a8065f7df..362dcc537 100644 --- a/resources/views/themes/default1/agent/layout/sidebar.blade.php +++ b/resources/views/themes/default1/agent/layout/sidebar.blade.php @@ -11,14 +11,14 @@
  • KNOWLEDGE BASE
    • -
  • +

  • {{Lang::get('lang.category')}}

     -
    • - - @stop @section('category') diff --git a/resources/views/themes/default1/client/layout/client.blade.php b/resources/views/themes/default1/client/layout/client.blade.php index fe36bfd71..b85c36457 100644 --- a/resources/views/themes/default1/client/layout/client.blade.php +++ b/resources/views/themes/default1/client/layout/client.blade.php @@ -79,6 +79,8 @@ .nav-item .dropdown-menu{right: unset !important; left: unset!important;;margin-left: -6px;} .btn-primary { background-color:#009aba !important;border-color:#00c0ef !important; } + + .breadcrumb-item+.breadcrumb-item::before {color: #ffffff !important;}