vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	skolehjem/app/Http/Controllers/MenuPlanController.php
#	skolehjem/resources/views/admin/external-links/index.blade.php
This commit is contained in:
Vedde
2020-06-26 13:56:47 +02:00
parent 89082b281b b56f3d2a34
commit 578dd8d522
31 changed files with 347 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/admin/menuplans/create.blade.php
+14 -14
View File
@@ -13,20 +13,20 @@
<h1>Opret Menuplan:</h1>
<form action="{{ action('MenuPlanController@store') }}" method="post">
@csrf
<label for="mandag">Mandag:</label>
<input type="text" name="mandag" id="mandag" required>
<label for="tirsdag">Tirsdag:</label>
<input type="text" name="tirsdag" id="tirsdag" required>
<label for="onsdag">Onsdag:</label>
<input type="text" name="onsdag" id="onsdag" required>
<label for="torsdag">Torsdag:</label>
<input type="text" name="torsdag" id="torsdag" required>
<label for="fredag">Fredag:</label>
<input type="text" name="fredag" id="fredag" required>
<label for="lørdag">Lørdag:</label>
<input type="text" name="lørdag" id="lørdag" required>
<label for="søndag">Søndag:</label>
<input type="text" name="søndag" id="søndag" required>
<label for="monday">Mandag:</label>
<input type="text" name="monday" id="monday" required>
<label for="tuesday">Tirsdag:</label>
<input type="text" name="tuesday" id="tuesday" required>
<label for="wednesday">Onsdag:</label>
<input type="text" name="wednesday" id="wednesday" required>
<label for="thursday">Torsdag:</label>
<input type="text" name="thursday" id="thursday" required>
<label for="friday">Fredag:</label>
<input type="text" name="friday" id="friday" required>
<label for="saturday">Lørdag:</label>
<input type="text" name="saturday" id="saturday" required>
<label for="sunday">Søndag:</label>
<input type="text" name="sunday" id="sunday" required>
<input type="submit" class="btn btn-dark text-white" value="Opret Menuplan">
</form>
skolehjem/resources/views/admin/menuplans/index.blade.php
+9 -11
View File
@@ -12,7 +12,6 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Mandag</th>
<th>Tirsdag</th>
<th>Onsdag</th>
@@ -25,16 +24,15 @@
</tr>
@foreach($menuPlans as $menuplan)
<tr>
<th>{ID}</th>
<th>{Mandag}</th>
<th>{Tirsdag}</th>
<th>{Onsdag}</th>
<th>{Torsdag}</th>
<th>{Fredag}</th>
<th>{Lørdag}</th>
<th>{Søndag}</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>
<td>{{$menuplan->monday}}</td>
<td>{{$menuplan->tuesday}}</td>
<td>{{$menuplan->wednesday}}</td>
<td>{{$menuplan->thursday}}</td>
<td>{{$menuplan->friday}}</td>
<td>{{$menuplan->saturday}}</td>
<td>{{$menuplan->sunday}}</td>
<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>
@endforeach
</table>
skolehjem/resources/views/admin/menuplans/show.blade.php
+1 -3
View File
@@ -6,13 +6,12 @@
@endsection
@section("path")
<a href="{{ route('menu-plans.show') }}" class="text-white">Vis Menuplan</a> /
<a href="{{ route('menu-plans.show', [ "id" => $menuplan->id ]) }}" class="text-white">Vis Menuplan</a> /
@endsection
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Fredag</th>
<th>Tirsdag</th>
<th>Onsdag</th>
@@ -24,7 +23,6 @@
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
<tr>
<td>{ID}</td>
<td>{Fredag}</td>
<td>{Tirsdag}</td>
<td>{Onsdag}</td>