From 35f35bcba5866c288a7b22666b940aedb64fe1ed Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 25 May 2019 16:35:09 +0100
Subject: [PATCH] Updated custom home views to use tri-layout

Closes #1423
---
 resources/views/books/index.blade.php         |  2 -
 resources/views/common/home-book.blade.php    | 28 ++++++--------
 resources/views/common/home-custom.blade.php  | 38 +++++++++----------
 resources/views/common/home-shelves.blade.php | 28 ++++++--------
 4 files changed, 42 insertions(+), 54 deletions(-)

diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index 38286c201..61d998489 100644
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -1,7 +1,5 @@
 @extends('tri-layout')
 
-@section('container-classes', 'mt-xl')
-
 @section('body')
     @include('books.list', ['books' => $books, 'view' => $view])
 @stop
diff --git a/resources/views/common/home-book.blade.php b/resources/views/common/home-book.blade.php
index 0efaa32ec..7644eeb88 100644
--- a/resources/views/common/home-book.blade.php
+++ b/resources/views/common/home-book.blade.php
@@ -1,23 +1,19 @@
-@extends('simple-layout')
+@extends('tri-layout')
 
 @section('body')
-    <div class="container mt-m">
-        <div class="grid right-focus gap-xl">
-            <div>
+    @include('books.list', ['books' => $books, 'view' => $view])
+@stop
 
-                <div class="actions mb-xl">
-                    <h5>{{ trans('common.actions') }}</h5>
-                    <div class="icon-list text-primary">
-                        @include('partials.view-toggle', ['view' => $view, 'type' => 'book'])
-                        @include('components.expand-toggle', ['target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
-                    </div>
-                </div>
+@section('left')
+    @include('common.home-sidebar')
+@stop
 
-                @include('common.home-sidebar')
-            </div>
-            <div>
-                @include('books.list', ['books' => $books, 'view' => $view])
-            </div>
+@section('right')
+    <div class="actions mb-xl">
+        <h5>{{ trans('common.actions') }}</h5>
+        <div class="icon-list text-primary">
+            @include('partials.view-toggle', ['view' => $view, 'type' => 'book'])
+            @include('components.expand-toggle', ['target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
         </div>
     </div>
 @stop
\ No newline at end of file
diff --git a/resources/views/common/home-custom.blade.php b/resources/views/common/home-custom.blade.php
index f1133a607..c93fa1a24 100644
--- a/resources/views/common/home-custom.blade.php
+++ b/resources/views/common/home-custom.blade.php
@@ -1,26 +1,24 @@
-@extends('simple-layout')
+@extends('tri-layout')
 
 @section('body')
-    <div class="container mt-l">
-        <div class="grid right-focus gap-xl">
-            <div>
-
-                <div class="actions mb-xl">
-                    <h5>{{ trans('common.actions') }}</h5>
-                    <div class="icon-list text-primary">
-                        @include('components.expand-toggle', ['target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
-                    </div>
-                </div>
-
-                @include('common.home-sidebar')
-            </div>
-            <div>
-                <div class="content-wrap card">
-                    <div class="page-content" page-display="{{ $customHomepage->id }}">
-                        @include('pages.page-display', ['page' => $customHomepage])
-                    </div>
-                </div>
+    <div class="mt-m">
+        <div class="content-wrap card">
+            <div class="page-content" page-display="{{ $customHomepage->id }}">
+                @include('pages.page-display', ['page' => $customHomepage])
             </div>
         </div>
     </div>
+@stop
+
+@section('left')
+    @include('common.home-sidebar')
+@stop
+
+@section('right')
+    <div class="actions mb-xl">
+        <h5>{{ trans('common.actions') }}</h5>
+        <div class="icon-list text-primary">
+            @include('components.expand-toggle', ['target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
+        </div>
+    </div>
 @stop
\ No newline at end of file
diff --git a/resources/views/common/home-shelves.blade.php b/resources/views/common/home-shelves.blade.php
index f09bfd416..a9c585893 100644
--- a/resources/views/common/home-shelves.blade.php
+++ b/resources/views/common/home-shelves.blade.php
@@ -1,23 +1,19 @@
-@extends('simple-layout')
+@extends('tri-layout')
 
 @section('body')
-    <div class="container mt-m">
-        <div class="grid right-focus gap-xl">
-            <div>
+    @include('shelves.list', ['shelves' => $shelves, 'view' => $view])
+@stop
 
-                <div class="actions mb-xl">
-                    <h5>{{ trans('common.actions') }}</h5>
-                    <div class="icon-list text-primary">
-                        @include('partials.view-toggle', ['view' => $view, 'type' => 'shelf'])
-                        @include('components.expand-toggle', ['target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
-                    </div>
-                </div>
+@section('left')
+    @include('common.home-sidebar')
+@stop
 
-                @include('common.home-sidebar')
-            </div>
-            <div>
-                @include('shelves.list', ['shelves' => $shelves, 'view' => $view])
-            </div>
+@section('right')
+    <div class="actions mb-xl">
+        <h5>{{ trans('common.actions') }}</h5>
+        <div class="icon-list text-primary">
+            @include('partials.view-toggle', ['view' => $view, 'type' => 'shelf'])
+            @include('components.expand-toggle', ['target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
         </div>
     </div>
 @stop
\ No newline at end of file