diff --git a/datacenterlight/static/datacenterlight/css/common.css b/datacenterlight/static/datacenterlight/css/common.css
new file mode 100644
index 00000000..9530d4a3
--- /dev/null
+++ b/datacenterlight/static/datacenterlight/css/common.css
@@ -0,0 +1,96 @@
+body,
+html {
+ width: 100%;
+ min-height: 100%;
+}
+
+
+/* bootstrap danger color override from #a94442 */
+.text-danger,
+.has-error .help-block,
+.has-error .control-label,
+.has-error .radio,
+.has-error .checkbox,
+.has-error .radio-inline,
+.has-error .checkbox-inline,
+.has-error.radio label,
+.has-error.checkbox label,
+.has-error.radio-inline label,
+.has-error.checkbox-inline label,
+.has-error .form-control-feedback,
+.alert-danger,
+.list-group-item-danger,
+a.list-group-item-danger,
+a.list-group-item-danger:hover,
+a.list-group-item-danger:focus,
+.panel-danger > .panel-heading {
+ color: #eb4d5c;
+}
+
+.alert-danger{
+ background: rgba(235, 204, 209, 0.2);
+}
+
+.has-error .form-control,
+.has-error .form-control:focus,
+.has-error .form-control:active,
+.has-error .input-group-addon {
+ color: #eb4d5c;
+ border-color: #eb4d5c;
+}
+
+a.list-group-item-danger.active,
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+ background-color: #eb4d5c;
+ border-color: #eb4d5c;
+}
+
+.panel-danger > .panel-heading .badge {
+ background-color: #eb4d5c;
+}
+
+
+.checkmark {
+ display: inline-block;
+}
+
+.checkmark:after {
+ /*Add another block-level blank space*/
+ content: '';
+ display: block;
+ /*Make it a small rectangle so the border will create an L-shape*/
+ width: 25px;
+ height: 60px;
+ /*Add a white border on the bottom and left, creating that 'L' */
+ border: solid #777;
+ border-width: 0 3px 3px 0;
+ /*Rotate the L 45 degrees to turn it into a checkmark*/
+ transform: rotate(45deg);
+}
+
+
+.topnav {
+ font-size: 14px;
+}
+
+.navbar-default {
+ background: #fff;
+ padding: 5px;
+}
+
+.navbar-brand {
+ padding: 10px 15px;
+}
+
+@media (max-width: 767px) {
+ .navbar-brand {
+ padding: 10px;
+ }
+}
+
+@media (min-width: 768px) {
+ .navbar-right {
+ margin-right: 10px;
+ }
+}
\ No newline at end of file
diff --git a/datacenterlight/static/datacenterlight/css/hosting.css b/datacenterlight/static/datacenterlight/css/hosting.css
index 28c7902b..c64eca96 100644
--- a/datacenterlight/static/datacenterlight/css/hosting.css
+++ b/datacenterlight/static/datacenterlight/css/hosting.css
@@ -1,9 +1,3 @@
-body,
-html {
- width: 100%;
- height: 100%;
-}
-
body,
h1,
h2,
@@ -14,25 +8,9 @@ h6 {
font-family: 'Lato', sans-serif;
}
-.topnav {
- font-size: 14px;
-}
.topnav .navbar-fixed-top .navbar-collapse {
max-height: 740px;
}
-.navbar-brand {
- padding: 10px 15px;
-}
-@media (max-width: 767px) {
- .navbar-brand {
- padding: 10px 0;
- }
-}
-
-.navbar-default {
- background: #fff;
- padding: 5px;
-}
.navbar-default .navbar-header {
position: relative;
@@ -169,10 +147,6 @@ p.copyright {
margin: 14px 0 0;
}
-a#forgotpassword {
- color: #ffffff;
-}
-
.content-404 h1 {
margin: 0 0 15px;
font-size: 200px;
@@ -292,58 +266,23 @@ a#forgotpassword {
margin-top: 4px;
}
-.navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:focus, .navbar-default .navbar-nav>.open>a:hover,
-.navbar-default .navbar-nav>.active>a, .navbar-default .navbar-nav>.active>a:focus, .navbar-default .navbar-nav>.active>a:hover {
+.navbar-default .navbar-nav>.open>a,
+.navbar-default .navbar-nav>.open>a:focus,
+.navbar-default .navbar-nav>.open>a:hover,
+.navbar-default .navbar-nav>.active>a,
+.navbar-default .navbar-nav>.active>a:focus,
+.navbar-default .navbar-nav>.active>a:hover {
background-color: transparent;
}
@media (max-width: 767px) {
- .navbar-default .navbar-nav .open .dropdown-menu>.active>a, .navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus, .navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover {
+ .navbar-default .navbar-nav .open .dropdown-menu>.active>a,
+ .navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,
+ .navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover {
background-color: transparent;
}
}
-/* bootstrap danger color override from #a94442 */
-.text-danger,
-.has-error .help-block,
-.has-error .control-label,
-.has-error .radio,
-.has-error .checkbox,
-.has-error .radio-inline,
-.has-error .checkbox-inline,
-.has-error.radio label,
-.has-error.checkbox label,
-.has-error.radio-inline label,
-.has-error.checkbox-inline label,
-.has-error .form-control-feedback,
-.alert-danger,
-.list-group-item-danger,
-a.list-group-item-danger,
-a.list-group-item-danger:hover,
-a.list-group-item-danger:focus,
-.panel-danger > .panel-heading {
- color: #eb4d5c;
-}
-.alert-danger{
- background: rgba(235, 204, 209, 0.2);
-}
-.has-error .form-control,
-.has-error .form-control:focus,
-.has-error .form-control:active,
-.has-error .input-group-addon {
- color: #eb4d5c;
- border-color: #eb4d5c;
-}
-a.list-group-item-danger.active,
-a.list-group-item-danger.active:hover,
-a.list-group-item-danger.active:focus {
- background-color: #eb4d5c;
- border-color: #eb4d5c;
-}
-.panel-danger > .panel-heading .badge {
- background-color: #eb4d5c;
-}
-
/* bootstrap input box-shadom disable */
.has-error .form-control:focus,
.has-error .form-control:active,
@@ -351,28 +290,6 @@ a.list-group-item-danger.active:focus {
.has-success .form-control:active {
box-shadow: inset 0 0 1px rgba(0,0,0,0.25);
}
-.checkmark {
- display: inline-block;
-}
-.checkmark:after {
- /*Add another block-level blank space*/
- content: '';
- display: block;
- /*Make it a small rectangle so the border will create an L-shape*/
- width: 25px;
- height: 60px;
- /*Add a white border on the bottom and left, creating that 'L' */
- border: solid #777;
- border-width: 0 3px 3px 0;
- /*Rotate the L 45 degrees to turn it into a checkmark*/
- transform: rotate(45deg);
-}
-
-@media (min-width: 768px) {
- .navbar-right {
- margin-right: 10px;
- }
-}
.content-dashboard{
min-height: calc(100vh - 60px);
@@ -671,223 +588,6 @@ a.list-group-item-danger.active:focus {
color: #a3c0e2;
}
-.price-calc-section {
- padding: 80px 40px !important;
-}
-
-@media (max-width: 768px) {
- .price-calc-section {
- margin-top: 40px;
- }
-}
-
-.price-calc-section .text {
- width: 50%;
-}
-
-.price-calc-section .text .section-heading {
- font-size: 48px;
- line-height: 48px;
- padding-bottom: 27px;
- color: #3a3a3a;
- letter-spacing: 1px;
- position: relative;
- text-align: right;
-}
-
-.price-calc-section .text .description {
- font-size: 20px;
- text-align: right;
-}
-
-.price-calc-section .text .section-heading::before {
- content: "";
- position: absolute;
- bottom: 0;
- background: #29427A;
- height: 7px;
- width: 70px;
- right: 0;
-}
-
-.price-calc-section .card {
- width: 50%;
- margin: 0 auto;
- background: #fff;
- box-shadow: 1px 3px 6px 2px rgba(0, 0, 0, 0.2);
- padding-bottom: 30px;
- text-align: center;
- max-width: 320px;
- position: relative;
-}
-
-@media (min-width: 768px) {
- .price-calc-section .card {
- margin-left: 0;
- }
-}
-
-.price-calc-section .landing {
- width: 100% !important;
-}
-
.no-padding {
padding: 0 !important;
-}
-
-.price-calc-section .card .img-beta {
- position: absolute;
- top: 5px;
- width: 60px;
- left: 3px;
-}
-
-.price-calc-section .card .title {
- padding: 15px 40px;
-}
-
-.price-calc-section .card .title h3 {
- font-weight: normal;
-}
-
-.price-calc-section .card .price {
- background: #5A74AF;
- padding: 22px;
- color: #fff;
- font-size: 32px;
-}
-
-.price-calc-section .card .price .price-text {
- font-size: 14px;
-}
-
-.price-calc-section .card .description {
- padding: 7px 8px 2px;
- position: relative;
- display: flex;
- justify-content: space-around !important;
- align-items: center !important;
-}
-
-.price-calc-section .card .description span {
- font-size: 14px;
- margin-left: 5px;
- width: 29%;
- text-align: left;
- line-height: 16px;
-}
-
-.price-calc-section .card .description .select-number{
- font-size: 16px;
- text-align: center;
- width: 85px;
-}
-
-.price-calc-section .card .description i {
- color: #29427a;
- cursor: pointer;
- font-size: 20px;
- border: 1px solid #ccc;
- padding: 5px 6px 3px;
- border-radius: 5px;
-}
-
-.price-calc-section .card .description .left {
- margin-right: 7px;
-}
-
-.price-calc-section .card .description .right {
- margin-left: 7px;
-}
-
-.price-calc-section .card .descriptions {
- padding: 10px;
-}
-
-.price-calc-section .card .description p {
- margin: 0;
-}
-
-.price-calc-section .card .btn {
- margin-top: 15px;
- font-size: 20px;
- width: 150px;
- border: none;
-}
-
-.price-calc-section .card .select-configuration select {
- outline: none;
- background: #fff;
- border-color: #d0d0d0;
- height: 32px;
- width: 150px;
- text-align: center;
- font-size: 14px;
- margin-left: 10px;
- padding: 6px;
- border-radius: 4px;
-}
-
-.price-calc-section .card .check-ip {
- font-size: 18px;
-}
-
-.price-calc-section .card .justify-center {
- justify-content: center !important;
-}
-
-.price-calc-section .card .description.input label {
- font-size: 15px;
- font-weight: 700;
- margin-bottom: 0;
- width: 40px;
-}
-
-.price-calc-section .card .description input {
- width: 200px;
- font-size: 14px;
- text-align: left;
- padding: 4px 10px;
- border-radius: 4px;
- border: 1px solid #d0d0d0;
- background: #fff;
- margin-left: 10px;
-}
-
-.price-calc-section .card .check-ip input[type=checkbox] {
- font-size: 17px;
- margin: 0 8px;
-}
-
-.price-calc-section .help-block.with-errors {
- text-align: center;
- margin: 0 0;
- padding: 0 0 5px;
-}
-.price-calc-section .help-block.with-errors ul {
- margin-bottom: 0;
-}
-
-.price-calc-section .form-group {
- margin: 0;
- position: relative;
-}
-
-.price-calc-section .form-group:after {
- content: ' ';
- display: block;
- position: absolute;
- bottom: 0;
- left: 18%;
- z-index: 20;
- height: 1px;
- width: 65%;
- background: rgba(128, 128, 128, 0.2);
-}
-
-.price-calc-section .btn-primary {
- background: #29427A;
- border-color: #29427A;
- color: #fff;
- width: auto;
}
\ No newline at end of file
diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css
index 92b7f121..e8943b0f 100755
--- a/datacenterlight/static/datacenterlight/css/landing-page.css
+++ b/datacenterlight/static/datacenterlight/css/landing-page.css
@@ -1,9 +1,3 @@
-body,
-html {
- width: 100%;
- min-height: 100%;
-}
-
body,
h1,
h2,
@@ -23,13 +17,8 @@ button, input, optgroup, select, textarea {
/*blue light #5A74AF*/
/*blue dark #29427A*/
-.topnav {
- font-size: 14px;
-}
-
.lead {
font-size: 18px;
- font-weight: 400;
}
@media (min-width: 768px) {
@@ -89,11 +78,6 @@ button, input, optgroup, select, textarea {
transition: all .3s ease-in;
}
-.navbar-default {
- background: #fff;
- padding: 5px;
-}
-
.navbar-transparent {
background: transparent;
border: none;
@@ -111,7 +95,6 @@ button, input, optgroup, select, textarea {
.navbar-default .navbar-nav>li>a {
cursor: pointer;
- font-weight: 400;
}
.navbar-transparent .navbar-nav>li>a {
@@ -119,10 +102,10 @@ button, input, optgroup, select, textarea {
cursor: pointer;
}
-@media (min-width: 768px) {
+@media (max-width: 767px) {
.navbar-default .navbar-nav>li>a,
.navbar-transparent .navbar-nav>li>a {
- font-weight: 300;
+ font-weight: 400;
}
}
@@ -145,19 +128,6 @@ button, input, optgroup, select, textarea {
border-radius: 5px;
}
-.navbar-brand {
- padding: 10px 15px;
-}
-@media (max-width: 767px) {
- .navbar-brand {
- padding: 10px 10px;
- }
-}
-
-.navbar-right {
- margin-right: 10px;
-}
-
.nav-language {
position: relative;
}
@@ -169,7 +139,6 @@ button, input, optgroup, select, textarea {
.navbar-transparent .nav-language .select-language {
color: #fff;
- font-weight: 300;
}
.nav-language .select-language span {
@@ -200,7 +169,6 @@ button, input, optgroup, select, textarea {
.nav-language .drop-language a{
cursor: pointer;
padding: 5px 10px !important;
- font-weight: 300;
}
/* Show the dropdown menu on hover */
@@ -223,7 +191,6 @@ button, input, optgroup, select, textarea {
.navbar-transparent .nav-language .drop-language a {
color: #fff;
padding: 5px 10px !important;
- font-weight: 300;
}
.intro-header {
@@ -276,7 +243,6 @@ button, input, optgroup, select, textarea {
.intro-message>h1 {
margin: 0;
- font-weight: 300;
font-size: 6em;
}
@@ -286,10 +252,6 @@ button, input, optgroup, select, textarea {
border-bottom: 1px solid rgba(0, 0, 0, 0.2);
}
-.intro-message>h3 {
- font-weight: 300;
-}
-
.intro-pricing {
text-align: center;
color: #fff;
@@ -577,6 +539,14 @@ button, input, optgroup, select, textarea {
font-weight: 400;
}
+.contact-form .with-errors ul {
+ margin-bottom: 0;
+ color: #ffc4ca;
+ text-align: left;
+ margin-left: 5px;
+ margin-top: 2px;
+}
+
.contact-form .btn {
min-width: 140px;
background: rgba(23, 23, 23, 0.18);
@@ -1276,10 +1246,6 @@ p.copyright {
margin: 15px 0 0;
}
-a#forgotpassword {
- color: #ffffff;
-}
-
.topnav a:focus {
outline: none;
outline-offset: 0;
@@ -1326,57 +1292,4 @@ a#forgotpassword {
.w380 {
max-width: 380px !important;
-}
-
-/* bootstrap danger color override from #a94442 */
-.text-danger,
-.has-error .help-block,
-.has-error .control-label,
-.has-error .radio,
-.has-error .checkbox,
-.has-error .radio-inline,
-.has-error .checkbox-inline,
-.has-error.radio label,
-.has-error.checkbox label,
-.has-error.radio-inline label,
-.has-error.checkbox-inline label,
-.has-error .form-control,
-.has-error .form-control-feedback,
-.alert-danger,
-.list-group-item-danger,
-a.list-group-item-danger,
-a.list-group-item-danger:hover,
-a.list-group-item-danger:focus,
-.panel-danger > .panel-heading {
- color: #eb4d5c;
-}
-.has-error .input-group-addon {
- color: #eb4d5c;
- border-color: #eb4d5c;
-}
-a.list-group-item-danger.active,
-a.list-group-item-danger.active:hover,
-a.list-group-item-danger.active:focus {
- background-color: #eb4d5c;
- border-color: #eb4d5c;
-}
-.panel-danger > .panel-heading .badge {
- background-color: #eb4d5c;
-}
-
-.checkmark {
- display: inline-block;
-}
-.checkmark:after {
- /*Add another block-level blank space*/
- content: '';
- display: block;
- /*Make it a small rectangle so the border will create an L-shape*/
- width: 25px;
- height: 60px;
- /*Add a white border on the bottom and left, creating that 'L' */
- border: solid #777;
- border-width: 0 3px 3px 0;
- /*Rotate the L 45 degrees to turn it into a checkmark*/
- transform: rotate(45deg);
-}
+}
\ No newline at end of file
diff --git a/datacenterlight/templates/datacenterlight/base.html b/datacenterlight/templates/datacenterlight/base.html
index b397bae5..d84847fa 100644
--- a/datacenterlight/templates/datacenterlight/base.html
+++ b/datacenterlight/templates/datacenterlight/base.html
@@ -21,6 +21,7 @@
{% endaddtoblock "vendor_css" %}
<!-- Custom CSS -->
{% addtoblock "custom_css" %}
+ <link href="{% static 'datacenterlight/css/common.css' %}" rel="stylesheet">
<link href="{% static 'datacenterlight/css/landing-page.css' %}" rel="stylesheet">
{% block css_extra %}
{% endblock css_extra %}
@@ -64,13 +65,14 @@
<script src="{% static 'datacenterlight/js/bootstrap.min.js' %}"></script>
{% endaddtoblock "vendor_js" %}
+ {% render_block "vendor_js" %}
+
<script src="//cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
{% addtoblock "custom_js" %}
<script src="{% static 'datacenterlight/js/main.js' %}"></script>
{% endaddtoblock "custom_js" %}
- {% render_block "vendor_js" %}
{% render_block "custom_js" postprocessor "compressor.contrib.sekizai.compress" %}
</body>
diff --git a/datacenterlight/templates/datacenterlight/base_hosting.html b/datacenterlight/templates/datacenterlight/base_hosting.html
index dff0ad8f..d88d49f8 100644
--- a/datacenterlight/templates/datacenterlight/base_hosting.html
+++ b/datacenterlight/templates/datacenterlight/base_hosting.html
@@ -23,6 +23,7 @@
{% endaddtoblock "vendor_css" %}
<!-- Custom CSS -->
{% addtoblock "custom_css" %}
+ <link href="{% static 'datacenterlight/css/common.css' %}" rel="stylesheet">
<link href="{% static 'datacenterlight/css/hosting.css' %}" rel="stylesheet">
{% block css_extra %}
{% endblock css_extra %}
@@ -67,7 +68,7 @@
</div>
</footer>
{% else %}
- <div class="footer-light">
+ <div class="footer-vm">
{% include "datacenterlight/includes/_footer.html" %}
</div>
{% endif %}
@@ -79,11 +80,12 @@
<script src="{% static 'hosting/js/bootstrap.min.js' %}"></script>
{% endaddtoblock "vendor_js" %}
+ {% render_block "vendor_js" %}
+
+ <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.16.0/jquery.validate.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
{% addtoblock "custom_js" %}
- <!-- Virtual Machine Detail Javascript -->
- <script src="{% static 'hosting/js/virtual_machine_detail.js' %}"></script>
<!-- Create Virtual Machine Javascript -->
<script src="{% static 'hosting/js/createvm.js' %}"></script>
<!-- Init JavaScript -->
@@ -96,7 +98,6 @@
{% endblock js_extra %}
{% endaddtoblock "custom_js" %}
- {% render_block "vendor_js" %}
{% render_block "custom_js" postprocessor "compressor.contrib.sekizai.compress" %}
<!-- Stripe Lib -->
@@ -106,8 +107,6 @@
{% addtoblock "payment_js" %}
<!-- Proccess payment lib -->
<script type="text/javascript" src="{% static 'hosting/js/payment.js' %}"></script>
- <!-- Gen SSH Key lib -->
- <script type="text/javascript" src="{% static 'hosting/js/gen-ssh-key.js' %}"></script>
{% endaddtoblock "payment_js" %}
{% render_block "payment_js" postprocessor "compressor.contrib.sekizai.compress" %}
diff --git a/datacenterlight/templates/datacenterlight/contact_form.html b/datacenterlight/templates/datacenterlight/contact_form.html
index 458d6168..7b57f227 100644
--- a/datacenterlight/templates/datacenterlight/contact_form.html
+++ b/datacenterlight/templates/datacenterlight/contact_form.html
@@ -17,12 +17,13 @@
</div>
</div>
</div>
- <form class="form-horizontal ajax-form" method="POST" action="{% url 'datacenterlight:contact_us' %}" data-toggle="validator" data-response="#contact-form">
+ <form class="form-horizontal ajax-form" method="POST" action="{% url 'datacenterlight:contact_us' %}" data-toggle="validator" data-response="#contact-form" role="form">
{% csrf_token %}
<div class="form-group">
<label class="control-label col-sm-2" for="name">{% trans "Name" %}</label>
<div class="col-sm-10">
<input type="text" name="name" class="form-control" data-minlength="3" data-error="{% trans 'Please enter your name.' %}" required>
+ <div class="help-block with-errors"></div>
{{contact_form.name.errors}}
</div>
</div>
@@ -30,6 +31,7 @@
<label class="control-label col-sm-2" for="email">{% trans "Email" %}</label>
<div class="col-sm-10">
<input name="email" type="email" pattern="^[^@\s]+@([^@\s]+\.)+[^@\s]+$" class="form-control" data-error="{% trans 'Please enter a valid email address.' %}" required>
+ <div class="help-block with-errors"></div>
{{contact_form.email.errors}}
</div>
</div>
@@ -37,6 +39,7 @@
<label class="control-label col-sm-2" for="message">{% trans "Message" %}</label>
<div class="col-sm-10">
<textarea class="form-control" name="message" id="message" rows="6" required></textarea>
+ <div class="help-block with-errors"></div>
{{contact_form.message.errors}}
</div>
</div>
diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html
index e2f1edc0..2f435704 100644
--- a/datacenterlight/templates/datacenterlight/includes/_navbar.html
+++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html
@@ -1,6 +1,6 @@
-{% load staticfiles i18n%}
-{% load custom_tags %}
+{% load staticfiles i18n custom_tags %}
{% get_current_language as LANGUAGE_CODE %}
+
<nav class="navbar navbar-default navbar-fixed-top topnav">
<div class="topnav">
<!-- Brand and toggle get grouped for better mobile display -->
diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html
index 4e8aad53..e47736c9 100755
--- a/datacenterlight/templates/datacenterlight/index.html
+++ b/datacenterlight/templates/datacenterlight/index.html
@@ -169,9 +169,9 @@
</div>
</div>
<div class="social">
- <a target="_blank" class="" href="https://twitter.com/datacenterlight"><i class="fa fa-twitter fa-fw"></i></a>
- <a target="_blank" class="" href="https://github.com/ungleich"><i class="fa fa-github fa-fw"></i></a>
- <a target="_blank" class="" href="https://www.facebook.com/ungleich.ch/"><i class="fa fa-facebook"></i></a>
+ <a target="_blank" href="https://twitter.com/datacenterlight"><i class="fa fa-twitter fa-fw"></i></a>
+ <a target="_blank" href="https://github.com/ungleich"><i class="fa fa-github fa-fw"></i></a>
+ <a target="_blank" href="https://www.facebook.com/ungleich.ch/"><i class="fa fa-facebook"></i></a>
</div>
</div>
<div class="col-sm-6">
diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 8a41005f..0e860b7e 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -391,7 +391,6 @@ class PaymentOrderView(FormView):
@cache_control(no_cache=True, must_revalidate=True, no_store=True)
def get(self, request, *args, **kwargs):
- # user is no longer added to session on the index page
if 'specs' not in request.session:
return HttpResponseRedirect(reverse('datacenterlight:index'))
return self.render_to_response(self.get_context_data())
diff --git a/digitalglarus/templates/new_base_glarus.html b/digitalglarus/templates/new_base_glarus.html
index 3b18756d..9a24f269 100644
--- a/digitalglarus/templates/new_base_glarus.html
+++ b/digitalglarus/templates/new_base_glarus.html
@@ -72,8 +72,8 @@
margin: 0px;
color:white;
}
-
- @media only screen and (min-width: 769px){
+
+ @media only screen and (min-width: 769px){
.dropdown.home-dropdown-mobile {
display: none;
}
@@ -81,14 +81,14 @@
display: block;
}
}
-
-
+
+
@media only screen and (max-width: 768px){
.dropdown.home-dropdown-mobile {
display: block;
- background-color:
+ background-color:
}
-
+
.dropdown.home-dropdown-mobile .dropdown-menu{
display: block;
background-color: #0f1221;
@@ -104,19 +104,19 @@
.dropdown.home-dropdown {
display: none;
}
-
+
}
-
+
</style>
</head>
-
+
<body id="page-top" class="index">
<!-- Navigation -->
<nav class="navbar navbar-default navbar-fixed-top">
- <div class="" style="margin-right: -; margin-left: 0px;margin-right: 0px;">
+ <div style="margin-left: 0px; margin-right: 0px;">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@@ -147,10 +147,10 @@
<a class="page-scroll" href="#contact">Contact</a>
</li>
-
+
{% if request.user.is_authenticated %}
-
-
+
+
<li class="dropdown home-dropdown-mobile open">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
<i class="glyphicon glyphicon-user"></i>{{request.user.name}} <span class="caret"></span>
@@ -162,7 +162,7 @@
</a>
</li>
<li>
- <a href="{% url 'digitalglarus:membership_orders_list' %}"><i class="fa fa-heart-o" aria-hidden="true"></i> {% trans "Membership"%}
+ <a href="{% url 'digitalglarus:membership_orders_list' %}"><i class="fa fa-heart-o" aria-hidden="true"></i> {% trans "Membership"%}
</a>
</li>
<li>
@@ -173,7 +173,7 @@
</li>
</ul>
</li>
-
+
<li class="dropdown home-dropdown">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
<i class="glyphicon glyphicon-user"></i>{{request.user.name}} <span class="caret"></span>
@@ -181,11 +181,11 @@
<ul id="g-account-menu" class="dropdown-menu" role="menu">
<li>
<a href="{% url 'digitalglarus:booking_orders_list' %}">
- <i class="fa fa-home" aria-hidden="true"></i> {% trans "Bookings"%}
+ <i class="fa fa-home" aria-hidden="true"></i> {% trans "Bookings"%}
</a>
</li>
<li>
- <a href="{% url 'digitalglarus:membership_orders_list' %}"><i class="fa fa-heart-o" aria-hidden="true"></i> {% trans "Membership"%}
+ <a href="{% url 'digitalglarus:membership_orders_list' %}"><i class="fa fa-heart-o" aria-hidden="true"></i> {% trans "Membership"%}
</a>
</li>
<li>
@@ -195,12 +195,12 @@
</a>
</li>
</ul>
- </li>
-
+ </li>
+
{% else %}
<li>
<a class="page-scroll" href="{% url 'digitalglarus:login' %}">Login</a>
- </li>
+ </li>
{% endif %}
<!-- <li>
<a class="page-scroll" href="{% url 'digitalglarus:signup' %}">Sign Up</a>
@@ -213,7 +213,7 @@
</nav>
{% block content %} {% endblock %}
-
+
<footer>
<div class="container">
<div class="row">
@@ -241,7 +241,7 @@
</div>
</div>
</footer>
-
+
<script type="text/javascript" src="{% static 'digitalglarus/bower_components/jquery/dist/jquery.min.js' %}"></script>
<!-- jQuery -->
@@ -282,7 +282,7 @@
<!-- <script type="text/javascript" src="//cdn.jsdelivr.net/jquery/1/jquery.min.js"></script> -->
<script type="text/javascript" src="//cdn.jsdelivr.net/momentjs/latest/moment.min.js"></script>
<!-- <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/bootstrap/latest/css/bootstrap.css" />
- -->
+ -->
<!-- Include Date Range Picker -->
<script type="text/javascript" src="//cdn.jsdelivr.net/bootstrap.daterangepicker/2/daterangepicker.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.42/js/bootstrap-datetimepicker.min.js
diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css
index 9d297a2c..275292d5 100644
--- a/hosting/static/hosting/css/landing-page.css
+++ b/hosting/static/hosting/css/landing-page.css
@@ -432,10 +432,6 @@ p.copyright {
margin: 14px 0 0;
}
-a#forgotpassword {
- color: #ffffff;
-}
-
.content-404 h1 {
margin: 0 0 15px;
font-size: 200px;
diff --git a/hosting/static/hosting/js/initial.js b/hosting/static/hosting/js/initial.js
index b7d96601..1fca9735 100644
--- a/hosting/static/hosting/js/initial.js
+++ b/hosting/static/hosting/js/initial.js
@@ -57,16 +57,6 @@ $( document ).ready(function() {
$('[data-toggle="tooltip"]').tooltip();
- var clipboard = new Clipboard('.to_copy');
-
- clipboard.on('success', function(e) {
- var selector = "#";
- var copy_button_id = selector.concat(e.trigger.id);
- setTimeout(function(){
- $(copy_button_id).tooltip('hide');
- }, 1000);
- });
-
_initNavUrl();
/*
diff --git a/hosting/static/hosting/js/virtual_machine_detail.js b/hosting/static/hosting/js/virtual_machine_detail.js
index d30ebc83..43a5a01d 100644
--- a/hosting/static/hosting/js/virtual_machine_detail.js
+++ b/hosting/static/hosting/js/virtual_machine_detail.js
@@ -1,3 +1,15 @@
+$( document ).ready(function() {
+ var clipboard = new Clipboard('.to_copy');
+
+ clipboard.on('success', function(e) {
+ var selector = "#";
+ var copy_button_id = selector.concat(e.trigger.id);
+ setTimeout(function(){
+ $(copy_button_id).tooltip('hide');
+ }, 1000);
+ });
+});
+
function VMTerminateStatus($container, url) {
$.ajax({
url: url,
diff --git a/hosting/templates/hosting/login.html b/hosting/templates/hosting/login.html
index 7832ec7d..9545cddb 100644
--- a/hosting/templates/hosting/login.html
+++ b/hosting/templates/hosting/login.html
@@ -29,7 +29,7 @@
<div class="auth-footer">
<div>
{% trans "Don't have an account yet ?" %}
- <a class="" href="{% url 'hosting:signup' %}">{% trans "Sign up" %}</a>
+ <a href="{% url 'hosting:signup' %}">{% trans "Sign up" %}</a>
</div>
<div>
or <a href="{% url 'hosting:reset_password' %}">{% trans "Forgot your password ?" %}</a><br>
diff --git a/hosting/templates/hosting/resend_activation_link.html b/hosting/templates/hosting/resend_activation_link.html
index b9fe6f49..a0338058 100644
--- a/hosting/templates/hosting/resend_activation_link.html
+++ b/hosting/templates/hosting/resend_activation_link.html
@@ -27,7 +27,7 @@
<div class="auth-footer">
<div>
{% trans "Don't have an account yet ?" %}
- <a class="" href="{% url 'hosting:signup' %}">{% trans "Sign up" %}</a>
+ <a href="{% url 'hosting:signup' %}">{% trans "Sign up" %}</a>
</div>
<div>
or <a href="{% url 'hosting:reset_password' %}">{% trans "Forgot your password ?" %}</a>
diff --git a/ungleich_page/templates/ungleich_page/glasfaser.html b/ungleich_page/templates/ungleich_page/glasfaser.html
index 3d8fbb76..71c824c1 100644
--- a/ungleich_page/templates/ungleich_page/glasfaser.html
+++ b/ungleich_page/templates/ungleich_page/glasfaser.html
@@ -229,9 +229,9 @@
</div>
</div>
<div class="social">
- <a target="_blank" class="" href="https://twitter.com/datacenterlight"><i class="fa fa-twitter fa-fw"></i></a>
- <a target="_blank" class="" href="https://github.com/ungleich"><i class="fa fa-github fa-fw"></i></a>
- <a target="_blank" class="" href="https://www.facebook.com/ungleich.ch/"><i class="fa fa-facebook"></i></a>
+ <a target="_blank" href="https://twitter.com/datacenterlight"><i class="fa fa-twitter fa-fw"></i></a>
+ <a target="_blank" href="https://github.com/ungleich"><i class="fa fa-github fa-fw"></i></a>
+ <a target="_blank" href="https://www.facebook.com/ungleich.ch/"><i class="fa fa-facebook"></i></a>
</div>
</div>
<div class="col-sm-6">
diff --git a/ungleich_page/templates/ungleich_page/glasfaser/section_contact.html b/ungleich_page/templates/ungleich_page/glasfaser/section_contact.html
index 26a3275c..4bf03d9a 100644
--- a/ungleich_page/templates/ungleich_page/glasfaser/section_contact.html
+++ b/ungleich_page/templates/ungleich_page/glasfaser/section_contact.html
@@ -19,9 +19,9 @@
</div>
</div>
<div class="social">
- <a target="_blank" class="" href="https://twitter.com/datacenterlight"><i class="fa fa-twitter fa-fw"></i></a>
- <a target="_blank" class="" href="https://github.com/ungleich"><i class="fa fa-github fa-fw"></i></a>
- <a target="_blank" class="" href="https://www.facebook.com/ungleich.ch/"><i class="fa fa-facebook"></i></a>
+ <a target="_blank" href="https://twitter.com/datacenterlight"><i class="fa fa-twitter fa-fw"></i></a>
+ <a target="_blank" href="https://github.com/ungleich"><i class="fa fa-github fa-fw"></i></a>
+ <a target="_blank" href="https://www.facebook.com/ungleich.ch/"><i class="fa fa-facebook"></i></a>
</div>
</div>
<div class="col-sm-6">