Remove references to / and polish some things

This commit is contained in:
Drew DeVault 2015-09-06 16:14:52 -04:00
parent 6a6cddc5b4
commit 010b2d666a
6 changed files with 11 additions and 5 deletions

View File

@ -93,7 +93,7 @@ def login():
login_user(user) login_user(user)
if user.admin: if user.admin:
return redirect("/admin") return redirect("/admin")
return redirect("/") return redirect("/panel")
@html.route("/logout") @html.route("/logout")
@loginrequired @loginrequired

View File

@ -68,6 +68,7 @@
var handler = StripeCheckout.configure({ var handler = StripeCheckout.configure({
name: your_name, name: your_name,
email: window.email,
key: window.stripe_key, key: window.stripe_key,
image: window.avatar, image: window.avatar,
locale: 'auto', locale: 'auto',

View File

@ -80,7 +80,7 @@
<div class="col-md-6 well"> <div class="col-md-6 well">
<h4>Add Project</h4> <h4>Add Project</h4>
<p>Donors will not be given a choice of project unless you have at least 2.</p> <p>Donors will not be given a choice of project unless you have at least 2.</p>
<form method="POST" action="/create-project"> <form method="POST" action="create-project">
<div class="form-group"> <div class="form-group">
<input class="form-control" type="text" placeholder="Project name" name="name" /> <input class="form-control" type="text" placeholder="Project name" name="name" />
</div> </div>

View File

@ -7,6 +7,9 @@ window.your_name = "{{ _cfg("your-name") }}";
window.bitcoin = "{{ _cfg("enable-bitcoin") }}" === "yes"; window.bitcoin = "{{ _cfg("enable-bitcoin") }}" === "yes";
window.default_amount = {{ _cfg("default-amount") }}; window.default_amount = {{ _cfg("default-amount") }};
window.default_type = "{{ _cfg("default-type") }}"; window.default_type = "{{ _cfg("default-type") }}";
{% if user %}
window.email = "{{user.email}}";
{% endif %}
</script> </script>
<script src="//checkout.stripe.com/checkout.js"></script> <script src="//checkout.stripe.com/checkout.js"></script>
<script src="static/index.js"></script> <script src="static/index.js"></script>
@ -32,7 +35,7 @@ window.default_type = "{{ _cfg("default-type") }}";
</noscript> </noscript>
<div class="container text-center hidden" id="thanks"> <div class="container text-center hidden" id="thanks">
{% include "post-donation-message.html" %} {% include "post-donation-message.html" %}
<form id="new-donor-password" class="hidden" action="/password-reset" method="POST"> <form id="new-donor-password" class="hidden" action="password-reset" method="POST">
<p>Set a password now if you want to manage your donations later:</p> <p>Set a password now if you want to manage your donations later:</p>
<input type="password" placeholder="Password" name="password" /> <input type="password" placeholder="Password" name="password" />
<input type="hidden" name="token" id="reset-token" /> <input type="hidden" name="token" id="reset-token" />
@ -138,12 +141,14 @@ window.default_type = "{{ _cfg("default-type") }}";
</div> </div>
<hr /> <hr />
<div class="container text-center"> <div class="container text-center">
{% if not user %}
<p> <p>
<small class="text-muted"> <small class="text-muted">
Been here before? <a href="login">Log in</a> to view your donation Been here before? <a href="login">Log in</a> to view your donation
history, edit recurring donations, and so on. history, edit recurring donations, and so on.
</small> </small>
</p> </p>
{% endif %}
<p> <p>
<small class="text-muted"> <small class="text-muted">
Powered by <a href="https://github.com/SirCmpwn/fosspay">fosspay</a>. Powered by <a href="https://github.com/SirCmpwn/fosspay">fosspay</a>.

View File

@ -16,7 +16,7 @@
</p> </p>
</div> </div>
{% endif %} {% endif %}
<form action="/login" method="POST"> <form action="login" method="POST">
<div class="form-group"> <div class="form-group">
<input class="form-control" type="text" name="email" placeholder="you@email.com" /> <input class="form-control" type="text" name="email" placeholder="you@email.com" />
</div> </div>

View File

@ -59,7 +59,7 @@
<h2>Admin Account</h2> <h2>Admin Account</h2>
<p>Enter your details for the admin account:</p> <p>Enter your details for the admin account:</p>
<form class="form" action="/setup" method="POST"> <form class="form" action="setup" method="POST">
<div class="form-group"> <div class="form-group">
<input type="text" class="form-control" name="email" <input type="text" class="form-control" name="email"
placeholder="Email" value="{{_cfg("your-email")}}" /> placeholder="Email" value="{{_cfg("your-email")}}" />