mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-25 22:22:26 +00:00
Move sidebar management to apps, replace base menu placeholders
This commit is contained in:
parent
9b527c4744
commit
e8009c98fd
4 changed files with 34 additions and 12 deletions
|
@ -11,7 +11,7 @@
|
||||||
<link rel="stylesheet" href="{% static "/static/css/base.css" %}">
|
<link rel="stylesheet" href="{% static "/static/css/base.css" %}">
|
||||||
|
|
||||||
{% bootstrap_javascript %}
|
{% bootstrap_javascript %}
|
||||||
<title>{% block title %}Re2o{% endblock %}</title>
|
<title>Re2o : {% block title %}Accueil{% endblock %}</title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
@ -23,14 +23,14 @@
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
</button>
|
</button>
|
||||||
<a class="navbar-brand" href="#">Re2o</a>
|
<a class="navbar-brand" href="/">Re2o</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="collapse navbar-collapse" id="myNavbar">
|
<div class="collapse navbar-collapse" id="myNavbar">
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
<li class="active"><a href="#">Home</a></li>
|
<li><a href="{% url "users:index" %}">Adhérents</a></li>
|
||||||
<li><a href="#">About</a></li>
|
<li><a href="#">Machines</a></li>
|
||||||
<li><a href="#">Projects</a></li>
|
<li><a href="#">Topologie</a></li>
|
||||||
<li><a href="#">Contact</a></li>
|
<li><a href="#">Statistiques</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="col-sm-3 col-md-3 navbar-right">
|
<div class="col-sm-3 col-md-3 navbar-right">
|
||||||
<form class="navbar-form" role="search">
|
<form class="navbar-form" role="search">
|
||||||
|
@ -52,9 +52,11 @@
|
||||||
<div class="container-fluid text-center">
|
<div class="container-fluid text-center">
|
||||||
<div class="row content">
|
<div class="row content">
|
||||||
<div class="col-sm-2 sidenav">
|
<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>
|
<p><a href="#">Link</a></p>
|
||||||
<p><a href="#">Link</a></p>
|
<p><a href="#">Link</a></p>
|
||||||
|
{% endblock %}
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-8 text-left">
|
<div class="col-sm-8 text-left">
|
||||||
{# Display django.contrib.messages as Bootstrap alerts #}
|
{# Display django.contrib.messages as Bootstrap alerts #}
|
||||||
|
|
|
@ -1,10 +1,24 @@
|
||||||
{% extends "base.html" %}
|
{% extends "users/sidebar.html" %}
|
||||||
{% load bootstrap3 %}
|
{% load bootstrap3 %}
|
||||||
|
|
||||||
{% block title %}Re2o : Utilisateurs{% endblock %}
|
{% block title %}Utilisateurs{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
{% url "users-new-user" as new_user %}
|
<table class="table table-striped">
|
||||||
{% bootstrap_button "Créer un utilisateur" button_type="link" button_class="btn-primary" icon="user" href=new_user %}
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Prénom</th>
|
||||||
|
<th>Nom</th>
|
||||||
|
<th>Pseudo</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
{% for user in users_list %}
|
||||||
|
<tr>
|
||||||
|
<td>{{ user.name }}</td>
|
||||||
|
<td>{{ user.surname }}</td>
|
||||||
|
<td>{{ user.pseudo }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
|
6
users/templates/users/sidebar.html
Normal file
6
users/templates/users/sidebar.html
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block sidebar %}
|
||||||
|
<p><a href="{% url "users:new-user" %}">Créer un adhérent</a></p>
|
||||||
|
<p><a href="{% url "users:index" %}">Liste des adhérents</a></p>
|
||||||
|
{% endblock %}
|
|
@ -1,7 +1,7 @@
|
||||||
{% extends "base.html" %}
|
{% extends "users/sidebar.html" %}
|
||||||
{% load bootstrap3 %}
|
{% load bootstrap3 %}
|
||||||
|
|
||||||
{% block title %}Re2o : création d'utilisateur{% endblock %}
|
{% block title %}Création d'utilisateur{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
{% bootstrap_form_errors userform %}
|
{% bootstrap_form_errors userform %}
|
||||||
|
|
Loading…
Reference in a new issue