Skip to content

Commit

Permalink
cambios varios
Browse files Browse the repository at this point in the history
  • Loading branch information
fabian committed May 15, 2013
1 parent a84978b commit 4a8ad14
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
24 changes: 24 additions & 0 deletions app/Resources/FOSUserBundle/views/Security/login.html.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{% extends 'JordiLlonchCrudGeneratorBundle::layout.html.twig' %}

{% block page %}
{% if error %}
<div><span class="label label-warning">{{ error|trans({}, 'FOSUserBundle') }}</span></div>
{% endif %}
<div class="login_form" style="text-align: center">
<form action="{{ path("fos_user_security_check") }}" method="post">
<input type="hidden" name="_csrf_token" value="{{ csrf_token }}" />

<label for="username" style="width: 90%;">{{ 'security.login.username'|trans({}, 'FOSUserBundle') }}</label>
<input type="text" id="username" name="_username" value="{{ last_username }}" class="corto" />
<br/>
<label for="password" style="width: 85%;">{{ 'security.login.password'|trans({}, 'FOSUserBundle') }}</label>
<input type="password" id="password" name="_password" class="corto" />
<br/>
{#
<input type="checkbox" id="remember_me" name="_remember_me" value="on" />
<label for="remember_me">{{ 'security.login.remember_me'|trans({}, 'FOSUserBundle') }}</label>
#}
<input type="submit" id="_submit" name="_submit" value="{{ 'security.login.submit'|trans({}, 'FOSUserBundle') }}" class="btn btn-primary" />
</form>
</div>
{% endblock page %}
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@
<li {% if app.request.pathinfo == '/admin/remitovolvo/' %} class="active" {% endif %}>
<a href="{{ path('remitovolvo') }}">Remitos - Volvo</a></li>
<li {% if app.request.pathinfo == '/admin/repvolvo/' %} class="active" {% endif %}>
<a href="{{ path('repvolvo') }}">Repuestos - Volvo</a></li>
<a href="{{ path('repvolvo') }}">Repuestos - Volvo</a></li>
<li {% if app.request.pathinfo == '/admin/ordvolvo/liquidacion' %} class="active" {% endif %}>
<a href="{{ path('liquidacion') }}">Liquidacion - Volvo</a></li>
<li {% if app.request.pathinfo == '/admin/renaultorden/' %} class="active" {% endif %}>
<a href="{{ path('renaultorden') }}">Ordenes - Renault</a></li>
{% elseif is_granted('ROLE_CAJERO') %}
<li {% if app.request.pathinfo == '/admin/caja/' %} class="active" {% endif %}>
<a href="{{ path('admin_index') }}">Inicio</a></li>
Expand Down Expand Up @@ -124,7 +128,7 @@
<footer>
<div class="wrapper">
<section class="col1 pad_left1">
<h3>Hecho por: <span>Fabián Serafini</span></h3>
<h3>Hecho por: <span>Fabián Serafini y Emanuel Duprat</span></h3>
</section>
<section class="col2 pad_left1">
<h3>Seguinos </h3>
Expand Down
Empty file modified app/Resources/views/base.html.twig
100644 → 100755
Empty file.

0 comments on commit 4a8ad14

Please sign in to comment.