diff --git a/src/nineschool-1.0/public/images/logo.png b/src/nineschool-1.0/public/images/logo.png index db76093..7d69e85 100644 Binary files a/src/nineschool-1.0/public/images/logo.png and b/src/nineschool-1.0/public/images/logo.png differ diff --git a/src/nineschool-1.0/src/Controller/ActivityController.php b/src/nineschool-1.0/src/Controller/ActivityController.php index bdc793d..1468c8c 100755 --- a/src/nineschool-1.0/src/Controller/ActivityController.php +++ b/src/nineschool-1.0/src/Controller/ActivityController.php @@ -40,7 +40,7 @@ class ActivityController extends AbstractController return $this->render($this->render.'list.html.twig',[ $this->data."s" => $datas, "useheader" => true, - "usesidebar" => ($this->getUser()->hasRole("ROLE_ADMIN")), + "usesidebar" => false, ]); } // View user @@ -94,7 +94,7 @@ class ActivityController extends AbstractController return $this->render('Answer/list.html.twig',[ $this->data."s" => $datas, "useheader" => true, - "usesidebar" => ($this->getUser()->hasRole("ROLE_ADMIN")), + "usesidebar" => false, ]); } } @@ -129,7 +129,7 @@ class ActivityController extends AbstractController // Affichage du formulaire return $this->render($this->render.'edit.html.twig', [ 'useheader' => true, - 'usesidebar' => ($this->getUser()->hasRole("ROLE_ADMIN")), + 'usesidebar' => false, $this->data => $data, 'mode' => 'submit', 'form' => $form->createView() @@ -240,7 +240,7 @@ class ActivityController extends AbstractController // Affichage du formulaire return $this->render($this->render.'edit.html.twig', [ 'useheader' => true, - 'usesidebar' => ($this->getUser()->hasRole("ROLE_ADMIN")), + 'usesidebar' => false, $this->data => $data, 'mode' => 'update', 'form' => $form->createView() diff --git a/src/nineschool-1.0/src/Migrations/.gitignore b/src/nineschool-1.0/src/Migrations/.gitignore index 66ca35b..cde8069 100644 --- a/src/nineschool-1.0/src/Migrations/.gitignore +++ b/src/nineschool-1.0/src/Migrations/.gitignore @@ -1 +1 @@ -*.php \ No newline at end of file +*.php diff --git a/src/nineschool-1.0/templates/Include/sidebar.html.twig b/src/nineschool-1.0/templates/Include/sidebar.html.twig index 0c3bc4a..ff076fb 100644 --- a/src/nineschool-1.0/templates/Include/sidebar.html.twig +++ b/src/nineschool-1.0/templates/Include/sidebar.html.twig @@ -1,14 +1,5 @@