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

v1.4.8 Fixed alot of the areas the graphic designer told me to.

Browse Source
This commit is contained in:
victor
2020-10-21 09:12:53 +02:00
parent 26ae5f1212
commit 94749fcf21
17 changed files with 103 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/admin/contacts/index.blade.php
+6 -1
View File
@@ -10,12 +10,17 @@
@endsection
@section("content")
<style>
.letterSpaceTable{
letter-spacing: 1.2px;
}
</style>
<div class="row align-items-center">
@if(auth()->user()->can('contact.create'))
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('contacts.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Kontakt</a>
@endif
</div>
<table class="tbl mt-2" id="table_id">
<table class="tbl mt-2 letterSpaceTable" id="table_id">
<thead>
<th>Kontakt Navn</th>
<th>Titel</th>
skolehjem/resources/views/admin/events/index.blade.php
+6 -1
View File
@@ -13,13 +13,18 @@
<?php
date_default_timezone_set('Europe/Copenhagen');
?>
<style>
.letterSpaceTable{
letter-spacing: 1.2px;
}
</style>
<div class="row align-items-center">
@if(auth()->user()->can('event.show'))
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('events.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Aktivitet</a>
@endif
</div>
<table class="tbl mt-2" id="table_id">
<table class="tbl mt-2 letterSpaceTable" id="table_id">
<thead>
<th>Aktivitet Navn</th>
<th>Aktivitet Ansvarlig</th>
skolehjem/resources/views/admin/feedbacks/index.blade.php
+6 -1
View File
@@ -11,7 +11,12 @@
@section("content")
<table class="tbl" id="table_id">
<style>
.letterSpaceTable{
letter-spacing: 1.2px;
}
</style>
<table class="tbl letterSpaceTable" id="table_id">
<thead>
<th style="width: 6em;">Dato</th>
<th>Feedback Besked</th>
skolehjem/resources/views/admin/guides/index.blade.php
+7 -2
View File
@@ -10,13 +10,18 @@
@endsection
@section("content")
<style>
.letterSpaceTable{
letter-spacing: 1.2px;
}
</style>
@if(auth()->user()->can('guides.create'))
<div class="row align-items-center mb-2">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('guides.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Bruger Vejledning</a>
<a class="btn btn-inline btn-sde-blue mb-0 ml-1" href="{{ route('guides-category.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret vejlednings kategori</a>
</div>
@endif
<div id="guides">
<div id="guides" class="letterSpaceTable">
<label>Vejledninger</label>
<table class="tbl">
<tr>
@@ -55,7 +60,7 @@
</table>
</div>
<div id="guidesCategory" class="mt-2">
<div id="guidesCategory" class="mt-2 letterSpaceTable">
<label>Kategorier til de forskellige vejledninger</label>
<table class="tbl">
<tr>
skolehjem/resources/views/admin/index.blade.php
+32 -20
View File
@@ -49,10 +49,20 @@
color: lightseagreen;
margin: auto;
}
.letterSpaceTable{
letter-spacing: 1.2px;
}
.letterSpaceNotTable{
letter-spacing: 2px;
}
</style>
<div class="card">
<div class="head" style="background-color: orange;">
<div class="head letterSpaceNotTable" style="background-color: #575756;">
<div>
<img style="width: 4rem;" src="{{ asset("/images/icons/users-hvid.svg") }}" alt="">
<h1 class="text-white">Brugere</h1>
@@ -61,10 +71,10 @@
</div>
<table class="tbl mt-1">
<tr>
<th class="text-white text-center" style="background-color: orange;">Nyeste brugere</th>
<th class="text-white text-center letterSpaceTable" style="background-color: #575756;">Nyeste brugere</th>
</tr>
@for($i = 0; $i < 10 && $i < count(\App\User::query()->orderByDesc("id")->get()); $i++)
<tr>
<tr class="letterSpaceTable">
<td>{{ ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_first)) . ' ' . ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_last)) }}</td>
</tr>
@endfor
@@ -72,7 +82,7 @@
</div>
<div class="card">
<div class="head" style="background-color: red;">
<div class="head letterSpaceNotTable" style="background-color: #6796b0;">
<div>
<img style="margin-top: 8px;width: 3rem;" src="{{ asset("/images/icons/Aktiviteter.svg") }}" alt="">
<h1 class="text-white">Aktiviteter</h1>
@@ -81,7 +91,7 @@
</div>
<table class="tbl mt-1">
<tr>
<th class="text-white text-center" style="background-color: red;">Næste aktivitet</th>
<th class="text-white text-center letterSpaceTable" style="background-color: #6796b0;">Næste aktivitet</th>
</tr>
@if(\App\Event::query()->orderBy("date", "asc")->first() == null)
<tr>
@@ -92,7 +102,7 @@
@if(\App\Event::query()->orderBy("date", "asc")->first() !== null)
<div class="event_card">
<div class="header" style="padding-top: 0">
<table class="tbl mt-0">
<table class="tbl mt-0 letterSpaceTable">
<tr>
<td><label>Aktivitet navn</label></td>
<td>{{ \App\Event::query()->orderBy("date", "asc")->first()->name }}</td>
@@ -107,7 +117,7 @@
</tr>
</table>
</div>
<div class="container" style="margin-top: 8px;">
<div class="container letterSpaceTable" style="margin-top: 8px;">
<table style="border: 1px solid lightgrey; width: 100%;">
<tr>
<td> {!! \App\Helpers::closetags(substr(\App\Event::query()->orderBy("date", "asc")->first()->description, 0, 300) )!!}</td>
@@ -123,7 +133,7 @@
</div>
<div class="card">
<div class="head" style="background-color: deepskyblue;">
<div class="head letterSpaceNotTable" style="background-color: #152f4b;">
<div>
<img style="width: 4rem;" src="{{ asset("/images/icons/Vejledninger.svg") }}" alt="">
<h1 class="text-white">Vejledninger</h1>
@@ -132,11 +142,11 @@
</div>
<table class="tbl mt-1">
<tr>
<th class="text-white text-center" style="background-color: deepskyblue;">Seneste Vejledninger</th>
<th class="text-white text-center letterSpaceTable" style="background-color: #152f4b;">Seneste Vejledninger</th>
</tr>
@if(count(\App\Guide::all()) > 0)
@for($i = 0; $i < 10 && $i < count(\App\Guide::query()->orderByDesc("id")->get()); $i++)
<tr>
<tr class="letterSpaceTable">
<td>{{ ucfirst(strtolower(\App\Guide::query()->orderByDesc("id")->get()[$i]->name)) }}</td>
</tr>
@endfor
@@ -149,7 +159,7 @@
</div>
<div class="card">
<div class="head" style="background-color: lightseagreen;">
<div class="head" style="background-color: #01788a; letter-spacing: 2px;">
<div>
<img style="width: 4rem;" src="{{ asset("/images/icons/Menuplan.svg") }}" alt="">
<h1 class="text-white">Menuplan</h1>
@@ -158,23 +168,25 @@
</div>
<table class="tbl mt-1">
<tr>
<th class="text-white text-center" colspan="2" style="background-color: lightseagreen;">Ugens Menuplan</th>
<th class="text-white text-center" colspan="2" style="background-color: #01788a; letter-spacing: 2px;">Ugens Menuplan</th>
</tr>
@if(\App\MenuPlan::query()->where("week", "=", date('W'))->first() !== null)
{{-- \App\MenuPlan::query()->where("week", "=", date('W'))->first() --}}
<tr>
<td><label>Mandag </label></td>
<td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday }}</td>
<td class="letterSpaceTable"><label>Mandag </label></td>
<td class="letterSpaceTable">{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday }}</td>
</tr>
<td><label>Tirsdag</label></td>
<td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday }}</td>
<td class="letterSpaceTable"><label>Tirsdag</label></td>
<td class="letterSpaceTable">{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday }}</td>
</tr>
<td><label>Onsdag</label></td>
<td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday }}</td>
<td class="letterSpaceTable"><label>Onsdag</label></td>
<td class="letterSpaceTable">{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday }}</td>
</tr>
<td><label>Torsdag</label></td>
<td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday }}</td>
<td class="letterSpaceTable"><label>Torsdag</label></td>
<td class="letterSpaceTable">{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday }}</td>
</tr>
<!--The code above is retarded, but it is what it is :) -->
@else
<tr>
<td colspan="2" class="text-center">Der er ingen menuplan for denne uge</td>
skolehjem/resources/views/admin/layout/base.blade.php
+1 -1
View File
@@ -3,7 +3,7 @@
<head>
<title>@yield("title")</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel='icon' href='{{ asset('/images/icons/pencil-dark.svg') }}' type='image/x-icon'>
<link rel='icon' href='{{ asset('/images/icons/browserFavIcon.svg') }}' type='image/x-icon'>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
<script type="text/javascript">
skolehjem/resources/views/admin/menuplans/index.blade.php
+6 -1
View File
@@ -10,6 +10,11 @@
@endsection
@section("content")
<style>
.letterSpaceTable{
letter-spacing: 1.2px;
}
</style>
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
@if(auth()->user()->can('menuplan.create'))
<div class="row align-items-center">
@@ -17,7 +22,7 @@
</div>
@endif
<table class="tbl" id="table_id">
<table class="tbl letterSpaceTable" id="table_id">
<thead>
<th>Uge</th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/print-hvid.svg') }}" alt="Print"></th>
skolehjem/resources/views/admin/news/index.blade.php
+6 -1
View File
@@ -10,12 +10,17 @@
@endsection
@section("content")
<style>
.letterSpaceTable{
letter-spacing: 1.2px;
}
</style>
@if(auth()->user()->can('news.create'))
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('news.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Nyheder</a>
</div>
@endif
<table class="tbl" id="table_id">
<table class="tbl letterSpaceTable" id="table_id">
<thead>
<th>Navn</th>
<th>Udløbsdato</th>
skolehjem/resources/views/admin/roles/index.blade.php
+6 -1
View File
@@ -10,12 +10,17 @@
@endsection
@section("content")
<style>
.letterSpaceTable{
letter-spacing: 1.2px;
}
</style>
<div class="row align-items-center">
@if(auth()->user()->can('roles.create'))
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('roles.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Rolle</a>
@endif
</div>
<table class="tbl mt-2" id="table_id">
<table class="tbl mt-2 letterSpaceTable" id="table_id">
<thead>
<th>Navn</th>
<th>Beskrivelse</th>
skolehjem/resources/views/admin/users/index.blade.php
+7 -3
View File
@@ -44,6 +44,10 @@
cursor: not-allowed;
}
.letterSpaceTable{
letter-spacing: 1.2px;
}
td >
</style>
<div class="row align-items-center">
@@ -51,12 +55,12 @@
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('users.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Bruger</a>
@endif
</div>
<table class="tbl mt-2" id="table_id">
<table class="tbl mt-2 letterSpaceTable" id="table_id">
<thead>
<th>Fornavn</th>
<th>Efternavn</th>
<th>Email</th>
<th>Tlf nr</th>
<th>Mail</th>
<th>Telefon</th>
<th>Rolle(r)</th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="ShowImage"></th>
@if(auth()->user()->can('user.edit'))
skolehjem/resources/views/admin/washing-machines/index.blade.php
+6 -1
View File
@@ -10,6 +10,11 @@
@endsection
@section("content")
<style>
.letterSpaceTable{
letter-spacing: 1.2px;
}
</style>
<div class="row align-items-center">
@if(auth()->user()->can('washing.machine.create'))
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('washing-machines.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>
@@ -28,7 +33,7 @@
</div>
<div id="searchWashingMachine" class="mt-2">
<label>Vaskemaskiner</label>
<table id="washingSearch" class="tbl">
<table id="washingSearch" class="tbl letterSpaceTable">
<thead>
<th>Navn</th>
<th>Lokation</th>
skolehjem/resources/views/admin/washing-reservations/index.blade.php
+6 -1
View File
@@ -13,7 +13,12 @@
<?php
date_default_timezone_set('Europe/Copenhagen');
?>
<table class="tbl mt-0" id="table_id">
<style>
.letterSpaceTable{
letter-spacing: 1.2px;
}
</style>
<table class="tbl mt-0 letterSpaceTable" id="table_id">
<thead>
<th>Lokation</th>
<th>Vaskemaskine</th>
skolehjem/resources/views/app/layout/base.blade.php
+4 -3
View File
@@ -5,9 +5,10 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="manifest" href="/resources/manifest.json">
<link type="text/css" rel="stylesheet" href="{{ asset("/css/normalize.css") }}">
<link rel='icon' href='{{ asset('/images/icons/pencil-dark.svg') }}' type='image/x-icon'>
@if(request()->cookie("mode") == "dark")
<link rel='icon' href='{{ asset('/images/icons/appIcon.svg') }}' type='image/x-icon'>
@if(request()->cookie("mode") == "dark")
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webappdark.css") }}">
@else
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
@@ -27,7 +28,7 @@
@else
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
@endif
<button class="ml-auto" id="toggle">
<button class="ml-auto btn-sde-blue" style="border: none; font-size: 20px" id="toggle">
<i id="icon" class="fas fa-bars" style="color: black;"></i>
</button>
</header>