Commit 51844a4ddd8fbbf08bd58317cc5a5c1f5fd50565
Merge branch 'master' of ssh://servclubinfo.insecure.deule.net/crep
Showing
4 changed files
with
39 additions
and
25 deletions
Show diff stats
agenda.php
1 | -<table class="table table-striped table condensed"> | |
1 | +<table class="table table-striped table-bordered table-condensed"> | |
2 | 2 | <div class="panel_heading"> |
3 | 3 | <thead> |
4 | 4 | <tr> |
5 | + <th/> | |
5 | 6 | <th> Lundi </th> |
6 | 7 | <th> Mardi </th> |
7 | 8 | <th> Mercredi </th> |
... | ... | @@ -10,5 +11,9 @@ |
10 | 11 | </tr> |
11 | 12 | </thead> |
12 | 13 | </div > |
14 | + <tbody> | |
15 | + <tr> | |
16 | + <td> </td> | |
17 | + </tr> | |
13 | 18 | </table> |
14 | 19 | ... | ... |
index.php
topnavbar.php
1 | 1 | <nav class="navbar navbar-fixed-top" role="navigation"> |
2 | 2 | <div class="container"> |
3 | - <div class="navbar-header"> | |
4 | - <a class="navbar-brand" href="#">Titre</a> | |
5 | - </div> | |
3 | + <div class="navbar-header"> | |
4 | + <a class="navbar-brand" href="#">CREP</a> | |
5 | + </div> | |
6 | 6 | <div class="collapse navbar-collapse"> |
7 | - | |
8 | - | |
9 | - <?php | |
10 | - if ( 1 == 1 ) | |
11 | - { | |
12 | - ?> | |
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> | |
16 | - </form> | |
17 | - <?php | |
18 | - } | |
19 | - else | |
20 | - { | |
21 | - ?> | |
22 | - <p class="navbar-text navbar-right">Bienvenue,_ | |
23 | - <a href="#" class="navbar-link">enanrock</a> | |
24 | - </p> | |
25 | - <?php | |
26 | - } | |
27 | - ?> | |
7 | + | |
8 | + | |
9 | + <?php | |
10 | + if ( 0 == 1 ) | |
11 | + { | |
12 | + ?> | |
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> | |
16 | + </form> | |
17 | + <?php | |
18 | + } | |
19 | + else | |
20 | + { | |
21 | + ?> | |
22 | + <p class="navbar-text navbar-right">Bienvenue,_ | |
23 | + <a href="#" class="navbar-link">NOM DE LA PERSONNE</a> | |
24 | + </p> | |
25 | + <?php | |
26 | + } | |
27 | + ?> | |
28 | + | |
28 | 29 | </div> |
29 | 30 | </div> |
30 | 31 | </nav> | ... | ... |