diff options
| -rw-r--r-- | mediagoblin/static/css/base.css | 124 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/auth/login.html | 31 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/auth/register.html | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 5 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/wtforms.html | 12 |
5 files changed, 105 insertions, 69 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index c7d3d4ad..672cc04c 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -1,9 +1,9 @@ body { - background-color: #272727; - color: #f7f7f7; - font-family: sans; - padding:none; - margin:0px; + background-color: #272727; + color: #f7f7f7; + font-family: sans; + padding:none; + margin:0px; } /* Carter One font */ @@ -18,13 +18,18 @@ body { /* text styles */ h1 { - font-family: 'Carter One', arial, serif; - margin-bottom: 20px; - margin-top:40px; + font-family: 'Carter One', arial, serif; + margin-bottom: 20px; + margin-top:40px; +} + +p { + font-family: sans; + font-size:16px; } a { - color: #86D4B1; + color: #86D4B1; } label { @@ -34,53 +39,90 @@ label { /* website structure */ .mediagoblin_header { - width:100%; - height:36px; - background-color:#393939; - padding-top:14px; - margin-bottom:40px; + width:100%; + height:36px; + background-color:#393939; + padding-top:14px; + margin-bottom:40px; } .icon { - vertical-align:middle; - margin-right:10px; + vertical-align:middle; + margin-right:10px; } .mediagoblin_container { - width: 960px; - margin-left: auto; - margin-right: auto; + width: 960px; + margin-left: auto; + margin-right: auto; } .mediagoblin_header_right { - float:right; + float:right; } .button { - font-family:'Carter One', arial, serif; - height:32px; - min-width:99px; - background-color:#86d4b1; - box-shadow:0px 0px 4px #000; - border-radius:5px; - border:none; - color:#272727; - margin:10px; - font-size:1em; - float:left; - display:block; - text-align:center; - padding-left:11px; - padding-right:11px; + font-family:'Carter One', arial, serif; + height:32px; + min-width:99px; + background-color:#86d4b1; + box-shadow:0px 0px 4px #000; + border-radius:5px; + border:none; + color:#272727; + margin:10px; + font-size:1em; + display:block; + text-align:center; + padding-left:11px; + padding-right:11px; } /* common website elements */ .dotted_line { - width:100%; - height:0px; - border-bottom: dotted 1px #5f5f5f; - position:absolute; - left:0px; - margin-top:-20px; + width:100%; + height:0px; + border-bottom: dotted 1px #5f5f5f; + position:absolute; + left:0px; + 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; } diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index 02bfb91f..22a57b70 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -20,25 +20,22 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_content %} - <h1>Login:</h1> <form action="{{ request.urlgen('mediagoblin.auth.login') }}" method="POST" enctype="multipart/form-data"> - - {% if login_failed %} - <p><i>Login failed!</i></p> - {% endif %} - - <table> - {{ wtforms_util.render_table(login_form) }} - <tr> - <td></td> - <td><input type="submit" value="submit" class="button"/></td> - </tr> - </table> - - {% if next %} - <input type="hidden" name="next" value="{{ next }}" class="button" /> - {% endif %} + <div class="login_box form_box"> + <h1>Log in</h1> + {% if login_failed %} + <div class="form_field_error">Login failed!</div> + {% endif %} + {{ wtforms_util.render_divs(login_form) }} + <div class="form_submit_buttons"> + <input type="submit" value="submit" class="button"/> + </div> + {% if next %} + <input type="hidden" name="next" value="{{ next }}" class="button" /> + {% endif %} + <p>Don't have an account yet? <a href="{{ request.urlgen('mediagoblin.auth.register') }}">Create one here!</a></p> + </div> </form> {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html index 31c3d23e..730d684d 100644 --- a/mediagoblin/templates/mediagoblin/auth/register.html +++ b/mediagoblin/templates/mediagoblin/auth/register.html @@ -20,11 +20,11 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_content %} - <h2>Create an account!</h2> <form action="{{ request.urlgen('mediagoblin.auth.register') }}" method="POST" enctype="multipart/form-data"> <div class="register_box form_box"> + <h1>Create an account!</h1> {{ wtforms_util.render_divs(register_form) }} <div class="form_submit_buttons"> <input type="submit" value="submit" class="button" /> diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 3306448d..0ba09646 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -34,9 +34,8 @@ {% endblock %}{% block mediagoblin_header_title %}GNU MediaGoblin Home{% endblock %} <div class="mediagoblin_header_right"> {% if request.user %} - Welcome {{ request.user['username'] }}! -- - <a href="{{ request.urlgen('mediagoblin.auth.logout') }}"> - Logout</a> + {{ request.user['username'] }}'s account + (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>) {% else %} <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> Login</a> diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html index 4a37ab33..9adf8e53 100644 --- a/mediagoblin/templates/mediagoblin/utils/wtforms.html +++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html @@ -26,13 +26,11 @@ {%- endif %} <div class="form_field_input">{{ field }}</div> {%- if field.errors -%} - <div class="form_field_errors"> - <ul> - {% for error in field.errors %} - <li>{{ error }}</li> - {% endfor %} - </ul> - </div> + {% for error in field.errors %} + <div class="form_field_error"> + {{ error }} + </div> + {% endfor %} {%- endif %} </div> {% endfor %} |