lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow Cachet to be setup not from the server's root

Browse Source 
The `asset()` helper was missing at some places so it was not possible
to install it in an other place than the server's root (/).

The paths have been fixed and now use the `asset()` helper. Also,
The steps process takes care of the current path.

See: #3618
This commit is contained in:
Anthony Bocci
2019-06-08 15:00:27 +02:00
parent c30b3659fe
commit c5217637e6
7 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/layout/clean.blade.php
View File

@@ -25,7 +25,7 @@
@if($enableExternalDependencies)
{{-- <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $fontSubset }}" rel="stylesheet" type="text/css"> --}}
@endif
<link rel="stylesheet" href="{{ mix('dist/css/dashboard/dashboard.css') }}">
<link rel="stylesheet" href="{{ asset(mix('dist/css/dashboard/dashboard.css')) }}">
@yield('css')
@include('partials.crowdin')
@@ -35,8 +35,8 @@
Global.locale = '{{ $appLocale }}';
</script>
<script src="{{ mix('dist/js/manifest.js') }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script>
<script src="{{ asset(mix('dist/js/manifest.js')) }}"></script>
<script src="{{ asset(mix('dist/js/vendor.js')) }}"></script>
</head>
<body class="@yield('bodyClass')">
@@ -45,5 +45,5 @@
</div>
</body>
@yield('js')
<script src="{{ mix('dist/js/all.js') }}"></script>
<script src="{{ asset(mix('dist/js/all.js')) }}"></script>
</html>

8
resources/views/layout/dashboard.blade.php
View File

@@ -31,13 +31,13 @@
@if($enableExternalDependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $fontSubset }}" rel="stylesheet" type="text/css">
@endif
<link rel="stylesheet" href="{{ mix('dist/css/dashboard/dashboard.css') }}">
<link rel="stylesheet" href="{{ asset(mix('dist/css/dashboard/dashboard.css')) }}">
@yield('css')
@include('partials.crowdin')
<script src="{{ mix('dist/js/manifest.js') }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script>
<script src="{{ asset(mix('dist/js/manifest.js')) }}"></script>
<script src="{{ asset(mix('dist/js/vendor.js')) }}"></script>
</head>
<body class="dashboard">
@@ -61,5 +61,5 @@
</div>
</body>
@yield('js')
<script src="{{ mix('dist/js/all.js') }}"></script>
<script src="{{ asset(mix('dist/js/all.js')) }}"></script>
</html>

8
resources/views/layout/master.blade.php
View File

@@ -48,7 +48,7 @@
@if($enableExternalDependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&amp;subset={{ $fontSubset }}" rel="stylesheet" type="text/css">
@endif
<link rel="stylesheet" href="{{ mix('dist/css/app.css') }}">
<link rel="stylesheet" href="{{ asset(mix('dist/css/app.css')) }} ">
@include('partials.stylesheet')
@@ -74,8 +74,8 @@
Global.locale = '{{ $appLocale }}';
</script>
<script src="{{ mix('dist/js/manifest.js') }}"></script>
<script src="{{ mix('dist/js/vendor.js') }}"></script>
<script src="{{ asset(mix('dist/js/manifest.js')) }}"></script>
<script src="{{ asset(mix('dist/js/vendor.js')) }}"></script>
</head>
<body class="status-page @yield('bodyClass')">
@yield('outer-content')
@@ -88,5 +88,5 @@
@yield('bottom-content')
</body>
<script src="{{ mix('dist/js/all.js') }}"></script>
<script src="{{ asset(mix('dist/js/all.js')) }}"></script>
</html>