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

bugfix. system menu was shown twice

Browse source
This commit is contained in:
Teja 2015-02-11 17:57:12 +01:00
parent 07918b9f0d
commit 6cc9d33b44
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
View file

@ -25,17 +25,7 @@
<!--<li><a href="#gcode" data-toggle="tab">gcode</a></li>-->
<li><a href="#focus" data-toggle="tab">focus</a></li>
<li><a href="#term" data-toggle="tab">terminal</a></li>
{% if enableSystemMenu %}
<li class="dropdown" style="display: none" data-bind="visible: loginState.isAdmin">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="icon-off"></i> {{ _('System') }}
<b class="caret"></b>
</a>
<ul class="dropdown-menu" data-bind="foreach: systemActions">
<li><a href="#" data-bind="click: $root.triggerAction, text: name"></a></li>
</ul>
</li>
{% endif %}
{% for data in navbarEntries %}
{% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- ko allowBindings: false -->{% endif %}
<li id="{{ data._div }}"

2
src/octoprint/templates/navbar/systemmenu.jinja2
View file

@ -1,6 +1,6 @@
{% if enableSystemMenu %}
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="icon-off"></i> {{ _('System') }}
<i class="icon-off">&nbsp;</i>
<b class="caret"></b>
</a>
<ul class="dropdown-menu" data-bind="foreach: systemActions">