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

v0.7.7 - Various fixes

This commit is contained in:
frederikpyt 2020-08-11 18:21:51 +02:00
parent 17434eb81d
commit 511e0b783f
9 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skolehjem/resources/views/app/contacts/index.blade.php
View File

@ -4,7 +4,7 @@
@endsection
@section("content")
<main>
<main style="justify-content: unset">
<h1 class="text-center sde-blue mt-0 mb-0">{{__('msg.kontakter')}}</h1>
@if(!$contacts->isEmpty())
@foreach($contacts as $contact)

6
skolehjem/resources/views/app/events/signups.blade.php
View File

@ -14,7 +14,11 @@
.tbl td,
.tbl th {
border: 1px solid #ddd;
@if(request()->cookie("mode") == "dark")
border: 0px solid #ddd;
@else
border: 1px solid #ddd;
@endif
padding: 8px;
overflow: hidden;
text-overflow: ellipsis;

2
skolehjem/resources/views/app/menuplans/index.blade.php
View File

@ -7,7 +7,7 @@
<?php
$Week = date('W'); //Current week
?>
<main onload="myFunction()">
<main style="justify-content: unset">
@if($menuPlans->contains('week', $Week)) {{-- If any of the menues in the menu table has the number of the week in the 'week' column, do this --}}
@foreach($menuPlans as $menuplan)
@if($menuplan->week == $Week)

9
skolehjem/resources/views/app/settings/index.blade.php
View File

@ -10,14 +10,14 @@
<label for="langu" class="mt-2">Sprog / Languages:</label>
<select name="langName" id="lang">
@if(request()->cookie('languagesSetting') == "dk")
<option selected name="langDK" value="dk">Dansk</option>
<option style="color: black;" selected name="langDK" value="dk">Dansk</option>
@else
<option name="langDK" value="dk">Dansk</option>
<option style="color: black;" name="langDK" value="dk">Dansk</option>
@endif
@if(request()->cookie('languagesSetting') == "en")
<option selected name="langEN" value="en">English</option>
<option selected style="color: black;" name="langEN" value="en">English</option>
@else
<option name="langEN" value="en">English</option>
<option name="langEN" style="color: black;" value="en">English</option>
@endif
</select>
<label for="dark">Tema / Theme:</label>
@ -34,7 +34,6 @@
@endif
</select>
</main>
<script>
$(document).ready(function (){
$('#lang').change(function () {

4
skolehjem/resources/views/app/users/account.blade.php
View File

@ -6,8 +6,8 @@
@section("content")
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
<main>
<h1 class="text-center sde-blue mt-0">{{__('msg.konto')}}</h1>
<main style="justify-content: unset">
<h1 class="text-center sde-blue mt-1">{{__('msg.konto')}}</h1>
<h4 class="mt-0">{{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}</h4>
<h4 class="mt-0">{{__('msg.email')}}: {{ Auth::user()->email }}</h4>
<h4 class="mt-0">{{__('msg.telefon')}} Nr.: {{ Auth::user()->phone }}</h4>

6
skolehjem/resources/views/app/users/edit.blade.php
View File

@ -5,9 +5,9 @@
@endsection
@section("content")
<main>
<h1 class="text-center sde-blue mt-0">{{__('msg.konto')}}</h1>
<form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}">
<main style="justify-content: unset">
<h1 class="text-center sde-blue mt-1">{{__('msg.konto')}}</h1>
<form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}">
@csrf
@method("put")
<span>{{__('msg.navn')}}:</span>

6
skolehjem/resources/views/app/users/editpass.blade.php
View File

@ -5,8 +5,8 @@
@endsection
@section("content")
<main>
<h1 class="text-center sde-blue mt-0">{{__('msg.konto')}}</h1>
<main style="justify-content: unset">
<h1 class="text-center sde-blue mt-1">{{__('msg.konto')}}</h1>
<form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}">
@csrf
@method("put")
@ -27,7 +27,7 @@
</div>
{!! session()->get('error#notsamepass') !!}
{!! session()->get('error#oldpass') !!}
<button type="submit" class="btn text-center btn-sde-blue mt-1">{{__('msg.rediger')}}</button>
<button type="submit" style="margin-top: auto;" class="btn text-center btn-sde-blue mt-1">{{__('msg.rediger')}}</button>
<a href="{{ route('users.account') }}" class="btn text-center btn-sde-blue mt-1">{{__('msg.tilbage')}}</a>
</form>

6
skolehjem/resources/views/app/vagttelefons/index.blade.php
View File

@ -4,7 +4,7 @@
@endsection
@section("content")
<main>
<main style="justify-content: unset">
<img class="mt-3" src="{{ URL::asset('/images/icons/Vagttelefon-normal.svg') }}" alt="Vagttelefon" style="height: 16vw;">
<h1 class="text-center sde-blue mt-0">{{__('msg.vagttelefon')}}</h1>
<p class="mt-0">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.</p>
@ -14,8 +14,8 @@
<span class="toggle__text sde-blue semi-bold">{{__('msg.accepter')}}</span>
</span>
</label>
<span class="text-center sde-black-20 mt-2">+45 24 62 94 50</span>
<a class="btn text-center btn-sde-blue btn-disabled" id="call">{{__('msg.ring')}}</a>
<span class="text-center sde-black-20 mt-2" style="margin-top: auto;">+45 24 62 94 50</span>
<a class="btn text-center btn-sde-blue btn-disabled" style="margin-bottom: 8px;" id="call">{{__('msg.ring')}}</a>
</main>
@endsection

11
skolehjem/resources/views/app/washing-reservations/create.blade.php
View File

@ -5,10 +5,10 @@
@endsection
@section("content")
<main>
<main style="justify-content: unset">
<h1 class="text-center sde-blue mb-0">{{__('msg.bookingliste')}}</h1>
{!! session()->get('ReservationExists') !!}
<div class="col w-100 mt-auto">
<div class="col w-100 mt-1">
<div class="calendar-container">
<div class="calendar-container__header">
<button id="week-previous" class="calendar-container__btn fas fa-arrow-left" title="Previous">
@ -287,8 +287,11 @@
generateCalendar();
document.getElementById("week-previous").onclick = function () {
weekOffset--;
generateCalendar(weekOffset);
if(weekOffset > 0)
{
weekOffset--;
generateCalendar(weekOffset);
}
}
document.getElementById("week-next").onclick = function () {