amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mobile order fixed

Browse source
This commit is contained in:
Arvind Tiwari 2017-09-13 01:55:58 +05:30
commit 6237469ab2
3 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
datacenterlight/templates/datacenterlight/landing_payment.html
View file

@ -43,23 +43,6 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="dcl-payment-box">
<div class="dcl-payment-section">
<h3>{%trans "Your Order" %}</h3>
<hr class="top-hr">
<div class="dcl-payment-order">
<p>{% trans "Cores"%} <strong class="pull-right">{{request.session.specs.cpu|floatformat}}</strong></p>
<hr>
<p>{% trans "Memory"%} <strong class="pull-right">{{request.session.specs.memory|floatformat}} GB</strong></p>
<hr>
<p>{% trans "Disk space"%} <strong class="pull-right">{{request.session.specs.disk_size|floatformat}} GB</strong></p>
<hr>
<p>{% trans "Configuration"%} <strong class="pull-right">{{request.session.template.name}}</strong></p>
<hr>
<p class="last-p"><strong>{%trans "Total" %}</strong>&nbsp;&nbsp;<small>({%trans "including VAT" %})</small> <strong class="pull-right">{{request.session.specs.price}} CHF/{% trans "Month" %}</strong></p>
</div>
</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 %} {% if not request.user.is_authenticated %}
@ -81,6 +64,23 @@
</form> </form>
</div> </div>
</div> </div>
<div class="dcl-payment-box">
<div class="dcl-payment-section">
<h3>{%trans "Your Order" %}</h3>
<hr class="top-hr">
<div class="dcl-payment-order">
<p>{% trans "Cores"%} <strong class="pull-right">{{request.session.specs.cpu|floatformat}}</strong></p>
<hr>
<p>{% trans "Memory"%} <strong class="pull-right">{{request.session.specs.memory|floatformat}} GB</strong></p>
<hr>
<p>{% trans "Disk space"%} <strong class="pull-right">{{request.session.specs.disk_size|floatformat}} GB</strong></p>
<hr>
<p>{% trans "Configuration"%} <strong class="pull-right">{{request.session.template.name}}</strong></p>
<hr>
<p class="last-p"><strong>{%trans "Total" %}</strong>&nbsp;&nbsp;<small>({%trans "including VAT" %})</small> <strong class="pull-right">{{request.session.specs.price}} CHF/{% trans "Month" %}</strong></p>
</div>
</div>
</div>
<div class="dcl-payment-box"> <div class="dcl-payment-box">
<div class="dcl-payment-section"> <div class="dcl-payment-section">
<h3><b>{%trans "Credit Card"%}</b></h3> <h3><b>{%trans "Credit Card"%}</b></h3>

1
datacenterlight/views.py
View file

@ -410,7 +410,6 @@ class PaymentOrderView(FormView):
@cache_control(no_cache=True, must_revalidate=True, no_store=True) @cache_control(no_cache=True, must_revalidate=True, no_store=True)
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
# user is no longer added to session on the index page # user is no longer added to session on the index page
# if 'specs' not in request.session or 'user' not in request.session:
if 'specs' not in request.session: if 'specs' not in request.session:
return HttpResponseRedirect(reverse('datacenterlight:index')) return HttpResponseRedirect(reverse('datacenterlight:index'))
return self.render_to_response(self.get_context_data()) return self.render_to_response(self.get_context_data())

11
hosting/static/hosting/css/payment.css
View file

@ -92,15 +92,22 @@
position: relative; position: relative;
padding: 0 30px; padding: 0 30px;
} }
.dcl-payment-box:nth-child(2) {
order: 1;
}
.dcl-payment-box:nth-child(4) {
order: 2;
}
.dcl-payment-section { .dcl-payment-section {
padding: 15px 10px; padding: 15px 10px;
margin-bottom: 0; margin-bottom: 0;
border-bottom-width: 5px; border-bottom-width: 5px;
} }
.dcl-payment-box:nth-child(n+3) .dcl-payment-section { .dcl-payment-box:nth-child(2n) .dcl-payment-section {
border-bottom: none; border-bottom: none;
} }
.dcl-payment-box:nth-child(2n+1):after { .dcl-payment-box:nth-child(1):after,
.dcl-payment-box:nth-child(2):after {
content: ' '; content: ' ';
display: block; display: block;
background: #eee; background: #eee;