--- a/src/catedit/templates/macros.html Wed Apr 08 11:27:26 2015 +0200
+++ b/src/catedit/templates/macros.html Wed Apr 08 12:57:59 2015 +0200
@@ -1,4 +1,4 @@
-{% macro category_table(cat_list, current_repository, state_list=["mixed"], target="", interactive=True, with_colors=True) -%}
+{% macro category_table(cat_list, current_repository, state_list=["mixed"], target="", interactive=True, with_colors=True, buttons_id="") -%}
{% for cat in cat_list %}
{% if state_list == ["mixed"] or (cat.state in state_list) %}
<tr
@@ -15,8 +15,8 @@
<td class="col-md-7">{{ cat.cat_description}}</td>
<td class="col-md-1 text-center">
<a title="Détails catégorie">
- <button class="btn btn-default cat-info-toggle" id="info_button_{% if ((cat.state != 'untouched') and (cat.state != 'original')) %}edited_{% endif %}{{ cat.cat_id }}">
- <span id="info_icon_{% if ((cat.state != 'untouched') and (cat.state != 'original')) %}edited_{% endif %}{{ cat.cat_id }}" class="glyphicon glyphicon-plus-sign"/>
+ <button class="btn btn-default cat-info-toggle" id="info_button_{% if ((cat.state != 'untouched') and (cat.state != 'original')) %}edited_{% endif %}{{ cat.cat_id }}{% if buttons_id %}-{{ buttons_id }}{% endif %}">
+ <span id="info_icon_{% if ((cat.state != 'untouched') and (cat.state != 'original')) %}edited_{% endif %}{{ cat.cat_id }}{% if buttons_id %}-{{ buttons_id }}{% endif %}" class="glyphicon glyphicon-plus-sign"/>
</button>
</a>
</td>
@@ -31,7 +31,7 @@
{% if (cat.state == "untouched") or (cat.state == "original") %}
<td class="col-md-1 text-center">
<a title="Supprimer catégorie">
- <button class="btn btn-default cat-delete-toggle {% if readonly %}disabled{% endif %}" id="delete_button_{{ cat.cat_id }}">
+ <button class="btn btn-default cat-delete-toggle {% if readonly %}disabled{% endif %}" id="delete_button_{{ cat.cat_id }}{% if buttons_id %}-{{ buttons_id }}{% endif %}">
<span id="delete_icon_{{ cat.cat_id }}" class="glyphicon glyphicon-trash"/>
</button>
</a>
@@ -39,7 +39,7 @@
{% elif (cat.state == "created" or cat.state == "modified") %}
<td class="col-md-1 text-center">
<a title="Supprimer changements">
- <button class="btn btn-default cat-delete-toggle {% if readonly %}disabled{% endif %}" id="delete_button_edited_{{ cat.cat_id }}">
+ <button class="btn btn-default cat-delete-toggle {% if readonly %}disabled{% endif %}" id="delete_button_edited_{{ cat.cat_id }}{% if buttons_id %}-{{ buttons_id }}{% endif %}">
<span id="delete_icon_edited_{{ cat.cat_id }}"class="glyphicon glyphicon-remove-sign"/>
</button>
</a>
@@ -67,7 +67,7 @@
{% endif %}
{% endif %}>
<td colspan="5">
- <div class="cat-info-div" id="properties_{% if (cat.state != 'untouched') and (cat.state != 'original') %}edited_{% endif %}{{cat.cat_id}}">
+ <div class="cat-info-div" id="properties_{% if (cat.state != 'untouched') and (cat.state != 'original') %}edited_{% endif %}{{cat.cat_id}}{% if buttons_id %}-{{ buttons_id }}{% endif %}">
<dl class="dl-horizontal">
{% if cat.cat_properties|length == 0 %} <dt></dt><dd>Aucune autre propriété</dd>
{% else %}
@@ -92,7 +92,7 @@
</div>
{% if interactive %}
{% if cat.state != "deleted" %}
- <div class="cat-delete-div" id="delete_confirm_{% if ((cat.state != 'untouched') and (cat.state != 'original')) %}edited_{% endif %}{{cat.cat_id}}">
+ <div class="cat-delete-div" id="delete_confirm_{% if ((cat.state != 'untouched') and (cat.state != 'original')) %}edited_{% endif %}{{cat.cat_id}}{% if buttons_id %}-{{ buttons_id }}{% endif %}">
<form method="POST" action=
"{% if cat.state == 'modified' %}
{{url_for(target, deleted_changes_id=cat.cat_id, repository=current_repository)}}