Update texts and Fixbugs

This commit is contained in:
Andros Fenollosa
2017-05-18 18:25:54 +02:00
parent f056300d27
commit e09c4abf8c
15 changed files with 166 additions and 131 deletions

View File

@ -3,7 +3,7 @@
<head>
<meta name="viewport" content="width=device-width" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Activar cuenta</title>
<title>Activate account</title>
<style>
/* -------------------------------------
GLOBAL RESETS
@ -286,8 +286,8 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
<p>Hola {{ username }},</p>
<p>Gracias por registrarte en nuestro ejemplo. Activa tu cuenta pulsando en el siguiente botón.</p>
<p>Hi {{ username }}!,</p>
<p>Thank you for registering you in our example. Activate your account by clicking on the button below.</p>
<table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
<tbody>
<tr>
@ -295,7 +295,7 @@
<table border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td> <a href="{{ token }}" target="_blank">Activar</a> </td>
<td> <a href="{{ token }}" target="_blank">Activate</a> </td>
</tr>
</tbody>
</table>
@ -303,7 +303,7 @@
</tr>
</tbody>
</table>
<p>En caso que no te funcione el botón, pulsa el siguiente enlace.</p>
<p>In the event that the button will not work, click the following link.</p>
<p>{{ token }}</p>
</td>
</tr>

View File

@ -1,7 +1,6 @@
Hola {{ username }},
restablece tu contraseña.
Pulsa en el siguiente enlace
Hi {{ username }}!,
thank you for registering you in our example. Activate your account by clicking on the link below.
{{ token }}
Example team.

View File

@ -3,7 +3,7 @@
<head>
<meta name="viewport" content="width=device-width" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Recuperar contraseña</title>
<title>Forgot password</title>
<style>
/* -------------------------------------
GLOBAL RESETS
@ -286,8 +286,8 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
<p>Hola {{ username }},</p>
<p>Para actualizar tu contraseña pulse en el boton.</p>
<p>Hi {{ username }}!,</p>
<p>To update your password, click on the button.</p>
<table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
<tbody>
<tr>
@ -295,7 +295,7 @@
<table border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td> <a href="{{ token }}" target="_blank">Restablecer contraseña</a> </td>
<td> <a href="{{ token }}" target="_blank">Reset password</a> </td>
</tr>
</tbody>
</table>
@ -303,7 +303,7 @@
</tr>
</tbody>
</table>
<p>En caso que no te funcione el botón, pulsa el siguiente enlace.</p>
<p>In the event that the button will not work, click the following link.</p>
<p>{{ token }}</p>
</td>
</tr>

View File

@ -1,6 +1,6 @@
Activa tu cuenta {{ username }}
Pulsa en el siguiente enlace
Hi {{ username }}!,
to update your password, click on the link.
{{ token }}
Example team.

View File

@ -0,0 +1,19 @@
{% macro generate_fields(form) -%}
{% for field in form %}
{% if field.type != 'CSRFTokenField' %}
<div class="form-group{%if field.errors %} has-error{% endif %}">
{{ field.label }}
{% if field.type in ('StringField', 'PasswordField') %}
{{ field(class='form-control') }}
{% else %}
{{ field() }}
{% endif %}
{% for error in field.errors %}
<span class="help-block">{{ error }}</span>
{% endfor %}
</div>
{% else %}
{{ field() }}
{% endif %}
{% endfor %}
{%- endmacro %}

View File

@ -1,9 +1,10 @@
{% from 'helpers/_forms.html' import generate_fields with context %}
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% block title %}{% endblock %} | Login example</title>
<title>{% block title %}{% endblock %} | Login system example</title>
<link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
</head>
<body>
@ -17,7 +18,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Example Login</a>
<a class="navbar-brand" href="/">Example Login</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->

View File

@ -1,28 +1,12 @@
{% extends 'layouts/master.html' %}
{% block title %}Restablecer contraseña{% endblock %}
{% block body %}
<h1>Restablece tu contraseña</h1>
<p>Te enviaremos un email para cambiar la contraseña</p>
<h1>Forgot password</h1>
<p>We will send you an email to change your password.</p>
<p>
<form action="" method="post">
{% for campo in form %}
{% if campo.type != 'CSRFTokenField' %}
<div class="form-group{%if campo.errors %} has-error{% endif %}">
{{ campo.label }}
{% if campo.type in ('StringField', 'PasswordField') %}
{{ campo(class='form-control') }}
{% else %}
{{ campo() }}
{% endif %}
{% for error in campo.errors %}
<span class="help-block">{{ error }}</span>
{% endfor %}
</div>
{% else %}
{{ campo() }}
{% endif %}
{% endfor %}
<input type="submit" class="btn btn-success" value="Enviar">
{{ generate_fields(form) }}
<input type="submit" class="btn btn-success">
</form>
</p>
{% endblock %}

View File

@ -4,30 +4,14 @@
<h1>Login</h1>
<p>
<form action="" method="post">
{% for campo in form %}
{% if campo.type != 'CSRFTokenField' %}
<div class="form-group{%if campo.errors %} has-error{% endif %}">
{{ campo.label }}
{% if campo.type in ('StringField', 'PasswordField') %}
{{ campo(class='form-control') }}
{% else %}
{{ campo() }}
{% endif %}
{% for error in campo.errors %}
<span class="help-block">{{ error }}</span>
{% endfor %}
</div>
{% else %}
{{ campo() }}
{% endif %}
{% endfor %}
<input type="submit" class="btn btn-success" value="Entrar">
{{ generate_fields(form) }}
<input type="submit" class="btn btn-success" value="Enter">
</form>
</p>
<p>
<a href="{{ url_for('signup') }}" class="btn btn-primary">Regístrate</a>
<a href="{{ url_for('signup') }}" class="btn btn-primary">Signup</a>
</p>
<p>
<a href="{{ url_for('forgot_password') }}" class="btn btn-warning">Me he olvidado la contraseña</a>
<a href="{{ url_for('forgot_password') }}" class="btn btn-warning">Forgot password</a>
</p>
{% endblock %}

View File

@ -3,23 +3,7 @@
{% block body %}
<h1>Signup</h1>
<form action="" method="post">
{% for campo in form %}
{% if campo.type != 'CSRFTokenField' %}
<div class="form-group{%if campo.errors %} has-error{% endif %}">
{{ campo.label }}
{% if campo.type in ('StringField', 'PasswordField') %}
{{ campo(class='form-control') }}
{% else %}
{{ campo() }}
{% endif %}
{% for error in campo.errors %}
<span class="help-block">{{ error }}</span>
{% endfor %}
</div>
{% else %}
{{ campo() }}
{% endif %}
{% endfor %}
<input type="submit" class="btn btn-success" value="Registrarse">
{{ generate_fields(form) }}
<input type="submit" class="btn btn-success" value="Signup">
</form>
{% endblock %}

View File

@ -1,26 +1,10 @@
{% extends 'layouts/master.html' %}
{% block title %}Cambiar contraseña{% endblock %}
{% block title %}Update password{% endblock %}
{% block body %}
<h1>Cambia tu contraseña</h1>
<h1>Update password</h1>
<form action="" method="post">
{{ generate_fields(form) }}
<input type="hidden" name="email" value="{{ email }}">
{% for campo in form %}
{% if campo.type != 'CSRFTokenField' %}
<div class="form-group{%if campo.errors %} has-error{% endif %}">
{{ campo.label }}
{% if campo.type in ('StringField', 'PasswordField') %}
{{ campo(class='form-control') }}
{% else %}
{{ campo() }}
{% endif %}
{% for error in campo.errors %}
<span class="help-block">{{ error }}</span>
{% endfor %}
</div>
{% else %}
{{ campo() }}
{% endif %}
{% endfor %}
<input type="submit" class="btn btn-success" value="Actualizar">
<input type="submit" class="btn btn-success" value="Update">
</form>
{% endblock %}