diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php index 44f7ea76f..87bee5b84 100644 --- a/application/views/system/infocenter/infocenter.php +++ b/application/views/system/infocenter/infocenter.php @@ -7,12 +7,8 @@ 'bootstrap' => true, 'fontawesome' => true, 'sbadmintemplate' => true, - 'tablesorter' => false, - 'customCSSs' => 'vendor/FHC-vendor/jquery-tablesorter/css/theme.default.css', - 'customJSs' => array( - 'vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js', - 'vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js' - ) + 'tablesorter' => true, + 'customCSSs' => 'skin/tablesort_bootstrap.css' ) ); ?> @@ -48,7 +44,7 @@ $("select").addClass("form-control"); $("input[type=text]").addClass("form-control"); $("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'); diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php index 285aa0137..e7014b2d6 100644 --- a/application/views/system/infocenter/infocenterDetails.php +++ b/application/views/system/infocenter/infocenterDetails.php @@ -6,9 +6,10 @@ 'jquery' => true, 'bootstrap' => true, 'fontawesome' => true, - 'bootstrapdatepicker' => true, - 'datatables' => true, - 'sbadmintemplate' => true + 'jqueryui' => true, + 'tablesorter' => true, + 'sbadmintemplate' => true, + 'customCSSs' => 'skin/tablesort_bootstrap.css' ) ); ?> @@ -38,7 +39,7 @@

Stammdaten

-
+
@@ -80,7 +81,7 @@
Vorname
-
+
@@ -131,12 +132,12 @@
-
-
-
-
-
- + + + + + +
@@ -145,45 +146,37 @@

Dokumentenprüfung

- - - - - - - - - - - formal_geprueft_amum) ? "checked" : ""; - ?> - - - - - - - - - - -
NameTypUploaddatumAusstellungsnationFormal geprüft
- titel) ? $dokument->bezeichnung : $dokument->titel ?> - dokument_bezeichnung ?>erstelltam), 'd.m.Y') ?>langtext ?> - /> - formal_geprueft_amum) ? date_format(date_create($dokument->formal_geprueft_amum), 'd.m.Y') : ''; ?> -
+ + + titel) ? $dokument->bezeichnung : $dokument->titel ?> + + dokument_bezeichnung ?> + erstelltam), 'd.m.Y') ?> + langtext ?> + + /> + formal_geprueft_amum) ? date_format(date_create($dokument->formal_geprueft_amum), 'd.m.Y') : ''; ?> + + + + + +
0): ?>

Nachzureichende Dokumente:

@@ -206,7 +199,6 @@ langtext ?> - anmerkung; ?> @@ -215,10 +207,10 @@ -
- - - + + + +
@@ -235,11 +227,11 @@ $infoonly = $zgvpruefung->infoonly; $firstcolumns = array(3, 2, 2, 2, 3); //set bootstrap columns - if($infoonly) + if ($infoonly) $columns = array(3, 2, 2, 5); else $columns = array(4, 3, 2, 3); - ?> + ?>

@@ -263,7 +255,7 @@
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].')' : ''); } @@ -278,7 +270,8 @@
- + prestudentstatus->ausbildungssemester) ? $zgvpruefung->prestudentstatus->ausbildungssemester : '' ?>
@@ -289,8 +282,8 @@ prestudentstatus->orgform)) ? ', ' : ''; echo (isset($zgvpruefung->prestudentstatus->orgform) ? $zgvpruefung->prestudentstatus->orgform : '') - .(isset($zgvpruefung->prestudentstatus->sprachedetails->bezeichnung) ? $separator.$zgvpruefung->prestudentstatus->sprachedetails->bezeichnung[0] : '') - .(isset($zgvpruefung->prestudentstatus->alternative) ? ' ('.$zgvpruefung->prestudentstatus->alternative.')' : '') ?> + .(isset($zgvpruefung->prestudentstatus->sprachedetails->bezeichnung) ? $separator.$zgvpruefung->prestudentstatus->sprachedetails->bezeichnung[0] : '') + .(isset($zgvpruefung->prestudentstatus->alternative) ? ' ('.$zgvpruefung->prestudentstatus->alternative.')' : '') ?>

