diff --git a/build/viewer/core/Viewer.php b/build/viewer/core/Viewer.php index 5762ac9..8ee0564 100755 --- a/build/viewer/core/Viewer.php +++ b/build/viewer/core/Viewer.php @@ -101,7 +101,7 @@ /* [2] On vérifie que le template existe =========================================================*/ - $class = '\\viewer\\view\\'.$match[1].'\\'.$match[1].'_'.$match[2]; + $class = '\\viewer\\view\\'.$match[1].'\\'.$match[2]; $method = 'render'; /* (1) On vérifie que la classe existe */ diff --git a/build/viewer/view/group/group_groupChoice.php b/build/viewer/view/group/groupChoice.php similarity index 93% rename from build/viewer/view/group/group_groupChoice.php rename to build/viewer/view/group/groupChoice.php index ec0aaac..d7b9456 100755 --- a/build/viewer/view/group/group_groupChoice.php +++ b/build/viewer/view/group/groupChoice.php @@ -5,7 +5,7 @@ use \error\core\Error; use \api\core\Authentification; - class group_groupChoice{ + class groupChoice{ public static function render(){ /* [1] Init Twig @@ -38,7 +38,7 @@ /* [4] Build the whole stuff =========================================================*/ - return $twig->render('group/group_groupChoice.twig', [ + return $twig->render('group/groupChoice.twig', [ 'p_icon' => $variables['p_icon'], 'p_theme' => $variables['p_theme'] ]); diff --git a/build/viewer/view/group/group_groupChoice.twig b/build/viewer/view/group/groupChoice.twig similarity index 100% rename from build/viewer/view/group/group_groupChoice.twig rename to build/viewer/view/group/groupChoice.twig diff --git a/build/viewer/view/group/group_membersChoice.php b/build/viewer/view/group/membersChoice.php similarity index 98% rename from build/viewer/view/group/group_membersChoice.php rename to build/viewer/view/group/membersChoice.php index d796605..619192f 100644 --- a/build/viewer/view/group/group_membersChoice.php +++ b/build/viewer/view/group/membersChoice.php @@ -6,7 +6,7 @@ use \error\core\Error; use \api\core\Authentification; - class group_membersChoice{ + class membersChoice{ public static function render($params){ /* [1] On vérifie le type de groupe (user/machine) @@ -122,7 +122,7 @@ /* [5] Build the whole stuff =========================================================*/ - return $twig->render('group/group_membersChoice.twig', [ + return $twig->render('group/membersChoice.twig', [ 'p_class' => $variables['p_class'], 'p_name' => $variables['p_name'], 'p_id_cluster' => $variables['p_id_cluster'], diff --git a/build/viewer/view/group/group_membersChoice.twig b/build/viewer/view/group/membersChoice.twig similarity index 100% rename from build/viewer/view/group/group_membersChoice.twig rename to build/viewer/view/group/membersChoice.twig diff --git a/build/viewer/view/group/group_view.php b/build/viewer/view/group/view.php similarity index 96% rename from build/viewer/view/group/group_view.php rename to build/viewer/view/group/view.php index decfd76..bb8fc29 100755 --- a/build/viewer/view/group/group_view.php +++ b/build/viewer/view/group/view.php @@ -5,7 +5,7 @@ use \api\core\Authentification; use \error\core\Error; - class group_view{ + class view{ public static function render(){ /* [1] Init Twig @@ -60,7 +60,7 @@ /* [4] Build the whole stuff =========================================================*/ - return $twig->render('group/group_view.twig', [ + return $twig->render('group/view.twig', [ 'p_icon' => $variables['p_icon'], 'p_theme' => $variables['p_theme'] ]); diff --git a/build/viewer/view/group/group_view.twig b/build/viewer/view/group/view.twig similarity index 100% rename from build/viewer/view/group/group_view.twig rename to build/viewer/view/group/view.twig diff --git a/build/viewer/view/history/history_view.php b/build/viewer/view/history/view.php similarity index 97% rename from build/viewer/view/history/history_view.php rename to build/viewer/view/history/view.php index eaf866e..53c501a 100644 --- a/build/viewer/view/history/history_view.php +++ b/build/viewer/view/history/view.php @@ -5,7 +5,7 @@ use \api\core\ModuleRequest; use \error\core\Error; - class history_view{ + class view{ public static function render(){ @@ -63,7 +63,7 @@ /* [4] Build the whole stuff =========================================================*/ - return $twig->render('history/history_view.twig', [ + return $twig->render('history/view.twig', [ 'p_theme' => $variables['p_theme'] ]); } diff --git a/build/viewer/view/history/history_view.twig b/build/viewer/view/history/view.twig similarity index 100% rename from build/viewer/view/history/history_view.twig rename to build/viewer/view/history/view.twig diff --git a/build/viewer/view/machine/machine_groups.php b/build/viewer/view/machine/groups.php similarity index 96% rename from build/viewer/view/machine/machine_groups.php rename to build/viewer/view/machine/groups.php index 2de434d..cbea892 100755 --- a/build/viewer/view/machine/machine_groups.php +++ b/build/viewer/view/machine/groups.php @@ -6,7 +6,7 @@ use \api\core\Authentification; use \error\core\Error; - class machine_groups{ + class groups{ public static function render(){ /* [1] Init Twig @@ -62,7 +62,7 @@ /* [4] Build the whole stuff =========================================================*/ - return $twig->render('machine/machine_groups.twig', [ + return $twig->render('machine/groups.twig', [ 'p_icon' => $variables['p_icon'], 'p_theme' => $variables['p_theme'] ]); diff --git a/build/viewer/view/machine/machine_groups.twig b/build/viewer/view/machine/groups.twig similarity index 100% rename from build/viewer/view/machine/machine_groups.twig rename to build/viewer/view/machine/groups.twig diff --git a/build/viewer/view/machine/machine_view.php b/build/viewer/view/machine/view.php similarity index 97% rename from build/viewer/view/machine/machine_view.php rename to build/viewer/view/machine/view.php index 3208c78..f21b8c9 100755 --- a/build/viewer/view/machine/machine_view.php +++ b/build/viewer/view/machine/view.php @@ -6,7 +6,7 @@ use \api\core\Authentification; use \error\core\Error; - class machine_view{ + class view{ public static function render(){ /* [1] Init Twig @@ -56,7 +56,7 @@ /* [4] Build the whole stuff =========================================================*/ - return $twig->render('machine/machine_view.twig', [ + return $twig->render('machine/view.twig', [ 'p_icon' => $variables['p_icon'], 'p_theme' => $variables['p_theme'] ]); diff --git a/build/viewer/view/machine/machine_view.twig b/build/viewer/view/machine/view.twig similarity index 100% rename from build/viewer/view/machine/machine_view.twig rename to build/viewer/view/machine/view.twig diff --git a/build/viewer/view/user/user_groups.php b/build/viewer/view/user/groups.php similarity index 96% rename from build/viewer/view/user/user_groups.php rename to build/viewer/view/user/groups.php index c8fe1e1..f26af91 100755 --- a/build/viewer/view/user/user_groups.php +++ b/build/viewer/view/user/groups.php @@ -6,7 +6,7 @@ use \api\core\Authentification; use \error\core\Error; - class user_groups{ + class groups{ public static function render(){ /* [1] Init Twig @@ -62,7 +62,7 @@ /* [4] Build the whole stuff =========================================================*/ - return $twig->render('user/user_groups.twig', [ + return $twig->render('user/groups.twig', [ 'p_icon' => $variables['p_icon'], 'p_theme' => $variables['p_theme'] ]); diff --git a/build/viewer/view/user/user_groups.twig b/build/viewer/view/user/groups.twig similarity index 100% rename from build/viewer/view/user/user_groups.twig rename to build/viewer/view/user/groups.twig diff --git a/build/viewer/view/user/user_view.php b/build/viewer/view/user/view.php similarity index 96% rename from build/viewer/view/user/user_view.php rename to build/viewer/view/user/view.php index 6d3244c..c801dcb 100755 --- a/build/viewer/view/user/user_view.php +++ b/build/viewer/view/user/view.php @@ -5,7 +5,7 @@ use \api\core\Authentification; use \error\core\Error; - class user_view{ + class view{ public static function render(){ /* [1] Init Twig @@ -56,7 +56,7 @@ /* [4] Build the whole stuff =========================================================*/ - return $twig->render('user/user_view.twig', [ + return $twig->render('user/view.twig', [ 'p_icon' => $variables['p_icon'], 'p_theme' => $variables['p_theme'] ]); diff --git a/build/viewer/view/user/user_view.twig b/build/viewer/view/user/view.twig similarity index 100% rename from build/viewer/view/user/user_view.twig rename to build/viewer/view/user/view.twig diff --git a/public_html/css/header.scss b/public_html/css/header.scss index bc2159b..6fe561a 100755 --- a/public_html/css/header.scss +++ b/public_html/css/header.scss @@ -12,7 +12,7 @@ height: $menu-side-width; background-color: darken($theme-color, 10); - background-image: url('/src/static/iconv2.svg'); + background-image: url('/src/static/iconv3.svg'); background-position: center center; background-repeat: no-repeat; background-size: 50% 50%; diff --git a/public_html/css/min/header.css b/public_html/css/min/header.css index 0ec4147..6a4314b 100755 --- a/public_html/css/min/header.css +++ b/public_html/css/min/header.css @@ -1,3 +1,26 @@ -#WRAPPER>#HEADER>.icon{display:block;position:absolute;top:0;left:0;width:4em;height:4em;background-color:#c23f05;background-image:url("/src/static/iconv2.svg");background-position:center center;background-repeat:no-repeat;background-size:50% 50%;cursor:pointer;transition:all .3s}#WRAPPER>#HEADER.loading>.icon{background-image:url("/src/static/loaderv2.svg");background-size:70% 70%} +/* COULEUR DU THEME */ +/* COULEUR DU SOUS-MENU */ +/* COULEUR DES ERREURS */ +/* FORMULAIRES */ +/* GESTION DES LONGUEURS */ +#WRAPPER > #HEADER { + /* Animation de chargement qudnd chargement ajax */ } + #WRAPPER > #HEADER > .icon { + display: block; + position: absolute; + top: 0; + left: 0; + width: 4em; + height: 4em; + background-color: #c23f05; + background-image: url("/src/static/iconv3.svg"); + background-position: center center; + background-repeat: no-repeat; + background-size: 50% 50%; + cursor: pointer; + transition: all .3s; } + #WRAPPER > #HEADER.loading > .icon { + background-image: url("/src/static/loaderv2.svg"); + background-size: 70% 70%; } -/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAiaGVhZGVyLmNzcyIsCgkic291cmNlcyI6IFsKCQkiLi4vaGVhZGVyLnNjc3MiLAoJCSIuLi9jb25zdGFudHMuc2NzcyIKCV0sCgkic291cmNlc0NvbnRlbnQiOiBbCgkJIkBpbXBvcnQgJ2NvbnN0YW50cyc7XG5cblxuI1dSQVBQRVIgPiAjSEVBREVSe1xuXHQvLyBJY29uZSBkdSBzaXRlXG5cdCYgPiAuaWNvbntcblx0XHRkaXNwbGF5OiBibG9jaztcblx0XHRwb3NpdGlvbjogYWJzb2x1dGU7XG5cdFx0XHR0b3A6IDA7XG5cdFx0XHRsZWZ0OiAwO1xuXHRcdFx0d2lkdGg6ICRtZW51LXNpZGUtd2lkdGg7XG5cdFx0XHRoZWlnaHQ6ICRtZW51LXNpZGUtd2lkdGg7XG5cblx0XHRiYWNrZ3JvdW5kLWNvbG9yOiBkYXJrZW4oJHRoZW1lLWNvbG9yLCAxMCk7XG5cdFx0YmFja2dyb3VuZC1pbWFnZTogdXJsKCcvc3JjL3N0YXRpYy9pY29udjIuc3ZnJyk7XG5cdFx0YmFja2dyb3VuZC1wb3NpdGlvbjogY2VudGVyIGNlbnRlcjtcblx0XHRiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0O1xuXHRcdGJhY2tncm91bmQtc2l6ZTogNTAlIDUwJTtcblxuXHRcdGN1cnNvcjogcG9pbnRlcjtcblxuXHRcdHRyYW5zaXRpb246IGFsbCAuM3M7XG5cblx0fVxuXG5cdC8qIEFuaW1hdGlvbiBkZSBjaGFyZ2VtZW50IHF1ZG5kIGNoYXJnZW1lbnQgYWpheCAqL1xuXHQmLmxvYWRpbmcgPiAuaWNvbntcblx0XHRiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJy9zcmMvc3RhdGljL2xvYWRlcnYyLnN2ZycpO1xuXHRcdGJhY2tncm91bmQtc2l6ZTogNzAlIDcwJTtcblx0fVxuXG59XG4iLAoJCSIvKiBDT1VMRVVSIERVIFRIRU1FICovXG4kdGhlbWUtY29sb3I6ICNmNDRmMDY7XG5cbi8qIENPVUxFVVIgRFUgU09VUy1NRU5VICovXG4kc3ViLW1lbnUtY29sb3I6ICM1YjVlNjM7XG5cbi8qIENPVUxFVVIgREVTIEVSUkVVUlMgKi9cbiRlcnJvci1jb2xvcjogI2NjNTg1NztcblxuLyogRk9STVVMQUlSRVMgKi9cbiRmb3JtLXZhbGlkLWNvbG9yOiAgICMyN2E1NjA7XG4kZm9ybS1uZXV0cmFsLWNvbG9yOiAjMjE5M2U2O1xuJGZvcm0tc2VhcmNoLWNvbG9yOiAgIzU2MzBlZDtcbiRmb3JtLWludmFsaWQtY29sb3I6ICNkNTI5MTg7XG5cblxuLyogR0VTVElPTiBERVMgTE9OR1VFVVJTICovXG4kbWVudS1zaWRlLXdpZHRoOiA0ZW07XG5cblxuLy8gUE9VUiBSRVNPVVJDRV9ESVNQQVRDSEVSXG4kcmQtZm9ybS12YWxpZC1jb2xvcjogICAnMjdhNTYwJztcbiRyZC1mb3JtLW5ldXRyYWwtY29sb3I6ICcyMTkzZTYnO1xuJHJkLWZvcm0tc2VhcmNoLWNvbG9yOiAgJzU2MzBlZCc7XG4kcmQtZm9ybS1pbnZhbGlkLWNvbG9yOiAnZDUyOTE4JztcbiIKCV0sCgkibWFwcGluZ3MiOiAiQUFHQSxBQUVLLFFBRkcsQ0FBRyxPQUFPLENBRWIsS0FBSyxBQUFBLENBQ1IsT0FBTyxDQUFFLEtBQU0sQ0FDZixRQUFRLENBQUUsUUFBUyxDQUNsQixHQUFHLENBQUUsQ0FBRSxDQUNQLElBQUksQ0FBRSxDQUFFLENBQ1IsS0FBSyxDQ09VLEdBQUcsQ0RObEIsTUFBTSxDQ01TLEdBQUcsQ0RKbkIsZ0JBQWdCLENBQUUsT0FBTSxDQUN4QixnQkFBZ0IsQ0FBRSw2QkFBRyxDQUNyQixtQkFBbUIsQ0FBRSxhQUFjLENBQ25DLGlCQUFpQixDQUFFLFNBQVUsQ0FDN0IsZUFBZSxDQUFFLE9BQVEsQ0FFekIsTUFBTSxDQUFFLE9BQVEsQ0FFaEIsVUFBVSxDQUFFLE9BQVEsQ0FFcEIsQUFwQkYsQUF1QmEsUUF2QkwsQ0FBRyxPQUFPLEFBdUJoQixRQUFRLENBQUcsS0FBSyxBQUFBLENBQ2hCLGdCQUFnQixDQUFFLCtCQUFHLENBQ3JCLGVBQWUsQ0FBRSxPQUFRLENBQ3pCIiwKCSJuYW1lcyI6IFtdCn0= */ \ No newline at end of file +/*# sourceMappingURL=header.css.map */ diff --git a/public_html/src/logauth.ico b/public_html/src/logauth.ico old mode 100755 new mode 100644 index cd36abb..b80cf95 Binary files a/public_html/src/logauth.ico and b/public_html/src/logauth.ico differ diff --git a/public_html/src/static/iconv3.svg b/public_html/src/static/iconv3.svg new file mode 100644 index 0000000..fb5458b --- /dev/null +++ b/public_html/src/static/iconv3.svg @@ -0,0 +1,56 @@ + +image/svg+xml \ No newline at end of file