From e68bef7ea7a4aaf6184b4fc120aebd83375b1218 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Thu, 12 Jul 2018 20:37:08 +0200 Subject: [PATCH] Updated to AdminLTEBundle 1.0 #201 (#206) --- README.md | 12 +-- composer.json | 2 +- composer.lock | 40 ++++----- config/packages/admin_lte.yml | 2 + templates/base.html.twig | 25 +++--- templates/dashboard/index.html.twig | 2 +- templates/default/_flash_messages.html.twig | 9 --- templates/invoice/index.html.twig | 2 +- templates/security/login.html.twig | 90 +++------------------ templates/user/profile.html.twig | 2 + translations/AdminLTEBundle.de.xliff | 31 +++++++ translations/AdminLTEBundle.en.xliff | 31 +++++++ translations/AdminLTEBundle.ru.xliff | 27 +++++++ translations/AvanzuAdminTheme.de.xliff | 15 ---- translations/AvanzuAdminTheme.en.xliff | 15 ---- translations/AvanzuAdminTheme.ru.xliff | 11 --- translations/messages.de.xliff | 8 -- translations/messages.en.xliff | 8 -- translations/messages.ru.xliff | 8 -- 19 files changed, 142 insertions(+), 198 deletions(-) delete mode 100644 templates/default/_flash_messages.html.twig create mode 100644 translations/AdminLTEBundle.de.xliff create mode 100644 translations/AdminLTEBundle.en.xliff create mode 100644 translations/AdminLTEBundle.ru.xliff delete mode 100644 translations/AvanzuAdminTheme.de.xliff delete mode 100644 translations/AvanzuAdminTheme.en.xliff delete mode 100644 translations/AvanzuAdminTheme.ru.xliff 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 %}
@@ -13,7 +11,6 @@ {% endblock %} {% block avanzu_page_content %} - {{ include('default/_flash_messages.html.twig') }} {% block main %}{% endblock %} {% endblock %} @@ -29,8 +26,6 @@ {% block page_subtitle %}{% endblock %} {% endblock %} -{% block avanzu_logo_path %}{{ path('dashboard') }}{% endblock %} - {% block avanzu_logo_mini %} KTT {% endblock %} @@ -74,14 +69,11 @@ {% endif %} {% endblock %} -{% block avanzu_navbar_toggle %}{{ parent() }}{% endblock %} {% block avanzu_navbar_tasks %}{#{ parent() }#}{% endblock %} {% block avanzu_navbar_user %}{#{ parent() }#}{% endblock %} -{% block avanzu_navbar_control_sidebar_toggle %}{{ parent() }}{% endblock %} {% block avanzu_sidebar_user %}{# right now we simply deactivate that box #}{% endblock %} {% block avanzu_sidebar_search %}{# right now we simply deactivate that box #}{% endblock %} -{% block avanzu_sidebar_nav %}{{ parent() }}{% endblock %} {% block avanzu_breadcrumb %} {{ block('page_actions') }} @@ -89,13 +81,18 @@ {% block page_actions %}{% endblock %} -{% block avanzu_control_sidebar %}{{ parent() }}{% endblock %} - -{% block avanzu_javascripts %} - {% block javascript_imports %}{% endblock %} +{% block stylesheets %} + {# we do not call parent() as we use a custom built for the frontend assets and don't want the default #} + {% endblock %} -{% block avanzu_javascripts_inline %} +{% block head %} + {{ parent() }} + +{% endblock %} + +{% block javascripts %} + {# we do not call parent() as we use a custom built for the frontend assets and don't want the default - - diff --git a/templates/user/profile.html.twig b/templates/user/profile.html.twig index 1daa3ea2..ad079ab8 100644 --- a/templates/user/profile.html.twig +++ b/templates/user/profile.html.twig @@ -57,6 +57,7 @@
{% endfor %} diff --git a/translations/AdminLTEBundle.de.xliff b/translations/AdminLTEBundle.de.xliff new file mode 100644 index 00000000..428885fa --- /dev/null +++ b/translations/AdminLTEBundle.de.xliff @@ -0,0 +1,31 @@ + + + + + + Toggle navigation + Ansicht der Seitenleiste umschalten + + + Remember Me + Dauerhaft anmelden + + + Sign in to start your session + Anmelden + + + Sign In + Anmelden + + + Username + Benutzername + + + Password + Passwort + + + + diff --git a/translations/AdminLTEBundle.en.xliff b/translations/AdminLTEBundle.en.xliff new file mode 100644 index 00000000..d7857154 --- /dev/null +++ b/translations/AdminLTEBundle.en.xliff @@ -0,0 +1,31 @@ + + + + + + Toggle navigation + Toggle navigation + + + Remember Me + Remember Me + + + Sign in to start your session + Login + + + Sign In + Login + + + Username + Username + + + Password + Password + + + + diff --git a/translations/AdminLTEBundle.ru.xliff b/translations/AdminLTEBundle.ru.xliff new file mode 100644 index 00000000..4183a585 --- /dev/null +++ b/translations/AdminLTEBundle.ru.xliff @@ -0,0 +1,27 @@ + + + + + + Toggle navigation + Переключить отображение боковой панели + + + Sign in to start your session + Логин + + + Sign In + Войти + + + Username + Имя пользователя + + + Password + Пароль + + + + diff --git a/translations/AvanzuAdminTheme.de.xliff b/translations/AvanzuAdminTheme.de.xliff deleted file mode 100644 index 0214159d..00000000 --- a/translations/AvanzuAdminTheme.de.xliff +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Toggle navigation - Ansicht der Seitenleiste umschalten - - - Remember Me - Dauerhaft anmelden - - - - diff --git a/translations/AvanzuAdminTheme.en.xliff b/translations/AvanzuAdminTheme.en.xliff deleted file mode 100644 index 1cfee403..00000000 --- a/translations/AvanzuAdminTheme.en.xliff +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Toggle navigation - Toggle navigation - - - Remember Me - Remember Me - - - - diff --git a/translations/AvanzuAdminTheme.ru.xliff b/translations/AvanzuAdminTheme.ru.xliff deleted file mode 100644 index 2a074e5f..00000000 --- a/translations/AvanzuAdminTheme.ru.xliff +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - Toggle navigation - Переключить отображение боковой панели - - - - diff --git a/translations/messages.de.xliff b/translations/messages.de.xliff index caa26381..f4f8eae2 100644 --- a/translations/messages.de.xliff +++ b/translations/messages.de.xliff @@ -47,10 +47,6 @@ - - security.title.login - Anmelden - label.password Passwort @@ -59,10 +55,6 @@ label.password_repeat Passwort wiederholen - - action.sign_in - Los geht's - label.logout Abmelden diff --git a/translations/messages.en.xliff b/translations/messages.en.xliff index 1f5ec8eb..57f0dba0 100644 --- a/translations/messages.en.xliff +++ b/translations/messages.en.xliff @@ -47,10 +47,6 @@ - - security.title.login - Login - label.password Password @@ -59,10 +55,6 @@ label.password_repeat Repeat password - - action.sign_in - Let's go - label.logout Logout diff --git a/translations/messages.ru.xliff b/translations/messages.ru.xliff index e659d78e..51f57f7e 100644 --- a/translations/messages.ru.xliff +++ b/translations/messages.ru.xliff @@ -47,10 +47,6 @@ - - security.title.login - Логин - label.password Пароль @@ -59,10 +55,6 @@ label.password_repeat Повторить пароль - - action.sign_in - Войти - label.logout Выйти