update v1.0.4

2016-01-04 18:05:45 +05:30
parent 372485336b
commit 4864e5a3f1
529 changed files with 20956 additions and 8178 deletions
--- a/resources/views/themes/default1/agent/helpdesk/organization/index.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/organization/index.blade.php
@@ -18,7 +18,7 @@ class="active"
 <div class="box box-primary">
    <div class="box-header">
        <h2 class="box-title">{{Lang::get('lang.organization')}}</h2><a href="{{route('organizations.create')}}" class="btn btn-primary pull-right">{{Lang::get('lang.create_organization')}}</a></div>
-    <div class="box-body table-responsive">
+    <div class="box-body">
        <!-- check whether success or not -->
        @if(Session::has('success'))
        <div class="alert alert-success alert-dismissable">
@@ -37,11 +37,6 @@ class="active"
            {{Session::get('fails')}}
        </div>
        @endif
-<?php
-$orgs = App\Model\helpdesk\Agent_panel\Organization::orderBy('id', 'ASC')->paginate(20);
-?>
-        <table class="table table-hover" style="overflow:hidden;">
-            <div class="row">
                {!! Datatable::table()
                    ->addColumn(Lang::get('lang.name'),
                                Lang::get('lang.website'),
@@ -49,21 +44,8 @@ $orgs = App\Model\helpdesk\Agent_panel\Organization::orderBy('id', 'ASC')->pagin
                                Lang::get('lang.action'))  // these are the column headings to be shown
                    ->setUrl(route('org.list'))  // this is the route where data will be retrieved
                    ->render() !!}
-            
-        </div>    
-        </table>
    </div>
 </div>

-
-@section('FooterInclude')
-
-@stop
@stop
 <!-- /content -->
-@stop
-@section('FooterInclude')
-
-@stop
-
-<!-- /content -->
--- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
@@ -209,7 +209,6 @@ echo UTC::usertimezone(date_format($time, 'Y-m-d H:i:s'));
    </div>
 </div>
 {{-- Event fire --}}
-<?php Event::fire(new App\Events\TimeLineFormEvent($TicketData)); ?>
 <div class='row'>
    <div class='col-xs-12'>
        <div class="nav-tabs-custom">
@@ -277,6 +276,7 @@ echo UTC::usertimezone(date_format($time, 'Y-m-d H:i:s'));
                                </div>
                            </div>
                        </div>
+                        <?php Event::fire(new App\Events\TimeLineFormEvent($TicketData)); ?>
                        <div class="form-group">
                            <div class="row">
                                <div class="col-md-2">
--- a/resources/views/themes/default1/agent/helpdesk/user/index.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/user/index.blade.php
@@ -37,7 +37,7 @@ class="active"
 <div class="box-header">
 	<h3 class="box-title">{{Lang::get('lang.user')}}</h3><a href="{{route('user.create')}}" class="btn btn-primary pull-right">{{Lang::get('lang.create_user')}}</a></div>

-<div class="box-body table-responsive">
+<div class="box-body">
 <!-- check whether success or not -->

@if(Session::has('success'))
@@ -60,15 +60,7 @@ class="active"
 <?php 
 $users = App\User::where('role','=','user')->orderBy('id', 'ASC')->paginate(20);
 ?>
