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

Merge pull request #3 from sebathefox/Multi-language

Browse Source 
v.0.5.8 - Multi language
This commit is contained in:
Neerholt
2020-08-07 08:53:29 +02:00
committed by GitHub
parent 76e3638706 60391793fc
commit b5fb505eaa
37 changed files with 295 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/app/washing-reservations/create.blade.php
+6 -6
View File
@@ -6,7 +6,7 @@
@section("content")
<main>
<h1 class="text-center sde-blue mb-0">Booking Liste</h1>
<h1 class="text-center sde-blue mb-0">{{__('msg.bookingliste')}}</h1>
{!! session()->get('ReservationExists') !!}
<div class="col w-100 mt-auto">
<div class="calendar-container">
@@ -30,7 +30,7 @@
@csrf
</form>
@if(count(\App\WashingMachine::all()) < 1)
<p style="margin: 0 18px;">Der er ingen vaskemaskiner.</p>
<p style="margin: 0 18px;">{{__('msg.dereringenvaskemaskiner')}}.</p>
@endif
</div>
</main>
@@ -47,7 +47,7 @@
return moment(index, "e").locale("da").startOf("week").weekday(index).format("ddd");
});
document.getElementById("title").innerHTML = 'Uge ' + moment().locale("da").day(weekDays[0]).week(week).isoWeek().toString();
document.getElementById("title").innerHTML = '{{__('msg.ugestor')}} ' + moment().locale("da").day(weekDays[0]).week(week).isoWeek().toString();
const calendar = document.getElementById("calendar");
@@ -160,7 +160,7 @@
else {
let span = document.createElement("span");
span.classList.add("events__title");
span.innerText = "Maskiner";
span.innerText = "{{__('msg.maskiner')}}";
let select = document.createElement("select");
select.classList.add("events__title");
@@ -181,7 +181,7 @@
else {
let span = document.createElement("span");
span.classList.add("events__title");
span.innerText = "Tilgængelige tider";
span.innerText = "{{__('msg.tilgængeligetider')}}";
let select = document.createElement("select");
select.classList.add("events__title");
@@ -199,7 +199,7 @@
let button = document.createElement("button");
button.id = "create-reservation";
button.innerText = "Reserver";
button.innerText = "{{__('msg.reserver')}}";
button.type = "submit";
container.appendChild(button);
skolehjem/resources/views/app/washing-reservations/index.blade.php
+5 -5
View File
@@ -5,25 +5,25 @@
@section("content")
<main style="min-height: calc(100% - 61.34px);">
<h2 class="text-center sde-blue mb-0">Dine reservationer</h2>
<h2 class="text-center sde-blue mb-0">{{__('msg.dinereservationer')}}</h2>
@foreach($reservations as $reservation)
<div class="reservation" style="margin: 0 32px 1.75rem 32px;">
<h3>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</h3>
<div class="row align-items-center">
<span style="font-size: 4vw"><b>Tid:</b> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</span>
<span style="font-size: 4vw"><b>{{__('msg.tid')}}:</b> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</span>
<form class="ml-auto" method="post" action="{{ route("washing-reservations.destroy", [ "washing_reservation" => $reservation ]) }}">
@csrf
@method("delete")
<input type="hidden" name="id" value="{{ $reservation->id }}">
<button class="btn btn-sde-blue mb-0" type="submit" onclick="return confirm('Are you sure you want to remove this reservation?');">Fjern</button>
<button class="btn btn-sde-blue mb-0" type="submit" onclick="return confirm('Are you sure you want to remove this reservation?');">{{__('msg.fjern')}}</button>
</form>
</div>
</div>
@endforeach
@if(count($reservations) < 1)
<p style="margin: 0 18px;">Du har ingen reservationer.</p>
<p style="margin: 0 18px;">{{__('msg.duharingenreservationer')}}.</p>
@endif
<a href="{{ route("washing-reservations.create") }}" class="btn btn-sde-blue mt-auto mb-1">Reserver vaskemaskine</a>
<a href="{{ route("washing-reservations.create") }}" class="btn btn-sde-blue mt-auto mb-1">{{__('msg.reservervaskemaskine')}}</a>
</main>
@endsection