diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 2cbc047ce..f2d3b2741 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -145,7 +145,9 @@ class AuthController extends Controller auth()->login($user); } - return redirect()->intended($this->redirectPath()); + $path = session()->pull('url.intended', '/'); + $path = baseUrl($path, true); + return redirect($path); } /** diff --git a/app/Services/SocialAuthService.php b/app/Services/SocialAuthService.php index 4b99df789..7e1bd4246 100644 --- a/app/Services/SocialAuthService.php +++ b/app/Services/SocialAuthService.php @@ -215,7 +215,7 @@ class SocialAuthService { session(); auth()->user()->socialAccounts()->where('driver', '=', $socialDriver)->delete(); - \Session::flash('success', $socialDriver . ' account successfully detached'); + session()->flash('success', title_case($socialDriver) . ' account successfully detached'); return redirect(auth()->user()->getEditUrl()); } diff --git a/app/helpers.php b/app/helpers.php index 541f23fbe..e4f9b1b10 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -64,13 +64,21 @@ function setting($key, $default = false) /** * Helper to create url's relative to the applications root path. - * @param $path + * @param string $path + * @param bool $forceAppDomain * @return string */ -function baseUrl($path) +function baseUrl($path, $forceAppDomain = false) { - if (strpos($path, 'http') === 0) return $path; + $isFullUrl = strpos($path, 'http') === 0; + if ($isFullUrl && !$forceAppDomain) return $path; $path = trim($path, '/'); + + if ($isFullUrl && $forceAppDomain) { + $explodedPath = explode('/', $path); + $path = implode('/', array_splice($explodedPath, 3)); + } + return rtrim(config('app.url'), '/') . '/' . $path; } diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss index d70e0cb3c..03faef344 100644 --- a/resources/assets/sass/_pages.scss +++ b/resources/assets/sass/_pages.scss @@ -250,13 +250,10 @@ margin: 0; padding: 0; } - span { - color: #666; - margin-left: $-s; - } - .heading { + .heading th { padding: $-xs $-s; - color: #444; + color: #333; + font-weight: 400; } td { border: 0; @@ -267,9 +264,6 @@ .tag-value { color: #888; } - td i { - color: #888; - } tr:last-child td { border-bottom: none; } diff --git a/resources/views/pages/page-display.blade.php b/resources/views/pages/page-display.blade.php index 11bcddcfc..2ddd4e0d8 100644 --- a/resources/views/pages/page-display.blade.php +++ b/resources/views/pages/page-display.blade.php @@ -4,14 +4,20 @@ @if(count($page->tags) > 0)
value) colspan="2" @endif>{{ $tag->name }} | - @if($tag->value){{$tag->value}} | @endif + +||
Page Tags | |||
---|---|---|---|
value) colspan="2" @endif>{{ $tag->name }} | + @if($tag->value){{$tag->value}} | @endif +