Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Nounous
re2o
Commits
e8009c98
Commit
e8009c98
authored
Jul 02, 2016
by
lhark
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move sidebar management to apps, replace base menu placeholders
parent
9b527c47
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
12 deletions
+34
-12
templates/base.html
templates/base.html
+8
-6
users/templates/users/index.html
users/templates/users/index.html
+18
-4
users/templates/users/sidebar.html
users/templates/users/sidebar.html
+6
-0
users/templates/users/user.html
users/templates/users/user.html
+2
-2
No files found.
templates/base.html
View file @
e8009c98
...
...
@@ -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 #}
...
...
users/templates/users/index.html
View file @
e8009c98
{% 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 %}
users/templates/users/sidebar.html
0 → 100644
View file @
e8009c98
{% 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 %}
users/templates/users/user.html
View file @
e8009c98
{% extends "
base
.html" %}
{% extends "
users/sidebar
.html" %}
{% load bootstrap3 %}
{% block title %}
Re2o : c
réation d'utilisateur{% endblock %}
{% block title %}
C
réation d'utilisateur{% endblock %}
{% block content %}
{% bootstrap_form_errors userform %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment