From c3acd3fac2a104f38797c03b9bd1b3278f36ba4f Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Sun, 8 Jan 2017 16:30:40 +0100 Subject: [PATCH] Fixed (partially) + font for login pages ( + ) + migrated view to Twig --- build/viewer/view/group/group_groupChoice.php | 1 - .../viewer/view/group/group_groupChoice.twig | 2 +- .../viewer/view/group/group_membersChoice.php | 287 +++++++----------- .../view/group/group_membersChoice.twig | 50 +++ public_html/css/layout.scss | 2 +- public_html/css/min/layout.css | 60 +++- public_html/css/min/reset.css | 130 +++++++- public_html/css/reset.scss | 1 + public_html/js/action-script.js | 28 +- public_html/js/lib/min/page-manager.js | 10 +- public_html/js/lib/page-manager.js | 8 +- public_html/js/min/action-script.js | 209 ++++++++++++- public_html/view/admin.php | 36 ++- public_html/view/groups.php | 4 +- public_html/view/js/groups.js | 2 +- public_html/view/warehouse.php | 5 +- 16 files changed, 586 insertions(+), 249 deletions(-) mode change 100755 => 100644 build/viewer/view/group/group_membersChoice.php create mode 100644 build/viewer/view/group/group_membersChoice.twig diff --git a/build/viewer/view/group/group_groupChoice.php b/build/viewer/view/group/group_groupChoice.php index bf0fb93..ec0aaac 100755 --- a/build/viewer/view/group/group_groupChoice.php +++ b/build/viewer/view/group/group_groupChoice.php @@ -4,7 +4,6 @@ use \api\core\ModuleRequest; use \error\core\Error; use \api\core\Authentification; - use \manager\repo\cluster as clusterRepo; class group_groupChoice{ diff --git a/build/viewer/view/group/group_groupChoice.twig b/build/viewer/view/group/group_groupChoice.twig index ec253bb..1bfc01d 100644 --- a/build/viewer/view/group/group_groupChoice.twig +++ b/build/viewer/view/group/group_groupChoice.twig @@ -1,4 +1,4 @@ -
+ - - - - - "; - break; - - - case 'machinelist': return " -
- @name - - - - - - - -
"; - break; - - - default: return " - Modifier un autre groupe

-
- - - -
- @header - Membre de @name -
- - @members -
"; - break; - - } - } - - public static function view($params){ - /* [0] Initialisation + public static function render($params){ + var_dump('membersChoice'); + debug(); + /* [1] On vérifie le type de groupe (user/machine) =========================================================*/ /* (1) On vérifie les paramètres */ if( !isset($params['id_cluster']) || !is_numeric($params['id_cluster']) || !isset($params['class']) || !is_numeric($params['class']) ) return Viewer::$htmlError; - /* (2) On initialise les vues */ - $view = ''; - $members_view = ''; - $header = ''; - - - - /* [1] On vérifie le type de groupe (user/machine) - =========================================================*/ - /* (1) On récupère le groupe */ + /* (2) On récupère le groupe */ $checktypeRequest = new ModuleRequest('clusterDefault/getById', [ 'id_cluster' => $params['id_cluster'], 'class' => $params['class'] ]); $checktypeResponse = $checktypeRequest->dispatch(); - /* (2) Si on ne le trouve pas, on retourne une erreur */ + /* (3) Si on ne le trouve pas, on retourne une erreur */ if( $checktypeResponse->error != Error::Success ) return Viewer::$htmlError; - /* (3) On récupère les données du groupe */ + /* (4) On récupère les données du groupe */ $currentCluster = $checktypeResponse->get('cluster'); - - /* [2] On récupère les membres du groupe + /* [2] Init Twig =========================================================*/ - /* (1) On exécute la requête */ - $getmembersRequest = new ModuleRequest('clusterDefault/getMembers', [ - 'id_cluster' => $params['id_cluster'], - 'class' => $params['class'] + $loader = new \Twig_Loader_Filesystem(__BUILD__.'/viewer/view'); + $twig = new \Twig_Environment($loader, []); + + + /* [3] Store variables + =========================================================*/ + $variables = [ + 'p_id_cluster' => $params['id_cluster'], + 'p_class' => $params['class'], + 'p_name' => $currentCluster['name'], + 'p_theme' => $_SESSION['WAREHOUSE']['theme'] + ]; + + /* [4] Store functions + =========================================================*/ + $twig->addFunction(new \Twig_Function('f_members', function($id_cluster, $class){ + /* [1] On récupère les membres + =========================================================*/ + + /* (1) On exécute la requête */ + $getmembersRequest = new ModuleRequest('clusterDefault/getMembers', [ + 'id_cluster' => $id_cluster, + 'class' => $class + ]); + $getmembersResponse = $getmembersRequest->dispatch(); + + /* (2) Si erreur, on retourne rien par défaut */ + if( $getmembersResponse->error != Error::Success ) + return []; + + /* (3) On récupère la liste des UID uniquement */ + $members_ids = []; + foreach($getmembersResponse->get('members') as $member) + $members_ids[] = ($class==0) ? $member['id_user'] : $member['id_machine']; + + + /* [2] On récupère les utilisateurs non membres + =========================================================*/ + /* (1) On récupère les utilisateurs */ + if( $class == 0 ){ + + /* (2) On exécute la requête */ + $getusersRequest = new ModuleRequest('userDefault/getAll'); + // On recupere la reponse + $getusersResponse = $getusersRequest->dispatch(); + + /* (3) si erreur, on affiche l'explicitation */ + if( $getusersResponse->error != Error::Success ) + return []; + + /* (4) On récupère la liste des utilisateurs */ + $users = $getusersResponse->get('users'); + + /* (5) On ajoute s'ils sont dans le groupe ou non */ + foreach($users as $u=>$user) + $users[$u]['already'] = in_array($user['id_user'], $members_ids); + return $users; + + + /* [3] On récupère les machines non membres + =========================================================*/ + /* (1) On récupère les machines */ + }else{ + + /* (2) On exécute la requête */ + $getmachinesRequest = new ModuleRequest('machineDefault/getAll'); + // On recupere la reponse + $getmachinesResponse = $getmachinesRequest->dispatch(); + + /* (3) si erreur, on affiche l'explicitation */ + if( $getmachinesResponse->error != Error::Success ) + return []; + + /* (4) On récupère la liste des machines */ + $machines = $getmachinesResponse->get('machines'); + + /* (5) On ajoute s'ils sont dans le groupe ou non */ + foreach($machines as $u=>$machine) + $machines[$u]['already'] = in_array($machine['id_machine'], $members_ids); + + return $machines; + } + + + })); + + + + /* [5] Build the whole stuff + =========================================================*/ + return $twig->render('group/group_membersChoice.twig', [ + 'p_class' => $variables['p_class'], + 'p_name' => $variables['p_name'], + 'p_id_cluster' => $variables['p_id_cluster'], + 'p_theme' => $variables['p_theme'] ]); - $getmembersResponse = $getmembersRequest->dispatch(); - - /* (2) Si erreur, on retourne l'erreur */ - if( $getmembersResponse->error != Error::Success ) - return Viewer::$htmlError; - - /* (3) On récupère la liste des UID uniquement */ - $members_id = []; - foreach($getmembersResponse->get('members') as $member) - $members_id[] = ($params['class']==0) ? $member['id_user'] : $member['id_machine']; - - - - /* [3] SI GROUPE D'UTILISATEURS -> On récupère les utilisateurs - =========================================================*/ - if( $params['class'] == 0 ){ - - /* (1) On récupère les utilisateurs - ---------------------------------------------------------*/ - /* (1) On exécute la requête */ - $getusersRequest = new ModuleRequest('userDefault/getAll'); // On utilise la methode 'getAll' du module 'userDefault' - $getusersResponse = $getusersRequest->dispatch(); // On recupere la reponse - - /* (2) si erreur, on affiche l'explicitation */ - if( $getusersResponse->error != Error::Success ) - return Viewer::$htmlError; - - /* (3) On récupère la liste des utilisateurs */ - $USERLIST = $getusersResponse->get('users'); - - - /* (2) On gère l'affichage des utilisateurs - ---------------------------------------------------------*/ - /* (1) On gère l'état 'membre' ou non */ - foreach($USERLIST as $u=>$user) - $USERLIST[$u]['already_in'] = in_array($user['id_user'], $members_id) ? 'checked' : ''; - - /* (2) On génère la vue */ - $header = self::template('userheader'); - - $members_view = Viewer::replaceMultiple( - self::template('userlist'), - $USERLIST - ); - - - /* [4] SI GROUPE DE MACHINES -> On récupère les machines - =========================================================*/ - }else{ - - /* (1) On récupère les machines - ---------------------------------------------------------*/ - /* (1) On exécute la requête */ - $getmachinesRequest = new ModuleRequest('machineDefault/getAll'); // On utilise la methode 'getAll' du module 'machineDefault' - $getmachinesResponse = $getmachinesRequest->dispatch(); // On recupere la reponse - - /* (2) si erreur, on affiche l'explicitation */ - if( $getmachinesResponse->error != Error::Success ) - return Viewer::$htmlError; - - /* (3) On récupère la liste des machines */ - $MACHINELIST = $getmachinesResponse->get('machines'); - - - /* (2) On gère l'affichage des machines - ---------------------------------------------------------*/ - /* (1) On gère l'état 'membre' ou non */ - foreach($MACHINELIST as $m=>$machine) - $MACHINELIST[$m]['already_in'] = in_array($machine['id_machine'], $members_id) ? 'checked' : ''; - - /* (2) On génère la vue */ - $header = self::template('machineheader'); - - $members_view = Viewer::replaceMultiple( - self::template('machinelist'), - $MACHINELIST - ); - - } - - - - return Viewer::replaceSingle( - self::template(), [ - 'id_cluster' => $params['id_cluster'], - 'class' => $params['class'], - 'name' => $currentCluster['name'], - 'clustertype' => ($params['class']==0) ? 'utilisateurs' : 'machines', - 'members' => $members_view, - 'header' => $header - ] - ); } - - - - - - } diff --git a/build/viewer/view/group/group_membersChoice.twig b/build/viewer/view/group/group_membersChoice.twig new file mode 100644 index 0000000..859bdf3 --- /dev/null +++ b/build/viewer/view/group/group_membersChoice.twig @@ -0,0 +1,50 @@ +Modifier un autre groupe +

+ +
+ + + +
+ + {# USER HEADER #} + {% if p_class == 0 %} + Identifiant + Nom + Code RFID + {# MACHINE HEADER #} + {% else %} + Nom + {% endif %} + Membre de {{ p_name }} +
+ + + {% for member in f_members(p_id_cluster, p_class) %} + + {# USER ENTRIES #} + {% if p_class == 0 %} +
+ {{ member.username }} + {{ member.firstname }} {{ member.lastname }} + {{ member.code }} + + + + + +
+ {# MACHINE ENTRIES #} + {% else %} +
+ {{ member.name }} + + + + + +
+ {% endif %} + + {% endfor %} +
diff --git a/public_html/css/layout.scss b/public_html/css/layout.scss index e5fbaa8..8aa7888 100755 --- a/public_html/css/layout.scss +++ b/public_html/css/layout.scss @@ -10,7 +10,7 @@ background-color: #edf0f5; - font-family: 'Open Sans', 'Ubuntu'; + font-family: 'Open Sans', 'Ubuntu', 'Verdana', 'Arial'; /* [1] Header de la page diff --git a/public_html/css/min/layout.css b/public_html/css/min/layout.css index f20e339..c4758fb 100755 --- a/public_html/css/min/layout.css +++ b/public_html/css/min/layout.css @@ -1,3 +1,59 @@ -#WRAPPER{display:block;position:fixed;top:0;left:0;width:100%;height:100%;background-color:#edf0f5;font-family:'Open Sans', 'Ubuntu'}#WRAPPER>#HEADER{display:block;position:absolute;top:0;left:0;width:100%;height:calc( 4em - 1px);border-bottom:1px solid #c23f05;background-color:#f44f06;z-index:10}#WRAPPER>#MENU-SIDE{display:block;position:absolute;top:4em;left:0;width:4em;height:100%;box-shadow:2px 1px 3px #ddd;background-color:#fff;transition:all .3s;z-index:9}#WRAPPER>#CONTAINER{display:flex;position:absolute;top:4em;left:4em;width:calc( 100% - 4em - 2*1em);height:calc( 100% - 4em - 2*1em);padding:1em;flex-direction:row;justify-content:space-between;overflow-x:none;overflow-y:auto} +/* COULEUR DU THEME */ +/* COULEUR DU SOUS-MENU */ +/* COULEUR DES ERREURS */ +/* FORMULAIRES */ +/* GESTION DES LONGUEURS */ +#WRAPPER { + display: block; + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: #edf0f5; + font-family: 'Open Sans', 'Ubuntu', 'Verdana', 'Arial'; + /* [1] Header de la page + ==========================================*/ + /* [2] Side-Menu de la page + ==========================================*/ + /* [3] Container de la page + ==========================================*/ +} +#WRAPPER > #HEADER { + display: block; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: calc( 4em - 1px ); + border-bottom: 1px solid #c23f05; + background-color: #f44f06; + z-index: 10; +} +#WRAPPER > #MENU-SIDE { + display: block; + position: absolute; + top: 4em; + left: 0; + width: 4em; + height: 100%; + box-shadow: 2px 1px 3px #ddd; + background-color: #fff; + transition: all .3s; + z-index: 9; +} +#WRAPPER > #CONTAINER { + display: flex; + position: absolute; + top: 4em; + left: 4em; + width: calc( 100% - 4em - 2*1em ); + height: calc( 100% - 4em - 2*1em ); + padding: 1em; + flex-direction: row; + justify-content: space-between; + overflow-x: none; + overflow-y: auto; +} -/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAibGF5b3V0LmNzcyIsCgkic291cmNlcyI6IFsKCQkiLi4vbGF5b3V0LnNjc3MiLAoJCSIuLi9jb25zdGFudHMuc2NzcyIKCV0sCgkic291cmNlc0NvbnRlbnQiOiBbCgkJIkBpbXBvcnQgJ2NvbnN0YW50cyc7XG5cbiNXUkFQUEVSe1xuXHRkaXNwbGF5OiBibG9jaztcblx0cG9zaXRpb246IGZpeGVkO1xuXHRcdHRvcDogMDtcblx0XHRsZWZ0OiAwO1xuXHRcdHdpZHRoOiAxMDAlO1xuXHRcdGhlaWdodDogMTAwJTtcblxuXHRiYWNrZ3JvdW5kLWNvbG9yOiAjZWRmMGY1O1xuXG5cdGZvbnQtZmFtaWx5OiAnT3BlbiBTYW5zJywgJ1VidW50dSc7XG5cblxuXHQvKiBbMV0gSGVhZGVyIGRlIGxhIHBhZ2Vcblx0PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki9cblx0JiA+ICNIRUFERVJ7XG5cdFx0ZGlzcGxheTogYmxvY2s7XG5cdFx0cG9zaXRpb246IGFic29sdXRlO1xuXHRcdFx0dG9wOiAwO1xuXHRcdFx0bGVmdDogMDtcblx0XHRcdHdpZHRoOiAxMDAlO1xuXHRcdFx0aGVpZ2h0OiBjYWxjKCAjeyRtZW51LXNpZGUtd2lkdGh9IC0gMXB4ICk7XG5cblx0XHRib3JkZXItYm90dG9tOiAxcHggc29saWQgZGFya2VuKCR0aGVtZS1jb2xvciwgMTApO1xuXG5cdFx0YmFja2dyb3VuZC1jb2xvcjogJHRoZW1lLWNvbG9yO1xuXG5cdFx0ei1pbmRleDogMTA7XG5cblx0fVxuXG5cblx0LyogWzJdIFNpZGUtTWVudSBkZSBsYSBwYWdlXG5cdD09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovXG5cdC8vIEdlc3Rpb24gZHUgbWVudVxuXHQmID4gI01FTlUtU0lERXtcblx0XHRkaXNwbGF5OiBibG9jaztcblx0XHRwb3NpdGlvbjogYWJzb2x1dGU7XG5cdFx0XHR0b3A6ICRtZW51LXNpZGUtd2lkdGg7XG5cdFx0XHRsZWZ0OiAwO1xuXHRcdFx0d2lkdGg6ICRtZW51LXNpZGUtd2lkdGg7XG5cdFx0XHRoZWlnaHQ6IDEwMCU7XG5cblx0XHRib3gtc2hhZG93OiAycHggMXB4IDNweCAjZGRkO1xuXG5cdFx0YmFja2dyb3VuZC1jb2xvcjogI2ZmZjtcblxuXHRcdHRyYW5zaXRpb246IGFsbCAuM3M7XG5cblx0XHR6LWluZGV4OiA5O1xuXHR9XG5cblxuXHQvKiBbM10gQ29udGFpbmVyIGRlIGxhIHBhZ2Vcblx0PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki9cblx0JiA+ICNDT05UQUlORVJ7XG5cdFx0ZGlzcGxheTogZmxleDtcblx0XHRwb3NpdGlvbjogYWJzb2x1dGU7XG5cdFx0XHR0b3A6ICRtZW51LXNpZGUtd2lkdGg7XG5cdFx0XHRsZWZ0OiAkbWVudS1zaWRlLXdpZHRoO1xuXHRcdFx0d2lkdGg6IGNhbGMoIDEwMCUgLSAjeyRtZW51LXNpZGUtd2lkdGh9IC0gMioxZW0gKTtcblx0XHRcdGhlaWdodDogY2FsYyggMTAwJSAtICN7JG1lbnUtc2lkZS13aWR0aH0gLSAyKjFlbSApO1xuXHRcdHBhZGRpbmc6IDFlbTtcblxuXHRcdC8vIEZsZXggcHJvcGVydGllc1xuXHRcdGZsZXgtZGlyZWN0aW9uOiByb3c7XG5cdFx0anVzdGlmeS1jb250ZW50OiBzcGFjZS1iZXR3ZWVuO1xuXG5cdFx0b3ZlcmZsb3cteDogbm9uZTtcblx0XHRvdmVyZmxvdy15OiBhdXRvO1xuXHR9XG59XG4iLAoJCSIvKiBDT1VMRVVSIERVIFRIRU1FICovXG4kdGhlbWUtY29sb3I6ICNmNDRmMDY7XG5cbi8qIENPVUxFVVIgRFUgU09VUy1NRU5VICovXG4kc3ViLW1lbnUtY29sb3I6ICM1YjVlNjM7XG5cbi8qIENPVUxFVVIgREVTIEVSUkVVUlMgKi9cbiRlcnJvci1jb2xvcjogI2NjNTg1NztcblxuLyogRk9STVVMQUlSRVMgKi9cbiRmb3JtLXZhbGlkLWNvbG9yOiAgICMyN2E1NjA7XG4kZm9ybS1uZXV0cmFsLWNvbG9yOiAjMjE5M2U2O1xuJGZvcm0tc2VhcmNoLWNvbG9yOiAgIzU2MzBlZDtcbiRmb3JtLWludmFsaWQtY29sb3I6ICNkNTI5MTg7XG5cblxuLyogR0VTVElPTiBERVMgTE9OR1VFVVJTICovXG4kbWVudS1zaWRlLXdpZHRoOiA0ZW07XG5cblxuLy8gUE9VUiBSRVNPVVJDRV9ESVNQQVRDSEVSXG4kcmQtZm9ybS12YWxpZC1jb2xvcjogICAnMjdhNTYwJztcbiRyZC1mb3JtLW5ldXRyYWwtY29sb3I6ICcyMTkzZTYnO1xuJHJkLWZvcm0tc2VhcmNoLWNvbG9yOiAgJzU2MzBlZCc7XG4kcmQtZm9ybS1pbnZhbGlkLWNvbG9yOiAnZDUyOTE4JztcbiIKCV0sCgkibWFwcGluZ3MiOiAiQUFFQSxBQUFBLFFBQVEsQUFBQSxDQUNQLE9BQU8sQ0FBRSxLQUFNLENBQ2YsUUFBUSxDQUFFLEtBQU0sQ0FDZixHQUFHLENBQUUsQ0FBRSxDQUNQLElBQUksQ0FBRSxDQUFFLENBQ1IsS0FBSyxDQUFFLElBQUssQ0FDWixNQUFNLENBQUUsSUFBSyxDQUVkLGdCQUFnQixDQUFFLE9BQVEsQ0FFMUIsV0FBVyxDQUFFLHFCQUFzQixDQTZEbkMsQUF2RUQsQUFlSyxRQWZHLENBZUgsT0FBTyxBQUFBLENBQ1YsT0FBTyxDQUFFLEtBQU0sQ0FDZixRQUFRLENBQUUsUUFBUyxDQUNsQixHQUFHLENBQUUsQ0FBRSxDQUNQLElBQUksQ0FBRSxDQUFFLENBQ1IsS0FBSyxDQUFFLElBQUssQ0FDWixNQUFNLENBQUUsZ0JBQUksQ0FFYixhQUFhLENBQUUsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFNLENBRS9CLGdCQUFnQixDQzFCSixPQUFPLENENEJuQixPQUFPLENBQUUsRUFBRyxDQUVaLEFBN0JGLEFBbUNLLFFBbkNHLENBbUNILFVBQVUsQUFBQSxDQUNiLE9BQU8sQ0FBRSxLQUFNLENBQ2YsUUFBUSxDQUFFLFFBQVMsQ0FDbEIsR0FBRyxDQ3ZCWSxHQUFHLENEd0JsQixJQUFJLENBQUUsQ0FBRSxDQUNSLEtBQUssQ0N6QlUsR0FBRyxDRDBCbEIsTUFBTSxDQUFFLElBQUssQ0FFZCxVQUFVLENBQUUsZ0JBQWlCLENBRTdCLGdCQUFnQixDQUFFLElBQUssQ0FFdkIsVUFBVSxDQUFFLE9BQVEsQ0FFcEIsT0FBTyxDQUFFLENBQUUsQ0FDWCxBQWxERixBQXVESyxRQXZERyxDQXVESCxVQUFVLEFBQUEsQ0FDYixPQUFPLENBQUUsSUFBSyxDQUNkLFFBQVEsQ0FBRSxRQUFTLENBQ2xCLEdBQUcsQ0MzQ1ksR0FBRyxDRDRDbEIsSUFBSSxDQzVDVyxHQUFHLENENkNsQixLQUFLLENBQUUseUJBQUksQ0FDWCxNQUFNLENBQUUseUJBQUksQ0FDYixPQUFPLENBQUUsR0FBSSxDQUdiLGNBQWMsQ0FBRSxHQUFJLENBQ3BCLGVBQWUsQ0FBRSxhQUFjLENBRS9CLFVBQVUsQ0FBRSxJQUFLLENBQ2pCLFVBQVUsQ0FBRSxJQUFLLENBQ2pCIiwKCSJuYW1lcyI6IFtdCn0= */ \ No newline at end of file +/*# sourceMappingURL=layout.css.map */ diff --git a/public_html/css/min/reset.css b/public_html/css/min/reset.css index 7248ac2..4fc9a1f 100755 --- a/public_html/css/min/reset.css +++ b/public_html/css/min/reset.css @@ -1,3 +1,129 @@ -/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0} +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ +/** 1. Set default font family to sans-serif. 2. Prevent iOS and IE text size adjust after device orientation change, without disabling user zoom. */ +html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } -/*# sourceMappingURL=data:application/json;base64,{
	"version": 3,
	"file": "reset.css",
	"sources": [
		"../reset.scss"
	],
	"sourcesContent": [
		"/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */\n\n/**\n * 1. Set default font family to sans-serif.\n * 2. Prevent iOS and IE text size adjust after device orientation change,\n *    without disabling user zoom.\n */\n\nhtml {\n  font-family: sans-serif; /* 1 */\n  -ms-text-size-adjust: 100%; /* 2 */\n  -webkit-text-size-adjust: 100%; /* 2 */\n}\n\n/**\n * Remove default margin.\n */\n\nbody {\n  margin: 0;\n  // font-size: 12px;\n}\n\n/* HTML5 display definitions\n   ========================================================================== */\n\n/**\n * Correct `block` display not defined for any HTML5 element in IE 8/9.\n * Correct `block` display not defined for `details` or `summary` in IE 10/11\n * and Firefox.\n * Correct `block` display not defined for `main` in IE 11.\n */\n\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nmain,\nmenu,\nnav,\nsection,\nsummary {\n  display: block;\n}\n\n/**\n * 1. Correct `inline-block` display not defined in IE 8/9.\n * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.\n */\n\naudio,\ncanvas,\nprogress,\nvideo {\n  display: inline-block; /* 1 */\n  vertical-align: baseline; /* 2 */\n}\n\n/**\n * Prevent modern browsers from displaying `audio` without controls.\n * Remove excess height in iOS 5 devices.\n */\n\naudio:not([controls]) {\n  display: none;\n  height: 0;\n}\n\n/**\n * Address `[hidden]` styling not present in IE 8/9/10.\n * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.\n */\n\n[hidden],\ntemplate {\n  display: none;\n}\n\n/* Links\n   ========================================================================== */\n\n/**\n * Remove the gray background color from active links in IE 10.\n */\n\na {\n  background-color: transparent;\n}\n\n/**\n * Improve readability of focused elements when they are also in an\n * active/hover state.\n */\n\na:active,\na:hover {\n  outline: 0;\n}\n\n/* Text-level semantics\n   ========================================================================== */\n\n/**\n * Address inconsistent styling of `abbr[title]`.\n * 1. Correct styling in Firefox 39 and Opera 12.\n * 2. Correct missing styling in Chrome, Edge, IE, Opera, and Safari.\n */\n\nabbr[title] {\n  border-bottom: none; /* 1 */\n  text-decoration: underline; /* 2 */\n  text-decoration: underline dotted; /* 2 */\n}\n\n/**\n * Address inconsistent styling of b and strong.\n * 1. Correct duplicate application of `bolder` in Safari 6.0.2.\n * 2. Correct style set to `bold` in Edge 12+, Safari 6.2+, and Chrome 18+.\n */\n\nb,\nstrong {\n  font-weight: inherit; /* 1 */\n}\n\nb,\nstrong {\n  font-weight: bolder; /* 2 */\n}\n\n/**\n * Address styling not present in Safari and Chrome.\n */\n\ndfn {\n  font-style: italic;\n}\n\n/**\n * Address variable `h1` font-size and margin within `section` and `article`\n * contexts in Firefox 4+, Safari, and Chrome.\n */\n\nh1 {\n  font-size: 2em;\n  margin: 0.67em 0;\n}\n\n/**\n * Address styling not present in IE 8/9.\n */\n\nmark {\n  background-color: #ff0;\n  color: #000;\n}\n\n/**\n * Address inconsistent and variable font size in all browsers.\n */\n\nsmall {\n  font-size: 80%;\n}\n\n/**\n * Prevent `sub` and `sup` affecting `line-height` in all browsers.\n */\n\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline;\n}\n\nsup {\n  top: -0.5em;\n}\n\nsub {\n  bottom: -0.25em;\n}\n\n/* Embedded content\n   ========================================================================== */\n\n/**\n * Remove border when inside `a` element in IE 8/9/10.\n */\n\nimg {\n  border: 0;\n}\n\n/**\n * Correct overflow not hidden in IE 9/10/11.\n */\n\nsvg:not(:root) {\n  overflow: hidden;\n}\n\n/* Grouping content\n   ========================================================================== */\n\n/**\n * Address margin not present in IE 8/9 and Safari.\n */\n\nfigure {\n  margin: 1em 40px;\n}\n\n/**\n * Address inconsistent styling of `hr`.\n * 1. Correct `box-sizing` set to `border-box` in Firefox.\n * 2. Correct `overflow` set to `hidden` in IE 8/9/10/11 and Edge 12.\n */\n\nhr {\n  box-sizing: content-box; /* 1 */\n  height: 0; /* 1 */\n  overflow: visible; /* 2 */\n}\n\n/**\n * Contain overflow in all browsers.\n */\n\npre {\n  overflow: auto;\n}\n\n/**\n * 1. Correct inheritance and scaling of font-size for preformatted text.\n * 2. Address odd `em`-unit font size rendering in all browsers.\n */\n\ncode,\nkbd,\npre,\nsamp {\n  font-family: monospace, monospace; /* 1 */\n  font-size: 1em; /* 2 */\n}\n\n/* Forms\n   ========================================================================== */\n\n/**\n * Known limitation: by default, Chrome and Safari on OS X allow very limited\n * styling of `select`, unless a `border` property is set.\n */\n\n/**\n * 1. Correct font properties not being inherited.\n * 2. Address margins set differently in Firefox 4+, Safari, and Chrome.\n */\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  font: inherit; /* 1 */\n  margin: 0; /* 2 */\n}\n\n/**\n * Address `overflow` set to `hidden` in IE 8/9/10/11.\n */\n\nbutton {\n  overflow: visible;\n}\n\n/**\n * Address inconsistent `text-transform` inheritance for `button` and `select`.\n * All other form control elements do not inherit `text-transform` values.\n * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.\n * Correct `select` style inheritance in Firefox.\n */\n\nbutton,\nselect {\n  text-transform: none;\n}\n\n/**\n * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`\n *    and `video` controls.\n * 2. Correct inability to style clickable `input` types in iOS.\n * 3. Improve usability and consistency of cursor style between image-type\n *    `input` and others.\n */\n\nbutton,\nhtml input[type=\"button\"], /* 1 */\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n  -webkit-appearance: button; /* 2 */\n  cursor: pointer; /* 3 */\n}\n\n/**\n * Re-set default cursor for disabled elements.\n */\n\nbutton[disabled],\nhtml input[disabled] {\n  cursor: default;\n}\n\n/**\n * Remove inner padding and border in Firefox 4+.\n */\n\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n  border: 0;\n  padding: 0;\n}\n\n/**\n * Address Firefox 4+ setting `line-height` on `input` using `!important` in\n * the UA stylesheet.\n */\n\ninput {\n  line-height: normal;\n}\n\n/**\n * It's recommended that you don't attempt to style these elements.\n * Firefox's implementation doesn't respect box-sizing, padding, or width.\n *\n * 1. Address box sizing set to `content-box` in IE 8/9/10.\n * 2. Remove excess padding in IE 8/9/10.\n */\n\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n  box-sizing: border-box; /* 1 */\n  padding: 0; /* 2 */\n}\n\n/**\n * Fix the cursor style for Chrome's increment/decrement buttons. For certain\n * `font-size` values of the `input`, it causes the cursor style of the\n * decrement button to change from `default` to `text`.\n */\n\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto;\n}\n\n/**\n * Address `appearance` set to `searchfield` in Safari and Chrome.\n */\n\ninput[type=\"search\"] {\n  -webkit-appearance: textfield;\n}\n\n/**\n * Remove inner padding and search cancel button in Safari and Chrome on OS X.\n * Safari (but not Chrome) clips the cancel button when the search input has\n * padding (and `textfield` appearance).\n */\n\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n/**\n * Define consistent border, margin, and padding.\n */\n\nfieldset {\n  border: 1px solid #c0c0c0;\n  margin: 0 2px;\n  padding: 0.35em 0.625em 0.75em;\n}\n\n/**\n * 1. Correct `color` not being inherited in IE 8/9/10/11.\n * 2. Remove padding so people aren't caught out if they zero out fieldsets.\n */\n\nlegend {\n  border: 0; /* 1 */\n  padding: 0; /* 2 */\n}\n\n/**\n * Remove default vertical scrollbar in IE 8/9/10/11.\n */\n\ntextarea {\n  overflow: auto;\n}\n\n/**\n * Don't inherit the `font-weight` (applied by a rule above).\n * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.\n */\n\noptgroup {\n  font-weight: bold;\n}\n\n/* Tables\n   ========================================================================== */\n\n/**\n * Remove most spacing between table cells.\n */\n\ntable {\n  border-collapse: collapse;\n  border-spacing: 0;\n}\n\ntd,\nth {\n  padding: 0;\n}\n"
	],
	"mappings": "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",
	"names": []
} */ \ No newline at end of file +/** Remove default margin. */ +body { margin: 0; font-family: 'Open Sans', 'Ubuntu', 'Verdana', 'Arial'; } + +/* HTML5 display definitions ========================================================================== */ +/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */ +article, aside, details, figcaption, figure, footer, header, main, menu, nav, section, summary { display: block; } + +/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ +audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ } + +/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */ +audio:not([controls]) { display: none; height: 0; } + +/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. */ +[hidden], template { display: none; } + +/* Links ========================================================================== */ +/** Remove the gray background color from active links in IE 10. */ +a { background-color: transparent; } + +/** Improve readability of focused elements when they are also in an active/hover state. */ +a:active, a:hover { outline: 0; } + +/* Text-level semantics ========================================================================== */ +/** Address inconsistent styling of `abbr[title]`. 1. Correct styling in Firefox 39 and Opera 12. 2. Correct missing styling in Chrome, Edge, IE, Opera, and Safari. */ +abbr[title] { border-bottom: none; /* 1 */ text-decoration: underline; /* 2 */ text-decoration: underline dotted; /* 2 */ } + +/** Address inconsistent styling of b and strong. 1. Correct duplicate application of `bolder` in Safari 6.0.2. 2. Correct style set to `bold` in Edge 12+, Safari 6.2+, and Chrome 18+. */ +b, strong { font-weight: inherit; /* 1 */ } + +b, strong { font-weight: bolder; /* 2 */ } + +/** Address styling not present in Safari and Chrome. */ +dfn { font-style: italic; } + +/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */ +h1 { font-size: 2em; margin: 0.67em 0; } + +/** Address styling not present in IE 8/9. */ +mark { background-color: #ff0; color: #000; } + +/** Address inconsistent and variable font size in all browsers. */ +small { font-size: 80%; } + +/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */ +sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } + +sup { top: -0.5em; } + +sub { bottom: -0.25em; } + +/* Embedded content ========================================================================== */ +/** Remove border when inside `a` element in IE 8/9/10. */ +img { border: 0; } + +/** Correct overflow not hidden in IE 9/10/11. */ +svg:not(:root) { overflow: hidden; } + +/* Grouping content ========================================================================== */ +/** Address margin not present in IE 8/9 and Safari. */ +figure { margin: 1em 40px; } + +/** Address inconsistent styling of `hr`. 1. Correct `box-sizing` set to `border-box` in Firefox. 2. Correct `overflow` set to `hidden` in IE 8/9/10/11 and Edge 12. */ +hr { box-sizing: content-box; /* 1 */ height: 0; /* 1 */ overflow: visible; /* 2 */ } + +/** Contain overflow in all browsers. */ +pre { overflow: auto; } + +/** 1. Correct inheritance and scaling of font-size for preformatted text. 2. Address odd `em`-unit font size rendering in all browsers. */ +code, kbd, pre, samp { font-family: monospace, monospace; /* 1 */ font-size: 1em; /* 2 */ } + +/* Forms ========================================================================== */ +/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */ +/** 1. Correct font properties not being inherited. 2. Address margins set differently in Firefox 4+, Safari, and Chrome. */ +button, input, optgroup, select, textarea { font: inherit; /* 1 */ margin: 0; /* 2 */ } + +/** Address `overflow` set to `hidden` in IE 8/9/10/11. */ +button { overflow: visible; } + +/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */ +button, select { text-transform: none; } + +/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */ +button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ } + +/** Re-set default cursor for disabled elements. */ +button[disabled], html input[disabled] { cursor: default; } + +/** Remove inner padding and border in Firefox 4+. */ +button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } + +/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */ +input { line-height: normal; } + +/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width. 1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */ +input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } + +/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */ +input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; } + +/** Address `appearance` set to `searchfield` in Safari and Chrome. */ +input[type="search"] { -webkit-appearance: textfield; } + +/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */ +input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } + +/** Define consistent border, margin, and padding. */ +fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } + +/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */ +legend { border: 0; /* 1 */ padding: 0; /* 2 */ } + +/** Remove default vertical scrollbar in IE 8/9/10/11. */ +textarea { overflow: auto; } + +/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */ +optgroup { font-weight: bold; } + +/* Tables ========================================================================== */ +/** Remove most spacing between table cells. */ +table { border-collapse: collapse; border-spacing: 0; } + +td, th { padding: 0; } + +/*# sourceMappingURL=reset.css.map */ diff --git a/public_html/css/reset.scss b/public_html/css/reset.scss index 4642136..bde343c 100755 --- a/public_html/css/reset.scss +++ b/public_html/css/reset.scss @@ -19,6 +19,7 @@ html { body { margin: 0; // font-size: 12px; + font-family: 'Open Sans', 'Ubuntu', 'Verdana', 'Arial'; } /* HTML5 display definitions diff --git a/public_html/js/action-script.js b/public_html/js/action-script.js index d1d0342..2ff51ea 100755 --- a/public_html/js/action-script.js +++ b/public_html/js/action-script.js @@ -66,7 +66,7 @@ function navSubMenu(subsection){ var page = null; // Si erreur, on retourne FALSE - if( !target.getData('sublink') ) return false + if( !target.getData('sublink') ) return false; var mustRefresh = pageManager.vars[0] != target.getData('sublink'); @@ -103,7 +103,7 @@ function navMenu(section, persistence){ target = (typeof section == 'string') ? document.querySelector('#WRAPPER > #MENU-SIDE > span[data-link="'+section+'"]') : target; // Si rien trouve, on prend le premier element correspondant a la premiere page - target = (target == null) ? document.querySelector('#WRAPPER > #MENU-SIDE > span[data-link="'+pageManager.pagelist[0]+'"]') : target; + target = target || document.querySelector('#WRAPPER > #MENU-SIDE > span[data-link="'+pageManager.pagelist[0]+'"]'); // Si le param n'est toujours pas bon, on retourne une erreur if( target == null ) return false; @@ -114,18 +114,16 @@ function navMenu(section, persistence){ /* [2] Gestion de l'affichage de l'element ------------------------------------------------*/ // On desactive l'element courant - if( current != null ) - current.remClass('active'); + current && current.remClass('active'); // On active le nouveau - if( target != null ) - target.addClass('active'); + target && target.addClass('active'); /* [3] Gestion de pageManager ------------------------------------------------*/ // Si element, on recupere le data-link var page = null; - // SI on change de menu, on efface les données URL + // Si on change de menu, on efface les données URL if( !persistence && current != target ) pageManager.vars = []; @@ -134,12 +132,11 @@ function navMenu(section, persistence){ if( target.getData('link') ){ DOM.HEADER.addClass('loading'); // Animation de chargement - pageManager.setPage( target.getData('link') ); - pageManager.activeXHR.addEventListener('loadend', function(){ + //pageManager.activeXHR.addEventListener('loadend', + + var handlerX = function(){ - // On retire l'icone de chargement - DOM.HEADER.remClass('loading'); // On gere la navigation du sous-menu (si defini, utilise) var subSectionExists = pageManager.vars.length > 0 && document.querySelector('#CONTAINER > .sub-menu-side > [data-sublink="'+pageManager.vars[0]+'"]') != null; @@ -160,7 +157,14 @@ function navMenu(section, persistence){ navSubMenu(target); }, false); - }, false); + }; + + /* (x) Si première ou changement de page, on charge la nouvelle */ + pageManager.page != target.getData('link') && pageManager.setPage( target.getData('link') ); + + /* (x) Si on a `pageManager.activeXHR`, on met le handler, sinon on lance */ + pageManager.activeXHR ? pageManager.activeXHR.addEventListener('loadend', handlerX, false) : handlerX.call(); + } }navMenu(pageManager.page); diff --git a/public_html/js/lib/min/page-manager.js b/public_html/js/lib/min/page-manager.js index b1080fe..06ddc9a 100755 --- a/public_html/js/lib/min/page-manager.js +++ b/public_html/js/lib/min/page-manager.js @@ -127,9 +127,8 @@ pageManagerClass.prototype = { // si pageList est correct et que l'URL correspond à un schéma de page => continue [sinon] return null if( this.pagelist != null && /^(?:(?:https?:\/\/)?[^\/]+)\/([a-z0-9_]+)(?:\/|((?:\/\w+)+)\/?)?(#.*)?$/i.test(url_data) ){ // si la page récupérée dans l'url est dans la liste => renvoi de l'objet [sinon] null - var vars = RegExp.$2.split('/'); // on supprime la première entrée vide - vars = vars.slice(1); + var vars = RegExp.$2.split('/').slice(1); return ( this.pagelist.indexOf(RegExp.$1) > -1 ) ? {page: RegExp.$1, var: vars} : null; }else @@ -310,16 +309,11 @@ pageManagerClass.prototype = { */ refresh: function(refresher){ if( refresher instanceof Function ){ - this.refresher = refresher; return; - - }else{ - + }else return this.setPage(true); - } - } }; diff --git a/public_html/js/lib/page-manager.js b/public_html/js/lib/page-manager.js index 7450141..06ddc9a 100755 --- a/public_html/js/lib/page-manager.js +++ b/public_html/js/lib/page-manager.js @@ -129,7 +129,6 @@ pageManagerClass.prototype = { // si la page récupérée dans l'url est dans la liste => renvoi de l'objet [sinon] null // on supprime la première entrée vide var vars = RegExp.$2.split('/').slice(1); - console.log(vars); return ( this.pagelist.indexOf(RegExp.$1) > -1 ) ? {page: RegExp.$1, var: vars} : null; }else @@ -310,16 +309,11 @@ pageManagerClass.prototype = { */ refresh: function(refresher){ if( refresher instanceof Function ){ - this.refresher = refresher; return; - - }else{ - + }else return this.setPage(true); - } - } }; diff --git a/public_html/js/min/action-script.js b/public_html/js/min/action-script.js index 4dc7a4a..2ff51ea 100755 --- a/public_html/js/min/action-script.js +++ b/public_html/js/min/action-script.js @@ -1,6 +1,203 @@ -DOM={WRAPPER:$("WRAPPER"),HEADER:$("HEADER"),MENUSIDE:$("MENU-SIDE"),CONTAINER:$("CONTAINER")};var pageManager=new pageManagerClass;pageManager.setPage(null,"/view",DOM.CONTAINER,"history profile machines users groups analytics settings".split(" "));var api=new APIClass("/api/"); -function navSubMenu(a){var d=document.querySelector('#CONTAINER > .sub-menu-side > span[data-sublink="'+pageManager.vars[0]+'"]'),b=null,b=a instanceof Element?a:null,b="string"==typeof a?document.querySelector('#CONTAINER > .sub-menu-side > span[data-sublink="'+a+'"]'):b,b=null==b?document.querySelector("#CONTAINER > .sub-menu-side > span[data-sublink]"):b;if(null==b)return!1;null!=d&&d.remClass("active");a=document.querySelectorAll("#CONTAINER > section[data-sublink].active");for(d=0;d section[data-sublink="'+b.getData("sublink")+'"]'),null!=a&&a.addClass("active"));if(!b.getData("sublink"))return!1;a=pageManager.vars[0]!=b.getData("sublink");pageManager.vars[0]=b.getData("sublink");a&&pageManager.updateURL()} -function navMenu(a,d){var b=document.querySelector('#WRAPPER > #MENU-SIDE > span[data-link="'+pageManager.page+'"]'),c=null,c=a instanceof Element?a:null,c="string"==typeof a?document.querySelector('#WRAPPER > #MENU-SIDE > span[data-link="'+a+'"]'):c,c=null==c?document.querySelector('#WRAPPER > #MENU-SIDE > span[data-link="'+pageManager.pagelist[0]+'"]'):c;if(null==c)return!1;d=!0===d?!0:!1;null!=b&&b.remClass("active");null!=c&&c.addClass("active");d||b==c||(pageManager.vars=[]);c.getData("link")&& -(DOM.HEADER.addClass("loading"),pageManager.setPage(c.getData("link")),pageManager.activeXHR.addEventListener("loadend",function(){DOM.HEADER.remClass("loading");0 .sub-menu-side > [data-sublink="'+pageManager.vars[0]+'"]')?navSubMenu(pageManager.vars[0]):navSubMenu(null);document.querySelector("#CONTAINER > .sub-menu-side").addEventListener("click",function(a){for(a=a.target;a!=document.body&&!a.getData("sublink");)a=a.parentNode; -a.getData("sublink")&&navSubMenu(a)},!1)},!1))}navMenu(pageManager.page);DOM.MENUSIDE.addEventListener("click",function(a){for(a=a.target;a!=document.body&&!a.getData("link");)a=a.parentNode;a.getData("link")&&navMenu(a.getData("link"))},!1); +// TODO: Attendre que API soit chargée, sinon erreur: le CONTAINER prend comme contenu la dépendance JS +DOM = { + WRAPPER: $('WRAPPER'), + HEADER: $('HEADER'), + MENUSIDE: $('MENU-SIDE'), + CONTAINER: $('CONTAINER') +}; + + +/* [0] Instanciation +===========================================*/ +var pageManager = new pageManagerClass(); +pageManager.setPage(null, '/view', DOM.CONTAINER, ['history', 'profile', 'machines', 'users', 'groups', 'analytics', 'settings'] ); + +var api = new APIClass('/api/'); + + +/* [1] Toggle du sub-menu-side <-> navigation +===========================================*/ +function navSubMenu(subsection){ + /* [1] Format du param + ------------------------------------------------*/ + // Contient l'element courant + var current = document.querySelector('#CONTAINER > .sub-menu-side > span[data-sublink="'+pageManager.vars[0]+'"]'); + + // Contiendra l'element cible + var target = null; + + // si @subsection est un element, on le prends + target = (subsection instanceof Element) ? subsection : null; + + // Si string, on trouve l'element correspondant + target = (typeof subsection == 'string') ? document.querySelector('#CONTAINER > .sub-menu-side > span[data-sublink="'+subsection+'"]') : target; + + // Si rien trouve, on prend le premier element correspondant a la premiere page + target = (target == null) ? document.querySelector('#CONTAINER > .sub-menu-side > span[data-sublink]') : target; + + // Si le param n'est toujours pas bon, on retourne une erreur + if( target == null ) return false; + + /* [2] Gestion de l'affichage de l'element + ------------------------------------------------*/ + // On desactive l'element courant + if( current != null ) + current.remClass('active'); + + // On cache les sections visibles + var visibleSections = document.querySelectorAll('#CONTAINER > section[data-sublink].active'); + for( var i = 0 ; i < visibleSections.length ; i++ ) + visibleSections[i].remClass('active'); + + // On active le nouveau + if( target != null ){ + target.addClass('active'); + + // On affiche la section associee + var targetSection = document.querySelector('#CONTAINER > section[data-sublink="'+target.getData('sublink')+'"]'); + if( targetSection != null ) + targetSection.addClass('active'); + + } + + /* [3] Gestion de pageManager + ------------------------------------------------*/ + // Si element, on recupere le data-link + var page = null; + + // Si erreur, on retourne FALSE + if( !target.getData('sublink') ) return false; + + var mustRefresh = pageManager.vars[0] != target.getData('sublink'); + + // On met a jour la variable page-manager si data-link trouve + pageManager.vars[0] = target.getData('sublink'); + + if( mustRefresh ) + // navMenu(pageManager.page); + pageManager.updateURL(); + +} + + + + + + +/* [2] Toggle du side-menu <-> navigation +===========================================*/ +function navMenu(section, persistence){ + + /* [1] Format du param + ------------------------------------------------*/ + // Contient l'element courant + var current = document.querySelector('#WRAPPER > #MENU-SIDE > span[data-link="'+pageManager.page+'"]'); + + // Contiendra l'element cible + var target = null; + + // si @section est un element, on le prends + target = (section instanceof Element) ? section : null; + + // Si string, on trouve l'element correspondant + target = (typeof section == 'string') ? document.querySelector('#WRAPPER > #MENU-SIDE > span[data-link="'+section+'"]') : target; + + // Si rien trouve, on prend le premier element correspondant a la premiere page + target = target || document.querySelector('#WRAPPER > #MENU-SIDE > span[data-link="'+pageManager.pagelist[0]+'"]'); + + // Si le param n'est toujours pas bon, on retourne une erreur + if( target == null ) return false; + + // Persistence de pageManager.vars (OPTIONNEL) + persistence = (persistence===true) ? true : false; + + /* [2] Gestion de l'affichage de l'element + ------------------------------------------------*/ + // On desactive l'element courant + current && current.remClass('active'); + // On active le nouveau + target && target.addClass('active'); + + /* [3] Gestion de pageManager + ------------------------------------------------*/ + // Si element, on recupere le data-link + var page = null; + + // Si on change de menu, on efface les données URL + if( !persistence && current != target ) + pageManager.vars = []; + + + // On charge la page si data-link trouve + if( target.getData('link') ){ + DOM.HEADER.addClass('loading'); // Animation de chargement + + + //pageManager.activeXHR.addEventListener('loadend', + + var handlerX = function(){ + + + // On gere la navigation du sous-menu (si defini, utilise) + var subSectionExists = pageManager.vars.length > 0 && document.querySelector('#CONTAINER > .sub-menu-side > [data-sublink="'+pageManager.vars[0]+'"]') != null; + if( subSectionExists ) // Si le lien du menu associe existe + navSubMenu(pageManager.vars[0]); // on charge la page associee + else // sinon + navSubMenu(null); // on charge le lien par defaut + + + // GESTION DE LA NAVIGATION DU SOUS-MENU + document.querySelector('#CONTAINER > .sub-menu-side').addEventListener('click', function(e){ + var target = e.target; + + while( target != document.body && !target.getData('sublink') ) + target = target.parentNode; + + if( target.getData('sublink') ) + navSubMenu(target); + }, false); + + }; + + /* (x) Si première ou changement de page, on charge la nouvelle */ + pageManager.page != target.getData('link') && pageManager.setPage( target.getData('link') ); + + /* (x) Si on a `pageManager.activeXHR`, on met le handler, sinon on lance */ + pageManager.activeXHR ? pageManager.activeXHR.addEventListener('loadend', handlerX, false) : handlerX.call(); + + } + +}navMenu(pageManager.page); + + + + + + + + + + + + + + + + + + + + +/* [4] Gestion de la navigation (physique) +===========================================*/ +DOM.MENUSIDE.addEventListener('click', function(e){ + var target = e.target; + + // On remonte dans les parents au bon niveau + while( target != document.body && !target.getData('link') ) + target = target.parentNode; + + // Si on a trouve l'element, on l'utilise pour la page + if( target.getData('link') ) + navMenu(target.getData('link')); +}, false); diff --git a/public_html/view/admin.php b/public_html/view/admin.php index 8978051..0e40a74 100755 --- a/public_html/view/admin.php +++ b/public_html/view/admin.php @@ -10,7 +10,8 @@ - + + @@ -21,25 +22,23 @@