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

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

This commit is contained in:
Neerholt 2020-08-25 12:00:33 +02:00
parent fa606bd89f e1a2fd87f7
commit 0c8791683f
4 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skolehjem/resources/lang/dk/msg.php
View File

@ -59,6 +59,8 @@ return[
"sedeltagere" => "Se deltagere", "sedeltagere" => "Se deltagere",
"af" => "Af", "af" => "Af",
"programmedby" => "Programmeret af", "programmedby" => "Programmeret af",
"omappen" => "Om appen",
"infoomappen" => "Denne app er udviklet til Odense erhvervskollegie.",
"error" => "Fejl", "error" => "Fejl",
"404" => "Denne side findes ikke.", "404" => "Denne side findes ikke.",
"canceled" => "Aflyst" "canceled" => "Aflyst"

2
skolehjem/resources/lang/en/msg.php
View File

@ -66,6 +66,8 @@ return[
"sedeltagere" => "See participants", "sedeltagere" => "See participants",
"af" => "By", "af" => "By",
"programmedby" => "Programmed by", "programmedby" => "Programmed by",
"omappen" => "The App",
"infoomappen" => "The app is developed and designed for 'Odense erhvervskollegie'.",
"error" => "Error", "error" => "Error",
"404" => "This page doesn't exist.", "404" => "This page doesn't exist.",
"canceled" => "Canceled" "canceled" => "Canceled"

6
skolehjem/resources/views/admin/locations/show.blade.php
View File

@ -12,7 +12,7 @@
<img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="brand" alt="Syddansk Erhvervsskole"> <img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="brand" alt="Syddansk Erhvervsskole">
<p class="text-white" style="margin-left: auto; padding-right: 24px; font-size: 1vw;">Lokation: {{ $location->name }}</p> <p class="text-white" style="margin-left: auto; padding-right: 24px; font-size: 1vw;">Lokation: {{ $location->name }}</p>
</header> </header>
<main style="min-height: calc(100% - 72px); background-color: #ffffff;"> <main style="min-height: calc(100% - 72px); background-color: #ffffff;" id="mainDiv">
<?php <?php
date_default_timezone_set('Europe/Copenhagen'); date_default_timezone_set('Europe/Copenhagen');
$i = 1; $i = 1;
@ -45,8 +45,8 @@
<script src="{{ mix("/js/app.js") }}"></script> <script src="{{ mix("/js/app.js") }}"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
setTimeout(function(){ setInterval(function(){ // There has to be a space between " and # or it will not load correctly
location.reload(true); $('#mainDiv').load(" #mainDiv").fadeIn();
}, (60000*5)); }, (60000*5));
}); });
</script> </script>

8
skolehjem/resources/views/app/about/index.blade.php
View File

@ -8,13 +8,13 @@
<h1 class="text-center sde-blue mb-0" style="margin-bottom: 2rem">{{ __('msg.omkring') }}</h1> <h1 class="text-center sde-blue mb-0" style="margin-bottom: 2rem">{{ __('msg.omkring') }}</h1>
<h4 class="mb-0 mt-1">Version:</h4> <h4 class="mb-0 mt-1">Version:</h4>
<p>1.0</p> <p>1.0</p>
<h4 class="mb-0 mt-1">Om appen:</h4> <h4 class="mb-0 mt-1">{{__("msg.omappen")}}:</h4>
<p>Denne app er udviklet til Odense erhvervskollegie.</p> <p>{{__("msg.infoomappen")}}</p>
<h4 class="mb-1 mt-1">{{__("msg.programmedby")}}:</h4> <h4 class="mb-1 mt-1">{{__("msg.programmedby")}}:</h4>
<span style="margin-bottom: 0.2rem;"><span style="float: left;">Anders Rasmussen,</span><span style="float: right;">anders164a@gmail.com</span></span> <span style="margin-bottom: 0.2rem;"><span style="float: left;">Anders Rasmussen,</span><span style="float: right;">anders164a@gmail.com</span></span>
<span style="margin-bottom: 0.2rem;">Frederik Milling Pytlick,<span style="float: right;">frederikpyt@gmail.com</span></span> <span style="margin-bottom: 0.2rem;">Frederik Milling Pytlick,<span style="float: right;">frederikpyt@gmail.com</span></span>
<span style="margin-bottom: 0.2rem;">Vedran Zelen,<span style="float: right;">vedr0021@gmail.com</span></span> <span style="margin-bottom: 0.2rem;">Vedran Zelen,<span style="float: right;">zelenvedran@gmail.com</span></span>
<span style="margin-bottom: 0.2rem;">Victor Neerholt,<span style="float: right;">victorneerholt@gmail.com</span></span> <span style="margin-bottom: 0.2rem;">Victor Neerholt,<span style="float: right;">victorneerholt@gmail.com</span></span>
<span style="margin-bottom: 0.2rem;">Sebastian Davaris,<span style="float: right;">seba4928@edu.sde.dk</span></span> <span style="margin-bottom: 0.2rem;">Sebastian Davaris,<span style="float: right;">sebastian@davaris.dk</span></span>
</main> </main>
@endsection @endsection