Merge branch 'frontend_buttons' into 'dev'

Frontend buttons

See merge request federez/re2o!286

cotisations/locale/fr/LC_MESSAGES/django.po

@@ -681,8 +681,9 @@ msgstr ""
 
 #: templates/cotisations/delete.html:38
 #: templates/cotisations/edit_facture.html:60
+#: views.py:181 views.py:235
 msgid "Confirm"
-msgstr "Confirmer"
+msgstr "Valider"
 
 #: templates/cotisations/edit_facture.html:31
 #: templates/cotisations/facture.html:30
@@ -695,12 +696,13 @@ msgstr "Modifier la facture"
 
 #: templates/cotisations/edit_facture.html:41
 #: templates/cotisations/facture.html:56
-msgid "Invoice's articles"
+#: templates/cotisations/index_article.html:30
-msgstr "Articles de la facture"
+msgid "Articles"
+msgstr "Articles"
 
 #: templates/cotisations/facture.html:37
-msgid "New invoice"
+msgid "Buy"
-msgstr "Nouvelle facture"
+msgstr "Acheter une cotisation"
 
 #: templates/cotisations/facture.html:40
 #, python-format
@@ -713,8 +715,8 @@ msgid "Current balance: %(balance)s €"
 msgstr "Solde actuel : %(balance)s €"
 
 #: templates/cotisations/facture.html:70
-msgid "Add an article"
+msgid "Add an extra article"
-msgstr "Ajouter un article"
+msgstr "Ajouter un article supplémentaire"
 
 #: templates/cotisations/facture.html:72
 msgid "Total price: <span id=\"total_price\">0,00</span> €"
@@ -728,9 +730,6 @@ msgstr "Factures"
 msgid "Subscriptions"
 msgstr "Cotisations"
 
-#: templates/cotisations/index_article.html:30
-msgid "Articles"
-msgstr "Articles"
 
 #: templates/cotisations/index_article.html:33
 msgid "Article types list"
@@ -812,9 +811,6 @@ msgstr "Contrôler les factures"
 msgid "You need to choose at least one article."
 msgstr "Vous devez choisir au moins un article."
 
-#: views.py:181 views.py:235
-msgid "Create"
-msgstr "Créer"
 
 #: views.py:228
 msgid "The custom invoice was created."

cotisations/templates/cotisations/control.html

@@ -105,7 +105,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% endfor %}
     </table>
     {% trans "Edit" as tr_edit %}
-    {% bootstrap_button tr_edit button_type='submit' icon='star' %}
+    {% bootstrap_button tr_edit button_type='submit' icon='ok' button_class='btn-success' %}
 </form>
 
 {% endblock %}

cotisations/templates/cotisations/delete.html

@@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% blocktrans %}Warning: are you sure you really want to delete this {{ object_name }} object ( {{ objet }} )?{% endblocktrans %}
     </h4>
     {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type='submit' icon='trash' %}
+    {% bootstrap_button tr_confirm button_type='submit' icon='trash' button_class='btn-danger' %}
 </form>
 {% endblock %}
 

cotisations/templates/cotisations/edit_facture.html

@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h3>{% trans "Edit the invoice" %}</h3>
     {% massive_bootstrap_form factureform 'user' %}
     {{ venteform.management_form }}
-    <h3>{% trans "Invoice's articles" %}</h3>
+    <h3>{% trans "Articles" %}</h3>
     <table class="table table-striped">
         <thead>
             <tr>
@@ -58,7 +58,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
          {% endfor %}
     </table>
     {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type='submit' icon='star' %}
+    {% bootstrap_button tr_confirm button_type='submit' icon='ok' button_class='btn-success' %}
 </form>
 
 {% endblock %}

cotisations/templates/cotisations/facture.html

@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% if title %}
 <h3>{{ title }}</h3>
 {% else %}
-<h3>{% trans "New invoice" %}</h3>
+<h3>{% trans "Buy" %}</h3>
 {% endif %}
 {% if max_balance %}
 <h4>{% blocktrans %}Maximum allowed balance: {{ max_balance }} €{% endblocktrans %}</h4>
@@ -53,7 +53,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <div id="paymentMethod"></div>
     {% endif %}
     {% if articlesformset %}
-    <h3>{% trans "Invoice's articles" %}</h3>
+    <h3>{% trans "Articles" %}</h3>
     <div id="form_set" class="form-group">
         {{ articlesformset.management_form }}
         {% for articlesform in articlesformset.forms %}
@@ -67,12 +67,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         </div>
         {% endfor %}
     </div>
-    <input class="btn btn-primary btn-sm" role="button" value="{% trans "Add an article"%}" id="add_one">
+    <input class="btn btn-primary btn-block" role="button" value="{% trans "Add an extra article"%}" id="add_one">
     <p>
         {% blocktrans %}Total price: <span id="total_price">0,00</span> €{% endblocktrans %}
     </p>
     {% endif %}
-    {% bootstrap_button action_name button_type='submit' icon='star' %}
+    {% bootstrap_button action_name button_type='submit' icon='ok' button_class='btn-success' %}
 </form>
 
 {% if articlesformset or payment_method%}

