WIP
This commit is contained in:
parent
b02d3db684
commit
86f0549e44
24 changed files with 710 additions and 398 deletions
|
@ -1,18 +1,8 @@
|
|||
{% extends 'layout.html' %}
|
||||
{% from 'macros.html' import render_form, render_field %}
|
||||
{% block body %}
|
||||
|
||||
<form role="form" method="post" action="{{ url_for('auth.login') }}" data-parsley-validate>
|
||||
<div class="form-group">
|
||||
<label for="email">Email</label>
|
||||
<input id="email" type="email" class="form-control" name="email" placeholder="Email" required />
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="password">Password</label>
|
||||
<input type="password" name="password" id="password" class="form-control" placeholder="Password" min="6" required />
|
||||
</div>
|
||||
|
||||
<input type="submit" class="btn btn-primary" value="Login" />
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
{% call render_form(form, action_url=url_for('auth.login'), action_text='Login', btn_class='btn btn-primary') %}
|
||||
{{ render_field(form.email, placeholder='Email', type='email', required=1) }}
|
||||
{{ render_field(form.password, placeholder='Password', type='password', required=1) }}
|
||||
{% endcall %}
|
||||
{% endblock %}
|
||||
|
|
|
@ -1,29 +1,13 @@
|
|||
{% extends 'layout.html' %}
|
||||
{% from 'macros.html' import render_form, render_field %}
|
||||
{% block body %}
|
||||
|
||||
<form role="form" method="post" action="{{ url_for('auth.register') }}" data-parsley-validate>
|
||||
<div class="form-group">
|
||||
<label for="username">Username</label>
|
||||
<input id="username" type="text" class="form-control" name="username" placeholder="Username" required data-parsley-type="alphanum" />
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="email">Email</label>
|
||||
<input id="email" type="email" class="form-control" name="email" placeholder="Email" required />
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="password">Password</label>
|
||||
<input type="password" name="password" id="password" class="form-control" placeholder="Password" required min="6"/>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="password_again">Confirm Password</label>
|
||||
<input type="password" name="password_again" id="password_again" class="form-control" placeholder="Password" required min="6"/>
|
||||
</div>
|
||||
|
||||
|
||||
<input type="submit" class="btn btn-primary" value="Register" />
|
||||
</form>
|
||||
|
||||
{% call render_form(form, action_url=url_for('auth.register'), action_text='Register', btn_class='btn btn-primary') %}
|
||||
{{ render_field(form.username, placeholder='Username', type='username', **{"required": 1, "data-parsley-type": "alphanum"}) }}
|
||||
{{ render_field(form.email, placeholder='Email', type='email', required=1) }}
|
||||
{{ render_field(form.password, placeholder='Password', type='password', **{"required": 1, "data-parsley-minlength": "6"}) }}
|
||||
{{ render_field(form.confirm, placeholder='Confirm Password', type='password', **{"required": 1, "data-parsley-minlength": "6"}) }}
|
||||
{% if config.RECAPTCHA_ENABLE %}
|
||||
{{ render_field(form.recaptcha) }}
|
||||
{% endif %}
|
||||
{% endcall %}
|
||||
{% endblock %}
|
5
realms/templates/auth/settings.html
Normal file
5
realms/templates/auth/settings.html
Normal file
|
@ -0,0 +1,5 @@
|
|||
{% extends 'layout.html' %}
|
||||
{% from 'macros.html' import render_form, render_field %}
|
||||
{% block body %}
|
||||
|
||||
{% endblock %}
|
|
@ -43,16 +43,16 @@
|
|||
{% endif %}
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
{% if session.get('user') %}
|
||||
{% if g.current_user.is_authenticated() %}
|
||||
<li class="dropdown user-avatar">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
||||
<span>
|
||||
<img src="{{ session['user'].get('avatar') }}" class="menu-avatar">
|
||||
<span>{{ session['user'].get('username') }} <i class="icon-caret-down"></i></span>
|
||||
<img src="{{ g.current_user.avatar }}" class="menu-avatar">
|
||||
<span>{{ g.current_user.username }} <i class="icon-caret-down"></i></span>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="{{ url_for('account') }}">Account</a></li>
|
||||
<li><a href="{{ url_for('auth.settings') }}">Settings</a></li>
|
||||
<li><a href="{{ url_for('auth.logout') }}">Logout</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
@ -68,8 +68,6 @@
|
|||
<!-- Page Menu -->
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="container">
|
||||
<div id="main-body">
|
||||
{% with messages = get_flashed_messages(with_categories=True) %}
|
||||
|
|
99
realms/templates/macros.html
Normal file
99
realms/templates/macros.html
Normal file
|
@ -0,0 +1,99 @@
|
|||
{# Source: https://gist.github.com/bearz/7394681 #}
|
||||
|
||||
{# Renders field for bootstrap 3 standards.
|
||||
|
||||
Params:
|
||||
field - WTForm field
|
||||
kwargs - pass any arguments you want in order to put them into the html attributes.
|
||||
There are few exceptions: for - for_, class - class_, class__ - class_
|
||||
|
||||
Example usage:
|
||||
{{ macros.render_field(form.email, placeholder='Input email', type='email') }}
|
||||
#}
|
||||
{% macro render_field(field, label_visible=true) -%}
|
||||
|
||||
<div class="form-group {% if field.errors %}has-error{% endif %} {{ kwargs.pop('class_', '') }}">
|
||||
{% if (field.type != 'HiddenField' or field.type !='CSRFTokenField') and label_visible %}
|
||||
<label for="{{ field.id }}" class="control-label">{{ field.label }}</label>
|
||||
{% endif %}
|
||||
{{ field(class_='form-control', **kwargs) }}
|
||||
{% if field.errors %}
|
||||
{% for e in field.errors %}
|
||||
<p class="help-block">{{ e }}</p>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</div>
|
||||
{%- endmacro %}
|
||||
|
||||
{# Renders checkbox fields since they are represented differently in bootstrap
|
||||
Params:
|
||||
field - WTForm field (there are no check, but you should put here only BooleanField.
|
||||
kwargs - pass any arguments you want in order to put them into the html attributes.
|
||||
There are few exceptions: for - for_, class - class_, class__ - class_
|
||||
|
||||
Example usage:
|
||||
{{ macros.render_checkbox_field(form.remember_me) }}
|
||||
#}
|
||||
{% macro render_checkbox_field(field) -%}
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
{{ field(type='checkbox', **kwargs) }} {{ field.label }}
|
||||
</label>
|
||||
</div>
|
||||
{%- endmacro %}
|
||||
|
||||
{# Renders radio field
|
||||
Params:
|
||||
field - WTForm field (there are no check, but you should put here only BooleanField.
|
||||
kwargs - pass any arguments you want in order to put them into the html attributes.
|
||||
There are few exceptions: for - for_, class - class_, class__ - class_
|
||||
|
||||
Example usage:
|
||||
{{ macros.render_radio_field(form.answers) }}
|
||||
#}
|
||||
{% macro render_radio_field(field) -%}
|
||||
{% for value, label, _ in field.iter_choices() %}
|
||||
<div class="radio">
|
||||
<label>
|
||||
<input type="radio" name="{{ field.id }}" id="{{ field.id }}" value="{{ value }}">{{ label }}
|
||||
</label>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{%- endmacro %}
|
||||
|
||||
{# Renders WTForm in bootstrap way. There are two ways to call function:
|
||||
- as macros: it will render all field forms using cycle to iterate over them
|
||||
- as call: it will insert form fields as you specify:
|
||||
e.g. {% call macros.render_form(form, action_url=url_for('login_view'), action_text='Login',
|
||||
class_='login-form') %}
|
||||
{{ macros.render_field(form.email, placeholder='Input email', type='email') }}
|
||||
{{ macros.render_field(form.password, placeholder='Input password', type='password') }}
|
||||
{{ macros.render_checkbox_field(form.remember_me, type='checkbox') }}
|
||||
{% endcall %}
|
||||
|
||||
Params:
|
||||
form - WTForm class
|
||||
action_url - url where to submit this form
|
||||
action_text - text of submit button
|
||||
class_ - sets a class for form
|
||||
#}
|
||||
{% macro render_form(form, action_url='', action_text='Submit', class_='', btn_class='btn btn-default') -%}
|
||||
|
||||
<form method="POST" action="{{ action_url }}" role="form" class="{{ class_ }}" data-parsley-validate>
|
||||
{{ form.hidden_tag() if form.hidden_tag }}
|
||||
{% if caller %}
|
||||
{{ caller() }}
|
||||
{% else %}
|
||||
{% for f in form %}
|
||||
{% if f.type == 'BooleanField' %}
|
||||
{{ render_checkbox_field(f) }}
|
||||
{% elif f.type == 'RadioField' %}
|
||||
{{ render_radio_field(f) }}
|
||||
{% else %}
|
||||
{{ render_field(f) }}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
<button type="submit" class="{{ btn_class }}">{{ action_text }} </button>
|
||||
</form>
|
||||
{%- endmacro %}
|
Loading…
Add table
Add a link
Reference in a new issue