Merge branch 'master' into translations

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 4bf4c0178067e92e74e2f0c146447cd1d5de18af..8b0ef309aeba8c61d156a4fd0692dbc94e2ba712 100644 (file)
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -52,7 +52,7 @@ class RegisterController extends Controller
      */
     public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
     {
-        $this->middleware('guest');
+        $this->middleware('guest')->except(['socialCallback', 'detachSocialAccount']);
         $this->socialAuthService = $socialAuthService;
         $this->emailConfirmationService = $emailConfirmationService;
         $this->userRepo = $userRepo;
@@ -298,5 +298,4 @@ class RegisterController extends Controller
         return $this->registerUser($userData, $socialAccount);
     }
 
-
 }
\ No newline at end of file

diff --git a/resources/assets/sass/_blocks.scss b/resources/assets/sass/_blocks.scss
index 727633f757f6a98fa6e97b5aa8b2e41ea1557d78..7eb595d3611a5dc705d486416ca708344174080c 100644 (file)
--- a/resources/assets/sass/_blocks.scss
+++ b/resources/assets/sass/_blocks.scss
@@ -135,7 +135,10 @@
   border-left: 3px solid #BBB;
   background-color: #EEE;
   padding: $-s;
-  display: flex;
+  display: block;
+  > * {
+    display: inline-block;
+  }
   &:before {
     font-family: 'Material-Design-Iconic-Font';
     padding-right: $-s;

diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss
index d88db2ec2f20ce072bec2b32b660268a0673426d..6acc4746881a6d669d5f867e7cec1b2da8bbf7da 100644 (file)
--- a/resources/assets/sass/_lists.scss
+++ b/resources/assets/sass/_lists.scss
@@ -110,6 +110,8 @@
   border-left: 0px solid #FFF;
   background-color: #FFF;
   &.fixed {
+    background-color: #FFF;
+    z-index: 5;
     position: fixed;
     top: 0;
     padding-left: $-l;

diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index 880a9fdcc1e4816e6bd5428d3a70fafaff514b8d..0052a3319fd4f47cace364dc638e5fd1651b0366 100755 (executable)
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -248,29 +248,32 @@
 }
 
 .tag-display {
-  margin: $-xl $-m;
-  border: 1px solid #DDD;
-  min-width: 180px;
-  max-width: 320px;
-  opacity: 0.7;
-  z-index: 5;
+  width: 100%;
+  //opacity: 0.7;
   position: relative;
   table {
     width: 100%;
     margin: 0;
     padding: 0;
   }
+  tr:first-child td {
+    padding-top: 0;
+  }
   .heading th {
     padding: $-xs $-s;
-    color: #333;
+    color: rgba(100, 100, 100, 0.7);
+    border: 0;
     font-weight: 400;
   }
   td {
     border: 0;
-    border-bottom: 1px solid #DDD;
+    border-bottom: 1px solid #EEE;
     padding: $-xs $-s;
     color: #444;
   }
+  tr td:first-child {
+    padding-left:0;
+  }
   .tag-value {
     color: #888;
   }

diff --git a/resources/views/pages/page-display.blade.php b/resources/views/pages/page-display.blade.php
index fcc046aae56a4eac68bd05f018a5929e8629ae62..fb6ca30451e35df171ac5b843612d1d347a5b102 100644 (file)
--- a/resources/views/pages/page-display.blade.php
+++ b/resources/views/pages/page-display.blade.php
@@ -2,26 +2,6 @@
 
     <h1 id="bkmrk-page-title" class="float left">{{$page->name}}</h1>
 
-    @if(count($page->tags) > 0)
-        <div class="tag-display float right">
-            <table>
-                <thead>
-                    <tr class="text-left heading primary-background-light">
-                        <th colspan="2">{{ trans('entities.page_tags') }}</th>
-                    </tr>
-                </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
-
     <div style="clear:left;"></div>
 
     @if (isset($diff) && $diff)

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index e54dacb428c8a4845d35033c91f887b909f91010..a734b1b9526bb75525fbc0d71e5c148c71637824 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -102,6 +102,8 @@
                     </div>
                 @endif
 
+
+
                 @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav])
             </div>
 

diff --git a/resources/views/pages/sidebar-tree-list.blade.php b/resources/views/pages/sidebar-tree-list.blade.php
index 74ce6c34dc4b59b61d27f349630c3d7cc07aa8c9..87eebed493a038b35dfe67f2be9f97ccf2c7d0f7 100644 (file)
--- a/resources/views/pages/sidebar-tree-list.blade.php
+++ b/resources/views/pages/sidebar-tree-list.blade.php
@@ -1,6 +1,22 @@
 
 <div class="book-tree" ng-non-bindable>
 
+    @if(isset($page) && $page->tags->count() > 0)
+        <div class="tag-display">
+            <h6 class="text-muted">Page Tags</h6>
+            <table>
+                <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
+
     @if (isset($page) && $page->attachments->count() > 0)
         <h6 class="text-muted">{{ trans('entities.pages_attachments') }}</h6>
         @foreach($page->attachments as $attachment)

diff --git a/routes/web.php b/routes/web.php
index 3b311d3f80287f155b92e9edaa6f965a168cacc6..076ffb94f133e648a0298a4e9e588ea3634aba95 100644 (file)
--- a/routes/web.php
+++ b/routes/web.php
@@ -154,7 +154,7 @@ Route::group(['middleware' => 'auth'], function () {
 });
 
 // Social auth routes
-Route::get('/login/service/{socialDriver}', 'Auth\RegisterController@getSocialLogin');
+Route::get('/login/service/{socialDriver}', 'Auth\LoginController@getSocialLogin');
 Route::get('/login/service/{socialDriver}/callback', 'Auth\RegisterController@socialCallback');
 Route::get('/login/service/{socialDriver}/detach', 'Auth\RegisterController@detachSocialAccount');
 Route::get('/register/service/{socialDriver}', 'Auth\RegisterController@socialRegister');