Merge pull request #78 from tmslav/develop

hosting: https://redmine.ungleich.ch/issues/2292, fixed footer

hosting/static/hosting/css/landing-page.css

@@ -38,6 +38,7 @@ h6 {
     background: url(../img/intro-bg.jpg) no-repeat center center;
     background-size: cover;
 }
+
 .intro-header-1 {
     padding-top: 50px; /* If you're making other pages, make sure there is 50px of padding to make sure the navbar doesn't overlap content! */
     padding-bottom: 50px;
@@ -46,6 +47,7 @@ h6 {
     background: url(../img/configure.jpg) no-repeat center center;
     background-size: cover;
 }
+
 .intro-header-2 {
     padding-top: 50px; /* If you're making other pages, make sure there is 50px of padding to make sure the navbar doesn't overlap content! */
     padding-bottom: 50px;
@@ -54,6 +56,7 @@ h6 {
     background: url(../img/configure.jpg) no-repeat center center;
     background-size: cover;
 }
+
 .intro-message {
     position: relative;
     padding-top: 20%;
@@ -194,15 +197,18 @@ h6 {
 }
 
 footer {
-    padding: 50px 0;
+    padding: 2%;
     background-color: #f8f8f8;
+    #position: absolute;
+    right: 0;
+    bottom: 0;
+    left: 0;
 }
 
 p.copyright {
     margin: 15px 0 0;
 }
 
-
 a#forgotpassword {
     color: #ffffff;
 }

hosting/templates/hosting/order_detail.html

@@ -58,6 +58,7 @@
                 <hr>
                 <h4>Total<p class="pull-right"><b>{{order.vm_plan.price}} CHF</b></p></h4>
             </div>
+            <a href="{% url 'hosting:virtual_machines' order.vm_plan.id %}" class="pull-right"><button class="btn-info">View instance</button></a>
         </div>
     </div>
 </div>

membership/static/stylesheet.css

@@ -71,6 +71,7 @@ table {
     color: #1a6687;
     padding-top: 2px;
 }
+
 /*Title*/
 .calendar thead {
     font-weight: 500;
@@ -93,10 +94,12 @@ table {
 
     /*border-radius: 50%;*/
 }
+
 .selected {
     background: #6b9699;
     color: #f9f9f9;
 }
+
 .calendar thead > tr > td {
     border-top: hidden;
     border-left: hidden;
@@ -134,7 +137,6 @@ table {
     /*background-color: #8BC4C9;*/
 }
 
-
 /*Next,Prev month*/
 .btn-prev,
 .btn-next {
@@ -150,7 +152,6 @@ table {
     /*width: 25em;*/
 }
 
-
 .btn-prev:hover,
 .btn-next:hover {
     background: none;
@@ -164,3 +165,4 @@ table {
 .btn-next {
     right: 6em;
 }
+