Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
7cb88d8b58
|
@ -145,7 +145,7 @@ class ContactController extends Controller
|
||||||
"<th>Titel</th>".
|
"<th>Titel</th>".
|
||||||
"<th>E-mail</th>".
|
"<th>E-mail</th>".
|
||||||
"<th>Tlf</th>".
|
"<th>Tlf</th>".
|
||||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan-dark.svg')." alt=\"Update\"></th>".
|
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/pencil.svg')." alt=\"Update\"></th>".
|
||||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
||||||
"</tr>";
|
"</tr>";
|
||||||
|
|
||||||
|
|
|
@ -140,7 +140,7 @@ class rolesController extends Controller
|
||||||
$output = "<tr>".
|
$output = "<tr>".
|
||||||
"<th>Navn</th>".
|
"<th>Navn</th>".
|
||||||
"<th>Beskrivelse</th>".
|
"<th>Beskrivelse</th>".
|
||||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan-dark.svg')." alt=\"Update\"></th>".
|
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/pencil.svg')." alt=\"Update\"></th>".
|
||||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
||||||
"</tr>";
|
"</tr>";
|
||||||
$roles = DB::table('roles')->where('name', 'LIKE',$request->search.'%')->get();
|
$roles = DB::table('roles')->where('name', 'LIKE',$request->search.'%')->get();
|
||||||
|
|
|
@ -414,7 +414,7 @@ class UserController extends Controller
|
||||||
"<th>Email</th>".
|
"<th>Email</th>".
|
||||||
"<th>Tlf nr</th>".
|
"<th>Tlf nr</th>".
|
||||||
"<th>Rolle(r)</th>".
|
"<th>Rolle(r)</th>".
|
||||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan-dark.svg')." alt=\"Update\"></th>".
|
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/pencil.svg')." alt=\"Update\"></th>".
|
||||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
||||||
"</tr>";
|
"</tr>";
|
||||||
|
|
||||||
|
|
|
@ -18,14 +18,6 @@
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
}
|
}
|
||||||
|
|
||||||
* {
|
|
||||||
word-break: break-word;
|
|
||||||
-webkit-hyphens: auto;
|
|
||||||
-ms-hyphens: auto;
|
|
||||||
hyphens: auto;
|
|
||||||
overflow-x: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
form {
|
form {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
padding: 0 0.45rem 0 0.45rem;
|
padding: 0 0.45rem 0 0.45rem;
|
||||||
|
|
|
@ -18,14 +18,6 @@
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
}
|
}
|
||||||
|
|
||||||
* {
|
|
||||||
word-break: break-word;
|
|
||||||
-webkit-hyphens: auto;
|
|
||||||
-ms-hyphens: auto;
|
|
||||||
hyphens: auto;
|
|
||||||
overflow-x: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
form {
|
form {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
padding: 0 0.45rem 0 0.45rem;
|
padding: 0 0.45rem 0 0.45rem;
|
||||||
|
@ -7071,6 +7063,14 @@ main {
|
||||||
bottom: 30px;
|
bottom: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
* {
|
||||||
|
word-break: break-word;
|
||||||
|
-webkit-hyphens: auto;
|
||||||
|
-ms-hyphens: auto;
|
||||||
|
hyphens: auto;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
#snackbar.show {
|
#snackbar.show {
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
-webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
|
-webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
|
||||||
|
|
|
@ -18,14 +18,6 @@
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
}
|
}
|
||||||
|
|
||||||
* {
|
|
||||||
word-break: break-word;
|
|
||||||
-webkit-hyphens: auto;
|
|
||||||
-ms-hyphens: auto;
|
|
||||||
hyphens: auto;
|
|
||||||
overflow-x: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
form {
|
form {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
padding: 0 0.45rem 0 0.45rem;
|
padding: 0 0.45rem 0 0.45rem;
|
||||||
|
@ -7071,6 +7063,14 @@ main {
|
||||||
bottom: 30px;
|
bottom: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
* {
|
||||||
|
word-break: break-word;
|
||||||
|
-webkit-hyphens: auto;
|
||||||
|
-ms-hyphens: auto;
|
||||||
|
hyphens: auto;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
#snackbar.show {
|
#snackbar.show {
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
-webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
|
-webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
|
||||||
|
|
|
@ -15,12 +15,6 @@
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
}
|
}
|
||||||
|
|
||||||
* {
|
|
||||||
word-break: break-word;
|
|
||||||
hyphens: auto;
|
|
||||||
overflow-x: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Variables
|
// Variables
|
||||||
@import 'variables';
|
@import 'variables';
|
||||||
|
|
||||||
|
|
|
@ -524,6 +524,12 @@ $primary-color: $blue;
|
||||||
bottom: 30px;
|
bottom: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
* {
|
||||||
|
word-break: break-word;
|
||||||
|
hyphens: auto;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
#snackbar.show {
|
#snackbar.show {
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
-webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
|
-webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
|
||||||
|
|
|
@ -10,6 +10,46 @@
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@section("content")
|
@section("content")
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.showUsers {
|
||||||
|
position: relative;
|
||||||
|
display: inline-block;
|
||||||
|
overflow: visible;
|
||||||
|
}
|
||||||
|
|
||||||
|
.showUsers .showUserImages {
|
||||||
|
visibility: hidden;
|
||||||
|
width: 250px;
|
||||||
|
max-height: 500px;
|
||||||
|
max-width: 300px;
|
||||||
|
object-fit: cover;
|
||||||
|
background-color: transparent;
|
||||||
|
color: #fff;
|
||||||
|
text-align: center;
|
||||||
|
border-radius: 6px;
|
||||||
|
padding: 5px 0;
|
||||||
|
/* Position the tooltip */
|
||||||
|
position: absolute;
|
||||||
|
z-index: 10;
|
||||||
|
top: -5px;
|
||||||
|
right: 105%;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.showUsers:hover .showUserImages {
|
||||||
|
visibility: visible;
|
||||||
|
z-index: 100;
|
||||||
|
}
|
||||||
|
|
||||||
|
.noImages{
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
td >
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
<div class="row align-items-center">
|
<div class="row align-items-center">
|
||||||
<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>
|
<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>
|
||||||
|
|
||||||
|
@ -42,6 +82,7 @@
|
||||||
<th>Email</th>
|
<th>Email</th>
|
||||||
<th>Tlf nr</th>
|
<th>Tlf nr</th>
|
||||||
<th>Rolle(r)</th>
|
<th>Rolle(r)</th>
|
||||||
|
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="ShowImage"></th>
|
||||||
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
|
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
|
||||||
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
|
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -61,6 +102,11 @@
|
||||||
@endif
|
@endif
|
||||||
@endfor
|
@endfor
|
||||||
</td>
|
</td>
|
||||||
|
@if($user->resource_id !== null)
|
||||||
|
<td style="overflow: visible"><a class="showUsers"><img src="{{ asset('/images/icons/eye-dark.svg') }}"><img src="{{ asset(\App\Resource::query()->where("id", "=", $user->resource_id)->first()->filename) }}" class="showUserImages"></a></td>
|
||||||
|
@else
|
||||||
|
<td style="overflow: visible"><a class="showUsers noImages"><img src="{{ asset('/images/icons/eye-dark.svg') }}"><img src="" class="showUserImages"></a></td>
|
||||||
|
@endif
|
||||||
<td><a href="{{ route("users.edit", [ "user" => $user->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
|
<td><a href="{{ route("users.edit", [ "user" => $user->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
|
||||||
<td><form method="post" action="{{ route("users.destroy", [ "user" => $user ]) }}" class="w-100 nostyle">
|
<td><form method="post" action="{{ route("users.destroy", [ "user" => $user ]) }}" class="w-100 nostyle">
|
||||||
@csrf
|
@csrf
|
||||||
|
|
Loading…
Reference in New Issue