diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css
index d8812ec7..dd25715f 100644
--- a/hosting/static/hosting/css/landing-page.css
+++ b/hosting/static/hosting/css/landing-page.css
@@ -10,7 +10,6 @@
src: url('../fonts/Lato/Lato-Regular.ttf');
}
@font-face {
- font-family: 'Lato-Black';
src: url('../fonts/Lato/Lato-Black.ttf');
}
@font-face {
@@ -241,7 +240,6 @@ h6 {
}
.auth-container .auth-title h2{
color: #fff;
- font-family: 'Lato-Black';
font-size: 44px;
text-align: center;
width: 425px;
@@ -280,7 +278,6 @@ h6 {
font-size: 20px;
border-radius: 3px 3px 0px 0px;
margin: 0 auto;
- font-family: 'Lato-Black';
}
.auth-box .form{
padding: 20px;
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Black.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Black.ttf
deleted file mode 100755
index bf5443c5..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-Black.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-BlackItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-BlackItalic.ttf
deleted file mode 100755
index 3eee3a76..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-BlackItalic.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Bold.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Bold.ttf
deleted file mode 100755
index 8e9a5f3f..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-Bold.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-BoldItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-BoldItalic.ttf
deleted file mode 100755
index 2c336300..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-BoldItalic.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraBold.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraBold.ttf
deleted file mode 100755
index 1e3692d6..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraBold.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf
deleted file mode 100755
index 5f6c3824..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraLight.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraLight.ttf
deleted file mode 100755
index 7490dc73..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraLight.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf
deleted file mode 100755
index 24e13547..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Italic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Italic.ttf
deleted file mode 100755
index c5a36e58..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-Italic.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Light.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Light.ttf
deleted file mode 100755
index e66dc5bf..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-Light.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-LightItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-LightItalic.ttf
deleted file mode 100755
index b78b8b73..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-LightItalic.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Medium.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Medium.ttf
deleted file mode 100755
index 88d70b89..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-Medium.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-MediumItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-MediumItalic.ttf
deleted file mode 100755
index 225fd18f..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-MediumItalic.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Regular.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Regular.ttf
deleted file mode 100755
index 626355a2..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-Regular.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-SemiBold.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-SemiBold.ttf
deleted file mode 100755
index 61570450..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-SemiBold.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf
deleted file mode 100755
index c6dd9773..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Thin.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Thin.ttf
deleted file mode 100755
index dc16a022..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-Thin.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-ThinItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-ThinItalic.ttf
deleted file mode 100755
index b9e12f4a..00000000
Binary files a/hosting/static/hosting/fonts/Montserrat/Montserrat-ThinItalic.ttf and /dev/null differ
diff --git a/hosting/static/hosting/fonts/Montserrat/OFL.txt b/hosting/static/hosting/fonts/Montserrat/OFL.txt
deleted file mode 100755
index 90ed8151..00000000
--- a/hosting/static/hosting/fonts/Montserrat/OFL.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-Copyright 2011 The Montserrat Project Authors (julieta.ulanovsky@gmail.com)
-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.
diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html
index 35db3cd9..6a2037f7 100644
--- a/hosting/templates/hosting/base_short.html
+++ b/hosting/templates/hosting/base_short.html
@@ -130,15 +130,7 @@
{% if request.user.is_authenticated %}
<footer class="footer-vm">
<div class="container">
-<<<<<<< HEAD
- <div class="row">
- <div class="col-lg-12">
- <p class="copyright text-muted small">Copyright © ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
- </div>
- </div>
-=======
<p class="copyright text-muted small">Copyright © ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
->>>>>>> 7b197ec75bb8eecd239988ac929315b50c50d233
</div>
</footer>
{% endif %}
diff --git a/hosting/templates/hosting/create_virtual_machine.html b/hosting/templates/hosting/create_virtual_machine.html
index 43b5cd15..f876ad76 100644
--- a/hosting/templates/hosting/create_virtual_machine.html
+++ b/hosting/templates/hosting/create_virtual_machine.html
@@ -61,33 +61,6 @@
<button class="btn btn-success" >{% trans "Start VM"%} </button>
</div>
</form>
- <!-- <form method="POST" action="">
- {% csrf_token %}
- <div class="form-group">
- {% trans "Select VM Template:" %}
- <select name="vm_template_id">
- {% for template in templates %}
- <option value="{{template.id}}">{{template.name}} </option>
- {% endfor %}
- </select>
- </div>
- <div class="form-group">
-
- <select name="configuration">
- {% for config in configuration_options %}
- <option value="{{config.id}}">
- CORE: {{config.cpu|floatformat}},
- RAM: {{config.memory|floatformat}} GB,
- SSD: {{config.disk_size|floatformat}} GB,
- PRICE: {{config.price|floatformat}} {% trans "CHF/Month" %}
- </option>
- {% endfor %}
- </select>
- </div>
- <div class="form-group">
- <button class="btn btn-success" >{% trans "Start VM"%} </button>
- </div>
- </form> -->
{% endif %}
</div>
</div>
diff --git a/hosting/templates/hosting/login.html b/hosting/templates/hosting/login.html
index 9749b280..3ae7b7c2 100644
--- a/hosting/templates/hosting/login.html
+++ b/hosting/templates/hosting/login.html
@@ -13,23 +13,6 @@
</div>
<div class="auth-content">
- {% if messages %}
- <ul class="list-unstyled" style="color: #fff">
- {% for message in messages %}
- <li>{{ message }}</li>
- {% endfor %}
- </ul>
- {% endif %}
-
- {% block messages %}
- {% if request.GET.logged_out %}
- <div class="alert"> <!-- singular -->
- <a class="close" data-dismiss="alert">×</a>
- {% trans "You haven been logged out"%}
- </div>
- {% endif %}
- {% endblock %}
-
<div class="intro-message auth-box">
<h2 class="section-heading">{% trans "Login"%}</h2>
<form action="{% url 'hosting:login' %}" method="post" class="form" novalidated>
diff --git a/hosting/templates/hosting/reset_password.html b/hosting/templates/hosting/reset_password.html
index 33aad944..be9fb82b 100644
--- a/hosting/templates/hosting/reset_password.html
+++ b/hosting/templates/hosting/reset_password.html
@@ -10,15 +10,6 @@
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div>
<div class="auth-content">
-
- {% if messages %}
- <ul class="list-unstyled" style="color: #fff">
- {% for message in messages %}
- <li>{{ message }}</li>
- {% endfor %}
- </ul>
- {% endif %}
-
<div class="intro-message auth-box sign-up">
<h2 class="section-heading">{% trans "Reset your password"%}</h2>