diff --git a/ajax/write/planning.php b/admin/admin/ajax.php similarity index 100% rename from ajax/write/planning.php rename to admin/admin/ajax.php diff --git a/admin/planning.php b/admin/admin/planning.php similarity index 84% rename from admin/planning.php rename to admin/admin/planning.php index 650fa40..9eb0506 100644 --- a/admin/planning.php +++ b/admin/admin/planning.php @@ -1,7 +1,6 @@

ADMIN

@@ -36,11 +35,12 @@ require_once $relativePath . 'classes/dao.php';

- + + Retour sur la page admin - Retour sur le site + Voir sur le site
@@ -52,7 +52,7 @@ require_once $relativePath . 'classes/dao.php'; $pageContent = ob_get_clean(); // Store html content in variable $pageTitle = "Édition planning"; -$pageScripts = ""; +$pageScripts = ""; include($relativePath . "includes/template.php"); // Display template with variable content diff --git a/ajax/write/scores.php b/admin/gda/ajax.php similarity index 100% rename from ajax/write/scores.php rename to admin/gda/ajax.php diff --git a/admin/scores.php b/admin/gda/scores.php similarity index 86% rename from admin/scores.php rename to admin/gda/scores.php index 7be5c7d..e3cf9d7 100644 --- a/admin/scores.php +++ b/admin/gda/scores.php @@ -1,6 +1,6 @@

ADMIN

@@ -39,11 +39,12 @@ $relativePath = "../";

- + + Retour sur la page admin - Retour sur le site + Voir sur le site
@@ -55,7 +56,7 @@ $relativePath = "../"; $pageContent = ob_get_clean(); // Store html content in variable $pageTitle = "Édition scores"; -$pageScripts = ""; +$pageScripts = ""; include($relativePath . "includes/template.php"); // Display template with variable content diff --git a/admin/index.php b/admin/index.php index 7e94b75..4d80f65 100644 --- a/admin/index.php +++ b/admin/index.php @@ -34,21 +34,21 @@ $relativePath = "../";

Action des GDA

- Editer les scores + Editer les scores

Action des admins

- Editer le planning + Editer le planning

Action des webmasters

- Editer le texte de la carte + Editer le texte de la carte
- Mises à jour + Mises à jour
diff --git a/ajax/write/master.php b/admin/webmaster/ajax.php similarity index 100% rename from ajax/write/master.php rename to admin/webmaster/ajax.php diff --git a/admin/map.php b/admin/webmaster/map.php similarity index 82% rename from admin/map.php rename to admin/webmaster/map.php index 21d8f6e..9e8cc60 100644 --- a/admin/map.php +++ b/admin/webmaster/map.php @@ -1,6 +1,6 @@
@@ -25,11 +25,12 @@ require_once $relativePath . 'classes/dao.php';

- + + Retour sur la page admin - Retour sur le site + Voir sur le site
@@ -41,7 +42,7 @@ require_once $relativePath . 'classes/dao.php'; $pageContent = ob_get_clean(); // Store html content in variable $pageTitle = "Édition carte"; -$pageScripts = ""; +$pageScripts = ""; include($relativePath . "includes/template.php"); // Display template with variable content diff --git a/admin/update.php b/admin/webmaster/update.php similarity index 83% rename from admin/update.php rename to admin/webmaster/update.php index 8b8640d..784eaf4 100644 --- a/admin/update.php +++ b/admin/webmaster/update.php @@ -1,6 +1,6 @@
- + + Retour sur la page admin - Retour sur le site + Voir sur le site
@@ -49,7 +50,7 @@ $log = shell_exec("git log | head -50"); // Show the first few commits $pageContent = ob_get_clean(); // Store html content in variable $pageTitle = "Mise à jour"; -$pageScripts = ""; +$pageScripts = ""; include($relativePath . "includes/template.php"); // Display template with variable content diff --git a/assets/css/adminEdit.css b/assets/css/adminEdit.css index 6decb9c..b2608e0 100644 --- a/assets/css/adminEdit.css +++ b/assets/css/adminEdit.css @@ -52,6 +52,7 @@ color: #000; border-radius: 5px; padding: 15px; + margin: 5px; box-shadow: 0 0 5px #000000; } @@ -66,6 +67,7 @@ color: #000; border-radius: 5px; padding: 15px; + margin: 5px; box-shadow: 0 0 5px #000000; } diff --git a/assets/js/mapManager.js b/assets/js/admin/mapManager.js similarity index 94% rename from assets/js/mapManager.js rename to assets/js/admin/mapManager.js index b2bafbf..6a8838e 100644 --- a/assets/js/mapManager.js +++ b/assets/js/admin/mapManager.js @@ -11,7 +11,7 @@ $(document).ready(function () { 'info': info, }; $.get( - "../ajax/write/master.php", + "ajax.php", object, function (data) { alert(data); @@ -33,7 +33,7 @@ function getMapInfo(selector) { 'selector': selector, }; $.get( - "../ajax/read", + "../../ajax/read", object, function (data) { console.log(data); diff --git a/assets/js/planningManager.js b/assets/js/admin/planningManager.js similarity index 98% rename from assets/js/planningManager.js rename to assets/js/admin/planningManager.js index 7e7538b..9d62eed 100644 --- a/assets/js/planningManager.js +++ b/assets/js/admin/planningManager.js @@ -141,7 +141,7 @@ function saveDayActivities() { "entries": currentActivities, }; $.get( - "../ajax/write/planning.php", + "ajax.php", object, function (data) { alert(data); @@ -155,7 +155,7 @@ function getDayActivities(day) { 'day': day, }; $.get( - "../ajax/read", + "../../ajax/read", object, function (data) { currentActivities = data; diff --git a/assets/js/statsManager.js b/assets/js/admin/statsManager.js similarity index 95% rename from assets/js/statsManager.js rename to assets/js/admin/statsManager.js index f9d086b..21c8568 100755 --- a/assets/js/statsManager.js +++ b/assets/js/admin/statsManager.js @@ -23,10 +23,11 @@ $(document).ready(function () { "lines": lines, }; $.get( - "../ajax/write/scores.php", + 'ajax.php', object, function (data) { alert(data); + window.location.reload(); }); }); $('#teamSelect').on('change', function () { @@ -55,9 +56,7 @@ function addLine(text, value) { $entry.find('.edit-text-input').val(text); $entry.find('.edit-value-input').val(value); $("#removeEntry_" + uniqueID).on("click", function () { - console.log($($entry)); $entry.remove(); - }); } @@ -73,7 +72,6 @@ function getLine() { }; array.push(values); } - console.log(array); return array; } @@ -84,7 +82,7 @@ function getScores(team) { 'team': team, }; $.get( - "../ajax/read", + "../../ajax/read", object, function (data) { for (let i = 0; i < data.length; i++) { diff --git a/assets/js/updateManager.js b/assets/js/admin/updateManager.js similarity index 100% rename from assets/js/updateManager.js rename to assets/js/admin/updateManager.js