Merge branch 'develop' of git://github.com/HenryGBC/dynamicweb into HenryGBC-develop

This commit is contained in:
Levi 2017-06-05 22:51:53 -05:00
commit a355ae9087
50 changed files with 704 additions and 327 deletions

Binary file not shown.

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-01 21:03+0000\n"
"POT-Creation-Date: 2017-05-30 13:47+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -79,70 +79,68 @@ msgstr "Anmelden"
msgid "Home"
msgstr "Home"
#: hosting/templates/hosting/bill_detail.html:11
#: hosting/templates/hosting/order_detail.html:10
#: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:10
msgid "Invoice"
msgstr "Rechnung"
#: hosting/templates/hosting/bill_detail.html:11
#: hosting/templates/hosting/order_detail.html:10
#: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:10
msgid "Order #"
msgstr "Rechnung #"
#: hosting/templates/hosting/bill_detail.html:25
#: templates/hosting/bill_detail.html:25
msgid "ungleich GmbH"
msgstr ""
#: hosting/templates/hosting/bill_detail.html:26
#: templates/hosting/bill_detail.html:26
msgid "buchhaltung@ungleich.ch"
msgstr ""
#: hosting/templates/hosting/bill_detail.html:27
#: templates/hosting/bill_detail.html:27
msgid "Hauptstrasse 14"
msgstr ""
#: hosting/templates/hosting/bill_detail.html:28
#: templates/hosting/bill_detail.html:28
msgid "CH-8775 Luchsingen"
msgstr ""
#: hosting/templates/hosting/bill_detail.html:29
#: templates/hosting/bill_detail.html:29
msgid "Mwst-Nummer: CHE-109.549.333 MWST"
msgstr ""
#: hosting/templates/hosting/bill_detail.html:60
#: templates/hosting/bill_detail.html:60
msgid "Total:"
msgstr ""
#: hosting/templates/hosting/bill_detail.html:68
#: templates/hosting/bill_detail.html:68
#, python-format
msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer."
msgstr "All prices in CHF including 8%% VAT"
#: hosting/templates/hosting/bill_detail.html:69
#: templates/hosting/bill_detail.html:69
msgid "Betrag zahlbar innerhalb von 30 Tagen ab Rechnungseingang."
msgstr ""
#: hosting/templates/hosting/bill_detail.html:70
#: templates/hosting/bill_detail.html:70
msgid "Kontoverbindung:"
msgstr ""
#: hosting/templates/hosting/bill_detail.html:73
#: templates/hosting/bill_detail.html:73
msgid "IBAN:"
msgstr ""
#: hosting/templates/hosting/bill_detail.html:76
#: templates/hosting/bill_detail.html:76
msgid "BIC:"
msgstr ""
#: hosting/templates/hosting/bill_detail.html:81
#: templates/hosting/bill_detail.html:81
msgid "CH02 0900 0000 6071 8848 8"
msgstr ""
#: hosting/templates/hosting/bill_detail.html:84
#: templates/hosting/bill_detail.html:84
msgid "POFICHBEXXX"
msgstr ""
#: hosting/templates/hosting/bills.html:12
#: templates/hosting/bills.html:12
msgid "Customers"
msgstr "Kunden"
@ -151,27 +149,31 @@ msgstr "Kunden"
msgid "Name"
msgstr ""
#: hosting/templates/hosting/bills.html:17
#: templates/hosting/bills.html:17
msgid "Email"
msgstr ""
#: hosting/templates/hosting/bills.html:28
#: templates/hosting/bills.html:28
msgid "View Bill"
msgstr "Rechnung anzeigen"
#: hosting/templates/hosting/bills.html:41
#: hosting/templates/hosting/orders.html:83
#: hosting/templates/hosting/virtual_machines.html:70
#: templates/hosting/bills.html:41 templates/hosting/orders.html.py:83
#: templates/hosting/virtual_machines.html:70
msgid "previous"
msgstr "vorherige"
#: hosting/templates/hosting/bills.html:47
#: hosting/templates/hosting/orders.html:89
#: hosting/templates/hosting/virtual_machines.html:76
#: templates/hosting/bills.html:47 templates/hosting/orders.html.py:89
#: templates/hosting/virtual_machines.html:76
msgid "next"
msgstr "nächste"
#: hosting/templates/hosting/confirm_reset_password.html:19
#: templates/hosting/confirm_reset_password.html:10
#: templates/hosting/login.html:9 templates/hosting/reset_password.html.py:9
#: templates/hosting/signup.html:8
msgid "Your VM hosted in Switzerland"
msgstr "Ihre VM in der Schweiz"
#: templates/hosting/confirm_reset_password.html:14
msgid "Set your new password"
msgstr "Setzen Ihr neues Passwort"
@ -206,40 +208,34 @@ msgstr "Wählen Sie eine Konfiguration"
msgid "CHF/Month"
msgstr "CHF/Monat"
#: hosting/templates/hosting/create_virtual_machine.html:45
#: templates/hosting/create_virtual_machine.html:45
msgid "Start VM"
msgstr "Start VM"
#: hosting/templates/hosting/emails/password_reset_email.html:2
#: hosting/templates/hosting/emails/password_reset_email.txt:2
#: templates/hosting/emails/password_reset_email.html:2
#: templates/hosting/emails/password_reset_email.txt:2
#, python-format
msgid ""
"You're receiving this email because you requested a password reset for your "
"user account at %(site_name)s."
msgstr ""
#: hosting/templates/hosting/emails/password_reset_email.html:4
#: hosting/templates/hosting/emails/password_reset_email.txt:4
#: templates/hosting/emails/password_reset_email.html:4
#: templates/hosting/emails/password_reset_email.txt:4
msgid "Please go to the following page and choose a new password:"
msgstr ""
#: hosting/templates/hosting/emails/password_reset_email.html:9
#: hosting/templates/hosting/emails/password_reset_email.txt:9
#: templates/hosting/emails/password_reset_email.html:9
#: templates/hosting/emails/password_reset_email.txt:9
msgid "Thanks for using our site!"
msgstr ""
#: hosting/templates/hosting/emails/password_reset_email.html:11
#: hosting/templates/hosting/emails/password_reset_email.txt:11
#: templates/hosting/emails/password_reset_email.html:11
#: templates/hosting/emails/password_reset_email.txt:11
#, python-format
msgid "The %(site_name)s team"
msgstr ""
#: hosting/templates/hosting/login.html:10
#: hosting/templates/hosting/reset_password.html:10
#: hosting/templates/hosting/signup.html:9
msgid "Your VM hosted in Switzerland"
msgstr "Ihre VM gehostet in der Schweiz"
#: hosting/templates/hosting/login.html:26
msgid "You haven been logged out"
msgstr "Sie wurden abgmeldet"
@ -258,44 +254,44 @@ msgstr "Registrieren"
msgid "Forgot your password ? "
msgstr "Passwort vergessen?"
#: hosting/templates/hosting/notifications.html:9
#: templates/hosting/notifications.html:9
msgid "Notifications"
msgstr "Benachrichtigungen"
#: hosting/templates/hosting/notifications.html:16
#: templates/hosting/notifications.html:16
msgid "Unread"
msgstr "Ungelesen"
#: hosting/templates/hosting/notifications.html:26
#: templates/hosting/notifications.html:26
msgid "All"
msgstr "Alle"
#: hosting/templates/hosting/notifications.html:38
#: templates/hosting/notifications.html:38
msgid "Unread notifications"
msgstr "Ungelesene Benachrichtigungen"
#: hosting/templates/hosting/notifications.html:48
#: templates/hosting/notifications.html:48
msgid "Mark as read"
msgstr "Als gelesen markieren"
#: hosting/templates/hosting/notifications.html:59
#: templates/hosting/notifications.html:59
msgid "All notifications"
msgstr "Alle Benachrichtigungen"
#: hosting/templates/hosting/order_detail.html:16
#: hosting/templates/hosting/order_detail.html:24
#: templates/hosting/order_detail.html:16
#: templates/hosting/order_detail.html:24
msgid "Billed To:"
msgstr ""
#: hosting/templates/hosting/order_detail.html:26
#: templates/hosting/order_detail.html:26
msgid "Status:"
msgstr ""
#: hosting/templates/hosting/order_detail.html:38
#: templates/hosting/order_detail.html:38
msgid "Payment Method:"
msgstr "Bezahlmethode"
#: hosting/templates/hosting/order_detail.html:49
#: templates/hosting/order_detail.html:49
msgid "Order summary"
msgstr "Bestellungsübersicht"
@ -308,6 +304,8 @@ msgstr "Prozessorkerne"
#: hosting/templates/hosting/order_detail.html:54
#: hosting/templates/hosting/payment.html:20
#: hosting/templates/hosting/virtual_machine_detail.html:81
#: templates/hosting/order_detail.html:54
#: templates/hosting/virtual_machine_detail.html:82
msgid "Memory"
msgstr "Arbeitsspeicher"
@ -316,19 +314,19 @@ msgstr "Arbeitsspeicher"
msgid "Disk space"
msgstr "Festplattenkapazität"
#: hosting/templates/hosting/order_detail.html:58
#: templates/hosting/order_detail.html:58
msgid "Total"
msgstr ""
#: hosting/templates/hosting/order_detail.html:64
#: templates/hosting/order_detail.html:64
msgid "Finish Configuration"
msgstr "Konfiguration beenden"
#: hosting/templates/hosting/orders.html:17
#: templates/hosting/orders.html:17
msgid "Date"
msgstr "Datum"
#: hosting/templates/hosting/orders.html:18
#: templates/hosting/orders.html:18
msgid "Amount"
msgstr "Betrag"
@ -339,32 +337,31 @@ msgstr "Betrag"
msgid "Status"
msgstr ""
#: hosting/templates/hosting/orders.html:30
#: templates/hosting/orders.html:30
msgid "Approved"
msgstr "Akzeptiert"
#: hosting/templates/hosting/orders.html:32
#: templates/hosting/orders.html:32
msgid "Declined"
msgstr "Abgelehnt"
#: hosting/templates/hosting/orders.html:37
#: hosting/templates/hosting/virtual_machines.html:58
#: templates/hosting/orders.html:37 templates/hosting/virtual_machines.html:58
msgid "View Detail"
msgstr "Details anzeigen"
#: hosting/templates/hosting/orders.html:41
#: templates/hosting/orders.html:41
msgid "Cancel Order"
msgstr "Bestellung stornieren"
#: hosting/templates/hosting/orders.html:56
#: templates/hosting/orders.html:56
msgid "Do You want do delete your order?"
msgstr "Wollen Sie ihre Bestellung löschen?"
#: hosting/templates/hosting/orders.html:64
#: templates/hosting/orders.html:64
msgid "Close"
msgstr "Schliessen"
#: hosting/templates/hosting/orders.html:66
#: templates/hosting/orders.html:66
msgid "Delete"
msgstr "Löschen"
@ -405,51 +402,51 @@ msgstr "CV Code"
msgid "Reset your password"
msgstr "Passwort zurücksetzen"
#: hosting/templates/hosting/virtual_machine_detail.html:19
#: templates/hosting/virtual_machine_detail.html:19
msgid "Settings"
msgstr "Einstellungen"
#: hosting/templates/hosting/virtual_machine_detail.html:25
#: templates/hosting/virtual_machine_detail.html:25
msgid "Billing"
msgstr "Abrechnungen"
#: hosting/templates/hosting/virtual_machine_detail.html:60
#: templates/hosting/virtual_machine_detail.html:60
msgid "Ip not assigned yet"
msgstr "Ip nicht zugewiesen"
#: hosting/templates/hosting/virtual_machine_detail.html:87
#: templates/hosting/virtual_machine_detail.html:89
msgid "Disk"
msgstr "Festplatte"
#: hosting/templates/hosting/virtual_machine_detail.html:96
#: templates/hosting/virtual_machine_detail.html:98
msgid "Configuration"
msgstr "Konfiguration"
#: hosting/templates/hosting/virtual_machine_detail.html:106
#: templates/hosting/virtual_machine_detail.html:108
msgid "Current pricing"
msgstr "Aktueller Preis"
#: hosting/templates/hosting/virtual_machine_detail.html:115
#: templates/hosting/virtual_machine_detail.html:117
msgid "Current status"
msgstr "Aktueller Status"
#: hosting/templates/hosting/virtual_machine_detail.html:140
#: templates/hosting/virtual_machine_detail.html:142
msgid "Terminate Virtual Machine"
msgstr "Virtuelle Maschine beenden"
#: hosting/templates/hosting/virtual_machine_detail.html:161
#: templates/hosting/virtual_machine_detail.html:163
msgid "Terminate your Virtual Machine"
msgstr "Ihre virtuelle Maschine beenden"
#: hosting/templates/hosting/virtual_machine_detail.html:164
#: templates/hosting/virtual_machine_detail.html:166
msgid "Are you sure do you want to cancel your Virtual Machine "
msgstr "Sind Sie sicher, dass Sie ihre virtuelle Maschine beenden wollen "
#: hosting/templates/hosting/virtual_machine_detail.html:167
#: templates/hosting/virtual_machine_detail.html:169
msgid "Cancel"
msgstr "Beenden"
#: hosting/templates/hosting/virtual_machine_key.html:11
#: templates/hosting/virtual_machine_key.html:11
msgid "Access Key"
msgstr "Zugriffsschlüssel"
@ -511,22 +508,22 @@ msgstr ""
msgid "Generate my key"
msgstr "Generiere meinen Schlüssel"
#: hosting/templates/hosting/virtual_machines.html:9
#: templates/hosting/virtual_machines.html:9
msgid "Virtual Machines"
msgstr "Virtuelle Maschinen"
#: hosting/templates/hosting/virtual_machines.html:22
#: templates/hosting/virtual_machines.html:22
msgid "Create VM"
msgstr "Neue VM"
#: hosting/templates/hosting/virtual_machines.html:28
#: templates/hosting/virtual_machines.html:28
msgid "ID"
msgstr ""
#: hosting/templates/hosting/virtual_machines.html:29
#: templates/hosting/virtual_machines.html:29
msgid "Ipv4"
msgstr ""
#: hosting/templates/hosting/virtual_machines.html:30
#: templates/hosting/virtual_machines.html:30
msgid "Ipv6"
msgstr ""

