Merge branch 'master' of git://gitorious.org/~schendje/mediagoblin/schendjes-mediagoblin
This commit is contained in:
commit
a78c8af8a6
@ -23,6 +23,11 @@ h1 {
|
|||||||
margin-top:40px;
|
margin-top:40px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
font-family: sans;
|
||||||
|
font-size:16px;
|
||||||
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
color: #86D4B1;
|
color: #86D4B1;
|
||||||
}
|
}
|
||||||
@ -67,7 +72,6 @@ label {
|
|||||||
color:#272727;
|
color:#272727;
|
||||||
margin:10px;
|
margin:10px;
|
||||||
font-size:1em;
|
font-size:1em;
|
||||||
float:left;
|
|
||||||
display:block;
|
display:block;
|
||||||
text-align:center;
|
text-align:center;
|
||||||
padding-left:11px;
|
padding-left:11px;
|
||||||
@ -84,3 +88,41 @@ label {
|
|||||||
left:0px;
|
left:0px;
|
||||||
margin-top:-20px;
|
margin-top:-20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* forms */
|
||||||
|
|
||||||
|
.form_box {
|
||||||
|
width:300px;
|
||||||
|
margin-left:auto;
|
||||||
|
margin-right:auto;
|
||||||
|
background-color:#393939;
|
||||||
|
padding:0px 83px 30px 83px;
|
||||||
|
border-top:5px solid #d49086;
|
||||||
|
font-size:18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form_box h1 {
|
||||||
|
font-size:28px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form_field_input input {
|
||||||
|
width:300px;
|
||||||
|
font-size:18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form_field_box {
|
||||||
|
margin-bottom:24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form_field_label,.form_field_input {
|
||||||
|
margin-bottom:4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form_field_error {
|
||||||
|
background-color:#87453b;
|
||||||
|
border:none;
|
||||||
|
font-size:16px;
|
||||||
|
padding:9px;
|
||||||
|
margin-top:8px;
|
||||||
|
margin-bottom:8px;
|
||||||
|
}
|
||||||
|
@ -20,25 +20,22 @@
|
|||||||
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
|
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
|
||||||
|
|
||||||
{% block mediagoblin_content %}
|
{% block mediagoblin_content %}
|
||||||
<h1>Login:</h1>
|
|
||||||
|
|
||||||
<form action="{{ request.urlgen('mediagoblin.auth.login') }}"
|
<form action="{{ request.urlgen('mediagoblin.auth.login') }}"
|
||||||
method="POST" enctype="multipart/form-data">
|
method="POST" enctype="multipart/form-data">
|
||||||
|
<div class="login_box form_box">
|
||||||
|
<h1>Log in</h1>
|
||||||
{% if login_failed %}
|
{% if login_failed %}
|
||||||
<p><i>Login failed!</i></p>
|
<div class="form_field_error">Login failed!</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{{ wtforms_util.render_divs(login_form) }}
|
||||||
<table>
|
<div class="form_submit_buttons">
|
||||||
{{ wtforms_util.render_table(login_form) }}
|
<input type="submit" value="submit" class="button"/>
|
||||||
<tr>
|
</div>
|
||||||
<td></td>
|
|
||||||
<td><input type="submit" value="submit" class="button"/></td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
{% if next %}
|
{% if next %}
|
||||||
<input type="hidden" name="next" value="{{ next }}" class="button" />
|
<input type="hidden" name="next" value="{{ next }}" class="button" />
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
<p>Don't have an account yet? <a href="{{ request.urlgen('mediagoblin.auth.register') }}">Create one here!</a></p>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -20,11 +20,11 @@
|
|||||||
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
|
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
|
||||||
|
|
||||||
{% block mediagoblin_content %}
|
{% block mediagoblin_content %}
|
||||||
<h2>Create an account!</h2>
|
|
||||||
|
|
||||||
<form action="{{ request.urlgen('mediagoblin.auth.register') }}"
|
<form action="{{ request.urlgen('mediagoblin.auth.register') }}"
|
||||||
method="POST" enctype="multipart/form-data">
|
method="POST" enctype="multipart/form-data">
|
||||||
<div class="register_box form_box">
|
<div class="register_box form_box">
|
||||||
|
<h1>Create an account!</h1>
|
||||||
{{ wtforms_util.render_divs(register_form) }}
|
{{ wtforms_util.render_divs(register_form) }}
|
||||||
<div class="form_submit_buttons">
|
<div class="form_submit_buttons">
|
||||||
<input type="submit" value="submit" class="button" />
|
<input type="submit" value="submit" class="button" />
|
||||||
|
@ -34,9 +34,8 @@
|
|||||||
{% endblock %}{% block mediagoblin_header_title %}GNU MediaGoblin Home{% endblock %}
|
{% endblock %}{% block mediagoblin_header_title %}GNU MediaGoblin Home{% endblock %}
|
||||||
<div class="mediagoblin_header_right">
|
<div class="mediagoblin_header_right">
|
||||||
{% if request.user %}
|
{% if request.user %}
|
||||||
Welcome {{ request.user['username'] }}! --
|
{{ request.user['username'] }}'s account
|
||||||
<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
|
(<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
|
||||||
Logout</a>
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<a href="{{ request.urlgen('mediagoblin.auth.login') }}">
|
<a href="{{ request.urlgen('mediagoblin.auth.login') }}">
|
||||||
Login</a>
|
Login</a>
|
||||||
|
@ -26,13 +26,11 @@
|
|||||||
{%- endif %}
|
{%- endif %}
|
||||||
<div class="form_field_input">{{ field }}</div>
|
<div class="form_field_input">{{ field }}</div>
|
||||||
{%- if field.errors -%}
|
{%- if field.errors -%}
|
||||||
<div class="form_field_errors">
|
|
||||||
<ul>
|
|
||||||
{% for error in field.errors %}
|
{% for error in field.errors %}
|
||||||
<li>{{ error }}</li>
|
<div class="form_field_error">
|
||||||
{% endfor %}
|
{{ error }}
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
|
{% endfor %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user