0
0
Fork 0
mirror of https://github.com/kevinpapst/kimai2.git synced 2025-03-17 14:32:38 +00:00

updated authorization screen styles ()

This commit is contained in:
Kevin Papst 2019-04-27 19:58:32 +02:00 committed by GitHub
parent 32f0d80729
commit e49bd05ae6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 63 additions and 201 deletions

View file

@ -26,7 +26,7 @@
"jms/metadata": "^2.0",
"jms/serializer": "^2.3",
"jms/serializer-bundle": "^3.2",
"kevinpapst/adminlte-bundle": "~2.1",
"kevinpapst/adminlte-bundle": "~2.6",
"kimai/kimai2-composer": "^0.1",
"mpdf/mpdf": "^7.1",
"nelmio/api-doc-bundle": "^3.2",

231
composer.lock generated
View file

@ -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": "ca352d4ae4a75f38e97069a8c6b63fb0",
"content-hash": "cd043a2f6453e0ad61c8acbbdbabc4b5",
"packages": [
{
"name": "beberlei/DoctrineExtensions",
@ -1097,16 +1097,16 @@
},
{
"name": "doctrine/migrations",
"version": "v2.0.0",
"version": "v2.0.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/migrations.git",
"reference": "0101f5bd7f4e5043bf8630db2930f8fd7da552b6"
"reference": "43280c14b696a7896a9c70a5e0e4a312ff003187"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/migrations/zipball/0101f5bd7f4e5043bf8630db2930f8fd7da552b6",
"reference": "0101f5bd7f4e5043bf8630db2930f8fd7da552b6",
"url": "https://api.github.com/repos/doctrine/migrations/zipball/43280c14b696a7896a9c70a5e0e4a312ff003187",
"reference": "43280c14b696a7896a9c70a5e0e4a312ff003187",
"shasum": ""
},
"require": {
@ -1175,7 +1175,7 @@
"migrations",
"php"
],
"time": "2019-01-03T18:59:09+00:00"
"time": "2019-04-25T22:14:55+00:00"
},
{
"name": "doctrine/orm",
@ -1261,16 +1261,16 @@
},
{
"name": "doctrine/persistence",
"version": "v1.1.0",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/persistence.git",
"reference": "c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38"
"reference": "3da7c9d125591ca83944f477e65ed3d7b4617c48"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/persistence/zipball/c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38",
"reference": "c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38",
"url": "https://api.github.com/repos/doctrine/persistence/zipball/3da7c9d125591ca83944f477e65ed3d7b4617c48",
"reference": "3da7c9d125591ca83944f477e65ed3d7b4617c48",
"shasum": ""
},
"require": {
@ -1339,7 +1339,7 @@
"orm",
"persistence"
],
"time": "2018-11-21T00:33:13+00:00"
"time": "2019-04-23T08:28:24+00:00"
},
{
"name": "doctrine/reflection",
@ -2894,20 +2894,20 @@
},
{
"name": "jms/serializer-bundle",
"version": "3.2.0",
"version": "3.3.0",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/JMSSerializerBundle.git",
"reference": "0ab81ca1abc4e843dc5d8eea9b79b13721f4a92f"
"reference": "2842e767bd0e64310ab803e05bb5f676c81c0bbe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/0ab81ca1abc4e843dc5d8eea9b79b13721f4a92f",
"reference": "0ab81ca1abc4e843dc5d8eea9b79b13721f4a92f",
"url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/2842e767bd0e64310ab803e05bb5f676c81c0bbe",
"reference": "2842e767bd0e64310ab803e05bb5f676c81c0bbe",
"shasum": ""
},
"require": {
"jms/serializer": "^2.2",
"jms/serializer": "^2.2|^3.0",
"php": "^7.2",
"symfony/dependency-injection": "^3.3 || ^4.0",
"symfony/framework-bundle": "^3.0 || ^4.0"
@ -2930,7 +2930,7 @@
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "3.2-dev"
"dev-master": "3.3-dev"
}
},
"autoload": {
@ -2963,20 +2963,20 @@
"serialization",
"xml"
],
"time": "2019-03-21T06:43:47+00:00"
"time": "2019-04-23T07:44:23+00:00"
},
{
"name": "kevinpapst/adminlte-bundle",
"version": "2.5.1",
"version": "2.6",
"source": {
"type": "git",
"url": "https://github.com/kevinpapst/AdminLTEBundle.git",
"reference": "bdeedba21e863dd0a28ad3f505d6372021697c8c"
"reference": "13c7b562f0e830138b2a2a182105991d51b59512"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/kevinpapst/AdminLTEBundle/zipball/bdeedba21e863dd0a28ad3f505d6372021697c8c",
"reference": "bdeedba21e863dd0a28ad3f505d6372021697c8c",
"url": "https://api.github.com/repos/kevinpapst/AdminLTEBundle/zipball/13c7b562f0e830138b2a2a182105991d51b59512",
"reference": "13c7b562f0e830138b2a2a182105991d51b59512",
"shasum": ""
},
"require": {
@ -3024,7 +3024,7 @@
}
],
"description": "Admin theme bundle for Symfony 4 based on AdminLTE 2.4.8 with FOSUserBundle support",
"time": "2019-04-25T14:54:29+00:00"
"time": "2019-04-27T15:08:47+00:00"
},
{
"name": "kimai/kimai2-composer",
@ -4627,16 +4627,16 @@
},
{
"name": "swiftmailer/swiftmailer",
"version": "v6.2.0",
"version": "v6.2.1",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
"reference": "6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707"
"reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707",
"reference": "6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a",
"reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a",
"shasum": ""
},
"require": {
@ -4685,7 +4685,7 @@
"mail",
"mailer"
],
"time": "2019-03-10T07:52:41+00:00"
"time": "2019-04-21T09:21:45+00:00"
},
{
"name": "symfony/asset",
@ -6135,16 +6135,16 @@
},
{
"name": "symfony/maker-bundle",
"version": "v1.11.5",
"version": "v1.11.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/maker-bundle.git",
"reference": "186ffc80b8f363e04ea3c2ebf49e1263a84b4e39"
"reference": "d262c2cace4d9bca99137a84f6fc6ba909a17e02"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/maker-bundle/zipball/186ffc80b8f363e04ea3c2ebf49e1263a84b4e39",
"reference": "186ffc80b8f363e04ea3c2ebf49e1263a84b4e39",
"url": "https://api.github.com/repos/symfony/maker-bundle/zipball/d262c2cace4d9bca99137a84f6fc6ba909a17e02",
"reference": "d262c2cace4d9bca99137a84f6fc6ba909a17e02",
"shasum": ""
},
"require": {
@ -6197,7 +6197,7 @@
"scaffold",
"scaffolding"
],
"time": "2019-03-11T15:55:09+00:00"
"time": "2019-04-19T17:26:45+00:00"
},
{
"name": "symfony/monolog-bridge",
@ -7464,16 +7464,16 @@
},
{
"name": "symfony/swiftmailer-bundle",
"version": "v3.2.5",
"version": "v3.2.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/swiftmailer-bundle.git",
"reference": "ac4f38c2ec7957f2dec8b6c2f24a060b10a254f2"
"reference": "7a83160b50a2479d37eb74ba71577380b9afe4f5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/ac4f38c2ec7957f2dec8b6c2f24a060b10a254f2",
"reference": "ac4f38c2ec7957f2dec8b6c2f24a060b10a254f2",
"url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/7a83160b50a2479d37eb74ba71577380b9afe4f5",
"reference": "7a83160b50a2479d37eb74ba71577380b9afe4f5",
"shasum": ""
},
"require": {
@ -7522,7 +7522,7 @@
],
"description": "Symfony SwiftmailerBundle",
"homepage": "http://symfony.com",
"time": "2019-01-05T11:51:59+00:00"
"time": "2019-04-18T15:52:54+00:00"
},
{
"name": "symfony/templating",
@ -9024,41 +9024,6 @@
"description": "A tool to automatically fix PHP code style",
"time": "2019-02-17T17:44:13+00:00"
},
{
"name": "jms/parser-lib",
"version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/parser-lib.git",
"reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
"reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
"shasum": ""
},
"require": {
"phpoption/phpoption": ">=0.9,<2.0-dev"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-0": {
"JMS\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache2"
],
"description": "A library for easily creating recursive-descent parsers.",
"time": "2012-11-18T18:08:43+00:00"
},
{
"name": "phar-io/manifest",
"version": "1.0.3",
@ -9212,104 +9177,6 @@
],
"time": "2018-02-15T16:58:55+00:00"
},
{
"name": "phpcollection/phpcollection",
"version": "0.5.0",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-collection.git",
"reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
"reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
"shasum": ""
},
"require": {
"phpoption/phpoption": "1.*"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "0.4-dev"
}
},
"autoload": {
"psr-0": {
"PhpCollection": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache2"
],
"authors": [
{
"name": "Johannes M. Schmitt",
"email": "schmittjoh@gmail.com"
}
],
"description": "General-Purpose Collection Library for PHP",
"keywords": [
"collection",
"list",
"map",
"sequence",
"set"
],
"time": "2015-05-17T12:39:23+00:00"
},
{
"name": "phpoption/phpoption",
"version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
"reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
"reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"require-dev": {
"phpunit/phpunit": "4.7.*"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3-dev"
}
},
"autoload": {
"psr-0": {
"PhpOption\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache2"
],
"authors": [
{
"name": "Johannes M. Schmitt",
"email": "schmittjoh@gmail.com"
}
],
"description": "Option Type for PHP",
"keywords": [
"language",
"option",
"php",
"type"
],
"time": "2015-07-25T16:39:46+00:00"
},
{
"name": "phpspec/prophecy",
"version": "1.8.0",
@ -9627,16 +9494,16 @@
},
{
"name": "phpunit/phpunit",
"version": "7.5.8",
"version": "7.5.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "c29c0525cf4572c11efe1db49a8b8aee9dfac58a"
"reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c29c0525cf4572c11efe1db49a8b8aee9dfac58a",
"reference": "c29c0525cf4572c11efe1db49a8b8aee9dfac58a",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/134669cf0eeac3f79bc7f0c793efbc158bffc160",
"reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160",
"shasum": ""
},
"require": {
@ -9707,7 +9574,7 @@
"testing",
"xunit"
],
"time": "2019-03-26T13:23:54+00:00"
"time": "2019-04-19T15:50:46+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@ -9876,16 +9743,16 @@
},
{
"name": "sebastian/environment",
"version": "4.1.0",
"version": "4.2.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
"reference": "6fda8ce1974b62b14935adc02a9ed38252eca656"
"reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6fda8ce1974b62b14935adc02a9ed38252eca656",
"reference": "6fda8ce1974b62b14935adc02a9ed38252eca656",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/3095910f0f0fb155ac4021fc51a4a7a39ac04e8a",
"reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a",
"shasum": ""
},
"require": {
@ -9900,7 +9767,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.1-dev"
"dev-master": "4.2-dev"
}
},
"autoload": {
@ -9925,7 +9792,7 @@
"environment",
"hhvm"
],
"time": "2019-02-01T05:27:49+00:00"
"time": "2019-04-25T07:55:20+00:00"
},
{
"name": "sebastian/exporter",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
{
"build/app.js": "./app.js?3ed515aea79a52cbbfee",
"build/app.css": "./app.css?cbfb66c264fd0b333955ff7c7e93f50a",
"build/app.js": "./app.js?b29bb0555b78f9292fa4",
"build/app.css": "./app.css?c100c1721c5df32e6284538a4249a1f6",
"build/images/blue@2x.png": "./images/blue@2x.png?2694acfd",
"build/images/blue.png": "./images/blue.png?96f8a905",
"build/fonts/fa-solid-900.woff2": "./fonts/fa-solid-900.woff2?e8a92a29",

View file

@ -188,9 +188,6 @@
"jms/metadata": {
"version": "1.6.0"
},
"jms/parser-lib": {
"version": "1.0.0"
},
"jms/serializer": {
"version": "1.13.0"
},
@ -269,9 +266,6 @@
"php-cs-fixer/diff": {
"version": "v1.2.0"
},
"phpcollection/phpcollection": {
"version": "0.5.0"
},
"phpdocumentor/reflection-common": {
"version": "1.0.1"
},
@ -290,9 +284,6 @@
"phpoffice/phpword": {
"version": "0.15.0"
},
"phpoption/phpoption": {
"version": "1.5.0"
},
"phpspec/prophecy": {
"version": "1.7.3"
},

View file

@ -3,6 +3,10 @@
{% block logo_login %}{% include 'partials/logo_login.html.twig' %}{% endblock %}
{% block title %}{{ 'browser.title'|trans }}{% endblock %}
{% block login_box_icon %}
<span class="glyphicon glyphicon-user"></span>
{% endblock %}
{% block head %}
{{ parent() }}
{% include 'partials/head.html.twig' %}

View file

@ -60,14 +60,14 @@ class SecurityControllerTest extends ControllerBaseTest
$this->assertContains('Register a new account', $content);
$this->assertContains('<form name="fos_user_registration_form" method="post" action="/en/register/" class="fos_user_registration_register">', $content);
$this->assertContains('<input type="email"', $content);
$this->assertContains('id="fos_user_registration_form_email" name="fos_user_registration_form[email]" required="required" class="form-control"', $content);
$this->assertContains('id="fos_user_registration_form_email" name="fos_user_registration_form[email]" required="required"', $content);
$this->assertContains('<input type="text"', $content);
$this->assertContains('id="fos_user_registration_form_username" name="fos_user_registration_form[username]" required="required" maxlength="60" pattern=".{3,}" class="form-control"', $content);
$this->assertContains('id="fos_user_registration_form_username" name="fos_user_registration_form[username]" required="required" maxlength="60" pattern=".{3,}"', $content);
$this->assertContains('<input type="password"', $content);
$this->assertContains('id="fos_user_registration_form_plainPassword_first" name="fos_user_registration_form[plainPassword][first]" required="required" autocomplete="new-password" class="form-control"', $content);
$this->assertContains('id="fos_user_registration_form_plainPassword_second" name="fos_user_registration_form[plainPassword][second]" required="required" autocomplete="new-password" class="form-control"', $content);
$this->assertContains('id="fos_user_registration_form_plainPassword_first" name="fos_user_registration_form[plainPassword][first]" required="required"', $content);
$this->assertContains('id="fos_user_registration_form_plainPassword_second" name="fos_user_registration_form[plainPassword][second]" required="required"', $content);
$this->assertContains('<input type="hidden"', $content);
$this->assertContains('id="fos_user_registration_form__token" name="fos_user_registration_form[_token]" class=" form-control"', $content);
$this->assertContains('id="fos_user_registration_form__token" name="fos_user_registration_form[_token]"', $content);
$this->assertContains('>Register</button>', $content);
}