From a97e78069c0e7e1a402fb58932ae1b740f565a2d Mon Sep 17 00:00:00 2001 From: Sujit Prasad Date: Wed, 20 Apr 2016 15:26:00 +0530 Subject: [PATCH] update v1.0.7.1 --- .../Admin/helpdesk/TemplateController.php | 2 +- public/lb-faveo/css/notification-style.css | 22 ++ .../media/images/check_radio_sheet.png | Bin 0 -> 4343 bytes resources/lang/en/lang.php | 2 + resources/views/notifications-all.blade.php | 242 +++++++++--------- .../helpdesk/dept-ticket/closed.blade.php | 4 +- .../helpdesk/dept-ticket/inprogress.blade.php | 4 +- .../agent/helpdesk/dept-ticket/open.blade.php | 4 +- .../agent/helpdesk/ticket/answered.blade.php | 4 +- .../agent/helpdesk/ticket/assigned.blade.php | 4 +- .../agent/helpdesk/ticket/closed.blade.php | 4 +- .../agent/helpdesk/ticket/inbox.blade.php | 6 +- .../agent/helpdesk/ticket/myticket.blade.php | 4 +- .../agent/helpdesk/ticket/open.blade.php | 4 +- .../agent/helpdesk/ticket/overdue.blade.php | 4 +- .../agent/helpdesk/ticket/trash.blade.php | 4 +- .../helpdesk/ticket/unassigned.blade.php | 4 +- .../default1/agent/layout/agent.blade.php | 30 ++- .../php-imap/php-imap/src/PhpImap/Mailbox.php | 64 +---- 19 files changed, 196 insertions(+), 216 deletions(-) create mode 100644 public/lb-faveo/css/notification-style.css create mode 100644 public/lb-faveo/media/images/check_radio_sheet.png 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 0000000000000000000000000000000000000000..de6549fa2ccd9f55d243e20f354177ae1b1dbd26 GIT binary patch literal 4343 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 l6NY!4B|iP)y1ntg0RWwU '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( + +