v1.3.2 - Fixed table css and removed pagination in backend
This commit is contained in:
frederikpyt
parent
7b99cd7f4e
commit
13197b8be8
|
|
@ -7,9 +7,6 @@ use Illuminate\Http\Response;
|
|||
|
||||
class AboutController extends Controller
|
||||
{
|
||||
|
||||
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware(["auth"]);
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ class ContactController extends Controller
|
|||
*/
|
||||
public function index(Request $request)
|
||||
{
|
||||
|
||||
$contact = Contact::query()->get();
|
||||
|
||||
return Response::detect("contacts.index", [ "contacts" => $contact]);
|
||||
|
|
|
|||
|
|
@ -245,6 +245,7 @@ class EventController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
//Fixes tags that have been substringed
|
||||
public function closetags($html) {
|
||||
preg_match_all('#<(?!meta|img|br|hr|input\b)\b([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result);
|
||||
$openedtags = $result[1];
|
||||
|
|
@ -289,7 +290,6 @@ class EventController extends Controller
|
|||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ class FeedbackController extends Controller
|
|||
*/
|
||||
public function index(Request $request)
|
||||
{
|
||||
$feedback = Feedbacks::query()->orderBy('created_at', 'desc')->paginate(20);
|
||||
$feedback = Feedbacks::query()->orderBy('created_at', 'desc')->get();
|
||||
|
||||
return Response::detect("feedbacks.index", [ "feedback" => $feedback ]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ class ResourceController extends Controller
|
|||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
* @return Resource
|
||||
*/
|
||||
public static function storeMime(Request $request, ResourceCategory $category)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6772,7 +6772,20 @@ nav > .pagination {
|
|||
.tbl {
|
||||
border-collapse: collapse;
|
||||
width: 100%;
|
||||
table-layout: fixed;
|
||||
}
|
||||
|
||||
div.dataTables_length,
|
||||
div.dataTables_info {
|
||||
margin-right: auto !important;
|
||||
}
|
||||
|
||||
div.dataTables_paginate,
|
||||
div.dataTables_filter {
|
||||
margin-left: auto !important;
|
||||
}
|
||||
|
||||
.col-sm-12 {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.tbl td,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,18 @@
|
|||
.tbl {
|
||||
border-collapse: collapse;
|
||||
width: 100%;
|
||||
table-layout: fixed;
|
||||
//table-layout: fixed;
|
||||
}
|
||||
div.dataTables_length, div.dataTables_info {
|
||||
margin-right: auto !important;
|
||||
}
|
||||
|
||||
div.dataTables_paginate, div.dataTables_filter {
|
||||
margin-left: auto !important;
|
||||
}
|
||||
|
||||
.col-sm-12 {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.tbl td, .tbl th {
|
||||
|
|
|
|||
|
|
@ -11,34 +11,16 @@
|
|||
|
||||
|
||||
@section("content")
|
||||
|
||||
|
||||
<div class="risRos">
|
||||
<label for="risros">Vælg type feedback:</label>
|
||||
<select name="risRosName" id="risRosValue">
|
||||
<option selected="selected" name="all" value="all">Alle</option>
|
||||
<option name="ris" value="Ris">Ris</option>
|
||||
<option name="ros" value="Ros">Ros</option>
|
||||
<option name="andet" value="Andet">Andet</option>
|
||||
</select>
|
||||
<!-- Dont delete me sir :(
|
||||
<input class="checkbox-inline" type="checkbox" name="checkbox" id="ris" value="ris">
|
||||
<label for="efternavn">Ris</label>
|
||||
<input class="checkbox-inline" type="checkbox" name="checkbox" id="ros" value="ros">
|
||||
<label for="efternavn">Ros</label>
|
||||
-->
|
||||
</div>
|
||||
|
||||
|
||||
<table class="tbl">
|
||||
<tr>
|
||||
<table class="tbl" id="table_id">
|
||||
<thead>
|
||||
<th style="width: 6em;">Dato</th>
|
||||
<th>Feedback Besked</th>
|
||||
<th style="width: 7em;">Feedback type</th>
|
||||
@if(auth()->user()->can('feedback.delete'))
|
||||
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
|
||||
@endif
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($feedback as $fb)
|
||||
<tr>
|
||||
<td>{{ date('d-m-Y', strtotime($fb->created_at)) }}</td>
|
||||
|
|
@ -55,29 +37,17 @@
|
|||
@endif
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
{{ $feedback->links() }}
|
||||
|
||||
|
||||
<script>
|
||||
$('#risRosValue').change(function () {
|
||||
$value = $('#risRosValue').find(":selected").val();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: '{{route('feedbacks.search')}}',
|
||||
data: {'option':$value},
|
||||
success:function (data) {
|
||||
$('tbody').html(data);
|
||||
},
|
||||
error:function (data) {
|
||||
console.log(data);
|
||||
}
|
||||
});
|
||||
})
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
|
||||
@endsection
|
||||
@section('scripts')
|
||||
<script>
|
||||
$(document).ready( function () {
|
||||
$('#table_id').DataTable({
|
||||
columnDefs: [
|
||||
{ orderable: false, targets: [-1] }
|
||||
]
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
|
|
|
|||
Loading…
Reference in New Issue