Dan Brown

Improved 404 page and updated tests for empty search

...@@ -107,7 +107,7 @@ class ActivityService ...@@ -107,7 +107,7 @@ class ActivityService
107 } 107 }
108 108
109 /** 109 /**
110 - * Filters out similar acitivity. 110 + * Filters out similar activity.
111 * @param Activity[] $activity 111 * @param Activity[] $activity
112 * @return array 112 * @return array
113 */ 113 */
......
...@@ -43,14 +43,14 @@ ...@@ -43,14 +43,14 @@
43 <div class="float right"> 43 <div class="float right">
44 <div class="links text-center"> 44 <div class="links text-center">
45 <a href="/books"><i class="zmdi zmdi-book"></i>Books</a> 45 <a href="/books"><i class="zmdi zmdi-book"></i>Books</a>
46 - @if($currentUser->can('settings-update')) 46 + @if(isset($currentUser) && $currentUser->can('settings-update'))
47 <a href="/settings"><i class="zmdi zmdi-settings"></i>Settings</a> 47 <a href="/settings"><i class="zmdi zmdi-settings"></i>Settings</a>
48 @endif 48 @endif
49 - @if(!$signedIn) 49 + @if(!isset($signedIn) || !$signedIn)
50 <a href="/login"><i class="zmdi zmdi-sign-in"></i>Sign In</a> 50 <a href="/login"><i class="zmdi zmdi-sign-in"></i>Sign In</a>
51 @endif 51 @endif
52 </div> 52 </div>
53 - @if($signedIn) 53 + @if(isset($signedIn) && $signedIn)
54 <div class="dropdown-container" dropdown> 54 <div class="dropdown-container" dropdown>
55 <span class="user-name" dropdown-toggle> 55 <span class="user-name" dropdown-toggle>
56 <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}"> 56 <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">
......
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
4 4
5 5
6 <div class="container"> 6 <div class="container">
7 - <h1>Page Not Found</h1> 7 + <h1 class="text-muted">Page Not Found</h1>
8 - <p>The page you were looking for could not be found.</p> 8 + <p>Sorry, The page you were looking for could not be found.</p>
9 + <a href="/" class="button">Return To Home</a>
9 </div> 10 </div>
10 11
11 @stop 12 @stop
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -180,6 +180,14 @@ class EntityTest extends TestCase ...@@ -180,6 +180,14 @@ class EntityTest extends TestCase
180 ->seeStatusCode(200); 180 ->seeStatusCode(200);
181 } 181 }
182 182
183 + public function testEmptySearchRedirectsBack()
184 + {
185 + $this->asAdmin()
186 + ->visit('/')
187 + ->visit('/search/all')
188 + ->seePageIs('/');
189 + }
190 +
183 191
184 public function testEntitiesViewableAfterCreatorDeletion() 192 public function testEntitiesViewableAfterCreatorDeletion()
185 { 193 {
......