Merge remote-tracking branch 'origin/master'

# Conflicts:
#	usages/config.php

controllers/ControllerAdmin.php

@@ -16,6 +16,15 @@ class ControllerAdmin {
                 case "goToAdminConnexion":
                     require($vues['adminConnexion']);
                     break;
+                case "goToAdministration":
+                    $gatewaySources = new GatewaySources(new Connection($dsn,$user,$pass));
+                    $listeSources = $gatewaySources->getSources();
+                    require($vues['administration']);
+                    break;
+                case "refreshData":
+                    //require("appel.php");
+                    header("location: index.php?action=goToAdministration");
+                    break;
                 case "verifValidation":
                     $this->validationConnexion();
                     break;
@@ -68,7 +77,7 @@ class ControllerAdmin {
             $MdlAdmin = new MdlAdmin();
             $validation = $MdlAdmin->connection($_POST['name'],$_POST['password']);
             if (!empty($validation)) {
-                header("location: ".$vues['administration']);
+                header("location: index.php?action=goToAdministration");
             }
         }
     }

controllers/FrontController.php

@@ -4,7 +4,7 @@ class FrontController{
     function __construct()
     {
         global $dsn,$user,$pass,$vues;
-        $listeAction_Admin = array('goToAdminConnexion','verifValidation', 'ajoutSource','supprimerSource','setNbArticlesParPage');
+        $listeAction_Admin = array('goToAdminConnexion','verifValidation', 'ajoutSource','supprimerSource','setNbArticlesParPage','goToAdministration','refreshData');
         Try{
             $mdlAdmin = new MdlAdmin();
             $admin = $mdlAdmin->isAdmin();

css/listeNews.css

@@ -13,7 +13,7 @@
     text-align: justify;
 }
 
-div{
+.news{
     background-color: white;
     border-bottom:solid ;
     padding: 5px;
@@ -24,3 +24,8 @@ div{
     color: white;
     background-color: black;
 }
+
+#boutonMenu{
+    display: flex;
+    justify-content: center;
+}

vues/administration.php

@@ -4,3 +4,18 @@
         <input type="submit" value="add source">
     </form>
 </html>
+
+<?php
+        foreach ($listeSources as $n){
+            echo "<div class=source>";
+            echo "<p id=link>";
+            echo $n->getlink();
+            echo "</p>";
+            echo "</div>";
+    }
+?>
+
+<form action="index.php">
+    <input type="hidden" name="action" value="refreshData">
+    <input type="submit" value="refresh">
+</form>

vues/listeNews.php

@@ -9,7 +9,7 @@
     </div>
     <?php
         foreach ($listeNews as $n){
-            echo "<div>";
+            echo "<div class=news>";
             echo "<p id=titre>";
             echo '<a href='.$n->getLink().'>'.$n->getTitle().'</a>';
             echo "</p>";
@@ -22,18 +22,24 @@
             echo "</div>";
     }
     ?>
+    <div id="boutonMenu">
     <?php
       if($pageAvant > 0) {
+         echo "<div>";
          echo '<form action = "index.php" >';
             echo "<input type = 'hidden' name = 'page' value = $pageAvant />";
             echo '<button >'.$pageAvant.'</button >';
          echo '</form >';
+         echo "</div>";
       }
       if($pageApres <= $pageMAX){
+          echo "<div>";
           echo '<form action = "index.php" >';
               echo "<input type = 'hidden' name = 'page' value = $pageApres />";
               echo '<button >'.$pageApres.'</button >';
           echo '</form >';
+          echo "</div>";
       }
    ?>
+   </div>
 </html>