rezometz
/
re2o
mirror of https://gitlab.federez.net/re2o/re2o
8
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Move sidebar management to apps, replace base menu placeholders

test_david
lhark 10 years ago
parent
9b527c4744
commit
e8009c98fd
4 changed files with 34 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      templates/base.html
  2. 22
      users/templates/users/index.html
  3. 6
      users/templates/users/sidebar.html
  4. 4
      users/templates/users/user.html

14
templates/base.html
View File

@ -11,7 +11,7 @@
<link rel="stylesheet" href="{% static "/static/css/base.css" %}">
{% bootstrap_javascript %}
<title>{% block title %}Re2o{% endblock %}</title>
<title>Re2o : {% block title %}Accueil{% endblock %}</title>
</head>
<body>
@ -23,14 +23,14 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Re2o</a>
<a class="navbar-brand" href="/">Re2o</a>
</div>
<div class="collapse navbar-collapse" id="myNavbar">
<ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#">About</a></li>
<li><a href="#">Projects</a></li>
<li><a href="#">Contact</a></li>
<li><a href="{% url "users:index" %}">Adhérents</a></li>
<li><a href="#">Machines</a></li>
<li><a href="#">Topologie</a></li>
<li><a href="#">Statistiques</a></li>
</ul>
<div class="col-sm-3 col-md-3 navbar-right">
<form class="navbar-form" role="search">
@ -52,9 +52,11 @@
<div class="container-fluid text-center">
<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">
{# Display django.contrib.messages as Bootstrap alerts #}

22
users/templates/users/index.html
View File

@ -1,10 +1,24 @@
{% extends "base.html" %}
{% extends "users/sidebar.html" %}
{% load bootstrap3 %}
{% block title %}Re2o : Utilisateurs{% endblock %}
{% block title %}Utilisateurs{% endblock %}
{% block content %}
{% url "users-new-user" as new_user %}
{% bootstrap_button "Créer un utilisateur" button_type="link" button_class="btn-primary" icon="user" href=new_user %}
<table class="table table-striped">
<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 %}

6
users/templates/users/sidebar.html
View 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 %}

4
users/templates/users/user.html
View File

@ -1,7 +1,7 @@
{% extends "base.html" %}
{% extends "users/sidebar.html" %}
{% load bootstrap3 %}
{% block title %}Re2o : création d'utilisateur{% endblock %}
{% block title %}Création d'utilisateur{% endblock %}
{% block content %}
{% bootstrap_form_errors userform %}

Write Preview
Loading…
Cancel
Save