mirror of
https://github.com/krateng/maloja.git
synced 2023-08-10 21:12:55 +03:00
Removed merge icon handling on pages that don't use them
This commit is contained in:
parent
428d92a267
commit
8023c2d51c
@ -86,9 +86,7 @@
|
|||||||
{% block icon_bar %}{% endblock %}
|
{% block icon_bar %}{% endblock %}
|
||||||
{% include 'icons/settings.jinja' %}
|
{% include 'icons/settings.jinja' %}
|
||||||
</div>
|
</div>
|
||||||
<script>
|
|
||||||
showValidMergeIcons();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div id="notification_area">
|
<div id="notification_area">
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
{% include 'icons/merge.jinja' %}
|
{% include 'icons/merge.jinja' %}
|
||||||
{% include 'icons/merge_mark.jinja' %}
|
{% include 'icons/merge_mark.jinja' %}
|
||||||
{% include 'icons/merge_cancel.jinja' %}
|
{% include 'icons/merge_cancel.jinja' %}
|
||||||
|
<script>showValidMergeIcons();</script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
{% include 'icons/merge.jinja' %}
|
{% include 'icons/merge.jinja' %}
|
||||||
{% include 'icons/merge_mark.jinja' %}
|
{% include 'icons/merge_mark.jinja' %}
|
||||||
{% include 'icons/merge_cancel.jinja' %}
|
{% include 'icons/merge_cancel.jinja' %}
|
||||||
|
<script>showValidMergeIcons();</script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user