From fe8e5ed5077a8a3c8e033e9378bd4c95270eb653 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 24 Jan 2018 17:29:12 +0100 Subject: [PATCH] added mottie tablesorter, removed datatables and datepicker, restyled tablesorter for better bootstrap look, layout changes --- .../views/system/infocenter/infocenter.php | 10 +- .../system/infocenter/infocenterDetails.php | 277 +++++++++--------- application/views/templates/FHC-Header.php | 45 ++- composer.json | 17 +- composer.lock | 155 ++-------- skin/tablesort_bootstrap.css | 52 ++++ 6 files changed, 244 insertions(+), 312 deletions(-) create mode 100644 skin/tablesort_bootstrap.css diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php index 7b8b077bf..46f3f3e6d 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 bc89479f8..b3436c4ec 100644 --- a/application/views/system/infocenter/infocenterDetails.php +++ b/application/views/system/infocenter/infocenterDetails.php @@ -1,5 +1,17 @@ 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' + ) + ); ?>
@@ -27,7 +39,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',

Stammdaten

-
+
@@ -69,7 +81,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
Vorname
-
+
@@ -120,12 +132,12 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
-
-
-
-
-
-
+ + + + + +
@@ -134,45 +146,37 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',

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:

@@ -195,7 +199,6 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', langtext ?> - anmerkung; ?> @@ -204,10 +207,10 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', -
- - - + + + +
@@ -224,11 +227,11 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', $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); - ?> + ?>

@@ -252,7 +255,7 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
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].')' : ''); } @@ -267,7 +270,8 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
- + prestudentstatus->ausbildungssemester) ? $zgvpruefung->prestudentstatus->ausbildungssemester : '' ?>
@@ -278,8 +282,8 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', 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.')' : '') ?>

@@ -592,6 +596,15 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails', +
+
+ + + + + +
+
@@ -611,105 +624,84 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
-
- - - - - +
+
+ + + + + +
+
+ + + + + +
+ + load->view('templates/FHC-Footer'); ?> diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php index 40467bfbd..424aa0a0d 100644 --- a/application/views/templates/FHC-Header.php +++ b/application/views/templates/FHC-Header.php @@ -12,8 +12,6 @@ $jquery3 = isset($jquery3) ? $jquery3 : 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,14 +94,15 @@ function _generateJSsInclude($JSs) if ($bootstrap === true) _generateCSSsInclude('vendor/components/bootstrap/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){ + if ($sbadmintemplate === true) + { _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'); } @@ -117,26 +116,24 @@ function _generateJSsInclude($JSs) // JQuery V3 if ($jquery3 === 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/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 - 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 1a6904333..285f19528 100644 --- a/composer.json +++ b/composer.json @@ -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", "package": { @@ -249,10 +237,7 @@ "jquery-archive/jquery-metadata": "^1.0", "BlackrockDigital/startbootstrap-sb-admin-2": "^3.3", "components/font-awesome": "^4.7", - "moment/moment": "^2.20", - "datatables/datatables": "^1.10", - "datatables/plugins": "^3.3", - "eternicode/bootstrap-datepicker": "^1.7" + "mottie/tablesorter": "^2.29" }, "require-dev": { "squizlabs/php_codesniffer": "2.*" diff --git a/composer.lock b/composer.lock index 9aa3c5f64..1e3497d36 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": "b386e8ea62cfd8c96c6697729860cc5a", - "content-hash": "65e7f00446fd7f602e914089cedaa931", + "hash": "25135351fcaa90fd7d838614ceb47d37", + "content-hash": "702a9ad9bfca6802a7cd586e0d002002", "packages": [ { "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.", "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", "version": "0.9.1", @@ -775,61 +742,6 @@ ], "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", "version": "0.3.3", @@ -1332,58 +1244,55 @@ "time": "2016-10-10 08:57:56" }, { - "name": "moment/moment", - "version": "2.20.1", + "name": "mottie/tablesorter", + "version": "v2.29.4", "source": { "type": "git", - "url": "https://github.com/moment/moment.git", - "reference": "03073778ec18ee38e179208cd1af899e8d1848dc" + "url": "https://github.com/Mottie/tablesorter.git", + "reference": "bf7339036ce11c91f55281825b1b601d18b67ed8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/moment/moment/zipball/03073778ec18ee38e179208cd1af899e8d1848dc", - "reference": "03073778ec18ee38e179208cd1af899e8d1848dc", + "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/bf7339036ce11c91f55281825b1b601d18b67ed8", + "reference": "bf7339036ce11c91f55281825b1b601d18b67ed8", "shasum": "" }, "require": { - "robloach/component-installer": "*" + "components/jquery": ">=1.2.6" }, "type": "component", "extra": { "component": { "scripts": [ - "moment.js" + "dist/js/jquery.tablesorter.combined.js" ], - "files": [ - "min/*.js", - "locale/*.js" - ] + "files": "dist/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "(MIT OR GPL-2.0)" ], "authors": [ { - "name": "Tim Wood", - "email": "washwithcare@gmail.com" + "name": "Rob Garrison", + "email": "wowmotty@gmail.com" + }, + { + "name": "Christian Bach" } ], - "description": "Parse, validate, manipulate, and display dates in JavaScript.", - "homepage": "https://github.com/moment/moment", + "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": [ - "date", - "ender", - "format", - "i18n", - "l10n", - "moment", - "parse", - "time", - "validate" + "alphanumeric", + "jquery-plugin", + "natural", + "sort", + "sorting", + "table" ], - "time": "2017-12-19 04:36:30" + "time": "2018-01-18 23:30:03" }, { "name": "netcarver/textile", @@ -2086,16 +1995,16 @@ }, { "name": "symfony/process", - "version": "v3.3.10", + "version": "v3.4.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "fdf89e57a723a29baf536e288d6e232c059697b1" + "reference": "ff69f110c6b33fd33cd2089ba97d6112f44ef0ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/fdf89e57a723a29baf536e288d6e232c059697b1", - "reference": "fdf89e57a723a29baf536e288d6e232c059697b1", + "url": "https://api.github.com/repos/symfony/process/zipball/ff69f110c6b33fd33cd2089ba97d6112f44ef0ba", + "reference": "ff69f110c6b33fd33cd2089ba97d6112f44ef0ba", "shasum": "" }, "require": { @@ -2104,7 +2013,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2131,7 +2040,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-10-02 06:42:24" + "time": "2018-01-03 07:37:34" }, { "name": "symfony/yaml", 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