colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved 404 page and updated tests for empty search

This commit is contained in:
Dan Brown 2016-01-01 09:03:40 +00:00
parent 9a470b07fd
commit f60a0c3b76
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/ActivityService.php
View File

@ -107,7 +107,7 @@ class ActivityService
} }
/** /**
* Filters out similar acitivity. * Filters out similar activity.
* @param Activity[] $activity * @param Activity[] $activity
* @return array * @return array
*/ */

6
resources/views/base.blade.php
View File

@ -43,14 +43,14 @@
<div class="float right"> <div class="float right">
<div class="links text-center"> <div class="links text-center">
<a href="/books"><i class="zmdi zmdi-book"></i>Books</a> <a href="/books"><i class="zmdi zmdi-book"></i>Books</a>
@if($currentUser->can('settings-update')) @if(isset($currentUser) && $currentUser->can('settings-update'))
<a href="/settings"><i class="zmdi zmdi-settings"></i>Settings</a> <a href="/settings"><i class="zmdi zmdi-settings"></i>Settings</a>
@endif @endif
@if(!$signedIn) @if(!isset($signedIn) || !$signedIn)
<a href="/login"><i class="zmdi zmdi-sign-in"></i>Sign In</a> <a href="/login"><i class="zmdi zmdi-sign-in"></i>Sign In</a>
@endif @endif
</div> </div>
@if($signedIn) @if(isset($signedIn) && $signedIn)
<div class="dropdown-container" dropdown> <div class="dropdown-container" dropdown>
<span class="user-name" dropdown-toggle> <span class="user-name" dropdown-toggle>
<img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}"> <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">

5
resources/views/errors/404.blade.php
View File

@ -4,8 +4,9 @@
<div class="container"> <div class="container">
<h1>Page Not Found</h1> <h1 class="text-muted">Page Not Found</h1>
<p>The page you were looking for could not be found.</p> <p>Sorry, The page you were looking for could not be found.</p>
<a href="/" class="button">Return To Home</a>
</div> </div>
@stop @stop

8
tests/EntityTest.php
View File

@ -180,6 +180,14 @@ class EntityTest extends TestCase
->seeStatusCode(200); ->seeStatusCode(200);
} }
public function testEmptySearchRedirectsBack()
{
$this->asAdmin()
->visit('/')
->visit('/search/all')
->seePageIs('/');
}
public function testEntitiesViewableAfterCreatorDeletion() public function testEntitiesViewableAfterCreatorDeletion()
{ {