v1.4.5 Fixed some languages settings, add to home screen script, fixed skolehjem to Erhvervskollegiet, flytte noget css
This commit is contained in:
@@ -22,9 +22,9 @@
|
||||
<label for="title">Titel på nyheden:</label>
|
||||
<label hidden id="error" for="errormesseages">Dette navn findes allerede</label>
|
||||
<input type="text" name="subname" id="title" placeholder="OBS: Menuplanen er ændret" required>
|
||||
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
|
||||
<label for="date">Dato til når nyheden skal slettes (valgfri)</label>
|
||||
<input type="datetime-local" name="news_expiration_date" id="date">
|
||||
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
|
||||
<div id="editor"></div>
|
||||
<textarea name="content" class="d-none" id="hiddenArea"></textarea>
|
||||
<input type="submit" id="disable" class="btn btn-dark text-white" value="Opret">
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
iframe, .ql-video {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
div.card {
|
||||
margin-top: 1rem;
|
||||
margin-bottom: 30px;
|
||||
@@ -16,7 +15,6 @@
|
||||
heigt: auto;
|
||||
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
|
||||
}
|
||||
|
||||
div.header {
|
||||
background-color: #00788a;
|
||||
color: white;
|
||||
@@ -24,19 +22,14 @@
|
||||
font-size: 10px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
div.container {
|
||||
padding: 8px;
|
||||
text-align: justify;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
ol {
|
||||
padding-right: 8px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*Alert box*/
|
||||
.alert {
|
||||
opacity: 0.8;
|
||||
@@ -45,7 +38,6 @@
|
||||
color: white;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
.closebtn {
|
||||
margin-left: 15px;
|
||||
color: white;
|
||||
@@ -56,23 +48,20 @@
|
||||
cursor: pointer;
|
||||
transition: 0.3s;
|
||||
}
|
||||
|
||||
.closebtn:hover {
|
||||
color: black;
|
||||
}
|
||||
|
||||
alertBoxBackground {
|
||||
margin-top: 1rem;
|
||||
margin-bottom: 30px;
|
||||
width: auto;
|
||||
heigt: auto;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<main>
|
||||
<h1 class="text-center sde-blue mb-0" style="margin-bottom: 2rem">{{ __('msg.aktiviteter') }}</h1>
|
||||
|
||||
<!--Alert box, display when a event is delete: start-->
|
||||
@if(count(\App\Notification::query()->where("user_id", "=", auth()->user()->id)->get()) > 0)
|
||||
<div class="alertBoxBackground" id="notifications">
|
||||
<div class="alert">
|
||||
@@ -84,15 +73,18 @@
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<!--Alert box, display when a event is delete: end -->
|
||||
|
||||
<!--If there is a images to the event do this: Start-->
|
||||
@if(!$events->isEmpty())
|
||||
@foreach($events as $event)
|
||||
<div class="card">
|
||||
@if($event->resource_id !== null)
|
||||
<div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}');">
|
||||
<h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $event->name }}</h3>
|
||||
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
|
||||
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
|
||||
</div>
|
||||
<h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $event->name }}</h3>
|
||||
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
|
||||
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
|
||||
</div>
|
||||
@else
|
||||
<div class="header">
|
||||
<h3>{{ $event->name }}</h3>
|
||||
@@ -109,7 +101,7 @@
|
||||
@if (count(\App\UserEvent::query()->where('event_id', '=', $event->id)->where('user_id', '=', Auth::user()->id)->get()) > 0)
|
||||
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.afmeld')}}</a>
|
||||
@else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}}
|
||||
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.tilmeld')}}</a>
|
||||
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.tilmeld')}}</a>
|
||||
@endif
|
||||
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.show", ["event" => $event->id ])}}">{{__('msg.læsmere')}}</a>
|
||||
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.accountsignups", ["event" => $event->id ])}}">{{__('msg.sedeltagere')}}</a>
|
||||
|
||||
@@ -18,17 +18,17 @@
|
||||
<span class="text-center text-white bold">{{ __('msg.ugestor') }}: {{$menuplan->week}}</span>
|
||||
@endif
|
||||
<div class="col w-100 mt-1">
|
||||
{!! '<h2 class="ql-align-center"><strong>Mandag:</strong></h2>'.
|
||||
'<p class="ql-align-center">'.$menuplan->monday.'</p><p class="ql-align-center"></p>'.
|
||||
<h2 class="ql-align-center"><strong>{{__('msg.mandag')}}:</strong></h2>
|
||||
<p class="ql-align-center">{{$menuplan->monday}}</p><p class="ql-align-center"></p>
|
||||
|
||||
'<h2 class="ql-align-center"><strong>Tirsdag:</strong></h2>'.
|
||||
'<p class="ql-align-center">'.$menuplan->tuesday.'</p><p class="ql-align-center"></p>'.
|
||||
<h2 class="ql-align-center"><strong>{{__('msg.tirsdag')}}:</strong></h2>
|
||||
<p class="ql-align-center">{{$menuplan->tuesday}}</p><p class="ql-align-center"></p>
|
||||
|
||||
'<h2 class="ql-align-center"><strong>Onsdag:</strong></h2>'.
|
||||
'<p class="ql-align-center">'.$menuplan->wednesday.'</p><p class="ql-align-center"></p>'.
|
||||
<h2 class="ql-align-center"><strong>{{__('msg.onsdag')}}:</strong></h2>
|
||||
<p class="ql-align-center">{{$menuplan->wednesday}}</p><p class="ql-align-center"></p>
|
||||
|
||||
'<h2 class="ql-align-center"><strong>Torsdag:</strong></h2>'.
|
||||
'<p class="ql-align-center">'.$menuplan->thursday.'</p>' !!}
|
||||
<h2 class="ql-align-center"><strong>{{__('msg.torsdag')}}:</strong></h2>
|
||||
<p class="ql-align-center">{{$menuplan->thursday}}</p>
|
||||
</div>
|
||||
@endif
|
||||
@endforeach
|
||||
|
||||
@@ -108,6 +108,10 @@
|
||||
<?php
|
||||
date_default_timezone_set('Europe/Copenhagen');
|
||||
?>
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="/../../../css/addtohomescreen.css">
|
||||
<script src="/../../../js/addtohomescreen.js"></script>
|
||||
|
||||
@foreach($news as $new)
|
||||
<!--Code to list events-->
|
||||
@if($new->type == 'News')<!--Code that prints news-->
|
||||
@@ -252,5 +256,11 @@
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
addToHomescreen();
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
@endsection
|
||||
|
||||
Reference in New Issue
Block a user