pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only display sidebar/tab if there are components within

Browse source 
If sidebar is present but tabs not or vice versa, it will be blown up to 100% width.
This commit is contained in:
Gina Häußge 2015-03-09 13:29:51 +01:00
parent 1a96480aa7
commit a956abd65a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/octoprint/templates/index.jinja2
View file

@ -38,7 +38,8 @@
<div class="container octoprint-container">
<div class="row">
<!-- Sidebar -->
<div class="accordion span4">
{% if templates.sidebar.order %}
<div class="accordion {% if templates.tab.order %}span4{% else %}span12{% endif %}">
{% for key in templates.sidebar.order %}
{% set entry, data = templates.sidebar.entries[key] %}
{% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- ko allowBindings: false -->{% endif %}
@ -67,9 +68,11 @@
{% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- /ko -->{% endif %}
{% endfor %}
</div>
{% endif %}
<!-- Tabs -->
<div class="span8 tabbable">
{% if templates.tab.order %}
<div class="tabbable {% if templates.sidebar.order %}span8{% else %}span12{% endif %}">
<ul class="nav nav-tabs" id="tabs">
{% for key in templates.tab.order %}
{% set entry, data = templates.tab.entries[key] %}
@ -100,6 +103,7 @@
{% endfor %}
</div>
</div>
{% endif %}
</div>
<div class="footer">
<ul class="pull-left muted">