cotisations/templates/cotisations/payment.html

@@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% bootstrap_form form %}
         {% endif %}
         {% trans "Pay" as tr_pay %}
-        {% bootstrap_button tr_pay button_type='submit' icon='piggy-bank' %}
+        {% bootstrap_button tr_pay button_type='submit' icon='piggy-bank' button_class='btn-success' %}
     </form>
 {% endblock %}
 

cotisations/views.py

@@ -169,7 +169,7 @@ def new_facture(request, user, userid):
             'articlesformset': article_formset,
             'articlelist': article_list,
             'balance': balance,
-            'action_name': _('Create'),
+            'action_name': _('Confirm'),
         },
         'cotisations/facture.html', request
     )
@@ -218,7 +218,7 @@ def new_custom_invoice(request):
 
     return form({
         'factureform': invoice_form,
-        'action_name': _("Create"),
+        'action_name': _("Confirm"),
         'articlesformset': articles_formset,
         'articlelist': articles
     }, 'cotisations/facture.html', request)

machines/templates/machines/delete.html

@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% csrf_token %}
     <h4>{% blocktrans %}Warning: are you sure you want to delete this object {{ objet_name }} ( {{ objet }} )?{% endblocktrans %}</h4>
     {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type="submit" icon="trash" %}
+    {% bootstrap_button tr_confirm button_type="submit" icon='trash' button_class='btn-danger' %}
 </form>
   <br />
   <br />

machines/templates/machines/edit_portlist.html

@@ -51,7 +51,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <input class="btn btn-primary btn-sm" role="button" value=value id="add_one">
     </p>
     {% trans "Create or edit" as tr_create_or_edit %}
-    {% bootstrap_button tr_create_or_edit button_type="submit" icon="star" %}
+    {% bootstrap_button tr_create_or_edit icon='ok' button_class='btn-success' %}
 </form>
 <script type="text/javascript">
     var template = `{{ports.empty_form}}`;

machines/templates/machines/machine.html

@@ -168,7 +168,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     	<h3>{% trans "IPv6 address" %}</h3>
         {% bootstrap_form ipv6form %}
     {% endif %}
-    {% bootstrap_button action_name button_type="submit" icon="star" %}
+    {% bootstrap_button action_name button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />

preferences/templates/preferences/edit_preferences.html

@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% csrf_token %}
     {% massive_bootstrap_form options 'utilisateur_asso' %}
     {% trans "Edit" as tr_edit %}
-    {% bootstrap_button tr_edit button_type="submit" icon="star" %}
+    {% bootstrap_button tr_edit button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
     <br />
     <br />

preferences/templates/preferences/preferences.html

@@ -39,7 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% if preferenceform %}
     {% bootstrap_form preferenceform %}
     {% endif %}
-    {% bootstrap_button action_name button_type="submit" icon="star" %}
+    {% bootstrap_button action_name button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />

topologie/templates/topologie/delete.html

@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% csrf_token %}
     <h4>{% blocktrans %}Warning: are you sure you want to delete this {{ objet_name }} object ( {{ objet }} )?{% endblocktrans %}</h4>
     {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type="submit" icon="trash" %}
+    {% bootstrap_button tr_confirm button_type="submit" icon="trash" button_class='btn-danger' %}
 </form>
   <br />
   <br />

topologie/templates/topologie/switch.html

@@ -44,7 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% massive_bootstrap_form topoform 'switch_interface' %}
     {% endif %}
     {% trans "Create" as tr_create %}
-    {% bootstrap_button tr_create button_type="submit" icon="ok" %}
+    {% bootstrap_button tr_create button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />

topologie/templates/topologie/topo.html

@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <form class="form" method="post">
     {% csrf_token %}
     {% massive_bootstrap_form topoform 'room,related,machine_interface,members' %}
-    {% bootstrap_button action_name button_type="submit" icon="ok" %}
+    {% bootstrap_button action_name icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />

topologie/templates/topologie/topo_more.html

@@ -57,7 +57,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% bootstrap_form domainform %}
     {% endif %}
     {% trans "Create or edit" as tr_create_or_edit %}
-    {% bootstrap_button tr_create_or_edit button_type="submit" icon="ok" %}
+    {% bootstrap_button tr_create_or_edit button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />

users/templates/users/delete.html

@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% csrf_token %}
     <h4>{% blocktrans %}Warning: are you sure you want to delete this {{ objet_name }} object ( {{ objet }} )?{% endblocktrans %}</h4>
     {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type="submit" icon="trash" %}
+    {% bootstrap_button tr_confirm button_type="submit" icon="trash" button_class='btn-danger' %}
 </form>
 <br />
 <br />

users/templates/users/user.html

@@ -35,7 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <form class="form" method="post">
     {% csrf_token %}
     {% massive_bootstrap_form userform 'room,school,administrators,members' %}
-    {% bootstrap_button action_name button_type="submit" icon="star" %}
+    {% bootstrap_button action_name button_type="submit" icon='ok' button_class='btn-success' %}
 </form>
 {% if load_js_file %}
 <script src="{{ load_js_file }}"></script>