v1.4.8i Fix border on the X, and added substr
This commit is contained in:
parent
16eba9cd62
commit
0ae9dfd5d4
|
|
@ -7,6 +7,8 @@
|
|||
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/food.svg" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/location.svg" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/phone.svg" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/preview-dark.svg" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/preview.svg" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/print-hvid.svg" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/questionmark.svg" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/statistics.svg" charset="UTF-8" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><style>#Capa_1{fill:#000;}</style>
|
||||
<g>
|
||||
<g>
|
||||
<path d="M435.174,382.964c25.042-35.155,21.986-84.07-9.541-115.597c-33.803-33.803-93.51-33.816-127.266,0
|
||||
c-35.193,35.162-35.175,92.122,0,127.266c31.531,31.556,80.458,34.567,115.596,9.542l76.826,75.036L512,458L435.174,382.964z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
<g>
|
||||
<polygon points="272,8.789 272,121 383.211,121 "/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
<g>
|
||||
<path d="M361.985,451.015c-32.051,0-62.183-12.495-84.844-35.186c-46.915-46.855-46.926-122.794,0.029-169.688
|
||||
c26.755-26.81,69.164-41.373,114.829-30.018V151H242V0H0v512h392v-65.235C382.268,449.274,372.302,451.015,361.985,451.015z
|
||||
M60,181h212v30H60V181z M212,391H60v-30h152V391z M212,331H60v-30h152V331z M212,271H60v-30h152V271z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
|
|
@ -0,0 +1,53 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><style>#Capa_1{fill:#FFF;}</style>
|
||||
<g>
|
||||
<g>
|
||||
<path d="M435.174,382.964c25.042-35.155,21.986-84.07-9.541-115.597c-33.803-33.803-93.51-33.816-127.266,0
|
||||
c-35.193,35.162-35.175,92.122,0,127.266c31.531,31.556,80.458,34.567,115.596,9.542l76.826,75.036L512,458L435.174,382.964z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
<g>
|
||||
<polygon points="272,8.789 272,121 383.211,121 "/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
<g>
|
||||
<path d="M361.985,451.015c-32.051,0-62.183-12.495-84.844-35.186c-46.915-46.855-46.926-122.794,0.029-169.688
|
||||
c26.755-26.81,69.164-41.373,114.829-30.018V151H242V0H0v512h392v-65.235C382.268,449.274,372.302,451.015,361.985,451.015z
|
||||
M60,181h212v30H60V181z M212,391H60v-30h152V391z M212,331H60v-30h152V331z M212,271H60v-30h152V271z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -52,12 +52,17 @@
|
|||
|
||||
.letterSpaceTable{
|
||||
letter-spacing: 1.2px;
|
||||
|
||||
}
|
||||
|
||||
.letterSpaceNotTable{
|
||||
letter-spacing: 2px;
|
||||
}
|
||||
|
||||
.fixOverflow{
|
||||
overflow: hidden !important;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
|
|
@ -75,7 +80,7 @@
|
|||
</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>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,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 btn-sde-blue" style="border: none; font-size: 20px" id="toggle">
|
||||
<button class="ml-auto btn-sde-blue" style="border: none; font-size: 20px; outline: none;" id="toggle">
|
||||
<i id="icon" class="fas fa-bars" style="color: black;"></i>
|
||||
</button>
|
||||
</header>
|
||||
|
|
|
|||
|
|
@ -102,6 +102,14 @@
|
|||
@endif
|
||||
}
|
||||
|
||||
.dot {
|
||||
height: 10px;
|
||||
width: 10px;
|
||||
background-color: #bbb;
|
||||
border-radius: 50%;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
<main style="justify-content: unset; padding: 0">
|
||||
|
|
@ -131,7 +139,7 @@
|
|||
<div class="img"><a href="{{ route('menu-plans.index') }}"><img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan:"></a></div>
|
||||
<div class="title">
|
||||
{{ $new->subname }}
|
||||
<span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}}</span>
|
||||
<span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i', strtotime($new->created_at))}}</span>
|
||||
</div>
|
||||
@if($new->resource_id !== null)
|
||||
<div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $new->resource_id)->first()->filename) }}');"></div>
|
||||
|
|
@ -148,11 +156,11 @@
|
|||
<div class="card">
|
||||
<div class="img"><a href="{{ route('events.index') }}"><img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Aktiviteter:"></a></div>
|
||||
<div class="title">{{ $new->subname }}
|
||||
<span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}}</span>
|
||||
<span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i', strtotime($new->created_at))}}</span>
|
||||
</div>
|
||||
@if($new->resource_id !== null)
|
||||
<div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $new->resource_id)->first()->filename) }}');"></div>
|
||||
<div class="information">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->date))->format('d/m/Y \k\l\. H:i') }} | {{\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->accountable}} </div>
|
||||
<div class="information">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->date))->format('d/m/Y \k\l\. H:i') }} <span class="dot"></span> {{\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->accountable}} </div>
|
||||
<div class="container">
|
||||
{!! \App\Helpers::closetags(substr($new->content, 0, 300) ) !!}
|
||||
<div class="row" style="justify-content: space-between; padding-top: 12px; border-top: 1px solid rgba(0, 0, 0, .2);">
|
||||
|
|
@ -185,7 +193,7 @@
|
|||
<div class="card">
|
||||
<div class="img"><a href="{{ route('guides.index') }}"><img src="{{URL::asset('/images/icons/Vejledninger.svg')}}" alt="Vejledninger:"></a></div>
|
||||
<div class="title">{{ $new->subname }}
|
||||
<span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}}</span>
|
||||
<span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i', strtotime($new->created_at))}}</span>
|
||||
</div>
|
||||
@if($new->resource_id !== null)
|
||||
<div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $new->resource_id)->first()->filename) }}');"></div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue