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

Merge pull request #445 from tiwariav/bugfix/3683/hosting_footer

Browse source 
bugfix/3683 footer fix on hosting
This commit is contained in:
Arvind Tiwari 2017-08-12 01:28:31 +05:30 committed by GitHub
commit 7825114f5e
3 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosting/static/hosting/css/commons.css
View file

@ -7,7 +7,7 @@
} }
.content-dashboard{ .content-dashboard{
min-height: calc(100vh - 120px); min-height: calc(100vh - 70px);
width: 80%; width: 80%;
margin: 0 auto; margin: 0 auto;
max-width: 1120px; max-width: 1120px;

6
hosting/static/hosting/css/landing-page.css
View file

@ -457,16 +457,16 @@ h6 {
} }
footer { footer {
padding: 2%; padding: 20px;
background-color: #f8f8f8; background-color: #f8f8f8;
#position: absolute; /* position: absolute */
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
} }
p.copyright { p.copyright {
margin: 15px 0 0; margin: 14px 0 0;
} }
a#forgotpassword { a#forgotpassword {

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

@ -1,12 +1,12 @@
{% extends "hosting/base_short.html" %} {% extends "hosting/base_short.html" %}
{% load staticfiles bootstrap3 i18n %} {% load staticfiles bootstrap3 i18n %}
{% block content %} {% block content %}
<div> <div>
<div class="dashboard-container"> <div class="dashboard-container">
<div class="row"> <div class="row">
<div class="col-xs-12 container-table"> <div class="col-xs-12 container-table">
<table class="table borderless table-hover"> <table class="table borderless table-hover">
<h3 class="pull-left"><i class="fa fa-server fa-separate" 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"> <div class="col-md-12">
<br/> <br/>
{% if messages %} {% if messages %}
@ -19,12 +19,12 @@
</div> </div>
{% if not error %} {% if not error %}
<p class="pull-right btn-create-vm"> <p class="pull-right btn-create-vm">
<a class="btn btn-success" href="{% url 'hosting:create_virtual_machine' %}" >{% trans "Create VM"%} </a> <a class="btn btn-success" href="{% url 'hosting:create_virtual_machine' %}" >{% trans "Create VM"%} </a>
</p> </p>
<br/> <br/>
<thead> <thead>
<tr> <tr>
<th>{% trans "ID"%}</th> <th>{% trans "ID"%}</th>
<th>{% trans "Ipv4"%}</th> <th>{% trans "Ipv4"%}</th>
<th>{% trans "Ipv6"%}</th> <th>{% trans "Ipv6"%}</th>
@ -32,36 +32,36 @@
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for vm in vms %} {% for vm in vms %}
<tr> <tr>
<td scope="row">{{vm.vm_id}}</td> <td scope="row">{{vm.vm_id}}</td>
{% if vm.ipv6 %} {% if vm.ipv6 %}
<td>{{vm.ipv4}}</td> <td>{{vm.ipv4}}</td>
<td>{{vm.ipv6}}</td> <td>{{vm.ipv6}}</td>
{% endif %} {% endif %}
<td> <td>
{% if vm.state == 'ACTIVE' %} {% if vm.state == 'ACTIVE' %}
<span class="h3 label label-success"><strong> {{vm.state}}</strong></span> <span class="h3 label label-success"><strong> {{vm.state}}</strong></span>
{% elif vm.state == 'FAILED' %} {% elif vm.state == 'FAILED' %}
<span class="h3 label label-danger"><strong>{{vm.state}}</strong></span> <span class="h3 label label-danger"><strong>{{vm.state}}</strong></span>
{% else %} {% else %}
<span class="h3 label label-warning"><strong>{{vm.state}}</strong></span> <span class="h3 label label-warning"><strong>{{vm.state}}</strong></span>
{% endif %} {% endif %}
</td> </td>
<td> <td>
<button type="button" class="btn btn-default"><a <button type="button" class="btn btn-default"><a
href="{% url 'hosting:virtual_machines' vm.vm_id %}">{% trans "View Detail"%}</a></button> href="{% url 'hosting:virtual_machines' vm.vm_id %}">{% trans "View Detail"%}</a></button>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table>
{% endif %} {% endif %}
</table>
{% if is_paginated %} {% if is_paginated %}
<div class="pagination"> <div class="pagination">
@ -78,7 +78,7 @@
</span> </span>
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div> </div>