diff options
author | shivam kohli <kohlishivam5522@gmail.com> | 2018-08-02 03:47:52 +0530 |
---|---|---|
committer | shivam kohli <kohlishivam5522@gmail.com> | 2018-08-02 03:47:52 +0530 |
commit | eb3994b48199d772cde345910a13bc69ca4341a2 (patch) | |
tree | 06964d441df5154e101f5207b2730f35dd417818 | |
parent | dcfedfee9d419619a660ef4fe0ddd8153f8d180c (diff) | |
download | codeless-eb3994b48199d772cde345910a13bc69ca4341a2.tar.gz codeless-eb3994b48199d772cde345910a13bc69ca4341a2.tar.bz2 codeless-eb3994b48199d772cde345910a13bc69ca4341a2.zip |
styling for reset page changed
-rw-r--r-- | codeless/settings.py | 3 | ||||
-rw-r--r-- | templates/inventory/reset/base.html | 71 | ||||
-rw-r--r-- | templates/inventory/reset/password_reset_complete.html | 42 | ||||
-rw-r--r-- | templates/inventory/reset/password_reset_confirm.html | 39 | ||||
-rw-r--r-- | templates/inventory/reset/password_reset_done.html | 48 | ||||
-rw-r--r-- | templates/inventory/reset/password_reset_form.html | 49 |
6 files changed, 180 insertions, 72 deletions
diff --git a/codeless/settings.py b/codeless/settings.py index 1d53365..c6f418e 100644 --- a/codeless/settings.py +++ b/codeless/settings.py @@ -123,3 +123,6 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media') FILE_UPLOAD_HANDLERS = [ 'django.core.files.uploadhandler.TemporaryFileUploadHandler', ] + +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' # During development only + diff --git a/templates/inventory/reset/base.html b/templates/inventory/reset/base.html index 21c7fc1..9940d1f 100644 --- a/templates/inventory/reset/base.html +++ b/templates/inventory/reset/base.html @@ -1,24 +1,47 @@ -<!DOCTYPE html> -<html> -<head> - <meta charset="utf-8"> - <title>{% block title %}RESET{% endblock %}</title> -</head> -<body> - <header> - <h1>Django Simple Login</h1> - {% if user.is_authenticated %} - Hi {{ user.username }}! - <a href="{% url 'logout' %}">logout</a> - {% else %} - <a href="{% url 'login' %}">login</a> - {% endif %} - </header> - <hr> - <main> - {% block content %} - {% endblock %} - </main> - <hr> -</body> -</html>
\ No newline at end of file +<!doctype html> +<!-- +This file is part of the Taler Codeless Merchant. +(C) 2018 GNUnet e.V. + +The Taler Codeless Merchant is free software: you can redistribute it and/or +modify it under the terms of the GNU Affero General Public License as published +by the Free Software Foundation, either version 3 of the License, or (at your +option) any later version. + +The Taler Codeless Merchant is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License +for more details. + +You should have received a copy of the GNU Affero General Public License along +with the Taler Codeless Merchant. If not, see <https://www.gnu.org/licenses/>. + +@author Shivam Kohli +@author Marcello Stanisci +@author Florian Dold + --> +{% load staticfiles %} +<html data-taler-nojs="true"> + <head> + <title>Merchant Demo</title> + <link rel="stylesheet" type="text/css" href="{% static 'pure.css' %}" /> + <link rel="stylesheet" type="text/css" href="{% static 'web-common/demo.css' %}" /> + <link rel="stylesheet" type="text/css" href="{% static 'sidenav.css' %}" /> + <link rel="stylesheet" type="text/css" href="{% static 'web-common/taler-fallback.css' %}" id="taler-presence-stylesheet" /> + <link rel="stylesheet" type="text/css" href="{% static 'bank.css' %}" /> + {% block head %} {% endblock %} + </head> + <body> + <div class="demobar"> + <h1><span class="tt adorn-brackets">Codeless Demo</span></h1> + <h1><span class="it"><a href="">Merchant</a></span></h1> + <p>Codeless is a platform for the merchant where they can manage their inventory and simultaneously create a 'Buy Now' button for the specific product. This code can be directly copy pasted on the seller's frontend and can be used for 'Pay with Taler'.</p> + <li><a href="/accounts/login">Login</a></li> + <p>You can learn more about Taler on our main <a href="https://taler.net">website</a>.</p> + </div> + <div class="content"> + {% block headermsg %} {% endblock %} + {% block content %} {% endblock %} + </div> + </body> +</html> diff --git a/templates/inventory/reset/password_reset_complete.html b/templates/inventory/reset/password_reset_complete.html index 5b4260b..1d308ab 100644 --- a/templates/inventory/reset/password_reset_complete.html +++ b/templates/inventory/reset/password_reset_complete.html @@ -1,12 +1,32 @@ -<!DOCTYPE html> -<html> -<head> - <title></title> -</head> -<body> - <p> - Your password has been set. You may go ahead and login now.<br><br> - <a href="{% url 'login' %}">login</a> +<!-- +This file is part of the Taler Codeless Merchant. +(C) 2018 GNUnet e.V. + +The Taler Codeless Merchant is free software: you can redistribute it and/or +modify it under the terms of the GNU Affero General Public License as published +by the Free Software Foundation, either version 3 of the License, or (at your +option) any later version. + +The Taler Codeless Merchant is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License +for more details. + +You should have received a copy of the GNU Affero General Public License along +with the Taler Codeless Merchant. If not, see <https://www.gnu.org/licenses/>. + +@author Shivam Kohli + --> +{% extends "inventory/reset/base.html" %} + +{% block headermsg %} + <center><h1 class="nav">RESET PASSWORD</h1></center> +{% endblock headermsg %} + +{% block content %} +<div class="main"> + <p> + Your password has been set. You may go ahead and login now. </p> -</body> -</html>
\ No newline at end of file +</div> +{% endblock content %}
\ No newline at end of file diff --git a/templates/inventory/reset/password_reset_confirm.html b/templates/inventory/reset/password_reset_confirm.html index 84d1c68..1cf36db 100644 --- a/templates/inventory/reset/password_reset_confirm.html +++ b/templates/inventory/reset/password_reset_confirm.html @@ -1,10 +1,31 @@ -<!DOCTYPE html> -<html> -<head> - <title></title> -</head> -<body> - {% if validlink %} +<!-- +This file is part of the Taler Codeless Merchant. +(C) 2018 GNUnet e.V. + +The Taler Codeless Merchant is free software: you can redistribute it and/or +modify it under the terms of the GNU Affero General Public License as published +by the Free Software Foundation, either version 3 of the License, or (at your +option) any later version. + +The Taler Codeless Merchant is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License +for more details. + +You should have received a copy of the GNU Affero General Public License along +with the Taler Codeless Merchant. If not, see <https://www.gnu.org/licenses/>. + +@author Shivam Kohli + --> +{% extends "inventory/reset/base.html" %} + +{% block headermsg %} + <center><h1 class="nav">RESET PASSWORD</h1></center> +{% endblock headermsg %} + +{% block content %} +<div class="main"> + {% if validlink %} <h3>Change password</h3> <form method="post"> {% csrf_token %} @@ -17,5 +38,5 @@ Please request a new password reset. </p> {% endif %} -</body> -</html>
\ No newline at end of file +</div> +{% endblock content %}
\ No newline at end of file diff --git a/templates/inventory/reset/password_reset_done.html b/templates/inventory/reset/password_reset_done.html index a679fa9..ca9c8a3 100644 --- a/templates/inventory/reset/password_reset_done.html +++ b/templates/inventory/reset/password_reset_done.html @@ -1,17 +1,37 @@ +<!-- +This file is part of the Taler Codeless Merchant. +(C) 2018 GNUnet e.V. -<!DOCTYPE html> -<html> -<head> - <title></title> -</head> -<body> - <p> +The Taler Codeless Merchant is free software: you can redistribute it and/or +modify it under the terms of the GNU Affero General Public License as published +by the Free Software Foundation, either version 3 of the License, or (at your +option) any later version. + +The Taler Codeless Merchant is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License +for more details. + +You should have received a copy of the GNU Affero General Public License along +with the Taler Codeless Merchant. If not, see <https://www.gnu.org/licenses/>. + +@author Shivam Kohli + --> +{% extends "inventory/reset/base.html" %} + +{% block headermsg %} + <center><h1 class="nav">RESET PASSWORD</h1></center> +{% endblock headermsg %} + +{% block content %} +<div class="main"> + <p> We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly. - </p> - <p> - If you don't receive an email, please make sure you've entered the address you registered with, - and check your spam folder. - </p> -</body> -</html>
\ No newline at end of file + </p> + <p> + If you don't receive an email, please make sure you've entered the address you registered with, + and check your spam folder. + </p> +</div> +{% endblock content %}
\ No newline at end of file diff --git a/templates/inventory/reset/password_reset_form.html b/templates/inventory/reset/password_reset_form.html index db929c4..007f475 100644 --- a/templates/inventory/reset/password_reset_form.html +++ b/templates/inventory/reset/password_reset_form.html @@ -1,14 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>RESET PASSWORD</title> -</head> -<body> - <h3>Forgot password</h3> - <form method="post"> - {% csrf_token %} - {{ form.as_p }} - <button type="submit">Submit</button> - </form> -</body> -</html>
\ No newline at end of file +<!-- +This file is part of the Taler Codeless Merchant. +(C) 2018 GNUnet e.V. + +The Taler Codeless Merchant is free software: you can redistribute it and/or +modify it under the terms of the GNU Affero General Public License as published +by the Free Software Foundation, either version 3 of the License, or (at your +option) any later version. + +The Taler Codeless Merchant is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License +for more details. + +You should have received a copy of the GNU Affero General Public License along +with the Taler Codeless Merchant. If not, see <https://www.gnu.org/licenses/>. + +@author Shivam Kohli + --> +{% extends "inventory/reset/base.html" %} + +{% block headermsg %} + <center><h1 class="nav">RESET PASSWORD</h1></center> +{% endblock headermsg %} + +{% block content %} +<div class="main"> + <h3>Enter the Email Associated with your account.</h3> + <form method="post"> + {% csrf_token %} + {{ form.as_p }} + <button type="submit">Submit</button> + </form> +</div> +{% endblock content %}
\ No newline at end of file |