resolve conflicts
This commit is contained in:
Tomislav R
commit
2a7603778a
60 changed files with 676 additions and 444 deletions
|
|
@ -81,23 +81,23 @@
|
|||
</li>
|
||||
{% else %}
|
||||
<li>
|
||||
<a href="{{ request.META.HTTP_REFERER }}#how">How it works</a>
|
||||
<a href="{{ request.session.hosting_url}}#how">How it works</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ request.META.HTTP_REFERER }}#your">Your infrastructure</a>
|
||||
<a href="{{ request.session.hosting_url }}#your">Your infrastructure</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ request.META.HTTP_REFERER }}#our">Our inftrastructure</a>
|
||||
<a href="{{ request.session.hosting_url }}#our">Our inftrastructure</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ request.META.HTTP_REFERER }}#price">Pricing</a>
|
||||
<a href="{{ request.session.hosting_url }}#price">Pricing</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ request.META.HTTP_REFERER }}#contact">Contact</a>
|
||||
<a href="{{ request.session.hosting_url }}#contact">Contact</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{% url 'hosting:login' %}?next={{request.current_path}}">Login</a>
|
||||
</li>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
@ -123,21 +123,22 @@
|
|||
</li>
|
||||
<li class="footer-menu-divider">⋅</li>
|
||||
<li>
|
||||
<a href="{{ request.META.HTTP_REFERER }}#how">How it works</a>
|
||||
<a href="{{ request.session.hosting_url}}#how">How it works</a>
|
||||
<li class="footer-menu-divider">⋅</li>
|
||||
<li>
|
||||
<a href="{{ request.META.HTTP_REFERER }}#your">Your infrastructure</a></li>
|
||||
<a href="{{ request.session.hosting_url }}#your">Your infrastructure</a></li>
|
||||
<li>⋅</li>
|
||||
<li>
|
||||
<a href="{{ request.META.HTTP_REFERER }}#our">Our infrastructure</a></li>
|
||||
<a href="{{ request.session.hosting_url }}#our">Our infrastructure</a></li>
|
||||
<li class="footer-menu-divider">⋅</li>
|
||||
<li>
|
||||
<a href="{{ request.META.HTTP_REFERER }}#services">Pricing</a>
|
||||
<a href="{{ request.session.hosting_url }}#services">Pricing</a>
|
||||
</li>
|
||||
<li class="footer-menu-divider">⋅</li>
|
||||
<li>
|
||||
<a href="{{ request.META.HTTP_REFERER }}#contact">Contact</a>
|
||||
<a href="{{ request.session.hosting_url }}#contact">Contact</a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
<p class="copyright text-muted small">Copyright © ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
{% load staticfiles %}
|
||||
<a name="price"></a>
|
||||
<div class="content-section-b">
|
||||
<div class="container-fluid pricing-container">
|
||||
|
|
@ -6,7 +7,6 @@
|
|||
<hr class="section-heading-spacer">
|
||||
<div class="clearfix"></div>
|
||||
<h2 class="section-heading">Hosting Price</h2>
|
||||
<p class="lead">Here are samples of our {{ hosting_long }} hosting offers, suited for different projects. Our offer examples come in different size, speed, and storage. </p>
|
||||
</div>
|
||||
<!-- Title -->
|
||||
<div class="row">
|
||||
|
|
@ -17,17 +17,31 @@
|
|||
<!-- Page Features -->
|
||||
<div class="row text-center">
|
||||
|
||||
<div class="block col-md-offset-1">
|
||||
<div class="block col-md-offset-3">
|
||||
{% for vm in vm_types %}
|
||||
<div class="col-xs-12 col-sm-6 col-md-2">
|
||||
<div class="col-xs-12 col-sm-6 col-md-4">
|
||||
<form class="form-inline" method="POST" action="{{request.path}}">
|
||||
{% csrf_token %}
|
||||
<input type="hidden" name="hosting_company" value="{{vm.hosting_company}}">
|
||||
<input type="hidden" name="hosting_company_name" value="{{vm.hosting_company_name}}">
|
||||
<ul class="pricing {% cycle 'p-green' 'p-yel' 'p-red' 'p-blue' %}">
|
||||
|
||||
|
||||
<ul class="pricing {% cycle 'p-red' 'p-black' 'p-red' 'p-yel' %}">
|
||||
<li class="type">
|
||||
<!-- <img src="http://bread.pp.ua/n/settings_g.svg" alt=""> -->
|
||||
<h3 >{{vm.hosting_company_name}}</h3>
|
||||
<br/>
|
||||
<img class="img-responsive" src="{{ STATIC_URL }}hosting/img/{{vm.location_code}}_flag.png" alt="">
|
||||
|
||||
</li>
|
||||
<li>
|
||||
<!-- Single button -->
|
||||
<div class="btn-group">
|
||||
<div class="form-group">
|
||||
<label for="cores">Location: </label>
|
||||
{{vm.location}}
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<!-- Single button -->
|
||||
|
|
@ -64,7 +78,7 @@
|
|||
<div class="form-group row">
|
||||
<div class="col-xs-offset-1 col-xs-9 col-sm-12 col-md-12 col-md-offset-0">
|
||||
<label for="Disk Size">Disk Size: </label>
|
||||
<input class="form-control short-input text-center disk-space-selector" name="disk_space" type="number" id="{{vm.hosting_company}}-disk_space" min="10" value="10" data-vm-type="{{vm.hosting_company}}"/>
|
||||
<input class="form-control short-input text-center disk-space-selector" name="disk_space" type="number" id="{{vm.hosting_company}}-disk_space" min="10" value="10" step="10" data-vm-type="{{vm.hosting_company}}"/>
|
||||
<span>GiB</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -75,7 +89,7 @@
|
|||
<span>per month</span>
|
||||
</li>
|
||||
<li>
|
||||
<button>Buy it</button>
|
||||
<button>Book it</button>
|
||||
</li>
|
||||
</ul>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,17 @@
|
|||
<div class="intro-auth intro-login">
|
||||
<div class="container">
|
||||
<div class="col-md-4 col-md-offset-4">
|
||||
|
||||
{% block messages %}
|
||||
{% if request.GET.logged_out %}
|
||||
<div class="alert alert-warning"> <!-- singular -->
|
||||
<a class="close" data-dismiss="alert">×</a>
|
||||
You haven been logged out
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
<div class="intro-message">
|
||||
<h2 class="section-heading">Login</h2>
|
||||
<form action="{% url 'hosting:login' %}" method="post" class="form" novalidate>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<div class="row">
|
||||
<div class="col-xs-8 col-xs-offset-2">
|
||||
<div class="invoice-title">
|
||||
<h2>Invoice</h2><h3 class="pull-right">Order # {{object.id}}</h3>
|
||||
<h2>Invoice</h2><h3 class="pull-right">Order # {{order.id}}</h3>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row">
|
||||
|
|
@ -14,18 +14,18 @@
|
|||
<address>
|
||||
<h3><b>Billed To:</b></h3>
|
||||
{{user.name}}<br>
|
||||
{{object.billing_address.street_address}},{{order.billing_address.postal_code}}<br>
|
||||
{{object.billing_address.city}}, {{object.billing_address.country}}.
|
||||
{{order.billing_address.street_address}},{{order.billing_address.postal_code}}<br>
|
||||
{{order.billing_address.city}}, {{order.billing_address.country}}.
|
||||
</address>
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
<address>
|
||||
<strong>Order Date:</strong><br>
|
||||
{{object.created_at}}<br><br>
|
||||
{{order.created_at}}<br><br>
|
||||
<strong>Status:</strong><br>
|
||||
<strong class="{% if object.status == 'Approved' %}text-success
|
||||
<strong class="{% if order.status == 'Approved' %}text-success
|
||||
{%else%} text-danger
|
||||
{% endif %}">{{object.status}}</strong>
|
||||
{% endif %}">{{order.status}}</strong>
|
||||
<br><br>
|
||||
</address>
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
<div class="col-xs-6">
|
||||
<address>
|
||||
<strong>Payment Method:</strong><br>
|
||||
{{object.cc_brand}} ending **** {{object.last4}}<br>
|
||||
{{order.cc_brand}} ending **** {{order.last4}}<br>
|
||||
{{user.email}}
|
||||
</address>
|
||||
</div>
|
||||
|
|
@ -48,15 +48,15 @@
|
|||
<h3><b>Order summary</b></h3>
|
||||
<hr>
|
||||
<div class="content">
|
||||
<p><b>Type</b> <span class="pull-right">{{object.VMPlan.hosting_company_name}}</span></p>
|
||||
<p><b>Type</b> <span class="pull-right">{{order.vm_plan.hosting_company_name}}</span></p>
|
||||
<hr>
|
||||
<p><b>Cores</b> <span class="pull-right">{{object.VMPlan.cores}}</span></p>
|
||||
<p><b>Cores</b> <span class="pull-right">{{order.vm_plan.cores}}</span></p>
|
||||
<hr>
|
||||
<p><b>Memory</b> <span class="pull-right">{{object.VMPlan.memory}} GiB</span></p>
|
||||
<p><b>Memory</b> <span class="pull-right">{{order.vm_plan.memory}} GiB</span></p>
|
||||
<hr>
|
||||
<p><b>Disk space</b> <span class="pull-right">{{object.VMPlan.disk_size}} GiB</span></p>
|
||||
<p><b>Disk space</b> <span class="pull-right">{{order.vm_plan.disk_size}} GiB</span></p>
|
||||
<hr>
|
||||
<h4>Total<p class="pull-right"><b>{{object.VMPlan.price}} CHF</b></p></h4>
|
||||
<h4>Total<p class="pull-right"><b>{{order.vm_plan.price}} CHF</b></p></h4>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<tr>
|
||||
<td scope="row">{{ order.id }}</td>
|
||||
<td>{{ order.created_at }}</td>
|
||||
<td>{{ order.VMPlan.price }} CHF</td>
|
||||
<td>{{ order.vm_plan.price }} CHF</td>
|
||||
<td>{% if order.approved %}
|
||||
<span class="text-success strong">Approved</span>
|
||||
{% else %}
|
||||
|
|
@ -55,7 +55,8 @@
|
|||
Your
|
||||
order?</h4>
|
||||
|
||||
<form method="post" action="{% url 'hosting:delete_order' order.id %}">
|
||||
<form method="post"
|
||||
action="{% url 'hosting:delete_order' order.id %}">
|
||||
{% csrf_token %}
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default"
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@
|
|||
<tr>
|
||||
<td scope="row">{{order.id}}</td>
|
||||
<td>{{order.created_at}}</td>
|
||||
<td>{{order.VMPlan.price}} CHF</td>
|
||||
<td>{{order.vm_plan.price}} CHF</td>
|
||||
<td>{% if order.approved %}
|
||||
<span class="text-success strong">Approved</span>
|
||||
{% else%}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue