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

kevin
2 parents f5d9961d b94caab9
Showing 2 changed files with 14 additions and 8 deletions Show diff stats
agenda.php
topnavbar.php
-<table class="table table-striped table-bordered table-condensed">
+<br/> <br/> <br/>
+<table class="table table-striped table-responsive table-bordered table-condensed">
 	<div class="panel_heading">
 	     <thead>
 		<tr> 
@@ -13,7 +14,12 @@
 	 </div >
 	 <tbody>
 		<tr>
-			<td> </td>
+			<td> date </td>
+			<td> jour </td>
+			<td> jour </td>
+			<td> jour </td>
+			<td> jour </td>
+			<td> jour </td>
 		</tr>
 </table>
  
 <nav class="navbar navbar-fixed-top" role="navigation">
   <div class="container">
     <div class="navbar-header">
-      <a class="navbar-brand" href="#">CREP</a>
+      <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 -->
     </div>
     <div class="collapse navbar-collapse">
  
  
       <?php
-        if ( 0 == 1 )
+        if ( 0 == 1 ) // modifier le test
           {
             ?>
               <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>
+                <button type="submit" class="btn btn-default">Inscription</button> <!-- ajouter un lien pour s inscrire  -->
+                <button type="submit" class="btn btn-default">Connection</button> <!-- ajouter un lien pour se connecter -->
               </form>
             <?php
           }
         else
           {
             ?>
-              <p class="navbar-text navbar-right">Bienvenue,_
-                <a href="#" class="navbar-link">NOM DE LA PERSONNE</a>
+              <p class="navbar-text navbar-right">Bienvenue, 
+                <a href="#" class="navbar-link">NOM DE LA PERSONNE</a> <!-- ajouter un lien aller au profil ? -->
               </p>
             <?php
           }