Commit c2b8ec96 by PANGERAN\pangeran

oke

parent 23f3744a
...@@ -344,8 +344,20 @@ ...@@ -344,8 +344,20 @@
</span> </span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<<<<<<< HEAD:resources/views/Admin/HalamanAdmin/index.blade.php
<li class="active"><a href="index.html"><i class="fa fa-circle-o"></i>Soni Silalahi</a></li> <li class="active"><a href="index.html"><i class="fa fa-circle-o"></i>Soni Silalahi</a></li>
<li><a href="index2.html"><i class="fa fa-circle-o"></i> Pancajuntak Siman</a></li> <li><a href="index2.html"><i class="fa fa-circle-o"></i> Pancajuntak Siman</a></li>
=======
<li><a href="{{URL::to('/HalamanMonitoring')}}"><i class="fa fa-circle-o"></i>Sayur</a></li>
<li><a href="{{URL::to('/cabe')}}"><i class="fa fa-circle-o"></i>Cabai</a></li>
<li><a href="{{URL::to('/ubi')}}"><i class="fa fa-circle-o"></i>Ubi</a></li>
<li><a href="{{URL::to('/tomat')}}"><i class="fa fa-circle-o"></i>Tomat</a></li>
<li><a href="{{URL::to('/andaliman')}}"><i class="fa fa-circle-o"></i>Andaliman</a></li>
<li><a href="{{URL::to('/jagung')}}"><i class="fa fa-circle-o"></i>Jagung</a></li>
<li><a href="{{URL::to('/kentang')}}"><i class="fa fa-circle-o"></i>Kentang</a></li>
<li><a href="{{URL::to('/kacang')}}"><i class="fa fa-circle-o"></i>Kacang</a></li>
>>>>>>> 95b7ce66b7ce3374f22ab33d90a56f9e02b557e2:resources/views/HalamanAdmin/index.blade.php
</ul> </ul>
</li> </li>
<li><a href="documentation/index.html"><i class="fa fa-user-circle"></i> <span>Tanaman</span></a></li> <li><a href="documentation/index.html"><i class="fa fa-user-circle"></i> <span>Tanaman</span></a></li>
......
...@@ -44,7 +44,11 @@ ...@@ -44,7 +44,11 @@
<header class="main-header"> <header class="main-header">
<!-- Logo --> <!-- Logo -->
<<<<<<< HEAD:resources/views/Backup/HalamanUser/index.blade.php
<a href="index2.html" class="logo"> <a href="index2.html" class="logo">
=======
<a href="{{URL::to("/home")}}" class="logo">
>>>>>>> 95b7ce66b7ce3374f22ab33d90a56f9e02b557e2:resources/views/HalamanMonitoring/monitoringsayur.blade.php
<!-- mini logo for sidebar mini 50x50 pixels --> <!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"><b>A</b>LT</span> <span class="logo-mini"><b>A</b>LT</span>
<!-- logo for regular state and mobile devices --> <!-- logo for regular state and mobile devices -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment