logged in user
This commit is contained in:
Arvind Tiwari
parent
114b4bea48
commit
0ed104cd56
6 changed files with 183 additions and 129 deletions
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2017-09-07 02:52+0530\n"
|
"POT-Creation-Date: 2017-09-07 19:54+0530\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -61,24 +61,6 @@ msgstr "Bitte gib einen Wert von 10 bis 200 ein."
|
||||||
msgid "GB Storage (SSD)"
|
msgid "GB Storage (SSD)"
|
||||||
msgstr "GB Storage (SSD)"
|
msgstr "GB Storage (SSD)"
|
||||||
|
|
||||||
msgid "Name"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Your Name"
|
|
||||||
msgstr "Dein Name"
|
|
||||||
|
|
||||||
msgid "Please enter your name."
|
|
||||||
msgstr "Bitte gib Deinen Namen ein."
|
|
||||||
|
|
||||||
msgid "Email"
|
|
||||||
msgstr "E-Mail-Adresse"
|
|
||||||
|
|
||||||
msgid "Your Email"
|
|
||||||
msgstr "Deine E-Mail"
|
|
||||||
|
|
||||||
msgid "Please enter a valid email address."
|
|
||||||
msgstr "Bitte gib eine gültige E-Mailadresse ein."
|
|
||||||
|
|
||||||
msgid "Continue"
|
msgid "Continue"
|
||||||
msgstr "Weiter"
|
msgstr "Weiter"
|
||||||
|
|
||||||
|
|
@ -91,6 +73,18 @@ msgstr "Vielen Dank für Deine Nachricht."
|
||||||
msgid "Get in touch with us!"
|
msgid "Get in touch with us!"
|
||||||
msgstr "Sende uns eine Nachricht."
|
msgstr "Sende uns eine Nachricht."
|
||||||
|
|
||||||
|
msgid "Name"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Please enter your name."
|
||||||
|
msgstr "Bitte gib Deinen Namen ein."
|
||||||
|
|
||||||
|
msgid "Email"
|
||||||
|
msgstr "E-Mail-Adresse"
|
||||||
|
|
||||||
|
msgid "Please enter a valid email address."
|
||||||
|
msgstr "Bitte gib eine gültige E-Mailadresse ein."
|
||||||
|
|
||||||
msgid "Message"
|
msgid "Message"
|
||||||
msgstr "Nachricht"
|
msgstr "Nachricht"
|
||||||
|
|
||||||
|
|
@ -260,6 +254,13 @@ msgstr "Kontaktiere uns"
|
||||||
msgid "Switzerland "
|
msgid "Switzerland "
|
||||||
msgstr "Schweiz "
|
msgstr "Schweiz "
|
||||||
|
|
||||||
|
msgid "Welcome back"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid ""
|
||||||
|
"Review your billing address and card details and proceed to make payment."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "Log in"
|
msgid "Log in"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -307,6 +308,11 @@ msgstr "Monat"
|
||||||
msgid "Sign up"
|
msgid "Sign up"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#, fuzzy
|
||||||
|
#| msgid "Billing Address"
|
||||||
|
msgid "Billing Address"
|
||||||
|
msgstr "Rechnungsadresse"
|
||||||
|
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#| msgid "Billing Address"
|
#| msgid "Billing Address"
|
||||||
msgid "Email Address"
|
msgid "Email Address"
|
||||||
|
|
@ -315,13 +321,20 @@ msgstr "Rechnungsadresse"
|
||||||
msgid "Credit Card"
|
msgid "Credit Card"
|
||||||
msgstr "Kreditkarte"
|
msgstr "Kreditkarte"
|
||||||
|
|
||||||
|
#, fuzzy
|
||||||
|
#| msgid ""
|
||||||
|
#| "\n"
|
||||||
|
#| " Please fill in your credit card "
|
||||||
|
#| "information below. We are using <a\n"
|
||||||
|
#| " href=\"https://stripe.com\" target="
|
||||||
|
#| "\"_blank\">Stripe</a> for payment and do not store\n"
|
||||||
|
#| " your information in our database.\n"
|
||||||
|
#| " "
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
" Please fill in your credit card information "
|
" Please fill in your credit card information below. "
|
||||||
"below. We are using <a\n"
|
"We are using <a href=\"https://stripe.com\" target=\"_blank\">Stripe</a> for "
|
||||||
" href=\"https://stripe.com\" target="
|
"payment and do not store your information in our database.\n"
|
||||||
"\"_blank\">Stripe</a> for payment and do not store\n"
|
|
||||||
" your information in our database.\n"
|
|
||||||
" "
|
" "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
|
|
@ -517,6 +530,12 @@ msgstr "ist kein gültiger Name"
|
||||||
msgid "is not a proper email"
|
msgid "is not a proper email"
|
||||||
msgstr "ist keine gültige E-Mailadresse"
|
msgstr "ist keine gültige E-Mailadresse"
|
||||||
|
|
||||||
|
#~ msgid "Your Name"
|
||||||
|
#~ msgstr "Dein Name"
|
||||||
|
|
||||||
|
#~ msgid "Your Email"
|
||||||
|
#~ msgstr "Deine E-Mail"
|
||||||
|
|
||||||
#~ msgid "Questions?"
|
#~ msgid "Questions?"
|
||||||
#~ msgstr "Fragen?"
|
#~ msgstr "Fragen?"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,7 @@
|
||||||
<!--<div class="description check-ip">
|
<!--<div class="description check-ip">
|
||||||
<input type="checkbox" name="ipv6"> Ipv6 Only<br>
|
<input type="checkbox" name="ipv6"> Ipv6 Only<br>
|
||||||
</div>-->
|
</div>-->
|
||||||
|
{% comment %}
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="description input justify-center">
|
<div class="description input justify-center">
|
||||||
<label for="name" class="control-label">{% trans "Name"%}</label>
|
<label for="name" class="control-label">{% trans "Name"%}</label>
|
||||||
|
|
@ -118,6 +119,7 @@
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% endcomment %}
|
||||||
</div>
|
</div>
|
||||||
<input type="submit" class="btn btn-primary disabled" value="{% trans 'Continue' %}"></input>
|
<input type="submit" class="btn btn-primary disabled" value="{% trans 'Continue' %}"></input>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
||||||
|
|
@ -16,23 +16,31 @@
|
||||||
<div class="dcl-payment-grid">
|
<div class="dcl-payment-grid">
|
||||||
<div class="dcl-payment-box">
|
<div class="dcl-payment-box">
|
||||||
<div class="dcl-payment-section">
|
<div class="dcl-payment-section">
|
||||||
|
{% if request.user.is_authenticated %}
|
||||||
|
<div class="dcl-payment-user">
|
||||||
|
<h4>{% trans "Welcome back" %} {{request.user.name}}!</h4>
|
||||||
|
<p>{% trans "Review your billing address and card details and proceed to make payment." %}</p>
|
||||||
|
</div>
|
||||||
|
{% else %}
|
||||||
<h3>{%trans "Log in" %}</h3>
|
<h3>{%trans "Log in" %}</h3>
|
||||||
<hr class="top-hr">
|
<hr class="top-hr">
|
||||||
<p>{% blocktrans %}Already signed up?<br>By logging in you can retrieve saved billing information.{% endblocktrans %}</p>
|
<p style="margin-bottom: 20px;">{% blocktrans %}Already signed up?<br>By logging in you can retrieve saved billing information.{% endblocktrans %}</p>
|
||||||
<form role="form" id="login-form" method="post" action="" novalidate>
|
<form role="form" id="login-form" method="post" action="{% url 'hosting:login' %}" novalidate>
|
||||||
{% for field in login_form %}
|
{% for field in login_form %}
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{% bootstrap_field field show_label=False type='fields'%}
|
{% bootstrap_field field show_label=False type='fields'%}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
<div class="text-right">
|
<input type='hidden' name='next' value='{{request.path}}'/>
|
||||||
<button type="submit" class="btn btn-vm-contact">{% trans "LOGIN" %}</button>
|
<div class="form-group text-right">
|
||||||
|
<button type="submit" class="btn btn-wide btn-vm-contact">{% trans "LOGIN" %}</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<p>
|
<p>
|
||||||
{% trans "Don't have an account yet?" %}<br>
|
{% trans "Don't have an account yet?" %}<br>
|
||||||
{% trans "You can sign up by filling in the information below." %}<br>
|
{% trans "You can sign up by filling in the information below." %}<br>
|
||||||
<a href="">{% trans "Forgot password?" %}</a>
|
<a href="{% url 'hosting:reset_password' %}">{% trans "Forgot password?" %}</a>
|
||||||
</p>
|
</p>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="dcl-payment-box">
|
<div class="dcl-payment-box">
|
||||||
|
|
@ -54,9 +62,14 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="dcl-payment-box">
|
<div class="dcl-payment-box">
|
||||||
<div class="dcl-payment-section">
|
<div class="dcl-payment-section">
|
||||||
|
{% if not request.user.is_authenticated %}
|
||||||
<h3><b>{%trans "Sign up"%}</b></h3>
|
<h3><b>{%trans "Sign up"%}</b></h3>
|
||||||
|
{% else %}
|
||||||
|
<h3><b>{%trans "Billing Address"%}</b></h3>
|
||||||
|
{% endif %}
|
||||||
<hr class="top-hr">
|
<hr class="top-hr">
|
||||||
<form role="form" id="billing-form" method="post" action="" novalidate>
|
<form role="form" id="billing-form" method="post" action="" novalidate>
|
||||||
|
{% if not request.user.is_authenticated %}
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="sr-only" for="id_signup_name">{% trans "Name" %}</label>
|
<label class="sr-only" for="id_signup_name">{% trans "Name" %}</label>
|
||||||
<input type="text" id="id_signup_name" class="form-control" name="signup_name" placeholder="{% trans 'Name' %}">
|
<input type="text" id="id_signup_name" class="form-control" name="signup_name" placeholder="{% trans 'Name' %}">
|
||||||
|
|
@ -65,6 +78,7 @@
|
||||||
<label class="sr-only" for="id_signup_email">{% trans "Email Address" %}</label>
|
<label class="sr-only" for="id_signup_email">{% trans "Email Address" %}</label>
|
||||||
<input type="email" id="id_signup_email" class="form-control" name="signup_email" placeholder="{% trans 'Email Address' %}">
|
<input type="email" id="id_signup_email" class="form-control" name="signup_email" placeholder="{% trans 'Email Address' %}">
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
{% for field in form %}
|
{% for field in form %}
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{% bootstrap_field field show_label=False type='fields'%}
|
{% bootstrap_field field show_label=False type='fields'%}
|
||||||
|
|
@ -76,17 +90,11 @@
|
||||||
<div class="dcl-payment-section">
|
<div class="dcl-payment-section">
|
||||||
<h3><b>{%trans "Credit Card"%}</b></h3>
|
<h3><b>{%trans "Credit Card"%}</b></h3>
|
||||||
<hr class="top-hr">
|
<hr class="top-hr">
|
||||||
<div>
|
|
||||||
<div>
|
|
||||||
<p>
|
<p>
|
||||||
{% blocktrans %}
|
{% blocktrans %}
|
||||||
Please fill in your credit card information below. We are using <a
|
Please fill in your credit card information below. We are using <a href="https://stripe.com" target="_blank">Stripe</a> for payment and do not store your information in our database.
|
||||||
href="https://stripe.com" target="_blank">Stripe</a> for payment and do not store
|
|
||||||
your information in our database.
|
|
||||||
{% endblocktrans %}
|
{% endblocktrans %}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
|
||||||
<br>
|
|
||||||
<div>
|
<div>
|
||||||
{% if credit_card_data.last4 %}
|
{% if credit_card_data.last4 %}
|
||||||
<form role="form" id="payment-form-with-creditcard" novalidate>
|
<form role="form" id="payment-form-with-creditcard" novalidate>
|
||||||
|
|
@ -142,7 +150,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="card-errors" role="alert"></div>
|
<div id="card-errors"></div>
|
||||||
{% if not messages and not form.non_field_errors %}
|
{% if not messages and not form.non_field_errors %}
|
||||||
<p class="card-warning-content">
|
<p class="card-warning-content">
|
||||||
{% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}
|
{% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}
|
||||||
|
|
@ -178,7 +186,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- stripe key data -->
|
<!-- stripe key data -->
|
||||||
{% if stripe_key %}
|
{% if stripe_key %}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2017-09-07 02:50+0530\n"
|
"POT-Creation-Date: 2017-09-07 19:54+0530\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
|
||||||
|
|
@ -667,7 +667,7 @@ a.unlink:hover {
|
||||||
|
|
||||||
#card-errors {
|
#card-errors {
|
||||||
clear: both;
|
clear: both;
|
||||||
padding: 0 0 10px;
|
padding: 0 5px 10px;
|
||||||
color: #eb4d5c;
|
color: #eb4d5c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -48,13 +48,39 @@
|
||||||
}
|
}
|
||||||
.dcl-payment-section p {
|
.dcl-payment-section p {
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
|
font-weight: 400;
|
||||||
}
|
}
|
||||||
.dcl-payment-section .card-warning-content {
|
.dcl-payment-section .card-warning-content {
|
||||||
padding: 8px 10px;
|
padding: 8px 10px;
|
||||||
|
font-weight: 300;
|
||||||
}
|
}
|
||||||
.dcl-payment-order strong{
|
.dcl-payment-order strong{
|
||||||
font-size: 17px;
|
font-size: 17px;
|
||||||
}
|
}
|
||||||
|
.dcl-payment-order p {
|
||||||
|
font-weight: 300;
|
||||||
|
}
|
||||||
|
.dcl-payment-section .form-group {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
.dcl-payment-section .form-control {
|
||||||
|
box-shadow: none;
|
||||||
|
padding: 6px 12px;
|
||||||
|
height: 32px;
|
||||||
|
}
|
||||||
|
.dcl-payment-user {
|
||||||
|
height: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dcl-payment-user h4 {
|
||||||
|
font-weight: 600;
|
||||||
|
padding-left: 5px;
|
||||||
|
font-size: 17px;
|
||||||
|
}
|
||||||
|
|
||||||
@media (min-width: 768px) {
|
@media (min-width: 768px) {
|
||||||
.dcl-payment-grid {
|
.dcl-payment-grid {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -67,7 +93,7 @@
|
||||||
padding: 0 30px;
|
padding: 0 30px;
|
||||||
}
|
}
|
||||||
.dcl-payment-section {
|
.dcl-payment-section {
|
||||||
padding: 30px 10px;
|
padding: 15px 10px;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
border-bottom-width: 5px;
|
border-bottom-width: 5px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue