]> BookStack Code Mirror - bookstack/commitdiff
Minor fixes to editor and auth
authorDan Brown <redacted>
Wed, 5 Aug 2015 20:16:10 +0000 (21:16 +0100)
committerDan Brown <redacted>
Wed, 5 Aug 2015 20:16:10 +0000 (21:16 +0100)
app/Http/Controllers/Auth/AuthController.php
app/Http/Middleware/Authenticate.php
app/Http/routes.php
resources/views/pages/form.blade.php

index 4b777e44c20983b5bedf5bcf2c600976c3fc8ec7..11f68fb983ba4b945bdcc2bd90adaf01a36cfe2e 100644 (file)
@@ -25,6 +25,7 @@ class AuthController extends Controller
 
     protected $loginPath = '/login';
     protected $redirectPath = '/';
+    protected $redirectAfterLogout = '/login';
 
 
     /**
index b09e9cd32519630837e2d98b0d537d19df653059..c3ddb9a0dba430d0f8161f9830df8b39736072f5 100644 (file)
@@ -38,7 +38,7 @@ class Authenticate
             if ($request->ajax()) {
                 return response('Unauthorized.', 401);
             } else {
-                return redirect()->guest('auth/login');
+                return redirect()->guest('/login');
             }
         }
 
index 28b81b2957aab5c1b66b24699716ee2ad18c5eac..7053c71b9035dd6c44047a1a0043a66364af317d 100644 (file)
@@ -63,6 +63,7 @@ Route::group(['middleware' => 'auth'], function() {
 
 
 });
+
 Route::get('/login', 'Auth\AuthController@getLogin');
 Route::post('/login', 'Auth\AuthController@postLogin');
 Route::get('/logout', 'Auth\AuthController@getLogout');
index 667a855a5efebc0e0759b6715b2f808eca4e92cf..8d5cdb158dee8dfcc19c0b0249fd7c8e67685e43 100644 (file)
 
         tinymce.init({
             selector: '.edit-area textarea',
-            content_css: '/css/app.css',
+            content_css: [
+                '/css/app.css',
+                '//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300'
+            ],
             body_class: 'page-content',
             relative_urls: false,
             statusbar: false,
Morty Proxy This is a proxified and sanitized view of the page, visit original site.