Commit ac6eb26f6851742c66624a8fb73c12ef0cbf4ab3
Merge branch 'master' of ssh://servclubinfo.insecure.deule.net/crep
Showing
2 changed files
with
14 additions
and
8 deletions
Show diff stats
agenda.php
1 | -<table class="table table-striped table-bordered table-condensed"> | 1 | +<br/> <br/> <br/> |
2 | +<table class="table table-striped table-responsive table-bordered table-condensed"> | ||
2 | <div class="panel_heading"> | 3 | <div class="panel_heading"> |
3 | <thead> | 4 | <thead> |
4 | <tr> | 5 | <tr> |
@@ -13,7 +14,12 @@ | @@ -13,7 +14,12 @@ | ||
13 | </div > | 14 | </div > |
14 | <tbody> | 15 | <tbody> |
15 | <tr> | 16 | <tr> |
16 | - <td> </td> | 17 | + <td> date </td> |
18 | + <td> jour </td> | ||
19 | + <td> jour </td> | ||
20 | + <td> jour </td> | ||
21 | + <td> jour </td> | ||
22 | + <td> jour </td> | ||
17 | </tr> | 23 | </tr> |
18 | </table> | 24 | </table> |
19 | 25 |
topnavbar.php
1 | <nav class="navbar navbar-fixed-top" role="navigation"> | 1 | <nav class="navbar navbar-fixed-top" role="navigation"> |
2 | <div class="container"> | 2 | <div class="container"> |
3 | <div class="navbar-header"> | 3 | <div class="navbar-header"> |
4 | - <a class="navbar-brand" href="#">CREP</a> | 4 | + <a class="navbar-brand" href="#">CREP</a> <!-- ajouter un lien pour actualiser + message [Actualiser] ou [Coupe de Robotique des Ecoles Primaires] quand la souris passe --> |
5 | </div> | 5 | </div> |
6 | <div class="collapse navbar-collapse"> | 6 | <div class="collapse navbar-collapse"> |
7 | 7 | ||
8 | 8 | ||
9 | <?php | 9 | <?php |
10 | - if ( 0 == 1 ) | 10 | + if ( 0 == 1 ) // modifier le test |
11 | { | 11 | { |
12 | ?> | 12 | ?> |
13 | <form class="navbar-form navbar-right" role="search"> | 13 | <form class="navbar-form navbar-right" role="search"> |
14 | - <button type="submit" class="btn btn-default">Inscription</button> | ||
15 | - <button type="submit" class="btn btn-default">Connection</button> | 14 | + <button type="submit" class="btn btn-default">Inscription</button> <!-- ajouter un lien pour s inscrire --> |
15 | + <button type="submit" class="btn btn-default">Connection</button> <!-- ajouter un lien pour se connecter --> | ||
16 | </form> | 16 | </form> |
17 | <?php | 17 | <?php |
18 | } | 18 | } |
19 | else | 19 | else |
20 | { | 20 | { |
21 | ?> | 21 | ?> |
22 | - <p class="navbar-text navbar-right">Bienvenue,_ | ||
23 | - <a href="#" class="navbar-link">NOM DE LA PERSONNE</a> | 22 | + <p class="navbar-text navbar-right">Bienvenue, |
23 | + <a href="#" class="navbar-link">NOM DE LA PERSONNE</a> <!-- ajouter un lien aller au profil ? --> | ||
24 | </p> | 24 | </p> |
25 | <?php | 25 | <?php |
26 | } | 26 | } |