mirror of
https://github.com/retspen/webvirtcloud
synced 2024-12-23 22:55:23 +00:00
Fix instance bottom bar overlapping main content
This commit is contained in:
parent
618d88f1c4
commit
6d82c2820b
3 changed files with 40 additions and 31 deletions
31
instances/templates/bottom_bar.html
Normal file
31
instances/templates/bottom_bar.html
Normal file
|
@ -0,0 +1,31 @@
|
|||
{% load i18n %}
|
||||
<nav class="navbar navbar-default navbar navbar-fixed-bottom">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar_bottom" aria-expanded="false" aria-controls="navbar">
|
||||
<span class="sr-only">{% trans 'Toggle navigation' %}</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#">{% trans 'HOST' %}</a>
|
||||
</div>
|
||||
<div id="navbar_bottom" class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
<li>
|
||||
<a class="navbar-link" href="{% url 'overview' compute.id %}">
|
||||
<i class="fa fa-server"></i>
|
||||
{{ compute.name }} {% if compute.name != compute.hostname %} - {{ compute.hostname }}{% endif %}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{% url 'instances' compute.id %}"><i class="fa fa-desktop"></i> {% trans "Instances" %}</a>
|
||||
</li>
|
||||
<li class="active">
|
||||
<a href="{% url 'instance' compute.id vname %}"><i class="fa fa-hdd-o"></i> {{ vname }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
<div class="bottom-bar-margin"></div>
|
|
@ -4,37 +4,6 @@
|
|||
{% block title %}{% trans "Instance" %} - {{ vname }}{% endblock %}
|
||||
{% block content %}
|
||||
{% include 'pleasewaitdialog.html' %}
|
||||
{% if bottom_bar %}
|
||||
<nav class="navbar navbar-default navbar navbar-fixed-bottom">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar_bottom" aria-expanded="false" aria-controls="navbar">
|
||||
<span class="sr-only">{% trans 'Toggle navigation' %}</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#">{% trans 'HOST' %}</a>
|
||||
</div>
|
||||
<div id="navbar_bottom" class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
<li>
|
||||
<a class="navbar-link" href="{% url 'overview' compute.id %}">
|
||||
<i class="fa fa-server"></i>
|
||||
{{ compute.name }} {% if compute.name != compute.hostname %} - {{ compute.hostname }}{% endif %}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{% url 'instances' compute.id %}"><i class="fa fa-desktop"></i> {% trans "Instances" %}</a>
|
||||
</li>
|
||||
<li class="active">
|
||||
<a href="{% url 'instance' compute.id vname %}"><i class="fa fa-hdd-o"></i> {{ vname }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
{% endif %}
|
||||
<!-- Page Heading -->
|
||||
<div>
|
||||
<div>
|
||||
|
@ -1690,6 +1659,11 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if bottom_bar %}
|
||||
{% include 'bottom_bar.html' %}
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
{% block script %}
|
||||
<script src="{% static "js/ace.js" %}" type="text/javascript" charset="utf-8"></script>
|
||||
|
|
|
@ -150,4 +150,8 @@ p {
|
|||
.multipleselect-on {
|
||||
color:#ffffff;
|
||||
background-color:#000099;
|
||||
}
|
||||
|
||||
.bottom-bar-margin {
|
||||
margin-top: 65px;
|
||||
}
|
Loading…
Reference in a new issue