diff --git a/README.md b/README.md index 9d746415..5a031c48 100644 --- a/README.md +++ b/README.md @@ -10,20 +10,22 @@ Kimai v2 - the open source time-tracking application with a mobile-first approac ## Introduction This is the reloaded version of the open source timetracker Kimai. +Kimai v2 has nothing in common with its predecessor [Kimai v1](http://www.kimai.org) besides the basic ideas of time-tracking and the current development team. + Right now its in an early development phase, its usable but some advanced features from Kimai v1 are missing by now. -Kimai v2 has nothing in common with its predecessor [Kimai v1](http://www.kimai.org) besides the basic ideas of time-tracking and the current development team. -It is based on a lot of great frameworks. Special thanks to [Symfony v4](https://github.com/symfony/symfony), [Doctrine](https://github.com/doctrine/), -[AdminThemeBundle](https://github.com/avanzu/AdminThemeBundle/) (based on [AdminLTE](https://github.com/almasaeed2010/AdminLTE/)). +It is developed with modern frameworks like [Symfony v4](https://github.com/symfony/symfony), [Doctrine](https://github.com/doctrine/), +[AdminLTE](https://github.com/kevinpapst/AdminLTEBundle/) and [many](composer.json) [more](package.json)... ### Requirements - PHP 7.1.3 or higher - One PHP extension of [PDO-SQLite](https://php.net/manual/en/ref.pdo-sqlite.php) or [PDO-MySQL](https://php.net/manual/en/ref.pdo-mysql.php) enabled (it might work with PostgreSQL and Oracle as well, but that wasn't tested and is not officially supported) - The PHP extension [intl](https://php.net/manual/en/book.intl.php) -- the [usual Symfony application requirements](http://symfony.com/doc/current/reference/requirements.html) +- The [usual Symfony application requirements](http://symfony.com/doc/current/reference/requirements.html) +- If you use MariaDB, make sure its at least v10.7.2 (see #191) - Kimai needs to be installed in the root directory of a domain or you need to [recompile the frontend assets](var/docs/developers.md) -- a modern browser, Kimai v2 might be broken on old browsers like IE 9 +- A modern browser, Kimai v2 might be broken on old browsers like IE 9 ## Documentation & Roadmap diff --git a/composer.json b/composer.json index 6f1b2d16..4387191f 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "ext-pdo_sqlite": "*", "beberlei/DoctrineExtensions": "^1.0", "erusev/parsedown": "^1.6", - "kevinpapst/adminlte-bundle": "^0.3.0", + "kevinpapst/adminlte-bundle": "^1.0", "ocramius/proxy-manager": "2.1.1", "sensio/framework-extra-bundle": "^5.1", "symfony/asset": "^4.0", diff --git a/composer.lock b/composer.lock index 3c1115cb..a160caf6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7e58d46b399667b75fa9f0b39e8cf11d", + "content-hash": "2ccc40edc01587287a3db23b0e9b0458", "packages": [ { "name": "beberlei/DoctrineExtensions", @@ -1145,29 +1145,28 @@ }, { "name": "kevinpapst/adminlte-bundle", - "version": "0.3", + "version": "1.0", "source": { "type": "git", "url": "https://github.com/kevinpapst/AdminLTEBundle.git", - "reference": "d7210c249e782b143a5c72f119c4bf463cbb38e5" + "reference": "a225f58aeba1aace8f3675fcbb23990d3883f15c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kevinpapst/AdminLTEBundle/zipball/d7210c249e782b143a5c72f119c4bf463cbb38e5", - "reference": "d7210c249e782b143a5c72f119c4bf463cbb38e5", + "url": "https://api.github.com/repos/kevinpapst/AdminLTEBundle/zipball/a225f58aeba1aace8f3675fcbb23990d3883f15c", + "reference": "a225f58aeba1aace8f3675fcbb23990d3883f15c", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/config": "^4.0", - "symfony/dependency-injection": "^4.0", - "symfony/event-dispatcher": "^4.0", - "symfony/framework-bundle": "^4.0", - "symfony/http-foundation": "^4.0", - "symfony/http-kernel": "^4.0", - "symfony/options-resolver": "^4.0", - "symfony/security": "^4.0", - "twig/twig": "^2.0" + "symfony/config": ">3.4", + "symfony/dependency-injection": ">3.4", + "symfony/event-dispatcher": ">3.4", + "symfony/http-foundation": ">3.4", + "symfony/http-kernel": ">3.4", + "symfony/options-resolver": ">3.4", + "symfony/security-core": ">3.4", + "twig/twig": ">2.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.10", @@ -1189,24 +1188,19 @@ "authors": [ { "name": "Marc Bach", - "email": "mail@avanzu.de", - "homepage": "http://www.avanzu.de", - "role": "Original Author" + "homepage": "http://www.avanzu.de" }, { "name": "Ángel Guzmán Maeso", - "email": "shakaran@gmail.com", - "homepage": "https://shakaran.net/blog", - "role": "Developer Collaborator" + "homepage": "https://shakaran.net/blog" }, { "name": "Kevin Papst", - "homepage": "https://www.kevinpapst.de", - "role": "Developer" + "homepage": "https://www.kevinpapst.de" } ], "description": "Admin Theme based on the AdminLTE 2.3 for easy integration with Symfony 4", - "time": "2018-07-08T17:57:25+00:00" + "time": "2018-07-12T17:53:22+00:00" }, { "name": "monolog/monolog", diff --git a/config/packages/admin_lte.yml b/config/packages/admin_lte.yml index d81b7ba1..eaaa99ad 100644 --- a/config/packages/admin_lte.yml +++ b/config/packages/admin_lte.yml @@ -31,3 +31,5 @@ admin_lte: routes: adminlte_profile: user_profile + adminlte_welcome: dashboard + adminlte_login: security_login \ No newline at end of file diff --git a/templates/base.html.twig b/templates/base.html.twig index afd9449a..279f6cae 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -1,6 +1,4 @@ -{% extends '@AdminLTE/layout/default-layout.html.twig' %} - -{% block avanzu_page_content_class %}{{ parent() }} {% block main_content_class %}{% endblock %}{% endblock %} +{% extends '@AdminLTE/layout/default-layout-avanzu.html.twig' %} {% block avanzu_page_content_before %}