diff --git a/app/Http/Controllers/Admin/helpdesk/TemplateController.php b/app/Http/Controllers/Admin/helpdesk/TemplateController.php index 568dc84a0..cf41444e7 100644 --- a/app/Http/Controllers/Admin/helpdesk/TemplateController.php +++ b/app/Http/Controllers/Admin/helpdesk/TemplateController.php @@ -125,7 +125,7 @@ class TemplateController extends Controller */ public function listdirectories() { - $path = '../resources/views/emails/'; + $path = \Config::get('view.paths')[0].'/emails/'; $directories = scandir($path); $directory = str_replace('/', '-', $path); diff --git a/public/lb-faveo/css/notification-style.css b/public/lb-faveo/css/notification-style.css new file mode 100644 index 000000000..3596d38c5 --- /dev/null +++ b/public/lb-faveo/css/notification-style.css @@ -0,0 +1,22 @@ +.textcontent{ + display: inline-block; + padding-left: 5px; + font-weight: 600; + font-size: 14px; + font-family: 'Source Sans Pro','Helvetica Neue',Helvetica,Arial,sans-serif; +} +.task{ + opacity: 0.4; +} + +.task h6{ + text-decoration: line-through; +} + +.marginzero{ + margin: 0px; +} + +.font700{ + font-weight: 700; +} \ No newline at end of file diff --git a/public/lb-faveo/media/images/check_radio_sheet.png b/public/lb-faveo/media/images/check_radio_sheet.png new file mode 100644 index 000000000..de6549fa2 Binary files /dev/null and b/public/lb-faveo/media/images/check_radio_sheet.png differ diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 73252faf2..a44ee1abd 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -57,6 +57,8 @@ return [ 'terms' => 'terms', 'register' => 'Register', 'i_already_have_a_membership' => 'I already have a membership', + 'see-profile1' => 'Click here to see ', + 'see-profile2' => 's profile', /* |-------------------------------------- | Reset Password Page diff --git a/resources/views/notifications-all.blade.php b/resources/views/notifications-all.blade.php index bff4bbb5a..d279c27dc 100644 --- a/resources/views/notifications-all.blade.php +++ b/resources/views/notifications-all.blade.php @@ -6,39 +6,37 @@ class="active" @stop @section('HeadInclude') @stop @section('user-bar') @@ -52,38 +50,34 @@ class="active" @section('content') -
@if(Session::has('success')) -
- - Alert! Success. - - {{Session::get('success')}} -
- @endif - - @if(Session::has('fails')) -
- - Alert! Failed. - - {{Session::get('fails')}} -
- @endif +
+ + Alert! Success. + + {{Session::get('success')}} +
+ @endif + + @if(Session::has('fails')) +
+ + Alert! Failed. + + {{Session::get('fails')}} +
+ @endif -
-
- -
-
-

Notification Page

-
- -
+
+
+

Notification Page

+
+ +
@@ -96,9 +90,7 @@ class="active" + -->
    - @if(count($notifications)) - @foreach($notifications as $notification) - @if($notification->type == 'registration') + @if(count($notifications)) + @foreach($notifications as $notification) + @if($notification->type == 'registration')
  • - + - + +
    {!! $notification->message !!}
    + {{ $notification -> created_at }} +
    @@ -139,77 +131,73 @@ class="active"
    • @else
  • - +
    - - + +
    • - @endif - @endforeach - - @else + @endif + @endforeach + + @else
  • - -
    No Notifications Available!
    - - + +
    No Notifications Available!
    + +
    • @endif - +
- +
- - - - - - - - - - + + + + + + @stop \ No newline at end of file diff --git a/resources/views/themes/default1/agent/helpdesk/dept-ticket/closed.blade.php b/resources/views/themes/default1/agent/helpdesk/dept-ticket/closed.blade.php index a15ff7fd0..722714667 100644 --- a/resources/views/themes/default1/agent/helpdesk/dept-ticket/closed.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/dept-ticket/closed.blade.php @@ -110,7 +110,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first(); if(str.search("#000") == -1) { $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #F3F3F3"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd","border-right":"solid 0.5px #F3F3F3"}); @@ -118,7 +118,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first(); } else { $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); diff --git a/resources/views/themes/default1/agent/helpdesk/dept-ticket/inprogress.blade.php b/resources/views/themes/default1/agent/helpdesk/dept-ticket/inprogress.blade.php index fe5846240..f22c076c8 100644 --- a/resources/views/themes/default1/agent/helpdesk/dept-ticket/inprogress.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/dept-ticket/inprogress.blade.php @@ -111,7 +111,7 @@ if (Auth::user()->role == 'agent') { if(str.search("#000") == -1) { $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #F3F3F3"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd","border-right":"solid 0.5px #F3F3F3"}); @@ -119,7 +119,7 @@ if (Auth::user()->role == 'agent') { } else { $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); diff --git a/resources/views/themes/default1/agent/helpdesk/dept-ticket/open.blade.php b/resources/views/themes/default1/agent/helpdesk/dept-ticket/open.blade.php index 22f01fcbf..05d496314 100644 --- a/resources/views/themes/default1/agent/helpdesk/dept-ticket/open.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/dept-ticket/open.blade.php @@ -109,7 +109,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first(); if(str.search("#000") == -1) { $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #F3F3F3"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd","border-right":"solid 0.5px #F3F3F3"}); @@ -117,7 +117,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first(); } else { $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php index 5e0153bd2..58d8793d7 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php @@ -112,7 +112,7 @@ class="active" if(str.search("#000") == -1) { $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #F3F3F3"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd","border-right":"solid 0.5px #F3F3F3"}); @@ -120,7 +120,7 @@ class="active" } else { $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php index 9a76ba74f..d5ef1a6dd 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php @@ -104,7 +104,7 @@ class="active" if(str.search("#000") == -1) { $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #F3F3F3"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd","border-right":"solid 0.5px #F3F3F3"}); @@ -112,7 +112,7 @@ class="active" } else { $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php index 647671202..822c96d00 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php @@ -104,7 +104,7 @@ class="active" if(str.search("#000") == -1) { $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #F3F3F3"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd","border-right":"solid 0.5px #F3F3F3"}); @@ -112,7 +112,7 @@ class="active" } else { $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php index 9c22363a0..9cf8f8054 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php @@ -100,10 +100,10 @@ class="active" ->setClass('table table-hover table-bordered table-striped') ->setCallbacks("fnCreatedRow", 'function( nRow, aData, iDataIndex ) { var str = aData[3]; - if(str.search("#000") == -1) { + if(str.search("#000") == -1) { $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #F3F3F3"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd","border-right":"solid 0.5px #F3F3F3"}); @@ -111,7 +111,7 @@ class="active" } else { $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php index 0d923fb31..ecbe85757 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php @@ -104,7 +104,7 @@ class="active" if(str.search("#000") == -1) { $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #F3F3F3"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd","border-right":"solid 0.5px #F3F3F3"}); @@ -112,7 +112,7 @@ class="active" } else { $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php index fe8207a59..886fec3d5 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php @@ -109,7 +109,7 @@ class="active" if(str.search("#000") == -1) { $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #F3F3F3"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd","border-right":"solid 0.5px #F3F3F3"}); @@ -117,7 +117,7 @@ class="active" } else { $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php index 037f2e0d4..d628c8cfa 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php @@ -125,7 +125,7 @@ if ($i == 0) { if(str.search("#000") == -1) { $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #F3F3F3"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd","border-right":"solid 0.5px #F3F3F3"}); @@ -133,7 +133,7 @@ if ($i == 0) { } else { $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php index 90a748343..c11536bf1 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php @@ -107,7 +107,7 @@ class="active" if(str.search("#000") == -1) { $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #F3F3F3"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd","border-right":"solid 0.5px #F3F3F3"}); @@ -115,7 +115,7 @@ class="active" } else { $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php index 3e5f69518..8db5370cd 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php @@ -109,7 +109,7 @@ class="active" if(str.search("#000") == -1) { $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #F3F3F3"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "font-weight":"600", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"#F3F3F3", "font-weight":"600", "border-bottom":"solid 0.5px #ddd","border-right":"solid 0.5px #F3F3F3"}); @@ -117,7 +117,7 @@ class="active" } else { $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); $("td", nRow).mouseenter(function(){ - $("td", nRow).css({"background-color":"#DEDFE0", "border":"none"}); + $("td", nRow).css({"background-color":"#DEDFE0", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px #DEDFE0"}); }); $("td", nRow).mouseleave(function(){ $("td", nRow).css({"background-color":"white", "border-bottom":"solid 0.5px #ddd", "border-right":"solid 0.5px white"}); diff --git a/resources/views/themes/default1/agent/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php index 6b2896945..7483c16c9 100644 --- a/resources/views/themes/default1/agent/layout/agent.blade.php +++ b/resources/views/themes/default1/agent/layout/agent.blade.php @@ -30,6 +30,7 @@ + @@ -205,7 +206,7 @@ $tickets = App\Model\helpdesk\Ticket\Tickets::where('status','1')->where('dept_i $deleted = App\Model\helpdesk\Ticket\Tickets::where('status', '5')->where('dept_id','=',Auth::user())->get(); } if (Auth::user()->role == 'agent') { - $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first(); + $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); $overdues = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->get(); } else { $overdues = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->orderBy('id', 'DESC')->get(); @@ -400,7 +401,34 @@ $group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->where( + +