Private
Public Access
1
0

login && register form overrided

This commit is contained in:
2016-11-02 18:35:03 +01:00
parent e5d9266c9d
commit e1b22358b3
6 changed files with 51 additions and 75 deletions

View File

@@ -16,7 +16,7 @@ security:
form_login:
provider: fos_userbundle
csrf_token_generator: security.csrf.token_manager
default_target_path: /admin
default_target_path: /
logout: true
anonymous: true
@@ -26,4 +26,3 @@ security:
- { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/admin, role: ROLE_SUPER_ADMIN }
# - { path: ^/, role: ROLE_SUPER_ADMIN }

View File

@@ -6,8 +6,4 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
class DefaultController extends Controller
{
public function indexAction()
{
return $this->render('JotunheimrUserBundle:Default:index.html.twig');
}
}

View File

@@ -1,3 +0,0 @@
JotunheimrUserBundle_homepage:
path: /login
defaults: { _controller: JotunheimrUserBundle:Default:index }

View File

@@ -0,0 +1,28 @@
{% extends 'JotunheimrUserBundle::layout.html.twig' %}
{% trans_default_domain 'FOSUserBundle' %}
{% block fos_user_content %}
{{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }}
{{ form_label(form.email) }}
{{ form_widget(form.email) }}
{{ form_errors(form.email) }}
{{ form_label(form.username) }}
{{ form_widget(form.username) }}
{{ form_errors(form.username) }}
{{ form_label(form.plainPassword.first) }}
{{ form_widget(form.plainPassword.first) }}
{{ form_errors(form.plainPassword.first) }}
{{ form_label(form.plainPassword.second) }}
{{ form_widget(form.plainPassword.second) }}
{{ form_errors(form.plainPassword.second) }}
<div>
<input type="submit" value="{{ 'registration.submit'|trans }}" />
</div>
{{ form_end(form) }}
{% endblock fos_user_content %}

View File

@@ -3,55 +3,25 @@
{% trans_default_domain 'FOSUserBundle' %}
{% block fos_user_content %}
<div class="login-box">
<div class="login-logo">
<a href="#"><b>{{ project_name }}</b> Admin</a>
</div>
<div class="login-box-body">
{% if error %}
<div class="alert alert-danger alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h4><i class="icon fa fa-ban"></i> Login Error!</h4>
{{ error.messageKey|trans(error.messageData, 'security') }}
</div>
{% endif %}
{% if error %}
{{ error.messageKey|trans(error.messageData, 'security') }}
{% endif %}
<div class="callout callout-info">
<h4>Administration Area</h4>
<form action="{{ path("fos_user_security_check") }}" method="post">
<input type="hidden" name="_csrf_token" value="{{ csrf_token }}"/>
<p>For users only w/ valid authentication data</p>
</div>
<input type="text" id="username" name="_username" value="{{ last_username }}"
placeholder="{{ 'security.login.username'|trans }}"
required="required" autofocus/>
<form action="{{ path("fos_user_security_check") }}" method="post">
<input type="hidden" name="_csrf_token" value="{{ csrf_token }}"/>
<div class="form-group has-feedback">
<input type="text" id="username" name="_username" value="{{ last_username }}"
placeholder="{{ 'security.login.username'|trans }}"
class="form-control" required="required" autofocus/>
<i class="fa fa-user form-control-feedback"></i>
</div>
<div class="form-group has-feedback">
<input type="password" id="password" name="_password"
placeholder="{{ 'security.login.password'|trans }}" class="form-control"
required="required"/>
<i class="fa fa-lock form-control-feedback"></i>
</div>
<input type="checkbox" id="remember_me" name="_remember_me" value="on"/>
<label for="remember_me">{{ 'security.login.remember_me'|trans }}</label>
<div class="row">
<div class="col-xs-8"></div>
<div class="col-xs-4">
<input type="submit" id="_submit" name="_submit" class="btn btn-primary btn-block btn-flat"
value="{{ 'security.login.submit'|trans }}"/>
</div>
</div>
</form>
</div>
<div class="lockscreen-footer text-center">
Copyright &copy; 2016 &middot; <a href="http://www.laszlolang.com">www.laszlolang.com system7</a>
<br>
<b>Project Jotunheimr</b> <br>
<b>Version</b> {{ jotun_version }} &middot; All rights reserved.
</div>
</div>
<input type="password" id="password" name="_password"
placeholder="{{ 'security.login.password'|trans }}"
required="required"/>
<input type="checkbox" id="remember_me" name="_remember_me" value="on"/>
<label for="remember_me">{{ 'security.login.remember_me'|trans }}</label>
<input type="submit" id="_submit" name="_submit"
value="{{ 'security.login.submit'|trans }}"/>
</form>
{% endblock fos_user_content %}

View File

@@ -6,12 +6,8 @@
<title>{% block title %}{{ project_name }} Admin - Login{% endblock %}</title>
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
{% block stylesheets %}
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
{% stylesheets filter='cssrewrite'
'@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/css/bootstrap.min.css'
'@JotunheimrAdminBundle/Resources/public/css/s7Admin.css' %}
'@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/css/bootstrap.min.css' %}
<link rel="stylesheet" media="screen" href="{{ asset_url }}"/>
{% endstylesheets %}
{% endblock %}
@@ -24,18 +20,7 @@
<![endif]-->
</head>
<body class="hold-transition {% if last_username|length %}lockscreen{% else %}login-page{% endif %}">
{#<div>#}
{#{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}#}
{#{{ 'layout.logged_in_as'|trans({'%username%': app.user.username}, 'FOSUserBundle') }} |#}
{#<a href="{{ path('fos_user_security_logout') }}">#}
{#{{ 'layout.logout'|trans({}, 'FOSUserBundle') }}#}
{#</a>#}
{#{% else %}#}
{#<a href="{{ path('fos_user_security_login') }}">{{ 'layout.login'|trans({}, 'FOSUserBundle') }}</a>#}
{#{% endif %}#}
{#</div>#}
<body>
{% if app.request.hasPreviousSession %}
{% for type, messages in app.session.flashbag.all() %}
@@ -54,7 +39,8 @@
{% block javascripts %}
{% javascripts
'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jQuery-2.1.4.min.js'
'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-3.0.0.min.js'
'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-migrate-3.0.0.min.js'
'@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/js/bootstrap.min.js' %}
<script type="text/javascript" src="{{ asset_url }}"></script>
{% endjavascripts %}