Merge branch 'v0.11' into release

Author: ssddanbrown

app/Http/Controllers/Auth/AuthController.php

@@ -145,7 +145,9 @@ protected function authenticated(Request $request, Authenticatable $user)
             auth()->login($user);
         }
 
-        return redirect()->intended($this->redirectPath());
+        $path = session()->pull('url.intended', '/');
+        $path = baseUrl($path, true);
+        return redirect($path);
     }
 
     /**

app/Http/Middleware/Authenticate.php

@@ -40,7 +40,7 @@ public function handle($request, Closure $next)
             if ($request->ajax()) {
                 return response('Unauthorized.', 401);
             } else {
-                return redirect()->guest('/login');
+                return redirect()->guest(baseUrl('/login'));
             }
         }
 

app/Services/SocialAuthService.php

@@ -215,7 +215,7 @@ public function detachSocialAccount($socialDriver)
     {
         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());
     }
 

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;
 }
 

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;
   }

resources/views/pages/page-display.blade.php

@@ -4,14 +4,20 @@
 
     @if(count($page->tags) > 0)
         <div class="tag-display float right">
-            <div class="heading primary-background-light">Page Tags</div>
             <table>
-                @foreach($page->tags as $tag)
-                    <tr class="tag">
-                        <td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
-                        @if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
+                <thead>
+                    <tr class="text-left heading primary-background-light">
+                        <th colspan="2">Page Tags</th>
                     </tr>
-                @endforeach
+                </thead>
+                <tbody>
+                    @foreach($page->tags as $tag)
+                        <tr class="tag">
+                            <td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
+                            @if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
+                        </tr>
+                    @endforeach
+                </tbody>
             </table>
         </div>
     @endif

resources/views/pages/pdf.blade.php

@@ -3,12 +3,12 @@
 @section('head')
     <style>
         body {
-            font-size: 15px;
-            line-height: 1;
+            font-size: 14px;
+            line-height: 1.2;
         }
 
         h1, h2, h3, h4, h5, h6 {
-            line-height: 1;
+            line-height: 1.2;
         }
 
         table {
@@ -21,10 +21,21 @@
             width: auto !important;
         }
 
+        .page-content .float {
+            float: none !important;
+        }
+
         .page-content img.align-left, .page-content img.align-right  {
             float: none !important;
             clear: both;
             display: block;
         }
+
+        .tag-display {
+            min-width: 0;
+            max-width: none;
+            display: none;
+        }
+
     </style>
 @stop