Use the includeWhen macro

resources/views/dashboard/components/groups/index.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header">
             <span class="uppercase">

resources/views/dashboard/components/index.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header">
             <span class="uppercase">

resources/views/dashboard/incidents/index.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header">
             <span class="uppercase">

resources/views/dashboard/index.blade.php

@@ -87,7 +87,6 @@
         @endif
     </div>
 </div>
-@if ($welcome_user)
+
-@include('dashboard.partials.welcome-modal')
+@includeWhen($welcome_user, 'dashboard.partials.welcome-modal')
-@endif
 @stop

resources/views/dashboard/maintenance/index.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header">
             <span class="uppercase">

resources/views/dashboard/settings/analytics.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">

resources/views/dashboard/settings/app-setup.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">

resources/views/dashboard/settings/credits.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">

resources/views/dashboard/settings/customization.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">

resources/views/dashboard/settings/localization.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">

resources/views/dashboard/settings/log.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">

resources/views/dashboard/settings/mail.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">

resources/views/dashboard/settings/security.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header" id="security">
             <span class="uppercase">

resources/views/dashboard/settings/stylesheet.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header" id="stylesheet">
             <span class="uppercase">

resources/views/dashboard/settings/theme.blade.php

@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
-    @include('dashboard.partials.sub-sidebar')
-    @endif
     <div class="content-wrapper">
         <div class="header sub-header" id="theme">
             <span class="uppercase">