Skip to content

Commit

Permalink
Reorganised home and robots views
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ssddanbrown committed May 20, 2018
1 parent 8df9dab commit 63f96c1
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 107 deletions.
4 changes: 2 additions & 2 deletions app/Http/Controllers/HomeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function index()
$view = 'home-custom';
}

return view($view, [
return view('common/' . $view, [
'activity' => $activity,
'recents' => $recents,
'recentlyUpdatedPages' => $recentlyUpdatedPages,
Expand Down Expand Up @@ -150,7 +150,7 @@ public function getRobots()
$allowRobots = $sitePublic;
}
return response()
->view('robots', ['allowRobots' => $allowRobots])
->view('common/robots', ['allowRobots' => $allowRobots])
->header('Content-Type', 'text/plain');
}

Expand Down
18 changes: 18 additions & 0 deletions resources/views/common/home-book.blade.php
Original file line number Diff line number Diff line change
@@ -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
19 changes: 19 additions & 0 deletions resources/views/common/home-custom.blade.php
Original file line number Diff line number Diff line change
@@ -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
31 changes: 31 additions & 0 deletions resources/views/common/home-sidebar.blade.php
Original file line number Diff line number Diff line change
@@ -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>
File renamed without changes.
File renamed without changes.
48 changes: 0 additions & 48 deletions resources/views/home-book.blade.php

This file was deleted.

56 changes: 0 additions & 56 deletions resources/views/home-custom.blade.php

This file was deleted.

2 changes: 1 addition & 1 deletion resources/views/pages/show.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
@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" >
Expand Down

0 comments on commit 63f96c1

Please sign in to comment.