Commit 0f3ea6b2d24aaa0da7baa703247b0ddc589e45bd

Authored by Jean Wasilewski
2 parents 39e76ea1 4c122f88

Merge branch 'master' of ssh://servclubinfo.insecure.deule.net/crep

Showing 2 changed files with 19 additions and 21 deletions   Show diff stats
agenda.php
... ... @@ -2,6 +2,7 @@
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>
... ...
topnavbar.php
1 1 <nav class="navbar navbar-fixed-top" role="navigation">
2 2 <div class="container">
3 3 <div class="navbar-header">
4   - <a class="navbar-brand" href="#">Titre</a>
  4 + <a class="navbar-brand" href="#">CREP</a>
5 5 </div>
6   - <div class="collapse navbar-collapse">
  6 + <div class="collapse navbar-collapse">
7 7  
8 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   - }
  9 + <?php
  10 + if ( 0 == 1 )
  11 + {
  12 + <form class="navbar-form navbar-right" role="search">
  13 + <button type="submit" class="btn btn-default">Inscription</button>
  14 + <button type="submit" class="btn btn-default">Connection</button>
  15 + </form>
  16 + }
  17 + else
  18 + {
  19 + <p class="navbar-text navbar-right">Bienvenue,_
  20 + <a href="#" class="navbar-link">NOM DE LA PERSONNE</a>
  21 + </p>
  22 + }
  23 + </div>
27 24 ?>
28   - </div>
  25 +
29 26 </div>
30 27 </nav>
... ...