mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-21 08:52:21 +00:00
added mottie tablesorter, removed datatables and datepicker, restyled tablesorter for better bootstrap look, layout changes
This commit is contained in:
alex
@@ -7,12 +7,8 @@
|
|||||||
'bootstrap' => true,
|
'bootstrap' => true,
|
||||||
'fontawesome' => true,
|
'fontawesome' => true,
|
||||||
'sbadmintemplate' => true,
|
'sbadmintemplate' => true,
|
||||||
'tablesorter' => false,
|
'tablesorter' => true,
|
||||||
'customCSSs' => 'vendor/FHC-vendor/jquery-tablesorter/css/theme.default.css',
|
'customCSSs' => 'skin/tablesort_bootstrap.css'
|
||||||
'customJSs' => array(
|
|
||||||
'vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js',
|
|
||||||
'vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js'
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
?>
|
?>
|
||||||
@@ -48,7 +44,7 @@
|
|||||||
$("select").addClass("form-control");
|
$("select").addClass("form-control");
|
||||||
$("input[type=text]").addClass("form-control");
|
$("input[type=text]").addClass("form-control");
|
||||||
$("input[type=button]").addClass("btn btn-default");
|
$("input[type=button]").addClass("btn btn-default");
|
||||||
$("#tableDataset").addClass('table table-bordered table-responsive table-condensed');
|
$("#tableDataset").addClass('table table-bordered table-striped table-responsive table-condensed');
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,17 @@
|
|||||||
<?php
|
<?php
|
||||||
$this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', 'jquery3' => true, 'bootstrap' => true, 'fontawesome' => true, 'bootstrapdatepicker' => true, 'datatables' => true, 'sbadmintemplate' => true));
|
$this->load->view(
|
||||||
|
'templates/FHC-Header',
|
||||||
|
array(
|
||||||
|
'title' => 'InfocenterDetails',
|
||||||
|
'jquery3' => true,
|
||||||
|
'bootstrap' => true,
|
||||||
|
'fontawesome' => true,
|
||||||
|
'jqueryui' => true,
|
||||||
|
'tablesorter' => true,
|
||||||
|
'sbadmintemplate' => true,
|
||||||
|
'customCSSs' => 'skin/tablesort_bootstrap.css'
|
||||||
|
)
|
||||||
|
);
|
||||||
?>
|
?>
|
||||||
<body>
|
<body>
|
||||||
<div id="wrapper">
|
<div id="wrapper">
|
||||||
@@ -27,7 +39,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
<div class="panel-heading text-center"><h4>Stammdaten</h4></div>
|
<div class="panel-heading text-center"><h4>Stammdaten</h4></div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-6">
|
<div class="col-lg-6 table-responsive">
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<tr>
|
<tr>
|
||||||
<td><strong>Vorname</strong></td>
|
<td><strong>Vorname</strong></td>
|
||||||
@@ -69,7 +81,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-6">
|
<div class="col-lg-6 table-responsive">
|
||||||
<table class="table table-bordered">
|
<table class="table table-bordered">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
@@ -120,12 +132,12 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div> <!-- ./row -->
|
||||||
</div>
|
</div> <!-- ./column -->
|
||||||
</div>
|
</div> <!-- ./panel-body -->
|
||||||
</div>
|
</div> <!-- ./panel -->
|
||||||
</div>
|
</div> <!-- ./main column -->
|
||||||
</div>
|
</div> <!-- ./main row -->
|
||||||
</section>
|
</section>
|
||||||
<section>
|
<section>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@@ -134,45 +146,37 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
<a name="DokPruef"></a><!-- anchor for jumping to the section -->
|
<a name="DokPruef"></a><!-- anchor for jumping to the section -->
|
||||||
<div class="panel-heading text-center"><h4>Dokumentenprüfung</h4></div>
|
<div class="panel-heading text-center"><h4>Dokumentenprüfung</h4></div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<table id="doctable" class="table table-striped table-bordered table-condensed">
|
<div class="table-responsive">
|
||||||
<thead>
|
<table id="doctable" class="table table-striped table-bordered">
|
||||||
<th>Name</th>
|
<thead>
|
||||||
<th>Typ</th>
|
<th>Name</th>
|
||||||
<th>Uploaddatum</th>
|
<th>Typ</th>
|
||||||
<th>Ausstellungsnation</th>
|
<th>Uploaddatum</th>
|
||||||
<th>Formal geprüft</th>
|
<th>Ausstellungsnation</th>
|
||||||
<!-- <th>nachzureichen</th>
|
<th>Formal geprüft</th>
|
||||||
<th>nachgereicht am</th>-->
|
</thead>
|
||||||
</thead>
|
<tbody>
|
||||||
<tbody>
|
<?php
|
||||||
<?php
|
foreach ($dokumente as $dokument):
|
||||||
foreach ($dokumente as $dokument):
|
$geprueft = isset($dokument->formal_geprueft_amum) ? "checked" : "";
|
||||||
$geprueft = isset($dokument->formal_geprueft_amum) ? "checked" : "";
|
|
||||||
?>
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<a href="../outputAkteContent/<?php echo $dokument->akte_id ?>"><?php echo empty($dokument->titel) ? $dokument->bezeichnung : $dokument->titel ?></a>
|
|
||||||
</td>
|
|
||||||
<td><?php echo $dokument->dokument_bezeichnung ?></td>
|
|
||||||
<td><?php echo date_format(date_create($dokument->erstelltam), 'd.m.Y') ?></td>
|
|
||||||
<td><?php echo $dokument->langtext ?></td>
|
|
||||||
<td>
|
|
||||||
<input type="checkbox" class="form-check-input"
|
|
||||||
id="prchkbx<?php echo $dokument->akte_id ?>" <?php echo $geprueft ?> />
|
|
||||||
<?php echo isset($dokument->formal_geprueft_amum) ? date_format(date_create($dokument->formal_geprueft_amum), 'd.m.Y') : ''; ?>
|
|
||||||
</td>
|
|
||||||
<!-- <td class="text-center">
|
|
||||||
<?php /*echo $dokument->nachgereicht === true ? 'X' : ''; */
|
|
||||||
?>
|
?>
|
||||||
</td>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<?php /*echo isset($dokument->nachgereicht_am) ? date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : ''; */
|
<a href="../outputAkteContent/<?php echo $dokument->akte_id ?>"><?php echo empty($dokument->titel) ? $dokument->bezeichnung : $dokument->titel ?></a>
|
||||||
?>
|
</td>
|
||||||
</td>-->
|
<td><?php echo $dokument->dokument_bezeichnung ?></td>
|
||||||
</tr>
|
<td><?php echo date_format(date_create($dokument->erstelltam), 'd.m.Y') ?></td>
|
||||||
<?php endforeach ?>
|
<td><?php echo $dokument->langtext ?></td>
|
||||||
</tbody>
|
<td>
|
||||||
</table>
|
<input type="checkbox" class="form-check-input"
|
||||||
|
id="prchkbx<?php echo $dokument->akte_id ?>" <?php echo $geprueft ?> />
|
||||||
|
<?php echo isset($dokument->formal_geprueft_amum) ? date_format(date_create($dokument->formal_geprueft_amum), 'd.m.Y') : ''; ?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<?php endforeach ?>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
<?php if (count($dokumente_nachgereicht) > 0): ?>
|
<?php if (count($dokumente_nachgereicht) > 0): ?>
|
||||||
<br/>
|
<br/>
|
||||||
<p>Nachzureichende Dokumente:</p>
|
<p>Nachzureichende Dokumente:</p>
|
||||||
@@ -195,7 +199,6 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
<td>
|
<td>
|
||||||
<?php echo $dokument->langtext ?>
|
<?php echo $dokument->langtext ?>
|
||||||
</td>
|
</td>
|
||||||
</td>
|
|
||||||
<td>
|
<td>
|
||||||
<?php echo $dokument->anmerkung; ?>
|
<?php echo $dokument->anmerkung; ?>
|
||||||
</td>
|
</td>
|
||||||
@@ -204,10 +207,10 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</div>
|
</div> <!-- ./panel-body -->
|
||||||
</div>
|
</div> <!-- ./panel -->
|
||||||
</div>
|
</div> <!-- ./column -->
|
||||||
</div>
|
</div> <!-- ./row -->
|
||||||
</section>
|
</section>
|
||||||
<section>
|
<section>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@@ -224,11 +227,11 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
$infoonly = $zgvpruefung->infoonly;
|
$infoonly = $zgvpruefung->infoonly;
|
||||||
$firstcolumns = array(3, 2, 2, 2, 3);
|
$firstcolumns = array(3, 2, 2, 2, 3);
|
||||||
//set bootstrap columns
|
//set bootstrap columns
|
||||||
if($infoonly)
|
if ($infoonly)
|
||||||
$columns = array(3, 2, 2, 5);
|
$columns = array(3, 2, 2, 5);
|
||||||
else
|
else
|
||||||
$columns = array(4, 3, 2, 3);
|
$columns = array(4, 3, 2, 3);
|
||||||
?>
|
?>
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h4 class="panel-title">
|
<h4 class="panel-title">
|
||||||
@@ -252,7 +255,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label>Letzter Status: </label>
|
<label>Letzter Status: </label>
|
||||||
<?php
|
<?php
|
||||||
if(isset($zgvpruefung->prestudentstatus->status_kurzbz))
|
if (isset($zgvpruefung->prestudentstatus->status_kurzbz))
|
||||||
{
|
{
|
||||||
echo $zgvpruefung->prestudentstatus->status_kurzbz.(isset($zgvpruefung->prestudentstatus->bezeichnung_statusgrund[0]) && $zgvpruefung->prestudentstatus->status_kurzbz === 'Abgewiesener' ? ' ('.$zgvpruefung->prestudentstatus->bezeichnung_statusgrund[0].')' : '');
|
echo $zgvpruefung->prestudentstatus->status_kurzbz.(isset($zgvpruefung->prestudentstatus->bezeichnung_statusgrund[0]) && $zgvpruefung->prestudentstatus->status_kurzbz === 'Abgewiesener' ? ' ('.$zgvpruefung->prestudentstatus->bezeichnung_statusgrund[0].')' : '');
|
||||||
}
|
}
|
||||||
@@ -267,7 +270,8 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-lg-<?php echo $firstcolumns[3] ?>">
|
<div class="col-lg-<?php echo $firstcolumns[3] ?>">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label><span style="display: inline-block">Ausbildungs</span><span style="display: inline-block">semester: </span></label>
|
<label><span style="display: inline-block">Ausbildungs</span><span
|
||||||
|
style="display: inline-block">semester: </span></label>
|
||||||
<?php echo isset($zgvpruefung->prestudentstatus->ausbildungssemester) ? $zgvpruefung->prestudentstatus->ausbildungssemester : '' ?>
|
<?php echo isset($zgvpruefung->prestudentstatus->ausbildungssemester) ? $zgvpruefung->prestudentstatus->ausbildungssemester : '' ?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -278,8 +282,8 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
<?php
|
<?php
|
||||||
$separator = (isset($zgvpruefung->prestudentstatus->orgform)) ? ', ' : '';
|
$separator = (isset($zgvpruefung->prestudentstatus->orgform)) ? ', ' : '';
|
||||||
echo (isset($zgvpruefung->prestudentstatus->orgform) ? $zgvpruefung->prestudentstatus->orgform : '')
|
echo (isset($zgvpruefung->prestudentstatus->orgform) ? $zgvpruefung->prestudentstatus->orgform : '')
|
||||||
.(isset($zgvpruefung->prestudentstatus->sprachedetails->bezeichnung) ? $separator.$zgvpruefung->prestudentstatus->sprachedetails->bezeichnung[0] : '')
|
.(isset($zgvpruefung->prestudentstatus->sprachedetails->bezeichnung) ? $separator.$zgvpruefung->prestudentstatus->sprachedetails->bezeichnung[0] : '')
|
||||||
.(isset($zgvpruefung->prestudentstatus->alternative) ? ' ('.$zgvpruefung->prestudentstatus->alternative.')' : '') ?>
|
.(isset($zgvpruefung->prestudentstatus->alternative) ? ' ('.$zgvpruefung->prestudentstatus->alternative.')' : '') ?>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -592,6 +596,15 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
<?php endforeach ?>
|
<?php endforeach ?>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
<div id="notizpager" class="pager">
|
||||||
|
<form class="form-inline">
|
||||||
|
<i class="fa fa-step-backward first" style="cursor:pointer"></i>
|
||||||
|
<i class="fa fa-backward prev"></i>
|
||||||
|
<span class="pagedisplay"></span>
|
||||||
|
<i class="fa fa-forward next"></i>
|
||||||
|
<i class="fa fa-step-forward last"></i>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-6">
|
<div class="col-lg-6">
|
||||||
<table id="logtable" class="table table-bordered table-hover">
|
<table id="logtable" class="table table-bordered table-hover">
|
||||||
@@ -611,105 +624,84 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
<?php endforeach ?>
|
<?php endforeach ?>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
<div id="logpager" class="pager">
|
||||||
</div>
|
<form class="form-inline">
|
||||||
</div>
|
<i class="fa fa-step-backward first"></i>
|
||||||
</div>
|
<i class="fa fa-backward prev"></i>
|
||||||
</div>
|
<span class="pagedisplay"></span>
|
||||||
</div>
|
<i class="fa fa-forward next"></i>
|
||||||
|
<i class="fa fa-step-forward last"></i>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div> <!-- ./column -->
|
||||||
|
</div> <!-- ./row -->
|
||||||
|
</div> <!-- ./panel-body -->
|
||||||
|
</div> <!-- ./panel -->
|
||||||
|
</div> <!-- ./main column -->
|
||||||
|
</div> <!-- ./main row -->
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
$(document).ready(function ()
|
$(document).ready(function ()
|
||||||
{
|
{
|
||||||
//language for datatables
|
//initialise table sorter
|
||||||
/* var german =
|
addTablesorter("doctable", [[2, 1], [1, 0]]);
|
||||||
{
|
addTablesorter("nachgdoctable", [[2, 0], [1, 1]]);
|
||||||
"sEmptyTable": "Keine Daten in der Tabelle vorhanden",
|
addTablesorter("logtable", [[0, 1]], ["filter"]);
|
||||||
"sInfo": "_START_ bis _END_ von _TOTAL_ Einträgen",
|
addTablesorter("notiztable", [[0, 1]], ["filter"]);
|
||||||
"sInfoEmpty": "0 bis 0 von 0 Einträgen",
|
|
||||||
"sInfoFiltered": "(gefiltert von _MAX_ Einträgen)",
|
//add pager
|
||||||
"sInfoPostFix": "",
|
togglePager(23, "logtable", "logpager");
|
||||||
"sInfoThousands": ".",
|
togglePager(10, "notiztable", "notizpager");
|
||||||
"sLengthMenu": "_MENU_ Einträge anzeigen",
|
|
||||||
"sLoadingRecords": "Wird geladen...",
|
function addTablesorter(tableid, sortList, widgets)
|
||||||
"sProcessing": "Bitte warten...",
|
|
||||||
"sSearch": "Suchen",
|
|
||||||
"sZeroRecords": "Keine Einträge vorhanden.",
|
|
||||||
"oPaginate": {
|
|
||||||
"sFirst": "Erste",
|
|
||||||
"sPrevious": "Zurück",
|
|
||||||
"sNext": "Nächste",
|
|
||||||
"sLast": "Letzte"
|
|
||||||
},
|
|
||||||
"oAria": {
|
|
||||||
"sSortAscending": ": aktivieren, um Spalte aufsteigend zu sortieren",
|
|
||||||
"sSortDescending": ": aktivieren, um Spalte absteigend zu sortieren"
|
|
||||||
},
|
|
||||||
select: {
|
|
||||||
rows: {
|
|
||||||
_: '%d Zeilen ausgewählt',
|
|
||||||
0: 'Zum Auswählen auf eine Zeile klicken',
|
|
||||||
1: '1 Zeile ausgewählt'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};*/
|
|
||||||
var german = "//cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/German.json";
|
|
||||||
//hack for disabling table pagination if only one page
|
|
||||||
var drawCallback = function (settings)
|
|
||||||
{
|
{
|
||||||
var pagination = $(this).closest('.dataTables_wrapper').find('.dataTables_paginate');
|
$("#"+tableid).tablesorter(
|
||||||
pagination.toggle(this.api().page.info().pages > 1);
|
{
|
||||||
};
|
theme: "default",
|
||||||
|
dateFormat: "ddmmyyyy",
|
||||||
|
sortList: sortList,
|
||||||
|
widgets: widgets
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
//format for sorting dates in tables
|
//not show pager if on first table page
|
||||||
$.fn.dataTable.moment("DD.MM.YYYY");
|
function togglePager(size, tableid, pagerid)
|
||||||
$.fn.dataTable.moment("DD.MM.YYYY HH:mm:ss");
|
{
|
||||||
|
var rowcount = $("#"+tableid+" tr").length;
|
||||||
|
|
||||||
//initialise datatables and datepicker
|
if (rowcount > size)
|
||||||
$("#doctable").DataTable({
|
{
|
||||||
"language": {"url": german},
|
$("#"+tableid).tablesorterPager(
|
||||||
"responsive": true,
|
{
|
||||||
"paging": false,
|
container: $("#"+pagerid),
|
||||||
"searching": false,
|
size: size,
|
||||||
"info": false,
|
cssDisabled: 'disabled',
|
||||||
"order": [[2, "desc"], [1, "asc"]]
|
savePages: false
|
||||||
});
|
}
|
||||||
$("#nachgdoctable").DataTable({
|
);
|
||||||
"language": {"url": german},
|
}
|
||||||
"responsive": true,
|
else
|
||||||
"paging": false,
|
{
|
||||||
"searching": false,
|
$("#"+pagerid).remove();
|
||||||
"info": false,
|
}
|
||||||
"order": [[2, "asc"], [1, "desc"]]
|
}
|
||||||
});
|
|
||||||
$("#logtable").DataTable({
|
//initialise datepicker
|
||||||
"language": {"url": german},
|
$.datepicker.setDefaults($.datepicker.regional['de']);
|
||||||
"responsive": false,
|
|
||||||
"lengthChange": false,
|
|
||||||
"info": false,
|
|
||||||
"pageLength": 25,
|
|
||||||
"order": [[0, "desc"]],
|
|
||||||
"drawCallback": drawCallback
|
|
||||||
});
|
|
||||||
$("#notiztable").DataTable({
|
|
||||||
"language": {"url": german},
|
|
||||||
"responsive": false,
|
|
||||||
"lengthChange": false,
|
|
||||||
"info": false,
|
|
||||||
"pageLength": 13,
|
|
||||||
"order": [[0, "desc"], [2, "asc"]],
|
|
||||||
"drawCallback": drawCallback
|
|
||||||
});
|
|
||||||
$(".dateinput").datepicker({
|
$(".dateinput").datepicker({
|
||||||
"language": "de",
|
"dateFormat": "dd.mm.yy"
|
||||||
"format": "dd.mm.yyyy"
|
|
||||||
});
|
});
|
||||||
|
|
||||||
//javascript hack - not nice!
|
//javascript hack - not nice!
|
||||||
$("select").addClass('form-control');
|
$("select").addClass('form-control');
|
||||||
|
$("table").addClass('table-condensed');
|
||||||
|
$("#logtable, #notiztable").addClass('table-hover');
|
||||||
|
|
||||||
//add click events to "formal geprüft" checkboxes
|
//add click events to "formal geprüft" checkboxes
|
||||||
<?php foreach($dokumente as $dokument): ?>
|
<?php foreach($dokumente as $dokument): ?>
|
||||||
@@ -726,4 +718,5 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
|||||||
);
|
);
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
<?php $this->load->view('templates/FHC-Footer'); ?>
|
<?php $this->load->view('templates/FHC-Footer'); ?>
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ $jquery3 = isset($jquery3) ? $jquery3 : false;
|
|||||||
$jqueryui = isset($jqueryui) ? $jqueryui : false;
|
$jqueryui = isset($jqueryui) ? $jqueryui : false;
|
||||||
$bootstrap = isset($bootstrap) ? $bootstrap : false;
|
$bootstrap = isset($bootstrap) ? $bootstrap : false;
|
||||||
$fontawesome = isset($fontawesome) ? $fontawesome : false;
|
$fontawesome = isset($fontawesome) ? $fontawesome : false;
|
||||||
$bootstrapdatepicker = isset($bootstrapdatepicker) ? $bootstrapdatepicker : false;
|
|
||||||
$datatables = isset($datatables) ? $datatables : false;
|
|
||||||
$tablesorter = isset($tablesorter) ? $tablesorter : false;
|
$tablesorter = isset($tablesorter) ? $tablesorter : false;
|
||||||
$sbadmintemplate = isset($sbadmintemplate) ? $sbadmintemplate : false;
|
$sbadmintemplate = isset($sbadmintemplate) ? $sbadmintemplate : false;
|
||||||
|
|
||||||
@@ -96,14 +94,15 @@ function _generateJSsInclude($JSs)
|
|||||||
if ($bootstrap === true) _generateCSSsInclude('vendor/components/bootstrap/css/bootstrap.min.css');
|
if ($bootstrap === true) _generateCSSsInclude('vendor/components/bootstrap/css/bootstrap.min.css');
|
||||||
// font awesome CSS
|
// font awesome CSS
|
||||||
if ($fontawesome === true) _generateCSSsInclude('vendor/components/font-awesome/css/font-awesome.min.css');
|
if ($fontawesome === true) _generateCSSsInclude('vendor/components/font-awesome/css/font-awesome.min.css');
|
||||||
// bootstrap datepicker CSS
|
|
||||||
if ($bootstrapdatepicker === true) _generateCSSsInclude('vendor/eternicode/bootstrap-datepicker/dist/css/bootstrap-datepicker3.min.css');
|
|
||||||
// datatables CSS
|
|
||||||
if ($datatables === true) _generateCSSsInclude('vendor/datatables/datatables/media/css/dataTables.bootstrap.min.css');
|
|
||||||
// Table sorter CSS
|
// Table sorter CSS
|
||||||
if ($tablesorter === true) _generateCSSsInclude('skin/tablesort.css');
|
if ($tablesorter === true)
|
||||||
|
{
|
||||||
|
_generateCSSsInclude('vendor/mottie/tablesorter/css/theme.default.css');
|
||||||
|
_generateCSSsInclude('vendor/mottie/tablesorter/addons/pager/jquery.tablesorter.pager.css');
|
||||||
|
}
|
||||||
// sb admin template CSS
|
// sb admin template CSS
|
||||||
if ($sbadmintemplate === true){
|
if ($sbadmintemplate === true)
|
||||||
|
{
|
||||||
_generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.css');
|
_generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.css');
|
||||||
_generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css');
|
_generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css');
|
||||||
}
|
}
|
||||||
@@ -117,26 +116,24 @@ function _generateJSsInclude($JSs)
|
|||||||
// JQuery V3
|
// JQuery V3
|
||||||
if ($jquery3 === true) _generateJSsInclude('vendor/components/jquery/jquery.min.js');
|
if ($jquery3 === true) _generateJSsInclude('vendor/components/jquery/jquery.min.js');
|
||||||
// JQuery UI
|
// JQuery UI
|
||||||
if ($jqueryui === true) _generateJSsInclude('vendor/components/jqueryui/jquery-ui.min.js');
|
if ($jqueryui === true)
|
||||||
|
{
|
||||||
|
_generateJSsInclude('vendor/components/jqueryui/jquery-ui.min.js');
|
||||||
|
//datepicker german language file
|
||||||
|
_generateJSsInclude('vendor/components/jqueryui/ui/i18n/datepicker-de.js');
|
||||||
|
}
|
||||||
// bootstrap JS
|
// bootstrap JS
|
||||||
if ($bootstrap === true) _generateJSsInclude('vendor/components/bootstrap/js/bootstrap.min.js');
|
if ($bootstrap === true) _generateJSsInclude('vendor/components/bootstrap/js/bootstrap.min.js');
|
||||||
// bootstrap datepicker JS
|
|
||||||
if ($bootstrapdatepicker === true){
|
|
||||||
_generateJSsInclude('vendor/eternicode/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js');
|
|
||||||
_generateJSsInclude('vendor/eternicode/bootstrap-datepicker/dist/locales/bootstrap-datepicker.de.min.js');
|
|
||||||
}
|
|
||||||
// datatables JS
|
|
||||||
if ($datatables === true)
|
|
||||||
{
|
|
||||||
_generateJSsInclude('vendor/datatables/datatables/media/js/jquery.dataTables.js');
|
|
||||||
_generateJSsInclude('vendor/datatables/datatables/media/js/dataTables.bootstrap.min.js');
|
|
||||||
_generateJSsInclude('vendor/moment/moment/min/moment.min.js');
|
|
||||||
_generateJSsInclude('vendor/datatables/plugins/sorting/datetime-moment.js');
|
|
||||||
}
|
|
||||||
// Table sorter JS
|
// Table sorter JS
|
||||||
if ($tablesorter === true) _generateJSsInclude('vendor/christianbach/tablesorter/jquery.tablesorter.min.js');
|
if ($tablesorter === true)
|
||||||
|
{
|
||||||
|
_generateJSsInclude('vendor/mottie/tablesorter/js/jquery.tablesorter.js');
|
||||||
|
_generateJSsInclude('vendor/mottie/tablesorter/js/jquery.tablesorter.widgets.js');
|
||||||
|
_generateJSsInclude('vendor/mottie/tablesorter/addons/pager/jquery.tablesorter.pager.js');
|
||||||
|
}
|
||||||
// sb admin template JS
|
// sb admin template JS
|
||||||
if ($sbadmintemplate === true){
|
if ($sbadmintemplate === true)
|
||||||
|
{
|
||||||
_generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.js');
|
_generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.js');
|
||||||
_generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.js');
|
_generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.js');
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-16
@@ -186,18 +186,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"type": "package",
|
|
||||||
"package": {
|
|
||||||
"name": "datatables/plugins",
|
|
||||||
"version": "3.3.7",
|
|
||||||
"source": {
|
|
||||||
"url": "https://github.com/DataTables/Plugins.git",
|
|
||||||
"type": "git",
|
|
||||||
"reference": "master"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"package": {
|
"package": {
|
||||||
@@ -249,10 +237,7 @@
|
|||||||
"jquery-archive/jquery-metadata": "^1.0",
|
"jquery-archive/jquery-metadata": "^1.0",
|
||||||
"BlackrockDigital/startbootstrap-sb-admin-2": "^3.3",
|
"BlackrockDigital/startbootstrap-sb-admin-2": "^3.3",
|
||||||
"components/font-awesome": "^4.7",
|
"components/font-awesome": "^4.7",
|
||||||
"moment/moment": "^2.20",
|
"mottie/tablesorter": "^2.29"
|
||||||
"datatables/datatables": "^1.10",
|
|
||||||
"datatables/plugins": "^3.3",
|
|
||||||
"eternicode/bootstrap-datepicker": "^1.7"
|
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"squizlabs/php_codesniffer": "2.*"
|
"squizlabs/php_codesniffer": "2.*"
|
||||||
|
|||||||
Generated
+32
-123
@@ -4,8 +4,8 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"hash": "b386e8ea62cfd8c96c6697729860cc5a",
|
"hash": "25135351fcaa90fd7d838614ceb47d37",
|
||||||
"content-hash": "65e7f00446fd7f602e914089cedaa931",
|
"content-hash": "702a9ad9bfca6802a7cd586e0d002002",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "BlackrockDigital/startbootstrap-sb-admin-2",
|
"name": "BlackrockDigital/startbootstrap-sb-admin-2",
|
||||||
@@ -680,39 +680,6 @@
|
|||||||
"description": "jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library. Whether you're building highly interactive web applications or you just need to add a date picker to a form control, jQuery UI is the perfect choice.",
|
"description": "jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library. Whether you're building highly interactive web applications or you just need to add a date picker to a form control, jQuery UI is the perfect choice.",
|
||||||
"time": "2016-09-16 05:47:55"
|
"time": "2016-09-16 05:47:55"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "datatables/datatables",
|
|
||||||
"version": "1.10.16",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/DataTables/DataTables.git",
|
|
||||||
"reference": "75a665f64f02982c0f4666b15a25c4670e5e6b18"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/DataTables/DataTables/zipball/75a665f64f02982c0f4666b15a25c4670e5e6b18",
|
|
||||||
"reference": "75a665f64f02982c0f4666b15a25c4670e5e6b18",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"description": "DataTables is a plug-in for the jQuery Javascript library. It is a highly flexible tool, based upon the foundations of progressive enhancement, which will add advanced interaction controls to any HTML table.",
|
|
||||||
"homepage": "http://www.datatables.net/",
|
|
||||||
"time": "2017-08-31 13:52:17"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "datatables/plugins",
|
|
||||||
"version": "3.3.7",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/DataTables/Plugins.git",
|
|
||||||
"reference": "master"
|
|
||||||
},
|
|
||||||
"type": "library"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "easyrdf/easyrdf",
|
"name": "easyrdf/easyrdf",
|
||||||
"version": "0.9.1",
|
"version": "0.9.1",
|
||||||
@@ -775,61 +742,6 @@
|
|||||||
],
|
],
|
||||||
"time": "2015-02-27 09:45:49"
|
"time": "2015-02-27 09:45:49"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "eternicode/bootstrap-datepicker",
|
|
||||||
"version": "v1.7.1",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/uxsolutions/bootstrap-datepicker.git",
|
|
||||||
"reference": "4c12834aae54782ca41d9409d6334193f200124d"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/uxsolutions/bootstrap-datepicker/zipball/4c12834aae54782ca41d9409d6334193f200124d",
|
|
||||||
"reference": "4c12834aae54782ca41d9409d6334193f200124d",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"components/bootstrap": ">=2.0, <4.0",
|
|
||||||
"components/jquery": ">=1.7.1, <4.0.0",
|
|
||||||
"robloach/component-installer": "*"
|
|
||||||
},
|
|
||||||
"type": "component",
|
|
||||||
"extra": {
|
|
||||||
"component": {
|
|
||||||
"scripts": [
|
|
||||||
"js/bootstrap-datepicker.js"
|
|
||||||
],
|
|
||||||
"styles": [
|
|
||||||
"dist/css/bootstrap-datepicker.css",
|
|
||||||
"dist/css/bootstrap-datepicker3.css"
|
|
||||||
],
|
|
||||||
"files": [
|
|
||||||
"js/locales/bootstrap-datepicker.*.js"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"Apache-2.0"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Andrew Rowls",
|
|
||||||
"email": "eternicode@gmail.com"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Community",
|
|
||||||
"homepage": "https://github.com/uxsolutions/bootstrap-datepicker/contributors"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "A datepicker for Bootstrap",
|
|
||||||
"keywords": [
|
|
||||||
"bootstrap",
|
|
||||||
"datepicker"
|
|
||||||
],
|
|
||||||
"time": "2017-07-06 12:14:34"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "fgelinas/timepicker",
|
"name": "fgelinas/timepicker",
|
||||||
"version": "0.3.3",
|
"version": "0.3.3",
|
||||||
@@ -1332,58 +1244,55 @@
|
|||||||
"time": "2016-10-10 08:57:56"
|
"time": "2016-10-10 08:57:56"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "moment/moment",
|
"name": "mottie/tablesorter",
|
||||||
"version": "2.20.1",
|
"version": "v2.29.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/moment/moment.git",
|
"url": "https://github.com/Mottie/tablesorter.git",
|
||||||
"reference": "03073778ec18ee38e179208cd1af899e8d1848dc"
|
"reference": "bf7339036ce11c91f55281825b1b601d18b67ed8"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/moment/moment/zipball/03073778ec18ee38e179208cd1af899e8d1848dc",
|
"url": "https://api.github.com/repos/Mottie/tablesorter/zipball/bf7339036ce11c91f55281825b1b601d18b67ed8",
|
||||||
"reference": "03073778ec18ee38e179208cd1af899e8d1848dc",
|
"reference": "bf7339036ce11c91f55281825b1b601d18b67ed8",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"robloach/component-installer": "*"
|
"components/jquery": ">=1.2.6"
|
||||||
},
|
},
|
||||||
"type": "component",
|
"type": "component",
|
||||||
"extra": {
|
"extra": {
|
||||||
"component": {
|
"component": {
|
||||||
"scripts": [
|
"scripts": [
|
||||||
"moment.js"
|
"dist/js/jquery.tablesorter.combined.js"
|
||||||
],
|
],
|
||||||
"files": [
|
"files": "dist/"
|
||||||
"min/*.js",
|
|
||||||
"locale/*.js"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
"license": [
|
"license": [
|
||||||
"MIT"
|
"(MIT OR GPL-2.0)"
|
||||||
],
|
],
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
"name": "Tim Wood",
|
"name": "Rob Garrison",
|
||||||
"email": "washwithcare@gmail.com"
|
"email": "wowmotty@gmail.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Christian Bach"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "Parse, validate, manipulate, and display dates in JavaScript.",
|
"description": "tablesorter (FORK) is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.",
|
||||||
"homepage": "https://github.com/moment/moment",
|
"homepage": "https://mottie.github.io/tablesorter/",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"date",
|
"alphanumeric",
|
||||||
"ender",
|
"jquery-plugin",
|
||||||
"format",
|
"natural",
|
||||||
"i18n",
|
"sort",
|
||||||
"l10n",
|
"sorting",
|
||||||
"moment",
|
"table"
|
||||||
"parse",
|
|
||||||
"time",
|
|
||||||
"validate"
|
|
||||||
],
|
],
|
||||||
"time": "2017-12-19 04:36:30"
|
"time": "2018-01-18 23:30:03"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "netcarver/textile",
|
"name": "netcarver/textile",
|
||||||
@@ -2086,16 +1995,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/process",
|
"name": "symfony/process",
|
||||||
"version": "v3.3.10",
|
"version": "v3.4.3",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/process.git",
|
"url": "https://github.com/symfony/process.git",
|
||||||
"reference": "fdf89e57a723a29baf536e288d6e232c059697b1"
|
"reference": "ff69f110c6b33fd33cd2089ba97d6112f44ef0ba"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/process/zipball/fdf89e57a723a29baf536e288d6e232c059697b1",
|
"url": "https://api.github.com/repos/symfony/process/zipball/ff69f110c6b33fd33cd2089ba97d6112f44ef0ba",
|
||||||
"reference": "fdf89e57a723a29baf536e288d6e232c059697b1",
|
"reference": "ff69f110c6b33fd33cd2089ba97d6112f44ef0ba",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -2104,7 +2013,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "3.3-dev"
|
"dev-master": "3.4-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@@ -2131,7 +2040,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Symfony Process Component",
|
"description": "Symfony Process Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2017-10-02 06:42:24"
|
"time": "2018-01-03 07:37:34"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/yaml",
|
"name": "symfony/yaml",
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
/*reset font of tables*/
|
||||||
|
.tablesorter-default
|
||||||
|
{
|
||||||
|
font: unset !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*reset background color of tables*/
|
||||||
|
.tablesorter-default td
|
||||||
|
{
|
||||||
|
background-color: unset !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*reset table colors and backgrounds on hover*/
|
||||||
|
.tablesorter-default tbody > tr:hover > td
|
||||||
|
{
|
||||||
|
color: unset !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*remove black border at bottom of table header*/
|
||||||
|
.tablesorter-header
|
||||||
|
{
|
||||||
|
border-bottom: #ccc 2px solid !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*remove background color from filter row*/
|
||||||
|
.tablesorter-default .tablesorter-filter-row td
|
||||||
|
{
|
||||||
|
background-color: white !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*make filter row more condensed*/
|
||||||
|
.tablesorter-default input.tablesorter-filter, .tablesorter-default select.tablesorter-filter
|
||||||
|
{
|
||||||
|
margin: 0px auto;
|
||||||
|
padding: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*add cursor pointer for pager icons*/
|
||||||
|
.pager i
|
||||||
|
{
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* .tablesorter-default tr.even > td
|
||||||
|
{
|
||||||
|
background-color: #f9f9f9;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tablesorter-default tr.odd > td
|
||||||
|
{
|
||||||
|
background-color: unset;
|
||||||
|
}*/
|
||||||
Reference in New Issue
Block a user