diff --git a/templates/base.html b/templates/base.html index 887bc970..dbe59c41 100644 --- a/templates/base.html +++ b/templates/base.html @@ -75,9 +75,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
  • {% trans 'Activities' %}
    • -
  • - {% trans 'Button' %} -
  • {% trans 'Transfer' %}
    • diff --git a/templates/note/conso_form.html b/templates/note/conso_form.html index 286b4285..2c2066e8 100644 --- a/templates/note/conso_form.html +++ b/templates/note/conso_form.html @@ -6,75 +6,129 @@ {% block contenttitle %}{% endblock %} {% block content %} - {# Regroup buttons under categories #} - {% regroup transaction_templates by category as categories %} - -
    - {% csrf_token %} - -
    -
    - {% if form.non_field_errors %} -

    - {% for error in form.non_field_errors %} - {{ error }} - {% endfor %} -

    - {% endif %} - {% for field in form %} -
    - {{ field.errors }} -
    - {{ field.label_tag }} - {% if field.is_readonly %} -
    {{ field.contents }}
    - {% else %} - {{ field }} - {% endif %} - {% if field.field.help_text %} -
    {{ field.field.help_text|safe }}
    - {% endif %} +
    +
    +
    + {# User details column #} +
    +
    + +
    + Paquito (aka. PAC) : -230 €
    - {% endfor %} -
    +
    -
    -
    - {# Tabs for button categories #} -
    -
      - {% for category in categories %} -
    • - - {{ category.grouper }} - -
      • - {% endfor %} + {# User selection column #} +
      +
      +
      +

      + Sélection des émitteurs +

      +
      +
        +
      • + Cras justo odio + 14 +
        • +
      • + Dapibus ac facilisis in + 1 +
      -
      - - {# Tabs content #} -
      -
      - {% for category in categories %} -
      -
      - {% for button in category.list %} - - {% endfor %} -
      -
      - {% endfor %} +
      + TODO: reimplement select2 here in JS
    - + + {# Buttons column #} +
    + {# Show last used buttons #} +
    +
    +

    + Les boutons les plus utilisés s'afficheront ici. +

    +
    +
    + + {# Regroup buttons under categories #} + {% regroup transaction_templates by template_type as template_types %} + +
    + {# Tabs for button categories #} +
    + +
    + + {# Tabs content #} +
    +
    + {% for template_type in template_types %} +
    +
    + {% for button in template_type.list %} + + {% endfor %} +
    +
    + {% endfor %} +
    +
    + + {# Mode switch #} +
    + + Éditer + +
    + + +
    +
    +
    +
    +
    + +
    +
    +

    + Historique des transactions récentes +

    +
    + {% render_table table %} +
    +{% endblock %} + +{% block extracss %} + {% endblock %} {% block extrajavascript %}