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

v1.4.8i Fix border on the X, and added substr

Browse Source
This commit is contained in:
victor
2020-10-30 14:18:28 +01:00
parent 16eba9cd62
commit 0ae9dfd5d4
7 changed files with 157 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/admin/guides/index.blade.php
+14 -4
View File
@@ -28,6 +28,7 @@
<th>Navn</th>
<th>Kategori</th>
@if(auth()->user()->can('guides.edit'))
<!--<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="preview"></th>-->
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
@endif
@if(auth()->user()->can('guides.delete'))
@@ -39,6 +40,7 @@
<td>{{$guide->name}}</td>
<td>{{ \App\GuidesCategory::query()->where('id', '=', $guide->guide_category_id)->first()->guidesCategoryName }}</td>
@if(auth()->user()->can('guides.edit'))
<!-- <td><input type="image" name="preview" onclick="preview()" src="{{ asset('/images/icons/preview-dark.svg') }}" alt="preview"></td>-->
<td><a href="{{ route("guides.edit", [ "guide" => $guide ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
@endif
@if(auth()->user()->can('guides.delete'))
@@ -46,7 +48,7 @@
@csrf
@method("delete")
<button onclick="return confirm('Are you sure you want to delete?');" class="w-100 nostyle" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
<button onclick="return confirm('Er DU sikker på at du vil slette vejledningen? Der er igen vej tilbage hvis du sletter den!');" class="w-100 nostyle" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
</form>
</td>
@endif
@@ -54,12 +56,11 @@
@endforeach
@if(count($guides) == 0)
<tr>
<td colspan="4">Ingen vejledninger</td>
<td colspan="5">Ingen vejledninger</td>
</tr>
@endif
</table>
</div>
<div id="guidesCategory" class="mt-2 letterSpaceTable">
<label>Kategorier til de forskellige vejledninger</label>
<table class="tbl">
@@ -83,7 +84,7 @@
@csrf
@method("delete")
<button onclick="return confirm('Are you sure you want to delete? You will also delete all guides with this category!');" class="w-100 nostyle" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
<button onclick="return confirm('Er du sikker på at du vil slette denne kategori?');" class="w-100 nostyle" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
</form>
</td>
@endif
@@ -91,4 +92,13 @@
@endforeach
</table>
</div>
<script>
function preview(){
$value = $('#preview').val();
console.log($value);
}
</script>
@endsection
skolehjem/resources/views/admin/index.blade.php
+22 -14
View File
@@ -52,12 +52,17 @@
.letterSpaceTable{
letter-spacing: 1.2px;
}
.letterSpaceNotTable{
letter-spacing: 2px;
}
.fixOverflow{
overflow: hidden !important;
}
</style>
@@ -69,13 +74,13 @@
</div>
<h1 class="text-white ml-auto mr-2" style="font-size: 3.5rem;">{{ count(\App\User::all()) }}</h1>
</div>
<table class="tbl mt-1">
<table class="tbl mt-1 ">
<tr>
<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 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>
<td>{!! \App\Helpers::closetags(substr(ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_first)), 0, 24) ) . ' ' . \App\Helpers::closetags(substr(ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_last)), 0, 23) ) !!}</td>
</tr>
@endfor
</table>
@@ -95,7 +100,7 @@
</tr>
@if(\App\Event::query()->orderBy("date", "asc")->first() == null)
<tr>
<td class="text-center">Der er ingen aktiviteter</td>
<td class="text-center letterSpaceTable">Der er ingen aktiviteter</td>
</tr>
@endif
</table>
@@ -105,11 +110,13 @@
<table class="tbl mt-0 letterSpaceTable">
<tr>
<td><label>Aktivitet navn</label></td>
<td>{{ \App\Event::query()->orderBy("date", "asc")->first()->name }}</td>
<td>{!! \App\Helpers::closetags(substr(\App\Event::query()->orderBy("date", "asc")->first()->name, 0, 15)) !!}</td>
</tr>
<tr>
<td><label>Aktivitet ansvarlig</label></td>
<td>Af: {{ \App\Event::query()->orderBy("date", "asc")->first()->accountable }}</td>
<td>Af: {!! \App\Helpers::closetags(substr(\App\Event::query()->orderBy("date", "asc")->first()->accountable, 0, 15) ) !!}</td>
</tr>
<tr>
<td><label>Tidspunkt</label></td>
@@ -125,7 +132,7 @@
</table>
<input type="hidden" name="event_id" value="{{ \App\Event::query()->orderBy("date", "asc")->first()->id }}">
<div class="row" style="justify-content: space-between; margin-top: 16px;">
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.signups", ["event" => \App\Event::query()->orderBy("date", "asc")->first()->id ])}}">{{__('msg.sedeltagere')}}</a>
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.signups", ["event" => \App\Event::query()->orderBy("date", "asc")->first()->id ])}}">Se deltagere</a>
</div>
</div>
</div>
@@ -147,12 +154,12 @@
@if(count(\App\Guide::all()) > 0)
@for($i = 0; $i < 10 && $i < count(\App\Guide::query()->orderByDesc("id")->get()); $i++)
<tr class="letterSpaceTable">
<td>{{ ucfirst(strtolower(\App\Guide::query()->orderByDesc("id")->get()[$i]->name)) }}</td>
<td class="fixOverflow">{!! \App\Helpers::closetags(substr(ucfirst(strtolower(\App\Guide::query()->orderByDesc("id")->get()[$i]->name)), 0, 45) ) !!}</td>
</tr>
@endfor
@else
<tr>
<td class="text-center">Der er ingen vejledninger</td>
<td class="text-center letterSpaceTable">Der er ingen vejledninger</td>
</tr>
@endif
</table>
@@ -174,22 +181,23 @@
{{-- \App\MenuPlan::query()->where("week", "=", date('W'))->first() --}}
<tr>
<td class="letterSpaceTable"><label>Mandag </label></td>
<td class="letterSpaceTable">{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday }}</td>
\App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday, 0, 45) )
<td class="letterSpaceTable">{!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday, 0, 45) ) !!}</td>
</tr>
<td class="letterSpaceTable"><label>Tirsdag</label></td>
<td class="letterSpaceTable">{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday }}</td>
<td class="letterSpaceTable">{!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday, 0, 45) ) !!}</td>
</tr>
<td class="letterSpaceTable"><label>Onsdag</label></td>
<td class="letterSpaceTable">{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday }}</td>
<td class="letterSpaceTable">{!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday, 0, 45) ) !!}</td>
</tr>
<td class="letterSpaceTable"><label>Torsdag</label></td>
<td class="letterSpaceTable">{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday }}</td>
<td class="letterSpaceTable">{!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday, 0, 45) ) !!}</td>
</tr>
<!--The code above is retarded, but it is what it is :) -->
<!--The code above is retarded, but it is what it is :) BigSmoke -->
@else
<tr>
<td colspan="2" class="text-center">Der er ingen menuplan for denne uge</td>
<td colspan="2" class="text-center letterSpaceTable">Der er ingen menuplan for denne uge</td>
</tr>
@endif
</table>