aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

Improved Bootstrap experience and services improvements #154

Manually merged
aheathershaw merged 8 commits from feature/146-bootstrap-experience into master 2020-04-30 08:48:54 +01:00
Conversation 0 Commits 8 Files Changed 63 +4 -1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ad1cdda8f - Show all commits

4
public/index.php
View File

@ -10,7 +10,9 @@
/* Added by Andy - check to see if Composer/vendors are installed */ /* Added by Andy - check to see if Composer/vendors are installed */
if (!file_exists(__DIR__.'/../vendor/autoload.php')) if (!file_exists(__DIR__.'/../vendor/autoload.php'))
{ {
header('Location: bootstrap/'); $currentUrl = $_SERVER['PHP_SELF']; // e.g. /some/directory/index.php
$bootstrapUrl = sprintf('%sbootstrap', dirname($currentUrl));
header(sprintf('Location: %s', $bootstrapUrl));
exit(); exit();
} }
/* End Added by Andy */ /* End Added by Andy */

1
resources/views/install/layout.blade.php
View File

@ -15,6 +15,7 @@
{{-- As these files are shipped with core (not a theme) use the main app.version instead of the current theme's version --}} {{-- As these files are shipped with core (not a theme) use the main app.version instead of the current theme's version --}}
@if (App::environment() == 'production') @if (App::environment() == 'production')
<link href="css/blue-twilight.min.css?v={{ $app_version_url }}" rel="stylesheet" /> <link href="css/blue-twilight.min.css?v={{ $app_version_url }}" rel="stylesheet" />
<link href="themes/default/theme.css?v={{ $app_version_url }}" rel="stylesheet" />
@else @else
<link href="css/blue-twilight.css?v={{ $app_version_url }}" rel="stylesheet" /> <link href="css/blue-twilight.css?v={{ $app_version_url }}" rel="stylesheet" />
@endif @endif