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

Fixed details in Hosting pages and translate in login

Browse source
This commit is contained in:
Henry Bravo 2017-06-01 11:24:50 -05:00
commit 024f7565df
22 changed files with 300 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hosting/templates/hosting/base_short.html
View file

@ -118,10 +118,10 @@
{% endif %}
<!-- Header -->
<a name="about"></a>
{% block content %}
{% endblock %}
<div class="content-dashboard">
{% block content %}
{% endblock %}
</div>
<!-- Footer -->
{% if request.user.is_authenticated %}
@ -129,7 +129,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
<ul class="list-inline">
<!-- <ul class="list-inline">
<li>
<a href="#">{% trans "Home"%}</a>
</li>
@ -159,7 +159,7 @@
</a>
</li>
</ul>
</ul> -->
<p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
</div>
</div>

2
hosting/templates/hosting/bill_detail.html
View file

@ -3,7 +3,7 @@
{% load i18n %}
{% block content %}
<div class="container">
<div class="">
<div class="orders-container" style="padding-bottom: 15%">
{# Adress bar #}
<div class="row">

4
hosting/templates/hosting/bill_error.html
View file

@ -3,8 +3,8 @@
{% load i18n %}
{% block content %}
<div class="container">
<div class="container orders-container">
<div class="">
<div class="orders-container">
<h1>Error</h1>
<p> Could not get HostingBill object for client. </p>
<p> Please create a HostingBill object via the admin page </p>

2
hosting/templates/hosting/bills.html
View file

@ -5,7 +5,7 @@
{% block content %}
<div>
<div class="container orders-container">
<div class="orders-container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<table class="table borderless table-hover">

34
hosting/templates/hosting/confirm_reset_password.html
View file

@ -3,11 +3,15 @@
{% load i18n %}
{% block content %}
<div class="intro-auth intro-reset-password">
<div class="container">
<div class="col-md-4">&nbsp;</div>
<div class="col-md-4">
<div class="intro-message">
<div class="auth-container">
<div class="auth-bg"></div>
<div class="container">
<div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div>
<div class="auth-content">
<div class="intro-message auth-box sign-up">
<h2 class="section-heading">{% trans "Set your new password"%}</h2>
{% if messages %}
<ul class="list-unstyled">
{% for message in messages %}
@ -15,10 +19,7 @@
{% endfor %}
</ul>
{% endif %}
<h2 class="section-heading">{% trans "Set your new password"%}</h2>
<form action="" method="post" class="form" novalidate>
<form action="" method="post" class="form" novalidate>
{% csrf_token %}
{% for field in form %}
{% bootstrap_field field show_label=False %}
@ -29,11 +30,16 @@
</button>
{% endbuttons %}
</form>
<span>{% trans "Already have an account ?"%}<a class="unlink" href="{% url 'hosting:login' %}">{% trans "Log in"%}</a></span>
<ul class="list-inline intro-social-buttons">
</ul>
</div>
</div>
<div class="auth-footer">
<div class="text">
<span>{% trans "Already have an account ?"%}</span>
</div>
<div class="links">
<a class="unlink" href="{% url 'hosting:login' %}">{% trans "Login"%}</a>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

2
hosting/templates/hosting/create_virtual_machine.html
View file

@ -16,7 +16,7 @@
{% endif %}
</div>
{% if not error %}
<h3><i class="fa fa-server" aria-hidden="true"></i> {% trans "New Virtual Machine"%} </h3>
<h3><i class="fa fa-server fa-separate" aria-hidden="true"></i> {% trans "New Virtual Machine"%} </h3>
<hr/>
<form method="POST" action="">
{% csrf_token %}

3
hosting/templates/hosting/login.html
View file

@ -5,7 +5,6 @@
<div class="auth-container">
<div class="auth-bg"></div>
<div class="container">
<div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div>
@ -56,8 +55,6 @@
</div>
</div>
</div>
</div>
<!-- /.container -->
</div>
{% endblock %}

4
hosting/templates/hosting/notifications.html
View file

@ -2,11 +2,11 @@
{% load staticfiles bootstrap3 i18n %}
{% block content %}
<div>
<div class="container virtual-machine-container dashboard-container ">
<div class="virtual-machine-container dashboard-container ">
<div class="row">
<div class="col-md-9 col-md-offset-2">
<div class="col-sm-12">
<h3><i class="fa fa-bell" aria-hidden="true"></i>{% trans "Notifications"%} </h3>
<h3><i class="fa fa-bell fa-separate" aria-hidden="true"></i>{% trans "Notifications"%} </h3>
<hr/>
<div class="col-md-3"> <!-- required for floating -->
<!-- Nav tabs -->

4
hosting/templates/hosting/order_detail.html
View file

@ -3,9 +3,9 @@
{% load i18n %}
{% block content %}
<div class="container order-detail-container">
<div class="order-detail-container">
<div class="row">
<div class="col-xs-8 col-xs-offset-2">
<div class="col-xs-12 col-md-8 col-md-offset-2">
<div class="invoice-title">
<h2>{% trans "Invoice"%}</h2><h3 class="pull-right">{% trans "Order #"%} {{order.id}}</h3>
</div>

6
hosting/templates/hosting/orders.html
View file

@ -5,11 +5,11 @@
{% block content %}
<div>
<div class="container orders-container">
<div class="orders-container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="container-table col-md-8 col-md-offset-2">
<table class="table borderless table-hover">
<h3><i class="fa fa-credit-card"></i>{% trans "My Orders"%}</h3>
<h3><i class="fa fa-credit-card fa-separate"></i>{% trans "My Orders"%}</h3>
<br/>
<thead>
<tr>

2
hosting/templates/hosting/payment.html
View file

@ -3,7 +3,7 @@
{% block content %}
<!-- Credit card form -->
<div>
<div class="container payment-container">
<div class="payment-container">
<div class="row">
<div class="col-xs-12 col-md-offset-2 col-md-4 summary-box">
<form role="form" novalidate>

50
hosting/templates/hosting/reset_password.html
View file

@ -5,34 +5,32 @@
{% block content %}
<div class="auth-container">
<div class="auth-bg"></div>
<div class="container">
<div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div>
<div class="auth-content">
<div class="intro-message auth-box sign-up">
<h2 class="section-heading">{% trans "Reset your password"%}</h2>
<form action="{% url 'hosting:reset_password' %}" method="post" class="form" novalidate>
{% csrf_token %}
{% for field in form %}
{% bootstrap_field field show_label=False %}
{% endfor %}
{% buttons %}
<button type="submit" class="btn btn-block btn-success">
{% trans "Reset"%}
</button>
{% endbuttons %}
</form>
<div class="auth-footer">
<div class="text">
<span>{% trans "Already have an account ?"%}</span>
</div>
<div class="links">
<a class="unlink" href="{% url 'hosting:login' %}">{% trans "Login"%}</a>
</div>
<div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div>
<div class="auth-content">
<div class="intro-message auth-box sign-up">
<h2 class="section-heading">{% trans "Reset your password"%}</h2>
<form action="{% url 'hosting:reset_password' %}" method="post" class="form" novalidate>
{% csrf_token %}
{% for field in form %}
{% bootstrap_field field show_label=False %}
{% endfor %}
{% buttons %}
<button type="submit" class="btn btn-block btn-success">
{% trans "Reset"%}
</button>
{% endbuttons %}
</form>
<div class="auth-footer">
<div class="text">
<span>{% trans "Already have an account ?"%}</span>
</div>
<div class="links">
<a class="unlink" href="{% url 'hosting:login' %}">{% trans "Login"%}</a>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

52
hosting/templates/hosting/signup.html
View file

@ -4,34 +4,32 @@
{% block content %}
<div class="auth-container">
<div class="auth-bg"></div>
<div class="container">
<div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div>
<div class="auth-content">
<div class="intro-message auth-box sign-up">
<h2 class="section-heading">{% trans "Sign up"%}</h2>
<form action="{% url 'hosting:signup' %}" method="post" class="form" novalidate>
{% csrf_token %}
{% for field in form %}
{% bootstrap_field field show_label=False %}
{% endfor %}
{% buttons %}
<button type="submit" class="btn btn-block btn-info">
{% trans "Sign up"%}
</button>
{% endbuttons %}
</form>
<div class="auth-footer">
<div class="text">
<span>{% trans "Already have an account ?"%}</span>
</div>
<div class="links">
<a class="unlink" href="{% url 'hosting:login' %}">{% trans "Login"%}</a>
</div>
<div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div>
<div class="auth-content">
<div class="intro-message auth-box sign-up">
<h2 class="section-heading">{% trans "Sign up"%}</h2>
<form action="{% url 'hosting:signup' %}" method="post" class="form" novalidate>
{% csrf_token %}
{% for field in form %}
{% bootstrap_field field show_label=False %}
{% endfor %}
{% buttons %}
<button type="submit" class="btn btn-block btn-info">
{% trans "Sign up"%}
</button>
{% endbuttons %}
</form>
<div class="auth-footer">
<div class="text">
<span>{% trans "Already have an account ?"%}</span>
</div>
<div class="links">
<a class="unlink" href="{% url 'hosting:login' %}">{% trans "Login"%}</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

18
hosting/templates/hosting/virtual_machine_detail.html
View file

@ -4,11 +4,11 @@
{% block content %}
<div>
<div class="container virtual-machine-container dashboard-container ">
<div class="virtual-machine-container dashboard-container ">
<div class="row">
<div class="col-md-9 col-md-offset-2">
<div class="col-sm-12">
<h3><i class="fa fa-cloud" aria-hidden="true"></i> {{virtual_machine.name}}</h3>
<h3><i class="fa fa-cloud fa-separate" aria-hidden="true"></i> {{virtual_machine.name}}</h3>
<hr/>
<div class="col-md-3"> <!-- required for floating -->
<!-- Nav tabs -->
@ -71,20 +71,22 @@
<div class="col-md-12">
<div class="row">
<div class="col-md-3">
<div class="well text-center">
<i class="fa fa-cubes" aria-hidden="true"></i>{% trans "Cores"%} <br/>
<div class="well text-center box-setting">
<i class="fa fa-cubes" aria-hidden="true"></i>
<span>{% trans "Cores"%}</span>
<span class="label label-success">{{virtual_machine.cores}}</span>
</div>
</div>
<div class="col-md-3">
<div class="well text-center">
<div class="well text-center box-setting">
<i class="fa fa-tachometer" aria-hidden="true"></i> {% trans "Memory"%} <br/>
<span class="label label-success">{{virtual_machine.memory}} GiB</span>
</div>
</div>
<div class="col-md-3">
<div class="well text-center">
<i class="fa fa-hdd-o" aria-hidden="true"></i> {% trans "Disk"%} <br/>
<div class="well text-center box-setting">
<i class="fa fa-hdd-o" aria-hidden="true"></i>
<span>{% trans "Disk"%}</span>
<span class="label label-success">{{virtual_machine.disk_size|floatformat:2}} GiB</span>
</div>
</div>
@ -130,7 +132,7 @@
</div>
{% if not virtual_machine.status == 'canceled' %}
<div class="row">
<div class="col-md-12 space-above-big">
<div class="col-md-12 separate-md">
<div class="pull-right">
<form method="POST"
id="virtual_machine_cancel_form" class="cancel-form" action="{% url 'hosting:virtual_machines' virtual_machine.vm_id %}">

6
hosting/templates/hosting/virtual_machine_key.html
View file

@ -2,13 +2,13 @@
{% load staticfiles bootstrap3 i18n %}
{% block content %}
<div>
<div class="container virtual-machine-container dashboard-container ">
<div class="virtual-machine-container dashboard-container ">
<div class="row">
<div class="col-md-9 col-md-offset-2">
<div class="container-table col-md-9 col-md-offset-2">
<div class="col-sm-12">
<form method="POST" action="" >
{% csrf_token %}
<h3><i class="fa fa-key" aria-hidden="true"></i>{% trans "Access Key"%} </h3>
<h3><i class="fa fa-key fa-separate" aria-hidden="true"></i>{% trans "Access Key"%} </h3>
{% if messages %}
<div class="alert alert-warning">
{% for message in messages %}

8
hosting/templates/hosting/virtual_machines.html
View file

@ -2,11 +2,11 @@
{% load staticfiles bootstrap3 i18n %}
{% block content %}
<div>
<div class="container dashboard-container">
<div class="dashboard-container">
<div class="row">
<div class="col-md-8 col-md-offset-2" style="margin-top: 35px;">
<div class="col-xs-12 col-lg-8 col-lg-offset-2 container-table">
<table class="table borderless table-hover">
<h3 class="pull-left"><i class="fa fa-server" aria-hidden="true"></i> {% trans "Virtual Machines"%} </h3>
<h3 class="pull-left"><i class="fa fa-server fa-separate" aria-hidden="true"></i> {% trans "Virtual Machines"%} </h3>
<div class="col-md-12">
<br/>
{% if messages %}
@ -18,7 +18,7 @@
{% endif %}
</div>
{% if not error %}
<p class="pull-right">
<p class="pull-right btn-create-vm">
<a class="btn btn-success" href="{% url 'hosting:create_virtual_machine' %}" >{% trans "Create VM"%} </a>
</p>
<br/>