Skip to content

GitLab

L
ludotheque
Commit e3e9a36a authored by Denis S. Valdenaire's avatar Denis S. Valdenaire
Browse files
Options

quelques correction de templates

parent 1eb8934b
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 39 deletions
views/base.html
View file @ e3e9a36a
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/favicon.png">
<link rel="stylesheet" href="css/bootstrap.min.css">
<link rel="stylesheet" href="css/bootstrap-theme.min.css">
<link rel="stylesheet" href="css/zabuto_calendar.min.css">
<link rel="stylesheet" href="css/jquery.dataTables.min.css">
<link rel="stylesheet" href="css/bootstrap-datetimepicker.css">
<link rel="stylesheet" href="css/bootstrap-switch.min.css">
<link rel="stylesheet" href="css/bootstrap-multiselect.css">
<!-- link rel="stylesheet" href="css/datatables.min.css" -->
<link rel="stylesheet" href="css/styles.css">
<script src="js/jquery-2.1.4.min.js"></script>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/favicon.png">
<link rel="stylesheet" href="css/bootstrap.min.css">
<link rel="stylesheet" href="css/bootstrap-theme.min.css">
<link rel="stylesheet" href="css/zabuto_calendar.min.css">
<link rel="stylesheet" href="css/jquery.dataTables.min.css">
<link rel="stylesheet" href="css/bootstrap-datetimepicker.css">
<link rel="stylesheet" href="css/bootstrap-switch.min.css">
<link rel="stylesheet" href="css/bootstrap-multiselect.css">
<!-- link rel="stylesheet" href="css/datatables.min.css" -->
<link rel="stylesheet" href="css/styles.css">
<script src="js/jquery-2.1.4.min.js"></script>
<title>{% block title %}{% endblock %} - Ludothèque</title>
</head>
<body>
......@@ -21,37 +21,37 @@
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
data-target="#navbar">
data-target="#navbar">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.php">
<img id="logo" src="images/ludo-associative.jpg" alt="associative - ludotheque"></a>
<img id="logo" src="images/ludo-associative.jpg" alt="associative - ludotheque"></a>
</div>
{% if global['logged_user'].id %}
<div id="navbar" class="collapse navbar-collapse navbar-right">
<div id="navbar" class="collapse navbar-collapse navbar-right">
<ul class="nav navbar-nav">
{% if global['logged_user'].roles['games'] %}
<li class="dropdown">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false">Jeux...<span class="caret"></span></a>
aria-expanded="false">Jeux...<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="index.php?o=games">Catalogue des jeux</a></li>
<li><a href="index.php?o=loans">Emprunts</a></li>
<li><a href="index.php?o=games">Catalogue des jeux</a></li>
<li><a href="index.php?o=loans">Emprunts</a></li>
</ul>
</li>
{% endif %}
{% if global['logged_user'].roles['members'] %}
<li><a href="index.php?o=members">Adhérents</a></li>
<li><a href="index.php?o=members">Adhérents</a></li>
{% endif %}
{% if global['logged_user'].roles['admin'] %}
<li><a href="index.php?o=users&a=list">Comptes</a></li>
<li><a href="index.php?o=users&a=list">Comptes</a></li>
{% endif %}
{% if global['logged_user'].roles['games'] or user.roles['members'] %}
<li class="dropdown">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false">Options <span class="caret"></span></a>
aria-expanded="false">Options <span class="caret"></span></a>
<ul class="dropdown-menu">
{% if global['logged_user'].roles['games'] %}
<li><a href="index.php?o=esar_categories&a=list">Catégories Esar</a></li>
......@@ -64,23 +64,23 @@
</li>
{% endif %}
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="index.php?o=users&a=edit&i=<?=$logged_user->id?>"><span class="glyphicon glyphicon-user"></span> Mon compte</a></li>
<li><a href="index.php?a=logout"><span class="glyphicon glyphicon-log-out"></span> Se déconnecter</a></li>
<ul class="nav navbar-nav navbar-right">
<li><a href="index.php?o=users&a=edit&i=<?=$logged_user->id?>"><span class="glyphicon glyphicon-user"></span></a></li>
<li><a href="index.php?a=logout"><span class="glyphicon glyphicon-log-out"></span></a></li>
</ul>
<form class="navbar-form navbar-right">
<form class="navbar-form navbar-right">
<div id="search-all" >
<input class="typeahead" type="text" placeholder="Recherche...">
</div>
</form>
</form>
</div>
{% endif %}
</div>
</nav>
<form action="index.php" method="POST" id="defaultform" name="defaultform"
class="form-horizontal" enctype="multipart/form-data">
<!-- div class="col-sm-9 col-md-10 main" -->
<div class="container">
class="form-horizontal" enctype="multipart/form-data">
<!-- div class="col-sm-9 col-md-10 main" -->
<div class="container">
{% block content %}{% endblock %}
</div>
<input type="hidden" name="o" id="o" value="{{ request['o'] }}">
......@@ -89,12 +89,12 @@
</form>
<footer>
{% if global['debug'] %}
<pre>
REQUEST :
<pre>
REQUEST :
o : {{ request['o'] }}
a : {{ request['a'] }}
i : {{ request['i'] }}
</pre>
</pre>
{% endif %}
</footer>
<!-- Placed at the end of the document so the pages load faster -->
......
views/members/edit.html
View file @ e3e9a36a
......@@ -9,6 +9,8 @@
</div>
<div class="panel-body">
{% include 'ihm_messages.html' %}
<div class="form-group">
<label class="control-label col-sm-2" for="lastname">Nom</label>
<div class="col-sm-4">
......
views/members/list.html
View file @ e3e9a36a
......@@ -15,6 +15,8 @@
</div>
<div class="panel-body">
{% include 'ihm_messages.html' %}
<div class="col-sm-12" align="center">
<table id="list_member" style="display:none">
<thead>
......
views/membership_types/edit.html
View file @ e3e9a36a
......@@ -3,6 +3,7 @@
{% if object.id %} Adhésion : {{ object.name }} {% else %} Nouveau type d'adhésion {% endif %}
{% endblock %}
{% block modal_body %}
<div class="form-group">
<label class="control-label col-sm-2" for="name">Nom</label>
<div class="col-sm-4">
......@@ -21,7 +22,7 @@
</div>
{% endblock %}
{% block javascript_msg %}
var msg = 'Voulez-vous réellement supprimer ce type d\'adhésion ?\n' +
'Cette action n\'est possible que si ce type n\'a été\n' +
'utilisé pour l\'inscription d\'un adhérent.';
var msg = 'Voulez-vous réellement supprimer ce type d\'adhésion ?\n' +
'Cette action n\'est possible que si ce type n\'a été\n' +
'utilisé pour l\'inscription d\'un adhérent.';
{% endblock %}
views/membership_types/list.html
View file @ e3e9a36a
{% extends "base.html" %}
{% block title %}Catégories ESAR{% endblock %}
{% block title %}Types d'adhésion{% endblock %}
{% block content %}
<div class="panel panel-default">
<div class="panel-heading">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment