Reorganised home and robots views

Extracted home view sidebar into own view.
Moved home and robot views into 'common' folder so that we only have
layouts in the top-level views folder.

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index dff319506c20c4c3c7cddcc3e6a0d731e7c88992..02b4789c288885c9c6ca8b5f888eb7c5593fb2a0 100644 (file)
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -60,7 +60,7 @@ class HomeController extends Controller
             $view = 'home-custom';
         }
 
             $view = 'home-custom';
         }
 

-        return view($view, [
+        return view('common/' . $view, [

             'activity' => $activity,
             'recents' => $recents,
             'recentlyUpdatedPages' => $recentlyUpdatedPages,
             'activity' => $activity,
             'recents' => $recents,
             'recentlyUpdatedPages' => $recentlyUpdatedPages,


@@ -150,7 +150,7 @@ class HomeController extends Controller
             $allowRobots = $sitePublic;
         }
         return response()
             $allowRobots = $sitePublic;
         }
         return response()

-            ->view('robots', ['allowRobots' => $allowRobots])
+            ->view('common/robots', ['allowRobots' => $allowRobots])

             ->header('Content-Type', 'text/plain');
     }
 
             ->header('Content-Type', 'text/plain');
     }
 

diff --git a/resources/views/common/home-book.blade.php b/resources/views/common/home-book.blade.php
new file mode 100644 (file)
index 0000000..2849d5e
--- /dev/null
+++ b/resources/views/common/home-book.blade.php
@@ -0,0 +1,18 @@
+@extends('sidebar-layout')
+
+@section('toolbar')
+    <div class="col-sm-6 faded">
+        <div class="action-buttons text-left">
+            <a expand-toggle=".entity-list.compact .entity-item-snippet" class="text-primary text-button">@icon('expand-text'){{ trans('common.toggle_details') }}</a>
+            @include('books/view-toggle', ['booksViewType' => $booksViewType])
+        </div>
+    </div>
+@stop
+
+@section('sidebar')
+    @include('common/home-sidebar')
+@stop
+
+@section('body')
+    @include('books/list', ['books' => $books, 'bookViewType' => $booksViewType])
+@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
new file mode 100644 (file)
index 0000000..89154ee
--- /dev/null
+++ b/resources/views/common/home-custom.blade.php
@@ -0,0 +1,19 @@
+@extends('sidebar-layout')
+
+@section('toolbar')
+    <div class="col-sm-6 faded">
+        <div class="action-buttons text-left">
+            <a expand-toggle=".entity-list.compact .entity-item-snippet" class="text-primary text-button">@icon('expand-text'){{ trans('common.toggle_details') }}</a>
+        </div>
+    </div>
+@stop
+
+@section('sidebar')
+    @include('common/home-sidebar')
+@stop
+
+@section('body')
+    <div class="page-content" page-display="{{ $customHomepage->id }}">
+        @include('pages/page-display', ['page' => $customHomepage])
+    </div>
+@stop

diff --git a/resources/views/common/home-sidebar.blade.php b/resources/views/common/home-sidebar.blade.php
new file mode 100644 (file)
index 0000000..2210294
--- /dev/null
+++ b/resources/views/common/home-sidebar.blade.php
@@ -0,0 +1,31 @@
+@if(count($draftPages) > 0)
+    <div id="recent-drafts" class="card">
+        <h3>@icon('edit') {{ trans('entities.my_recent_drafts') }}</h3>
+        @include('partials/entity-list', ['entities' => $draftPages, 'style' => 'compact'])
+    </div>
+@endif
+
+<div class="card">
+    <h3>@icon($signedIn ? 'view' : 'star-circle') {{ trans('entities.' . ($signedIn ? 'my_recently_viewed' : 'books_recent')) }}</h3>
+    @include('partials/entity-list', [
+        'entities' => $recents,
+        'style' => 'compact',
+        'emptyText' => $signedIn ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
+        ])
+</div>
+
+<div class="card">
+    <h3>@icon('file') <a class="no-color" href="{{ baseUrl("/pages/recently-updated") }}">{{ trans('entities.recently_updated_pages') }}</a></h3>
+    <div id="recently-updated-pages">
+        @include('partials/entity-list', [
+        'entities' => $recentlyUpdatedPages,
+        'style' => 'compact',
+        'emptyText' => trans('entities.no_pages_recently_updated')
+        ])
+    </div>
+</div>
+
+<div id="recent-activity" class="card">
+    <h3>@icon('time') {{ trans('entities.recent_activity') }}</h3>
+    @include('partials/activity-list', ['activity' => $activity])
+</div>
\ No newline at end of file

diff --git a/resources/views/home.blade.php b/resources/views/common/home.blade.php
similarity index 100%
rename from resources/views/home.blade.php
rename to resources/views/common/home.blade.php

diff --git a/resources/views/robots.blade.php b/resources/views/common/robots.blade.php
similarity index 100%
rename from resources/views/robots.blade.php
rename to resources/views/common/robots.blade.php

diff --git a/resources/views/home-book.blade.php b/resources/views/home-book.blade.php
deleted file mode 100644 (file)
index 03fce4b..0000000
--- a/resources/views/home-book.blade.php
+++ /dev/null
@@ -1,48 +0,0 @@
-@extends('sidebar-layout')
-
-@section('toolbar')
-    <div class="col-sm-6 faded">
-        <div class="action-buttons text-left">
-            <a expand-toggle=".entity-list.compact .entity-item-snippet" class="text-primary text-button">@icon('expand-text'){{ trans('common.toggle_details') }}</a>
-            @include('books/view-toggle', ['booksViewType' => $booksViewType])
-        </div>
-    </div>
-@stop
-
-@section('sidebar')
-    @if(count($draftPages) > 0)
-        <div id="recent-drafts" class="card">
-            <h3>@icon('edit') {{ trans('entities.my_recent_drafts') }}</h3>
-            @include('partials/entity-list', ['entities' => $draftPages, 'style' => 'compact'])
-        </div>
-    @endif
-
-    <div class="card">
-        <h3>@icon($signedIn ? 'view' : 'star-circle') {{ trans('entities.' . ($signedIn ? 'my_recently_viewed' : 'books_recent')) }}</h3>
-        @include('partials/entity-list', [
-            'entities' => $recents,
-            'style' => 'compact',
-            'emptyText' => $signedIn ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
-            ])
-    </div>
-
-    <div class="card">
-        <h3>@icon('file') <a class="no-color" href="{{ baseUrl("/pages/recently-updated") }}">{{ trans('entities.recently_updated_pages') }}</a></h3>
-        <div id="recently-updated-pages">
-            @include('partials/entity-list', [
-            'entities' => $recentlyUpdatedPages,
-            'style' => 'compact',
-            'emptyText' => trans('entities.no_pages_recently_updated')
-            ])
-        </div>
-    </div>
-
-    <div id="recent-activity" class="card">
-        <h3>@icon('time') {{ trans('entities.recent_activity') }}</h3>
-        @include('partials/activity-list', ['activity' => $activity])
-    </div>
-@stop
-
-@section('body')
-    @include('books/list', ['books' => $books, 'bookViewType' => $booksViewType])
-@stop
\ No newline at end of file

diff --git a/resources/views/home-custom.blade.php b/resources/views/home-custom.blade.php
deleted file mode 100644 (file)
index d9fbab8..0000000
--- a/resources/views/home-custom.blade.php
+++ /dev/null
@@ -1,56 +0,0 @@
-@extends('sidebar-layout')
-
-@section('toolbar')
-    <div class="col-sm-6 faded">
-        <div class="action-buttons text-left">
-            <a expand-toggle=".entity-list.compact .entity-item-snippet" class="text-primary text-button">@icon('expand-text'){{ trans('common.toggle_details') }}</a>
-        </div>
-    </div>
-@stop
-
-@section('sidebar')
-    @if(count($draftPages) > 0)
-        <div id="recent-drafts" class="card">
-            <h3>@icon('edit') {{ trans('entities.my_recent_drafts') }}</h3>
-            @include('partials/entity-list', ['entities' => $draftPages, 'style' => 'compact'])
-        </div>
-    @endif
-
-    <div class="card">
-        <h3>@icon($signedIn ? 'view' : 'star-circle') {{ trans('entities.' . ($signedIn ? 'my_recently_viewed' : 'books_recent')) }}</h3>
-        @include('partials/entity-list', [
-            'entities' => $recents,
-            'style' => 'compact',
-            'emptyText' => $signedIn ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
-            ])
-    </div>
-
-    <div class="card">
-        <h3>@icon('file') <a class="no-color" href="{{ baseUrl("/pages/recently-updated") }}">{{ trans('entities.recently_updated_pages') }}</a></h3>
-        <div id="recently-updated-pages">
-            @include('partials/entity-list', [
-            'entities' => $recentlyUpdatedPages,
-            'style' => 'compact',
-            'emptyText' => trans('entities.no_pages_recently_updated')
-            ])
-        </div>
-    </div>
-
-    <div id="recent-activity" class="card">
-        <h3>@icon('time') {{ trans('entities.recent_activity') }}</h3>
-        @include('partials/activity-list', ['activity' => $activity])
-    </div>
-@stop
-
-@section('body')
-    <div class="page-content" ng-non-bindable>
-        @include('pages/page-display', ['page' => $customHomepage])
-    </div>
-@stop
-
-@section('scripts')
-    <script>
-        setupPageShow({{$customHomepage->id}});
-    </script>
-@stop
-

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 16f96717937f2fc35965c95438fbe3e907a7ec11..3448a164a4c196c8b4d2b9374c1a629c4430e7a0 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -118,7 +118,7 @@
 @stop
 
 @section('body')
 @stop
 
 @section('body')

-    <div class="page-content" page-display="{{ $page->id }}" ng-non-bindable>
+    <div class="page-content" page-display="{{ $page->id }}">

 
         <div class="pointer-container" id="pointer">
             <div class="pointer anim" >
 
         <div class="pointer-container" id="pointer">
             <div class="pointer anim" >