diff --git a/Project/php/.htaccess b/Project/php/.htaccess old mode 100644 new mode 100755 diff --git a/Project/php/assets/favicon.ico b/Project/php/assets/favicon.ico old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/app-store-badge.svg b/Project/php/assets/img/app-store-badge.svg old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/carte.png b/Project/php/assets/img/carte.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/celeb.png b/Project/php/assets/img/celeb.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/demo-screen.mp4 b/Project/php/assets/img/demo-screen.mp4 old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/google-play-badge.svg b/Project/php/assets/img/google-play-badge.svg old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/home.png b/Project/php/assets/img/home.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/ipad.png b/Project/php/assets/img/ipad.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/logo.png b/Project/php/assets/img/logo.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/memory.jpeg b/Project/php/assets/img/memory.jpeg old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/nyc.jpg b/Project/php/assets/img/nyc.jpg old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/nyc_blur.jpg b/Project/php/assets/img/nyc_blur.jpg old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/points.png b/Project/php/assets/img/points.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/portrait_black.png b/Project/php/assets/img/portrait_black.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/quizz.jpeg b/Project/php/assets/img/quizz.jpeg old mode 100644 new mode 100755 diff --git a/Project/php/config/config.php b/Project/php/config/config.php index 0fbb5bc..ae9c833 100755 --- a/Project/php/config/config.php +++ b/Project/php/config/config.php @@ -18,4 +18,4 @@ global $password; $password = 'achanger'; global $altorouterPath; -$altorouterPath = "/SAE_2A_Anglais/Project/php"; +$altorouterPath = "/~lugoigoux1/SAE_2A_Anglais/Project/php"; diff --git a/Project/php/css/login.css b/Project/php/css/login.css old mode 100644 new mode 100755 diff --git a/Project/php/css/quiz.css b/Project/php/css/quiz.css old mode 100644 new mode 100755 diff --git a/Project/php/css/styles.css b/Project/php/css/styles.css old mode 100644 new mode 100755 index a4ed05f..af587db --- a/Project/php/css/styles.css +++ b/Project/php/css/styles.css @@ -10996,7 +10996,7 @@ body { padding: 0.9rem 0; } #mainNav .navbar-nav .nav-item:hover { - color: fade(#fff, 80%); + color: #faf4e0; outline: none; background-color: transparent; } @@ -11021,7 +11021,7 @@ body { color: #fff; } #mainNav .nav-link:hover { - color: #a840a3; + color: #faf4e0; } #mainNav .nav-link:active { color: #fff; @@ -11053,7 +11053,7 @@ body { #secondNav { min-height: 3.5rem; - background-color: #940262; + background-color: #7464a1; } #secondNav .navbar-toggler { font-size: 80%; @@ -11095,7 +11095,7 @@ body { color: #fff; } #secondNav .nav-link:hover { - color: #a840a3; + color: #463c61; } #secondNav .nav-link:active { color: #fff; diff --git a/Project/php/js/memory.js b/Project/php/js/memory.js old mode 100644 new mode 100755 diff --git a/Project/php/js/quiz.js b/Project/php/js/quiz.js old mode 100644 new mode 100755 diff --git a/Project/php/js/scripts.js b/Project/php/js/scripts.js old mode 100644 new mode 100755 diff --git a/Project/php/navBar.html b/Project/php/navBar.html deleted file mode 100644 index de32be1..0000000 --- a/Project/php/navBar.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - In English Please ! - - - - - - - - - - - - - - - - diff --git a/Project/php/templates/addGroupForm.twig b/Project/php/templates/addGroupForm.twig old mode 100644 new mode 100755 diff --git a/Project/php/templates/addVocalList.html b/Project/php/templates/addVocalList.html old mode 100644 new mode 100755 diff --git a/Project/php/templates/groupContainer.twig b/Project/php/templates/groupContainer.twig old mode 100644 new mode 100755 diff --git a/Project/php/templates/manageGroupView.html b/Project/php/templates/manageGroupView.html old mode 100644 new mode 100755 index 4a25490..595945a --- a/Project/php/templates/manageGroupView.html +++ b/Project/php/templates/manageGroupView.html @@ -24,22 +24,22 @@ } -
-

Group list

- {% include 'groupContainer.twig' with {'actions' : ['showGroupDetails', 'removeGroup']} %} -
+
+

Group list

+ {% include 'groupContainer.twig' with {'actions' : ['showGroupDetails', 'removeGroup']} %} +
-
-

Users of the group

- {% include 'userContainer.twig' with {'users' : users, 'action' : 'removeUserFromGroup'} %} -
-
-

Add group

- {% include 'addGroupForm.twig' %} -
-
-

Unassigned users

- {% include 'userContainer.twig' with {'users' : unassignedUsers, 'action' : 'addUserToGroup'} %} -
+
+

Users of the group

+ {% include 'userContainer.twig' with {'users' : users, 'action' : 'removeUserFromGroup'} %} +
+
+

Add group

+ {% include 'addGroupForm.twig' %} +
+
+

Unassigned users

+ {% include 'userContainer.twig' with {'users' : unassignedUsers, 'action' : 'addUserToGroup'} %} +
\ No newline at end of file diff --git a/Project/php/templates/modifyPasswordForm.twig b/Project/php/templates/modifyPasswordForm.twig old mode 100644 new mode 100755 diff --git a/Project/php/templates/myAccountView.html b/Project/php/templates/myAccountView.html old mode 100644 new mode 100755 diff --git a/Project/php/templates/navBar.html b/Project/php/templates/navBar.html new file mode 100755 index 0000000..6faa02c --- /dev/null +++ b/Project/php/templates/navBar.html @@ -0,0 +1,33 @@ + + + + + diff --git a/Project/php/templates/navBar.twig b/Project/php/templates/navBar.twig new file mode 100755 index 0000000..af7a3f3 --- /dev/null +++ b/Project/php/templates/navBar.twig @@ -0,0 +1,29 @@ + \ No newline at end of file diff --git a/Project/php/templates/quizView.html b/Project/php/templates/quizView.html old mode 100644 new mode 100755 diff --git a/Project/php/templates/resultatsJeux.html b/Project/php/templates/resultatsJeux.html old mode 100644 new mode 100755