@@ -603,6 +596,15 @@ +
+
+ + + + + +
+
@@ -622,105 +624,84 @@
-
- - - - - +
+
+ + + + + +
+
+ + + + + +
+ + load->view('templates/FHC-Footer'); ?> diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php index d33ba25e0..098d2a795 100644 --- a/application/views/templates/FHC-Header.php +++ b/application/views/templates/FHC-Header.php @@ -12,8 +12,6 @@ $jquery = isset($jquery) ? $jquery : false; $jqueryui = isset($jqueryui) ? $jqueryui : false; $bootstrap = isset($bootstrap) ? $bootstrap : false; $fontawesome = isset($fontawesome) ? $fontawesome : false; -$bootstrapdatepicker = isset($bootstrapdatepicker) ? $bootstrapdatepicker : false; -$datatables = isset($datatables) ? $datatables : false; $tablesorter = isset($tablesorter) ? $tablesorter : false; $sbadmintemplate = isset($sbadmintemplate) ? $sbadmintemplate : false; @@ -96,12 +94,12 @@ function _generateJSsInclude($JSs) if ($bootstrap === true) _generateCSSsInclude('vendor/twbs/bootstrap/dist/css/bootstrap.min.css'); // font awesome 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 - 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 if ($sbadmintemplate === true) { @@ -118,27 +116,24 @@ function _generateJSsInclude($JSs) // JQuery V3 if ($jquery === true) _generateJSsInclude('vendor/components/jquery/jquery.min.js'); // 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 if ($bootstrap === true) _generateJSsInclude('vendor/twbs/bootstrap/dist/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 - 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 - 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/dist/js/sb-admin-2.js'); } diff --git a/composer.json b/composer.json index 4d0f0ada4..2392b922f 100644 --- a/composer.json +++ b/composer.json @@ -197,18 +197,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", "package": { @@ -254,6 +242,7 @@ "kingsquare/json-schema-form": "*", "michelf/php-markdown": "1.5.0", "ml/json-ld": "1.*", + "mottie/tablesorter": "^2.29", "netcarver/textile": "^3.5", "nicolaskruchten/pivottable": "^2.15.0", "rmariuzzo/jquery-checkboxes": "1.0.7", diff --git a/composer.lock b/composer.lock index 623d82a98..9964729cd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "3fb66aad75872c21f728348036efedcb", - "content-hash": "c2a0c9055aa589c5ec2d8a85eaaa1483", + "hash": "329973fd68eea79f7c67464cbd121d58", + "content-hash": "bf03cef0846a79959456abfccf90730e", "packages": [ { "name": "BlackrockDigital/startbootstrap-sb-admin-2", @@ -1063,6 +1063,57 @@ ], "time": "2016-10-10 08:57:56" }, + { + "name": "mottie/tablesorter", + "version": "v2.29.4", + "source": { + "type": "git", + "url": "https://github.com/Mottie/tablesorter.git", + "reference": "bf7339036ce11c91f55281825b1b601d18b67ed8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/bf7339036ce11c91f55281825b1b601d18b67ed8", + "reference": "bf7339036ce11c91f55281825b1b601d18b67ed8", + "shasum": "" + }, + "require": { + "components/jquery": ">=1.2.6" + }, + "type": "component", + "extra": { + "component": { + "scripts": [ + "dist/js/jquery.tablesorter.combined.js" + ], + "files": "dist/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "(MIT OR GPL-2.0)" + ], + "authors": [ + { + "name": "Rob Garrison", + "email": "wowmotty@gmail.com" + }, + { + "name": "Christian Bach" + } + ], + "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://mottie.github.io/tablesorter/", + "keywords": [ + "alphanumeric", + "jquery-plugin", + "natural", + "sort", + "sorting", + "table" + ], + "time": "2018-01-18 23:30:03" + }, { "name": "netcarver/textile", "version": "v3.6.0", diff --git a/skin/tablesort_bootstrap.css b/skin/tablesort_bootstrap.css new file mode 100644 index 000000000..9bad272d9 --- /dev/null +++ b/skin/tablesort_bootstrap.css @@ -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; + }*/ \ No newline at end of file