From 27423e204056c8b0c3eada4fd423cdbb62327ca5 Mon Sep 17 00:00:00 2001
From: Yoga Adrian <yoga.adrians14@gmail.com>
Date: Tue, 5 Apr 2016 02:07:27 +0700
Subject: [PATCH] fix institusi link
---
ppl2/app/Http/routes.php | 5 +----
ppl2/resources/views/app_template.blade.php | 4 ++--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ppl2/app/Http/routes.php b/ppl2/app/Http/routes.php
index a22abdb..c890bae 100644
--- a/ppl2/app/Http/routes.php
+++ b/ppl2/app/Http/routes.php
@@ -33,8 +33,6 @@ Route::get('pendidikan-formal', 'PendFormalController@getAll');
Route::get('pendidikan-formal/search', 'PendFormalController@search');
-<<<<<<< HEAD
-//Router for pendidikan informal
Route::get('pendidikan-informal/new', function() {
return view('pages.formInformal');
@@ -53,7 +51,7 @@ Route::post('pendidikan-informal/add', 'PendinFormalController@store');
Route::get('pendidikan-informal', 'PendinFormalController@getAll');
Route::get('pendidikan-informal/search', 'PendinFormalController@search');
-=======
+
Route::get('/institusi', function () {
return view('institusi');
});
@@ -73,4 +71,3 @@ Route::get('daftarinstitusi/{id}/delete','InstitusiController@destroy');
Route::get('daftarinstitusi/search','InstitusiController@search');
Route::resource('InstitusiController', 'InstitusiController');
->>>>>>> 45ba5c772caff94fc418e76065190d6c6c9c3449
diff --git a/ppl2/resources/views/app_template.blade.php b/ppl2/resources/views/app_template.blade.php
index c802552..2f5d3f9 100644
--- a/ppl2/resources/views/app_template.blade.php
+++ b/ppl2/resources/views/app_template.blade.php
@@ -71,14 +71,14 @@
</a>
</li>
<li>
- <a href="{{URL::to('institusi')}}">
+ <a href="{{URL::to('daftarinstitusi')}}">
<span>Institusi</span>
</a>
</li>
</ul>
</li>
<li>
- <a href="#">PROJECT</a>
+ <a href="#">PROJECT APLIKASI LAIN</a>
</li>
</ul>
<!-- / link and dropdown -->
--
GitLab