diff --git a/ordr2/static/style.css b/ordr2/static/style.css index d9344c7..1da274d 100644 --- a/ordr2/static/style.css +++ b/ordr2/static/style.css @@ -32,6 +32,14 @@ main h1 { } -.deform-form-buttons{ +.deform-form-buttons { padding-top: 2rem; } + +.form-group.has-error input { + border-color: #e32; + } + +.form-group.has-error .form-text:nth-of-type(1) { + color: #e32 !important; + } diff --git a/ordr2/templates/account/forgot_password_email.jinja2 b/ordr2/templates/account/forgot_password_email.jinja2 index 82e2a59..6d8697e 100644 --- a/ordr2/templates/account/forgot_password_email.jinja2 +++ b/ordr2/templates/account/forgot_password_email.jinja2 @@ -3,14 +3,13 @@ {% block title %} Ordr | Forgotten Password {% endblock title %} {% block content %} -
-
-
- -

Password Reset Link

-

To reset your password, an email has been sent to you.

-

Please follow the link in the email to set a new password.

- +
+
+

Password Reset Link

+

To reset your password, an email has been sent to you.

+

Please follow the link in the email to set a new password.

+
-
+ {{ macros.center_column_hack() }} + {% endblock content %} diff --git a/ordr2/templates/account/forgot_password_form.jinja2 b/ordr2/templates/account/forgot_password_form.jinja2 index e6e4303..77685a5 100644 --- a/ordr2/templates/account/forgot_password_form.jinja2 +++ b/ordr2/templates/account/forgot_password_form.jinja2 @@ -3,21 +3,22 @@ {% block title %} Ordr | Forgotten Password {% endblock title %} {% block content %} -
-
- -

Forgotten password?

-
- -
- - -
-
- - -
-
+
+
+

Forgotten password?

+
+ +
+ + +
+
+ + +
+
+
-
+ {{ macros.center_column_hack() }} + {% endblock content %} diff --git a/ordr2/templates/account/login.jinja2 b/ordr2/templates/account/login.jinja2 index 060ab83..dfb0481 100644 --- a/ordr2/templates/account/login.jinja2 +++ b/ordr2/templates/account/login.jinja2 @@ -3,9 +3,6 @@ {% block title %} Ordr | Login Failed {% endblock title %} {% block content %} -
-
-

Try again…

You entered the wrong username or password.

@@ -34,6 +31,6 @@

If you forgot your password you can reset it.

-
-
+ {{ macros.center_column_hack() }} + {% endblock content %} diff --git a/ordr2/templates/account/password_resetted.jinja2 b/ordr2/templates/account/password_resetted.jinja2 deleted file mode 100644 index 07441cd..0000000 --- a/ordr2/templates/account/password_resetted.jinja2 +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "ordr2:templates/layout.jinja2" %} - -{% block title %} Ordr | Reset Password {% endblock title %} - -{% block content %} -
-
-
- -

Password Reset Successful

-

You can now log on with your new password

- -
- -
- -
- -
-
-
- -
- -
-
-
-
-
- -
-
-
- -
-
-{% endblock content %} diff --git a/ordr2/templates/account/register.jinja2 b/ordr2/templates/account/register.jinja2 index a9e405b..e619217 100644 --- a/ordr2/templates/account/register.jinja2 +++ b/ordr2/templates/account/register.jinja2 @@ -3,13 +3,12 @@ {% block title %} Ordr | Account Registration {% endblock title %} {% block content %} -
-
-
- -

Account Registration

- {{ form.render()|safe }} - +
+
+

Account Registration

+ {{ form.render()|safe }} +
-
+ {{ macros.center_column_hack() }} + {% endblock content %} diff --git a/ordr2/templates/account/registration_completed.jinja2 b/ordr2/templates/account/registration_completed.jinja2 index 4115e42..fb0d4ea 100644 --- a/ordr2/templates/account/registration_completed.jinja2 +++ b/ordr2/templates/account/registration_completed.jinja2 @@ -3,15 +3,14 @@ {% block title %} Ordr | Account Registration {% endblock title %} {% block content %} -
-
-
- -

Account Registration Completed

-

Thank you for verifying your email address.

-

Before you can start ordering, an administrator must activate your account

-

You'll receive an email when your account is activated

- +
+
+

Account Registration Completed

+

Thank you for verifying your email address.

+

Before you can start ordering, an administrator must activate your account

+

You'll receive an email when your account is activated

+
-
+ {{ macros.center_column_hack() }} + {% endblock content %} diff --git a/ordr2/templates/account/registration_confirmation.jinja2 b/ordr2/templates/account/registration_confirmation.jinja2 index 81a047b..6c043ff 100644 --- a/ordr2/templates/account/registration_confirmation.jinja2 +++ b/ordr2/templates/account/registration_confirmation.jinja2 @@ -3,14 +3,13 @@ {% block title %} Ordr | Account Registration {% endblock title %} {% block content %} -
-
-
- -

Verify Your Email Address

-

To complete the registration process an email has been sent to you.

-

Please follow the link in the email to verify your address and complete the registration process

- +
+
+

Verify Your Email Address

+

To complete the registration process an email has been sent to you.

+

Please follow the link in the email to verify your address and complete the registration process

+
-
+ {{ macros.center_column_hack() }} + {% endblock content %} diff --git a/ordr2/templates/account/reset_password.jinja2 b/ordr2/templates/account/reset_password.jinja2 index 6569735..afd8d0d 100644 --- a/ordr2/templates/account/reset_password.jinja2 +++ b/ordr2/templates/account/reset_password.jinja2 @@ -3,13 +3,12 @@ {% block title %} Ordr | Reset Password {% endblock title %} {% block content %} -
-
-
- -

Reset Your Password

- {{ form.render()|safe }} - +
+
+

Reset Your Password

+ {{ form.render()|safe }} +
-
+ {{ macros.center_column_hack() }} + {% endblock content %} diff --git a/ordr2/templates/layout.jinja2 b/ordr2/templates/layout.jinja2 index d36151c..b6910c5 100644 --- a/ordr2/templates/layout.jinja2 +++ b/ordr2/templates/layout.jinja2 @@ -1,3 +1,5 @@ +{% import 'ordr2:templates/macros.jinja2' as macros with context %} + @@ -78,9 +80,17 @@
- {% block content %} -

No content

- {% endblock content %} +
+
+ {% block sidebar %} {% endblock sidebar %} +
+
+ {{ macros.flash_messages() }} + + {% block content %} +

No content

+ {% endblock content %} +
diff --git a/ordr2/templates/pages/faq.jinja2 b/ordr2/templates/pages/faq.jinja2 index 4a2ba24..01a5be0 100644 --- a/ordr2/templates/pages/faq.jinja2 +++ b/ordr2/templates/pages/faq.jinja2 @@ -3,8 +3,7 @@ {% block title %} Ordr | FAQ {% endblock title %} {% block content %} -
-
+

Frequently Asked Questions

@@ -69,5 +68,5 @@
-
+ {{ macros.center_column_hack() }} {% endblock content %} diff --git a/ordr2/templates/pages/welcome.jinja2 b/ordr2/templates/pages/welcome.jinja2 index 37816d5..64edf4b 100644 --- a/ordr2/templates/pages/welcome.jinja2 +++ b/ordr2/templates/pages/welcome.jinja2 @@ -3,31 +3,27 @@ {% block title %} Ordr | Welcome {% endblock title %} {% block content %} -
-
+
+

Welcome to ordr!

+

An order management system to simplify your shopping for laboratory supplies.

+

+ What can order do for you? It will simplify the process of ordering laboratory supplies by using the power of the newest web technologies. Interested? Just follow the three steps below! +

+
-
-

Welcome to ordr!

-

An order management system to simplify your shopping for laboratory supplies.

-

- What can order do for you? It will simplify the process of ordering laboratory supplies by using the power of the newest web technologies. Interested? Just follow the three steps below! -

+
+
+

1. Register

+

Registration is easy as 1-2-3. Just fill out the form on and as soon as an admin has activated your account the shopping can begin!

- -
-
-

1. Register

-

Registration is easy as 1-2-3. Just fill out the form on and as soon as an admin has activated your account the shopping can begin!

-
-
-

2. Place an Order

-

A lot of the chemicals, supllies and so forth are already stored in the database, so you don't have to fill out the order form your self!

-
-
-

3. Get notified

-

As soons as your purchase has arrived you will automatically get notified. Or you can use the orders overview to check what the working status is.

-
+
+

2. Place an Order

+

A lot of the chemicals, supllies and so forth are already stored in the database, so you don't have to fill out the order form your self!

+
+
+

3. Get notified

+

As soons as your purchase has arrived you will automatically get notified. Or you can use the orders overview to check what the working status is.

-
+ {{ macros.center_column_hack() }} {% endblock content %} diff --git a/ordr2/views/account.py b/ordr2/views/account.py index ecdb99c..6159820 100644 --- a/ordr2/views/account.py +++ b/ordr2/views/account.py @@ -106,8 +106,8 @@ def registration_form_processing(context, request): # issue a warning on a short password if len(appstruct['password']) < PROPOSED_PASSWORD_LENGTH: request.session.flash( - 'warning', - 'You should really consider a longer password' + 'You should really consider a longer password', + 'warning' ) return HTTPFound(request.resource_url(context, 'registered')) @@ -171,8 +171,8 @@ def forgot_password_form_processing(context, request): ) if not account: request.session.flash( - 'warning', - 'Username or email address unknown' + 'Username or email address unknown', + 'error' ) return {} @@ -234,10 +234,10 @@ def reset_password_form_processing(context, request): # issue a warning on a short password if len(appstruct['password']) < PROPOSED_PASSWORD_LENGTH: request.session.flash( - 'warning', - 'You should really consider a longer password' + 'You should really consider a longer password', + 'warning' ) - request.session.flash('OK', 'Your password was changed' ) + request.session.flash('Your password was changed', 'ok') return HTTPFound(request.resource_url(context.__parent__, 'login'))