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

Jean Wasilewski
2 parents 4d180f2c ae33248b
Showing 2 changed files with 29 additions and 2 deletions Show diff stats
connect.php
news.php
-test
+<form class="form-horizontal" role="form">
+  <div class="form-group">
+    <label for="entrer_Identifiant_3" class="col-sm-2 control-label">Identifiant</label>
+    <div class="col-sm-10">
+      <input type="identifiant" class="form-control" id="Entrer_Identifiant_3" placeholder="Votre identifiant">
+    </div>
+  </div>
+  <div class="form-group">
+    <label for="entrer_mot_de_passe_3" class="col-sm-2 control-label">Mot de passe</label>
+    <div class="col-sm-10">
+      <input type="mot de passe" class="form-control" id="entrer_mot_de_passe_3" placeholder="Votre mot de passe">
+    </div>
+  </div>
+  <div class="form-group">
+    <div class="col-sm-offset-2 col-sm-10">
+      <div class="checkbox">
+        <label>
+          <input type="checkbox"> Rester connecter
+        </label>
+      </div>
+    </div>
+  </div>
+  <div class="form-group">
+    <div class="col-sm-offset-2 col-sm-10">
+      <button type="submit" class="btn btn-default">Se connecter</button>
+    </div>
+  </div>
+</form>
@@ -9,7 +9,7 @@
 		exit;
 	}
  
-	$requete = "select title content user.realname as userName from news, user where news.fk_author==user.pk;";
+	$requete = "select title, content, users.realname as userName from news, users where news.fk_author=users.pk;";
 	$resultat = mysql_query($requete);
  
 	//Pour debugger