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

Jean Wasilewski
2 parents 39e76ea1 4c122f88
Showing 2 changed files with 19 additions and 21 deletions Show diff stats
agenda.php
topnavbar.php
@@ -2,6 +2,7 @@
 	<div class="panel_heading">
 	     <thead>
 		<tr> 
+		     <th/>
 		     <th> Lundi </th>
 		     <th> Mardi </th>
 		     <th> Mercredi </th>
 <nav class="navbar navbar-fixed-top" role="navigation">
   <div class="container">
   <div class="navbar-header">
-    <a class="navbar-brand" href="#">Titre</a>
+    <a class="navbar-brand" href="#">CREP</a>
   </div>
-    <div class="collapse navbar-collapse">
+  <div class="collapse navbar-collapse">
-    <?php
-      if ( 1 == 1 )
-        {
-          ?>    
-            <form class="navbar-form navbar-right" role="search">
-              <button type="submit" class="btn btn-default">Inscription</button>
-              <button type="submit" class="btn btn-default">Connection</button>
-            </form>
-           <?php
-        }
-      else
-        {
-          ?>
-            <p class="navbar-text navbar-right">Bienvenue,_
-              <a href="#" class="navbar-link">enanrock</a>
-            </p>
-          <?php
-        }
+  <?php
+    if ( 0 == 1 )
+      {    
+        <form class="navbar-form navbar-right" role="search">
+          <button type="submit" class="btn btn-default">Inscription</button>
+          <button type="submit" class="btn btn-default">Connection</button>
+        </form>
+      }
+    else
+      {
+        <p class="navbar-text navbar-right">Bienvenue,_
+          <a href="#" class="navbar-link">NOM DE LA PERSONNE</a>
+        </p>
+      }
+      </div>
    ?>
-    </div>
+  
   </div>
 </nav>