blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-30 18:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added tabulator to composer, FHC-Header and a CSS for it

Browse Source
This commit is contained in:
Paolo
2019-07-09 11:57:52 +02:00
parent f0ee8b0161
commit 2922aa26fe
4 changed files with 105 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/templates/FHC-Header.php
+20
View File
@@ -25,10 +25,12 @@
$jqueryui = isset($jqueryui) ? $jqueryui : false;
$jquerycheckboxes = isset($jquerycheckboxes) ? $jquerycheckboxes : false;
$jquerytreetable = isset($jquerytreetable) ? $jquerytreetable : false;
$momentjs = isset($momentjs) ? $momentjs : false;
$navigationwidget = isset($navigationwidget) ? $navigationwidget : false;
$pivotui = isset($pivotui) ? $pivotui : false;
$sbadmintemplate = isset($sbadmintemplate) ? $sbadmintemplate : false;
$tablesorter = isset($tablesorter) ? $tablesorter : false;
$tabulator = isset($tabulator) ? $tabulator : false;
$tinymce = isset($tinymce) ? $tinymce : false;
?>
@@ -79,6 +81,13 @@
generateCSSsInclude('vendor/mottie/tablesorter/dist/css/jquery.tablesorter.pager.min.css');
}
// Tabulator CSS
if ($tabulator === true)
{
generateCSSsInclude('vendor/olifolkerd/tabulator/dist/css/bootstrap/tabulator_bootstrap.min.css');
generateCSSsInclude('public/css/Tabulator.css');
}
// --------------------------------------------------------------------------------------------------------
// From public folder
@@ -134,6 +143,14 @@
// NOTE: keep it after jQuery includes
if ($jquerytreetable === true) generateJSsInclude('vendor/ludo/jquery-treetable/jquery.treetable.js');
// MomentJS
if ($momentjs === true)
{
generateJSsInclude('vendor/moment/momentjs/min/moment.min.js');
generateJSsInclude('vendor/moment/momentjs/locale/de-at.js');
generateJSsInclude('vendor/moment/momentjs/locale/en-ie.js');
}
// PivotUI CSS
if ($pivotui === true)
{
@@ -148,6 +165,9 @@
generateJSsInclude('vendor/mottie/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js');
}
// Tabulator JS
if ($tabulator === true) generateJSsInclude('vendor/olifolkerd/tabulator/dist/js/tabulator.min.js');
// Tinymce JS
if ($tinymce === true) generateJSsInclude('vendor/tinymce/tinymce/tinymce.min.js');
composer.json
+25
View File
@@ -162,6 +162,17 @@
}
}
},
{
"type": "package",
"package": {
"name": "moment/momentjs",
"version": "2.24.0",
"dist": {
"url": "https://github.com/moment/moment/archive/2.24.0.zip",
"type": "zip"
}
}
},
{
"type": "package",
"package": {
@@ -173,6 +184,17 @@
}
}
},
{
"type": "package",
"package": {
"name": "olifolkerd/tabulator",
"version": "4.2.7",
"dist": {
"url": "https://github.com/olifolkerd/tabulator/archive/4.2.7.zip",
"type": "zip"
}
}
},
{
"type": "package",
"package": {
@@ -252,6 +274,7 @@
"ludo/jquery-treetable": "^3.2",
"moment/momentjs": "2.24.0",
"michelf/php-markdown": "1.5.0",
"ml/json-ld": "1.*",
"mottie/tablesorter": "^2.29",
@@ -260,6 +283,8 @@
"netcarver/textile": "^3.5",
"nicolaskruchten/pivottable": "^2.15.0",
"olifolkerd/tabulator": "4.2.7",
"phpseclib/phpseclib": "^2.0",
"rmariuzzo/jquery-checkboxes": "1.0.7",
composer.lock
Generated
+46 -24
View File
@@ -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": "ddbbad487c655512e6983408339cb85f",
"content-hash": "b5902c71fe21cd14397101dba5a3080c",
"hash": "e3de1eee238160400fb63f68735b4144",
"content-hash": "5b71e8a3c356d52e43d788eb6f018151",
"packages": [
{
"name": "BlackrockDigital/startbootstrap-sb-admin-2",
@@ -1095,6 +1095,17 @@
],
"time": "2018-11-18 20:26:18"
},
{
"name": "moment/momentjs",
"version": "2.24.0",
"dist": {
"type": "zip",
"url": "https://github.com/moment/moment/archive/2.24.0.zip",
"reference": null,
"shasum": null
},
"type": "library"
},
{
"name": "mottie/tablesorter",
"version": "v2.31.1",
@@ -1198,16 +1209,16 @@
},
{
"name": "netcarver/textile",
"version": "v3.7.1",
"version": "v3.7.2",
"source": {
"type": "git",
"url": "https://github.com/textile/php-textile.git",
"reference": "377933125dd30d708804c545bf33da87a3c1b0f4"
"reference": "c24d68d9f4d099f9c2434e71024f2a6140dc1594"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/textile/php-textile/zipball/377933125dd30d708804c545bf33da87a3c1b0f4",
"reference": "377933125dd30d708804c545bf33da87a3c1b0f4",
"url": "https://api.github.com/repos/textile/php-textile/zipball/c24d68d9f4d099f9c2434e71024f2a6140dc1594",
"reference": "c24d68d9f4d099f9c2434e71024f2a6140dc1594",
"shasum": ""
},
"require": {
@@ -1247,7 +1258,7 @@
"plaintext",
"textile"
],
"time": "2019-01-26 17:03:58"
"time": "2019-06-08 17:57:17"
},
{
"name": "nicolaskruchten/pivottable",
@@ -1260,18 +1271,29 @@
},
"type": "library"
},
{
"name": "olifolkerd/tabulator",
"version": "4.2.7",
"dist": {
"type": "zip",
"url": "https://github.com/olifolkerd/tabulator/archive/4.2.7.zip",
"reference": null,
"shasum": null
},
"type": "library"
},
{
"name": "phpseclib/phpseclib",
"version": "2.0.15",
"version": "2.0.20",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0"
"reference": "d6819a55b05e123db1e881d8b230d57f912126be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
"reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d6819a55b05e123db1e881d8b230d57f912126be",
"reference": "d6819a55b05e123db1e881d8b230d57f912126be",
"shasum": ""
},
"require": {
@@ -1350,7 +1372,7 @@
"x.509",
"x509"
],
"time": "2019-03-10 16:53:45"
"time": "2019-06-23 16:33:11"
},
{
"name": "psr/log",
@@ -2073,16 +2095,16 @@
},
{
"name": "tinymce/tinymce",
"version": "4.9.4",
"version": "4.9.5",
"source": {
"type": "git",
"url": "https://github.com/tinymce/tinymce-dist.git",
"reference": "3a997f24eb54d890b1c88f22cff03092e0b73378"
"reference": "5c6d8f4a6dda33b379068bb12678a2b2b2271fb4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/3a997f24eb54d890b1c88f22cff03092e0b73378",
"reference": "3a997f24eb54d890b1c88f22cff03092e0b73378",
"url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/5c6d8f4a6dda33b379068bb12678a2b2b2271fb4",
"reference": "5c6d8f4a6dda33b379068bb12678a2b2b2271fb4",
"shasum": ""
},
"type": "component",
@@ -2115,7 +2137,7 @@
"tinymce",
"wysiwyg"
],
"time": "2019-03-20 13:56:58"
"time": "2019-07-03 01:28:44"
},
{
"name": "tomazdragar/SimpleCropper",
@@ -2180,16 +2202,16 @@
},
{
"name": "twig/twig",
"version": "v1.41.0",
"version": "v1.42.2",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "575cd5028362da591facde1ef5d7b94553c375c9"
"reference": "21707d6ebd05476854805e4f91b836531941bcd4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/575cd5028362da591facde1ef5d7b94553c375c9",
"reference": "575cd5028362da591facde1ef5d7b94553c375c9",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/21707d6ebd05476854805e4f91b836531941bcd4",
"reference": "21707d6ebd05476854805e4f91b836531941bcd4",
"shasum": ""
},
"require": {
@@ -2199,12 +2221,12 @@
"require-dev": {
"psr/container": "^1.0",
"symfony/debug": "^2.7",
"symfony/phpunit-bridge": "^3.4.19|^4.1.8"
"symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.41-dev"
"dev-master": "1.42-dev"
}
},
"autoload": {
@@ -2242,7 +2264,7 @@
"keywords": [
"templating"
],
"time": "2019-05-14 11:59:08"
"time": "2019-06-18 15:35:16"
},
{
"name": "zetacomponents/base",
public/css/Tabulator.css
+14
View File
@@ -0,0 +1,14 @@
.tabulator-col {
font-size: 14px;
}
.tabulator-page {
color: black;
opacity: 1 !important;
padding: 2px 7px !important;
border: 0px !important;
}
.tabulator-page.active {
color: #337ab7 !important;
}