Skip to content

Commit dc561a0

Browse files
committed
app: changed most of the location-report routes to location/report
Related to #615
1 parent 1003481 commit dc561a0

11 files changed

Lines changed: 14 additions & 14 deletions

File tree

app/public/js/location_search_map.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ function initMap() {
7878
});
7979

8080
google.maps.event.addListener(locationMarker, 'click', function() {
81-
window.location.href = '/location-report/' + location.id;
81+
window.location.href = '/location/report/' + location.id;
8282
});
8383
});
8484

app/resources/views/pages/internal_features/duplicate_finder.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@foreach ( $search_results as $search_result )
2323
<div class="row">
2424
<div class="col-xs-6">
25-
<a href="/location-report/{{ $search_result->id }}">{{ $search_result->name }}</a>
25+
<a href="/location/report/{{ $search_result->id }}">{{ $search_result->name }}</a>
2626
</div>
2727
<div class="col-xs-4">{{ $search_result->address }}</div>
2828
<div class="col-xs-2">{{ round($search_result->distance * 1000) }}</div>

app/resources/views/pages/location_management/modify.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@extends('layouts.default')
22
@section('content')
33
<div class="location-management">
4-
<h1>Modify Location - <a href="/location-report/{{ $location->id }}">{{ $location->name }}</a></h1>
4+
<h1>Modify Location - <a href="/location/report/{{ $location->id }}">{{ $location->name }}</a></h1>
55

66
<form method="post" action="/location-modify">
77
<input type="hidden" name="location_id" value="{{ $location->id }}">

app/resources/views/pages/location_rating/rate.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</div>
3838
</div>
3939
<div class="rate">
40-
<h1><a href="/location-report/{{ $location->id }}">{{ $location->name }}</a></h1>
40+
<h1><a href="/location/report/{{ $location->id }}">{{ $location->name }}</a></h1>
4141
@include('includes.rate_report_toggle',
4242
array(
4343
'location_id' => $location->id,

app/resources/views/pages/location_report/comments.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
@section('content')
44
<div class="location-comments">
5-
<h1><a href="/location-report/{{ $location->id }}">{{ $location->name }}</a></h1>
5+
<h1><a href="/location/report/{{ $location->id }}">{{ $location->name }}</a></h1>
66
<div class="comments">
77
<h2>Comments</h2>
88
@if ( count($comments) === 0 )
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<div class="text-center">
22
<p>The personal accessibility ratings are available only after you
3-
have <a href="/signin?message=Sign+in+to+see+personal+ratings&amp;after_signin_redirect=%2Flocation-report%2F{{ $location_id }}%2Fpersonal">signed in</a> and have specified your accessibility needs.</p>
3+
have <a href="/signin?message=Sign+in+to+see+personal+ratings&amp;after_signin_redirect=%2Flocation%2Freport%2F{{ $location_id }}%2Fpersonal">signed in</a> and have specified your accessibility needs.</p>
44
</div>

app/resources/views/pages/location_report/top.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
<a href="{{ $location_search_path }}" title="Back to last location search results" class="fa fa-search"></a>
55
@endif
66
@if (isset($question_category_id))
7-
<h1><a href="/location-report/{{ $location->id }}/{{ $rating_system }}">{{ $location->name }}</a></h1>
7+
<h1><a href="/location/report/{{ $location->id }}/{{ $rating_system }}">{{ $location->name }}</a></h1>
88
@else
99
<h1>{{ $location->name }}</h1>
1010
@endif
1111
</div>
1212
<div class="universal-personal">
1313
<a class="{{ $rating_system === 'universal' ? 'selected' : '' }}"
14-
href="/location-report/{{ $location->id }}/universal{{
14+
href="/location/report/{{ $location->id }}/universal{{
1515
isset($question_category_id)
1616
? '/'.$question_category_id
1717
: ''
1818
}}">Universal</a>
1919
<a class="{{ $rating_system === 'personal' ? 'selected' : '' }}"
20-
href="/location-report/{{ $location->id }}/personal{{
20+
href="/location/report/{{ $location->id }}/personal{{
2121
isset($question_category_id)
2222
? '/'.$question_category_id
2323
: ''

app/resources/views/pages/location_search/spreadsheet.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class="form-control" id="distance"
4141
<div class="data">
4242
@foreach ( $locations as $key => $value )
4343
<div class="location">
44-
<a href="/location-report/{{ $value->id }}">
44+
<a href="/location/report/{{ $value->id }}">
4545
<div class="row">
4646
<div class="col-xs-6">
4747
{{ $value->name }}

app/routes/location.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
'location-suggestions-for-name/{location_name}',
1212
'LocationManagementController@getLocationSuggestionsForLocationName'
1313
);
14-
Route::get('location-report/{location_id}', 'LocationReportController@show');
15-
Route::get('location-report/{location_id}/{rating_system}', 'LocationReportController@show');
14+
Route::get('location/report/{location_id}', 'LocationReportController@show');
15+
Route::get('location/report/{location_id}/{rating_system}', 'LocationReportController@show');
1616
Route::get('location-comments/{location_id}', 'LocationReportController@showComments');
1717
Route::get('location-map/{location_id}', 'LocationReportController@showMap');
1818
Route::get('location-map/{location_id}/{rating_system}', 'LocationReportController@showMap');

app/tests/LocationReportTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class LocationReportTest extends TestCase
44
{
55
public function testGet()
66
{
7-
$response = $this->get('/location-report/00000000-0000-0000-0000-000000000001');
7+
$response = $this->get('/location/report/00000000-0000-0000-0000-000000000001');
88
$this->assertEquals(200, $response->getStatusCode());
99
$content = $response->getContent();
1010
$this->assertTrue(strpos($content, 'Tim Hortons') !== false);

0 commit comments

Comments
 (0)