Merge remote-tracking branch 'origin/master'

# Conflicts: # skolehjem/app/Http/Controllers/MenuPlanController.php # skolehjem/resources/views/admin/external-links/index.blade.php
2020-06-26 13:56:47 +02:00
parent 89082b281b b56f3d2a34
commit 578dd8d522
31 changed files with 347 additions and 411 deletions
@@ -12,7 +12,6 @@
@section("content")
    <table class="tbl">
        <tr>
-            <th>ID</th>
            <th>Title</th>
            <th>Link</th>
            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
@@ -20,9 +19,8 @@
        </tr>
        @foreach($links as $link)
            <tr>
-                <th>{{ $link->id }}</th>
-                <th>{{$link->name}}</th>
-                <th><a href="{{$link->link}}"> {{$link->link}} </th>
+                <th>{Titel}</th>
+                <th>{Link}</th>
                <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
                <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
            </tr>