Fix dashboard templates

2018-06-25 22:20:07 +01:00
parent 8fb5b96543
commit dd6bbce517
2 changed files with 79 additions and 86 deletions
@@ -1,7 +1,7 @@
@extends('layout.dashboard')

@section('content')
-<dashboard inline-template :welcome-user="{{ $welcomeUser ? 'true' : 'false' }}">
+<dashboard inline-template :welcome-user="{{ $welcomeUser ? 'true' : 'false' }}" :user="{{ $currentUser }}">
    <div>
        <div class="header">
            <div class="sidebar-toggler visible-xs">
@@ -11,10 +11,6 @@
                <i class="ion ion-speedometer"></i> {{ trans('dashboard.dashboard') }}
            </span>
        </div>
-        <span class="uppercase">
-            <i class="ion ion-speedometer"></i> {{ trans('dashboard.dashboard') }}
-        </span>
-    </div>
        <div class="content-wrapper">
            <div class="row">
                <div class="col-md-12">
@@ -95,4 +91,5 @@
            @includeWhen($welcomeUser, 'dashboard.partials.welcome-modal')
        </div>
    </div>
+</div>
@stop
@@ -42,8 +42,6 @@

 <body class="dashboard">
    <div class="wrapper" id="app">
-        <dashboard inline-template :user="{{ $currentUser }}">
-            <div>
        @include('dashboard.partials.sidebar')
        <div class="page-content">
            @if(!$isWriteable)
@@ -61,8 +59,6 @@
            @yield('content')
        </div>
    </div>
-        </dashboard>
-    </div>
 </body>
@yield('js')
 <script src="{{ mix('dist/js/all.js') }}"></script>