update v1.0.5

This commit is contained in:
sujitprasad
2016-01-25 20:45:35 +05:30
parent 0b8ebb9c70
commit e7149e34e4
252 changed files with 9008 additions and 3152 deletions

View File

@@ -228,7 +228,7 @@ if (Auth::user()->role == 'admin') { ?>
<!-- /.sidebar -->
</aside>
<?php $agent_group = Auth::user()->assign_group;
$group = App\Model\helpdesk\Agent\Groups::where('name', '=', $agent_group)->where('group_status', '=', '1')->first();
$group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->where('group_status', '=', '1')->first();
// dd($group); ?>
<!-- Right side column. Contains the navbar and content of the page -->
<div class="content-wrapper">
@@ -288,6 +288,7 @@ $group = App\Model\helpdesk\Agent\Groups::where('name', '=', $agent_group)->wher
</footer>
</div><!-- ./wrapper -->
<script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.7.14/js/bootstrap-datetimepicker.min.js"></script>
<!-- Bootstrap 3.3.2 JS -->
<script src="{{asset("lb-faveo/downloads/bootstrap.min.js")}}" type="text/javascript"></script>
<!-- Slimscroll -->

View File

@@ -39,24 +39,14 @@
<li @yield('all-pages')><a href="{{url('page')}}"><i class="fa fa-circle-o"></i> {{Lang::get('lang.allpages')}}</a></li>
</ul>
</li>
<li class="treeview @yield('widget')">
<a href="#">
<i class="fa fa-th"></i> <span>{{Lang::get('lang.widgets')}}</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li @yield('side1')><a href="{{url('side1')}}"><i class="fa fa-circle-o"></i> {{Lang::get('lang.sidewidget1')}}</a></li>
<li @yield('side2')><a href="{{url('side2')}}"><i class="fa fa-circle-o"></i> {{Lang::get('lang.sidewidget2')}}</a></li>
<li @yield('social')><a href="{{url('social')}}"><i class="fa fa-circle-o"></i> {!! Lang::get('lang.social') !!}</a></li>
</ul>
</li>
<li @yield('comment')>
<li @yield('comment')>
<a href="{{url('comment')}}">
<i class="fa fa-comments-o"></i>
<span>{{Lang::get('lang.comments')}}</span>
</a>
</li>
<li @yield('settings')>
<li @yield('settings')>
<a href="{{url('kb/settings')}}">
<i class="fa fa-wrench"></i>
<span>{{Lang::get('lang.settings')}}</span>