-	<table class="table table-hover" style="overflow:hidden;">
-		
-		</table>
-			<div class="pull-right">
-                <?php echo $users->setPath(url('/user'))->render();?>&nbsp;
-            </div>
-            <div class="col-xs-12">
-        <div class="row">
-                {!! Datatable::table()
+	            {!! Datatable::table()
                    ->addColumn(Lang::get('lang.name'),
                    			Lang::get('lang.email'),
                    			Lang::get('lang.phone'),
@@ -78,20 +70,8 @@ class="active"
                    ->setUrl(route('user.list'))  // this is the route where data will be retrieved
                    ->render() !!}
            
-            </div>
-        </div>
-	</div>
+    </div>
 </div>

-
-@section('FooterInclude')
-
@stop
-@stop
-<!-- /content -->
-@stop
-@section('FooterInclude')
-
-@stop
-
 <!-- /content -->
--- a/resources/views/themes/default1/agent/kb/article/index.blade.php
+++ b/resources/views/themes/default1/agent/kb/article/index.blade.php
@@ -11,7 +11,7 @@
    <div class="box-header">
        <h2 class="box-title">{{Lang::get('lang.articles')}}</h2>
    </div>
-    <div class="box-body table-responsive">
+    <div class="box-body">
        <!-- check whether success or not -->
        @if(Session::has('success'))
            <div class="alert alert-success alert-dismissable">
@@ -30,18 +30,12 @@
                {{Session::get('fails')}}
            </div>
            @endif
-
-        <div class="col-xs-12">
-        <div class="row">
                {!! Datatable::table()
                    ->addColumn(Lang::get('lang.name'),
                                Lang::get('lang.create'),
                                Lang::get('lang.action'))       // these are the column headings to be shown
                    ->setUrl(route('api.article'))   // this is the route where data will be retrieved
                    ->render() !!}
-            
-            </div>
-        </div>
    </div>
 </div>
@stop
--- a/resources/views/themes/default1/agent/layout/agent.blade.php
+++ b/resources/views/themes/default1/agent/layout/agent.blade.php
@@ -36,6 +36,7 @@
            <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
            <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
        <![endif]-->
+        <script src="https://code.jquery.com/jquery-2.1.4.js" type="text/javascript"></script>
        <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
        @yield('HeadInclude')
    </head>
@@ -66,7 +67,7 @@ if ($company != null) {
                        </ul>
                        <ul class="nav navbar-nav navbar-right">
                            @if(Auth::user()->role == 'admin')
-                                <li><a href="{{url('agents')}}">{!! Lang::get('lang.admin_panel') !!}</a></li>
+                                <li><a href="{{url('admin')}}">{!! Lang::get('lang.admin_panel') !!}</a></li>
                            @endif
                            <!-- User Account: style can be found in dropdown.less -->
                            <li class="dropdown user user-menu">
@@ -192,13 +193,13 @@ $underprocess = App\Model\helpdesk\Ticket\Tickets::where('status','=','1')->wher
 $underprocess = count($underprocess);
 $closed = App\Model\helpdesk\Ticket\Tickets::where('status','=','2')->where('dept_id','=',$dept->id)->get();
 $closed = count($closed);
-	// $underprocess = 0;
-	// foreach ($inbox as $ticket4) {
-	// 	if ($ticket4->assigned_to == null) {
-	// 	} else {
-	// 		$underprocess++;
-	// 	}
-	// }
+    // $underprocess = 0;
+    // foreach ($inbox as $ticket4) {
+    //  if ($ticket4->assigned_to == null) {
+    //  } else {
+    //      $underprocess++;
+    //  }
+    // }
 if (Auth::user()->role == 'admin') { ?>
                                        <li class="treeview">
                                            <a href="#">
@@ -306,7 +307,11 @@ $group = App\Model\helpdesk\Agent\Groups::where('name', '=', $agent_group)->wher
                    <script src="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.js")}}" type="text/javascript"></script>
                    <script src="{{asset("lb-faveo/plugins/datatables/jquery.dataTables.js")}}" type="text/javascript"></script>
                    <!-- Page Script -->
-                    <script>
+                    
+                    <script type="text/javascript" src="https://cdn.datatables.net/1.10.10/js/jquery.dataTables.min.js"></script>
+                    <script type="text/javascript" src="{{asset('lb-faveo/plugins/datatables/dataTables.bootstrap.js')}}"></script>
+
+<script>
 $(function() {
    // Enable iCheck plugin for checkboxes
    // iCheck for checkbox and radio inputs
--- a/resources/views/themes/default1/agent/layout/sidebar.blade.php
+++ b/resources/views/themes/default1/agent/layout/sidebar.blade.php
@@ -7,8 +7,7 @@
@section('kb')
    class="active"
@stop
-
-                        @section('sidebar')
+@section('sidebar')
                        <li class="header">KNOWLEDGE BASE</li>
                        <li class="treeview @yield('category')">
                            <a href="#">
@@ -30,7 +29,6 @@
                                         <li @yield('all-article')><a href="{{url('article')}}"><i class="fa fa-circle-o"></i> {{Lang::get('lang.allarticle')}}</a></li>
                                     </ul>
                        </li>
-
                        <li class="treeview @yield('pages')">
                            <a href="#">
                                <i class="fa fa-file-text"></i> <span>{{Lang::get('lang.pages')}}</span>
@@ -59,10 +57,9 @@
                            </a>
                        </li>
                         <li @yield('settings')>
-                            <a href="{{url('settings')}}">
+                            <a href="{{url('kb/settings')}}">
                                 <i class="fa fa-wrench"></i>
                                <span>{{Lang::get('lang.settings')}}</span>
                            </a>
                        </li>
-
                    @stop