Un peu de style

cotisations/views.py

@@ -15,7 +15,7 @@ from .models import Facture, Article, Vente, Cotisation, Paiement, Banque
 from .forms import NewFactureForm, TrezEditFactureForm, EditFactureForm, ArticleForm, DelArticleForm, PaiementForm, DelPaiementForm, BanqueForm, DelBanqueForm, NewFactureFormPdf, SelectArticleForm
 from users.models import User
 from .tex import render_tex
-from re2o.settings_local import ASSO_NAME, ASSO_ADDRESS_LINE1, ASSO_ADDRESS_LINE2, ASSO_SIRET, ASSO_EMAIL, ASSO_PHONE, LOGO_PATH
+from re2o.settings import ASSO_NAME, ASSO_ADDRESS_LINE1, ASSO_ADDRESS_LINE2, ASSO_SIRET, ASSO_EMAIL, ASSO_PHONE, LOGO_PATH
 from re2o import settings
 
 from dateutil.relativedelta import relativedelta

machines/templates/machines/aff_machines.html

@@ -26,8 +26,15 @@
             <td>{{ interface.type }}</td>
             <td>{{ interface.mac_address }}</td>
             <td>{{ interface.ipv4 }}</td>
-            <td><a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:edit-interface' interface.id %}"><i class="glyphicon glyphicon-hdd"></i> Editer</a>
-            <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-interface' interface.id %}"><i class="glyphicon glyphicon-trash"></i> Supprimer</a></td>
+            <td><div class="dropdown">
+            <button class="btn btn-default dropdown-toggle" type="button" id="editioninterface" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+            Modifier
+            <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu" aria-labelledby="editioninterface">
+            <li><a href="{% url 'machines:edit-interface' interface.id %}"><i class="glyphicon glyphicon-hdd"></i> Editer</a></li>
+            <li><a href="{% url 'machines:del-interface' interface.id %}"><i class="glyphicon glyphicon-trash"></i> Supprimer</a></li>
+            </ul></div></td>
             </tr>
             {% endfor %}
             </table>

templates/base.html

@@ -70,9 +70,6 @@
                 <div class="row content">
                     <div class="col-sm-2 sidenav">
                         {% block sidebar %}
-                        <p><a href="#">Link</a></p>
-                        <p><a href="#">Link</a></p>
-                        <p><a href="#">Link</a></p>
                         {% endblock %}
                     </div>
                     <div class="col-sm-8 text-left">
@@ -91,7 +88,7 @@
                             <li>Chambre : {{ request_user.room }}</li>
                             <li>Connexion : {% if request_user.has_access == True %}<font color="green">Active</font>{% else %}<font color="red">Désactivée</font>{% endif %}</li>
                             <li>Fin d'adhésion : {% if request_user.end_adhesion != None %}<font color="green">{{ request_user.end_adhesion }}</font>{% else %}<font color="red">Non adhérent</font>{% endif %}</li>
-                            <p><a href="{% url "users:mon-profil" %}">Voir mon profil</a></p>
+                            <p><a class="btn btn-success btn-sm" role="button"href="{% url "users:mon-profil" %}">Voir mon profil</a></p>
                             {% else %}
                             <p>Vous n'êtes pas authentifié</p>
                             {% endif %}
@@ -102,7 +99,7 @@
                         {% for interface in interfaces|slice:":5" %}
                         <li>{{interface.dns}}</li>
                         {% endfor %}
-                        <p><a href="{% url "users:mon-profil" %}">Voir toutes mes machines</a></p>
+                        <p><a class="btn btn-warning btn-sm" role="button" href="{% url "users:mon-profil" %}">Voir mes machines</a></p>
                         </div>
                         {% endif %}
                     </div>