View file

@ -1,7 +1,20 @@
.dashboard-container {
padding-top:70px; padding-bottom: 11%;
padding-top:70px; padding-bottom: 70px;
}
.content-dashboard{
height: 100vh;
width: 80%;
margin: 0 auto;
max-width: 1120px;
}
.container-table{
margin-top: 35px;
overflow-y: hidden;
}
.container-table table{
overflow-y: auto;
}
.borderless td {
border: none !important;
}
@ -26,3 +39,19 @@
.space-above-big {
margin-top: 20%;
}
.table>tbody>tr>td{
vertical-align: middle;
}
.fa-separate{
margin-right: 15px;
}
@media (max-width: 540px) {
select {
width: 280px;
}
.content-dashboard {
width: 90%;
}
}

View file

@ -4,22 +4,20 @@
* For details, see http://www.apache.org/licenses/LICENSE-2.0.
*/
@font-face {
font-family: 'Montserrat-Regular';
src: url('../fonts/Montserrat/Montserrat-Regular.ttf');
font-family: 'Lato-Regular';
src: url('../fonts/Lato/Lato-Regular.ttf');
}
@font-face {
font-family: 'Montserrat-Bold';
src: url('../fonts/Montserrat/Montserrat-Bold.ttf');
font-family: 'Lato-Black';
src: url('../fonts/Lato/Lato-Black.ttf');
}
@font-face {
font-family: 'Montserrat-Medium';
src: url('../fonts/Montserrat/Montserrat-Medium.ttf');
}
@font-face {
font-family: 'Montserrat-Light';
src: url('../fonts/Montserrat/Montserrat-Light.ttf');
font-family: 'Lato-Light';
src: url('../fonts/Lato/Lato-Light.ttf');
}
body,
html {
width: 100%;
@ -33,8 +31,8 @@ h3,
h4,
h5,
h6 {
font-family: 'Montserrat-Regular', sans-serif;
font-weight: 700;
font-family: 'Lato-Regular', sans-serif;
font-weight: 300;
}
.topnav {
font-size: 14px;
@ -226,18 +224,24 @@ h6 {
z-index: 1000;
}
.auth-container .auth-content{
width: 80%;
width: 100%;
margin: 0 auto;
max-width: 390px;
margin-top: 60px;
}
.auth-container .auth-center{
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%,-50%);
width: 100%;
}
.auth-container .auth-title{
margin-top: 40px;
margin-bottom: 50px;
}
.auth-container .auth-title h2{
color: #fff;
font-family: 'Montserrat-Bold';
font-family: 'Lato-Black';
font-size: 44px;
text-align: center;
width: 425px;
@ -276,7 +280,7 @@ h6 {
font-size: 20px;
border-radius: 3px 3px 0px 0px;
margin: 0 auto;
font-family: 'Montserrat-Medium';
font-family: 'Lato-Black';
}
.auth-box .form{
padding: 20px;
@ -340,6 +344,19 @@ h6 {
ul.banner-social-buttons > li:last-child {
margin-bottom: 0;
}
.auth-box .form {
padding: 15px 0px 0 0;
}
.auth-box.sign-up .form {
padding: 15px 0px 0 0;
}
.auth-box .form .form-control {
height: 44px;
font-size: 13px;
}
.auth-container .auth-title {
display: none;
}
}
@media (max-width: 540px) {
.auth-container .auth-title h2{
@ -347,9 +364,16 @@ h6 {
width: 90%;
margin-bottom: 50px;
}
.auth-box .form {
padding: 15px;
.auth-container.auth-signup .auth-title h2{
font-size: 20px;
width: 90%;
margin-bottom: 50px;
}
.auth-box .form {
width: 90%;
}
.auth-box .section-heading {
font-size: 15px;
}
}
footer {

View file

@ -1,4 +1,4 @@
.order-detail-container {padding-top: 70px; padding-bottom: 11%;}
.order-detail-container {padding-top: 70px; padding-bottom: 70px; margin-bottom: 70px;}
.order-detail-container .invoice-title h2, .invoice-title h3 {
display: inline-block;

View file

@ -43,4 +43,38 @@
.virtual-machine-container .right-place{
margin-top: 15px;
}
.virtual-machine-container .separate-md{
margin-top: 35px;
}
.virtual-machine-container .box-setting{
height: 100px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.virtual-machine-container .box-setting .label-success{
padding-top: 4px;
}
@media (max-width: 990px) {
.virtual-machine-container .tabs-left {
border-right: 0;
}
.virtual-machine-container .tabs-left>li.active>a,
.virtual-machine-container .tabs-left>li.active>a:hover,
.virtual-machine-container .tabs-left>li.active>a:focus {
border: 1px solid #ddd;
}
.virtual-machine-container .tabs-left>li>a {
border-radius: 4px;
margin-right: 0;
display:block;
}
}
@media (max-width: 420px) {
.btn-create-vm {
float: left !important;
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -0,0 +1,92 @@
Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.

View file

@ -119,51 +119,16 @@
{% endif %}
<!-- Header -->
<a name="about"></a>
{% block content %}
{% endblock %}
<div class="content-dashboard">
{% block content %}
{% endblock %}
</div>
<!-- Footer -->
{% if request.user.is_authenticated %}
<footer class="navbar-fixed-bottom">
<div class="container">
<div class="row">
<div class="col-lg-12 hidden-xs">
<ul class="list-inline">
<li>
<a href="#">{% trans "Home"%}</a>
</li>
<li class="footer-menu-divider">&sdot;</li>
<li>
<a href="{% url 'hosting:virtual_machines' %}">
{% trans "My Virtual Machines"%}
</a>
</li>
<li class="footer-menu-divider">&sdot;</li>
<li>
<a href="{% url 'hosting:orders' %}">
{% trans "My Orders"%}
</a>
</li>
<li>&sdot;</li>
<li>
<li>
<a href="{% url 'hosting:ssh_keys' %}">
{% trans "Keys"%}
</a>
</li>
<li class="footer-menu-divider">&sdot;</li>
<li>
<a href="{% url 'hosting:notifications' %}">
{% trans "Notifications "%}
</a>
</li>
</ul>
<p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
</div>
</div>
<p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
</div>
</footer>
{% endif %}

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">

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>

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">

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="auth-center">
<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,17 @@
</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 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 %}

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 %}

View file

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

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 -->

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>

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>

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>

View file

@ -5,7 +5,7 @@
{% block content %}
<div class="auth-container">
<div class="auth-bg"></div>
<div class="container">
<div class="auth-center">
<div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div>
@ -32,7 +32,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

View file

@ -2,9 +2,9 @@
{% load staticfiles bootstrap3 i18n %}
{% block content %}
<div class="auth-container">
<div class="auth-container auth-signup">
<div class="auth-bg"></div>
<div class="container">
<div class="auth-center ">
<div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div>
@ -31,7 +31,8 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

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="" novalidate>
{% 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 %}

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 %}">

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/>