diff --git a/.gitignore b/.gitignore index 01b1d46..b54b42f 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .sass-cache/ *.css.map .tags +*.swp diff --git a/build/viewer/view/group/group_groupChoice.php b/build/viewer/view/group/group_groupChoice.php index ece3b64..bf0fb93 100755 --- a/build/viewer/view/group/group_groupChoice.php +++ b/build/viewer/view/group/group_groupChoice.php @@ -1,7 +1,6 @@ @name (@type)"; - break; - - - default: return " -
- - - -
"; - break; - - } - } - - public static function view($params){ - /* [0] Initialisation des variables (vues) + public static function render(){ + /* [1] Init Twig =========================================================*/ - $view = ''; - $cluster_view = ''; + $loader = new \Twig_Loader_Filesystem(__BUILD__.'/viewer/view'); + $twig = new \Twig_Environment($loader, []); + - - - /* [1] On récupére tous les groupes utilisateur + /* [2] Store variables =========================================================*/ - /* (1) On récupère les groupe */ - $getUserClustersReq = new ModuleRequest('clusterDefault/getAll', [ - 'class' => 0 + $variables = [ + 'p_theme' => $_SESSION['WAREHOUSE']['theme'] + ]; + + /* [3] Store functions + =========================================================*/ + $twig->addFunction(new \Twig_Function('f_clusters', function($class){ + /* (1) On récupère les groupes */ + $getClustersReq = new ModuleRequest('clusterDefault/getAll', ['class' => $class]); + $getClusters = $getClustersReq->dispatch(); + + /* (2) si erreur, on retourne rien par défaut */ + if( $getClusters->error != Error::Success ) + return []; + + /* (3) On enregistre le résultat */ + return $getClusters->get('clusters'); + })); + + + /* [4] Build the whole stuff + =========================================================*/ + return $twig->render('group/group_groupChoice.twig', [ + 'p_icon' => $variables['p_icon'], + 'p_theme' => $variables['p_theme'] ]); - $getUserClusters = $getUserClustersReq->dispatch(); - - /* (2) Si on ne le trouve pas, on retourne une erreur */ - if( $getUserClusters->error != Error::Success ) - return Viewer::$htmlError; - - /* (3) On récupère les données du groupe */ - $USERCLUSTERS = $getUserClusters->get('clusters'); - - /* (4) On ajoute les données */ - foreach($USERCLUSTERS as $c=>$cluster) - $USERCLUSTERS[$c]['id_cluster'] = $cluster['id_user_cluster']; - - /* (5) On construit la vue */ - $user_view = Viewer::replaceMultiple( - self::template('clusterlist'), - $USERCLUSTERS, - [ - 'prefix' => 'u', - 'type' => 'utilisateur' - ] - ); - - - /* [2] On récupére tous les groupes machine - =========================================================*/ - /* (1) On récupère les groupe */ - $getMachineClustersReq = new ModuleRequest('clusterDefault/getAll', [ - 'class' => 1 - ]); - $getMachineClusters = $getMachineClustersReq->dispatch(); - - /* (2) Si on ne le trouve pas, on retourne une erreur */ - if( $getMachineClusters->error != Error::Success ) - return Viewer::$htmlError; - - /* (3) On récupère les données du groupe */ - $MACHINECLUSTERS = $getMachineClusters->get('clusters'); - - /* (4) On ajoute les données */ - foreach($MACHINECLUSTERS as $c=>$cluster) - $MACHINECLUSTERS[$c]['id_cluster'] = $cluster['id_machine_cluster']; - - /* (5) On construit la vue */ - $machine_view = Viewer::replaceMultiple( - self::template('clusterlist'), - $MACHINECLUSTERS, - [ - 'prefix' => 'm', - 'type' => 'machine' - ] - ); - - - /* [3] On renvoie la vue globale - =========================================================*/ - return Viewer::replaceSingle( - self::template(), [ - 'clusters' => $user_view.$machine_view - ] - ); } - - - - - - } diff --git a/build/viewer/view/group/group_groupChoice.twig b/build/viewer/view/group/group_groupChoice.twig new file mode 100644 index 0000000..ec253bb --- /dev/null +++ b/build/viewer/view/group/group_groupChoice.twig @@ -0,0 +1,16 @@ +
+ + + +
diff --git a/build/viewer/view/group/group_view.php b/build/viewer/view/group/group_view.php index 2a6cd42..decfd76 100755 --- a/build/viewer/view/group/group_view.php +++ b/build/viewer/view/group/group_view.php @@ -1,210 +1,72 @@ - @name - - "; - break; - case 'user': return " - - @username - - "; - break; - - - - case 'machine_cluster': return " -
- - @name - @icon_remove - - @icon_edit - - - @icon_type - @members - - - - @icon_group - @machines - + - - -
"; - break; - - - - case 'user_cluster': return " -
- - @name - @icon_remove - - @icon_edit - - - @icon_type - @members - - - - @icon_group - @users - + - - -
"; - break; - - - default: return " - - @clusterlist"; - break; - - } - } - - public static function view($params){ - $view = ''; - - /* [1] On récupère la liste des groupes d'utilisatuers + public static function render(){ + /* [1] Init Twig =========================================================*/ - /* (1) On récupère les groupes */ - $getAllUsersReq = new ModuleRequest('clusterDefault/getAll', ['class' => 0]); - $getAllUsers = $getAllUsersReq->dispatch(); + $loader = new \Twig_Loader_Filesystem(__BUILD__.'/viewer/view'); + $twig = new \Twig_Environment($loader, []); + - /* (2) si erreur, on affiche l'explicitation */ - if( $getAllUsers->error != Error::Success ) - return Viewer::$htmlError; - - /* (3) On enregistre le résultat */ - $USERCLUSTERS = $getAllUsers->get('clusters'); - - - - /* [2] On récupère la liste des groupes de machines + /* [2] Store variables =========================================================*/ - /* (1) On récupère les groupes */ - $getAllMachinesReq = new ModuleRequest('clusterDefault/getAll', ['class' => 1]); - $getAllMachines = $getAllMachinesReq->dispatch(); + $variables = [ + 'p_icon' => [ + 'remove' => file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/remove.svg' ), + 'edit' => file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/edit.svg' ), + 'type' => file_get_contents( __PUBLIC__.'/src/static/menu-side/type.svg' ), + 'group' => file_get_contents( __PUBLIC__.'/src/static/container/group.svg' ) + ], - /* (2) si erreur, on affiche l'explicitation */ - if( $getAllMachines->error != Error::Success ) - return Viewer::$htmlError; + 'p_theme' => $_SESSION['WAREHOUSE']['theme'] + ]; - /* (3) On enregistre le résultat */ - $MACHINECLUSTERS = $getAllMachines->get('clusters'); - - - /* [3] On crée la vue avec les groupes d'utilisateurs + /* [3] Store functions =========================================================*/ - foreach($USERCLUSTERS as $u=>$cluster){ - /* (1) On récupère les members */ + $twig->addFunction(new \Twig_Function('f_clusters', function($class){ + /* (1) On récupère les groupes */ + $getClustersReq = new ModuleRequest('clusterDefault/getAll', ['class' => $class]); + $getClusters = $getClustersReq->dispatch(); + + /* (2) si erreur, on retourne rien par défaut */ + if( $getClusters->error != Error::Success ) + return []; + + /* (3) On enregistre le résultat */ + return $getClusters->get('clusters'); + })); + + $twig->addFunction(new \Twig_Function('f_members', function($id_cluster, $class){ $membersReq = new ModuleRequest('clusterDefault/getMembers', [ - 'id_cluster' => $cluster['id_user_cluster'], - 'class' => 0 + 'id_cluster' => (int) $id_cluster, + 'class' => $class ]); + $membersRes = $membersReq->dispatch(); + // + // si erreur, on affiche rien par défaut + if( $membersRes->error != Error::Success ) + return []; - /* (2) Gestion si erreur */ - if( $membersRes->error == Error::Success ) $members = $membersRes->get('members'); - else $members = []; - - /* (3) On crées les vues des membres (utilisateurs) */ - $USERCLUSTERS[$u]['users'] = Viewer::replaceMultiple( - self::template('user'), - $members, - [ 'id_cluster' => 'u'.$cluster['id_user_cluster'] ] - ); - - /* (4) On ajoute les attributs utiles */ - $USERCLUSTERS[$u]['id_cluster'] = 'u'.$cluster['id_user_cluster']; - $USERCLUSTERS[$u]['members'] = (count($members)<2) ? count($members).' utilisateur' : count($members).' utilisateurs'; - $USERCLUSTERS[$u]['icon_type'] = file_get_contents(__PUBLIC__.'/src/static/menu-side/users.svg'); - } - - /* (5) On crée la vue de la liste des tous les groupes d'utilisateurs */ - $user_clusters = Viewer::replaceMultiple( - self::template('user_cluster'), - $USERCLUSTERS, [ - 'icon_type' => file_get_contents( __PUBLIC__.'/src/static/menu-side/users.svg' ), - 'icon_remove' => file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/remove.svg' ), - 'icon_group' => file_get_contents( __PUBLIC__.'/src/static/container/group.svg' ), - 'icon_edit' => file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/edit.svg' ) - ]); + return $membersRes->get('members'); + })); - - - - /* [4] On crée la vue avec les groupes de machines + /* [4] Build the whole stuff =========================================================*/ - foreach($MACHINECLUSTERS as $u=>$cluster){ - /* (1) On récupère les members */ - $membersReq = new ModuleRequest('clusterDefault/getMembers', [ - 'id_cluster' => $cluster['id_machine_cluster'], - 'class' => 1 - ]); - $membersRes = $membersReq->dispatch(); - - /* (2) Gestion si erreur */ - if( $membersRes->error == Error::Success ) $members = $membersRes->get('members'); - else $members = []; - - /* (3) On crées les vues des membres (machines) */ - $MACHINECLUSTERS[$u]['machines'] = Viewer::replaceMultiple( - self::template('machine'), - $members, - [ 'id_cluster' => 'm'.$cluster['id_machine_cluster'] ] - ); - - /* (4) On ajoute les attributs utiles */ - $MACHINECLUSTERS[$u]['id_cluster'] = 'm'.$cluster['id_machine_cluster']; - $MACHINECLUSTERS[$u]['members'] = (count($members)<2) ? count($members).' machine' : count($members).' machines'; - $MACHINECLUSTERS[$u]['icon_type'] = file_get_contents(__PUBLIC__.'/src/static/menu-side/machines.svg'); - } - - /* (5) On crée la vue de la liste des tous les groupes de machines */ - $machine_clusters = Viewer::replaceMultiple( - self::template('machine_cluster'), - $MACHINECLUSTERS, [ - 'icon_type' => file_get_contents( __PUBLIC__.'/src/static/menu-side/device.svg' ), - 'icon_remove' => file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/remove.svg' ), - 'icon_group' => file_get_contents( __PUBLIC__.'/src/static/container/group.svg' ), - 'icon_edit' => file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/edit.svg' ) + return $twig->render('group/group_view.twig', [ + 'p_icon' => $variables['p_icon'], + 'p_theme' => $variables['p_theme'] ]); - - - - - - return Viewer::replaceSingle(self::template(), [ 'clusterlist' => $user_clusters.''.$machine_clusters ]); } - - - - - - } diff --git a/build/viewer/view/group/group_view.twig b/build/viewer/view/group/group_view.twig new file mode 100644 index 0000000..1fd57e8 --- /dev/null +++ b/build/viewer/view/group/group_view.twig @@ -0,0 +1,69 @@ + + + +{% for user_cluster in f_clusters(0) %} + + {% set id_user_cluster = 'u' ~ user_cluster.id_user_cluster %} + {% set memlen = f_members(user_cluster.id_user_cluster,0) | length %} + +
+ + {{ user_cluster.name }} + {{ p_icon.remove | raw }} + + {{ p_icon.edit | raw }} + + + {{ p_icon.type | raw }} + {{ memlen }} utilisateur{% if memlen > 1 %}s{% endif %} + + + + {{ p_icon.group | raw }} + + {% for user in f_members(user_cluster.id_user_cluster, 0) %} + + {{ user.username }} + + + {% endfor %} + + + + + +
+{% endfor %} + + +{% for machine_cluster in f_clusters(1) %} + + {% set id_machine_cluster = 'm' ~ machine_cluster.id_machine_cluster %} + {% set memlen = f_members(machine_cluster.id_machine_cluster,1) | length %} + +
+ + {{ machine_cluster.name }} + {{ p_icon.remove | raw }} + + {{ p_icon.edit | raw }} + + + {{ p_icon.type | raw }} + {{ memlen }} machine{% if memlen > 1 %}s{% endif %} + + + + {{ p_icon.group | raw }} + + {% for machine in f_members(machine_cluster.id_machine_cluster,1) %} + + {{ machine.name }} + + + {% endfor %} + + + + + +
+{% endfor %} diff --git a/build/viewer/view/machine/machine_groups.php b/build/viewer/view/machine/machine_groups.php index 45c8137..2de434d 100755 --- a/build/viewer/view/machine/machine_groups.php +++ b/build/viewer/view/machine/machine_groups.php @@ -8,109 +8,67 @@ class machine_groups{ - public static function template($type=null){ - - switch($type){ - case 'machine': return " - - @name - - "; - break; - - - case 'machine_cluster': return " -
- - @name - @icon_remove - - @icon_edit - - - @icon_type - @count machines - - - - @icon_group - @machines - + - - -
"; - break; - - - default: return " - - @clusterlist"; - break; - - } - } - - public static function view($params){ - $view = ''; - - /* [1] On récupère la liste des utilisateurs + public static function render(){ + /* [1] Init Twig =========================================================*/ - $request = new ModuleRequest('clusterDefault/getAll', [ - 'class' => 1 - ]); - $answer = $request->dispatch(); + $loader = new \Twig_Loader_Filesystem(__BUILD__.'/viewer/view'); + $twig = new \Twig_Environment($loader, []); + - // si erreur, on affiche l'explicitation - if( $answer->error != Error::Success ) - return Viewer::$htmlError; + /* [2] Store variables + =========================================================*/ + $variables = [ + 'p_icon' => [ + 'remove' => file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/remove.svg' ), + 'edit' => file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/edit.svg' ), + 'device' => file_get_contents( __PUBLIC__.'/src/static/menu-side/device.svg' ), + 'group' => file_get_contents( __PUBLIC__.'/src/static/container/group.svg' ) + ], - $CLUSTERLIST = $answer->get('clusters'); + 'p_theme' => $_SESSION['WAREHOUSE']['theme'] + ]; + /* [3] Store functions + =========================================================*/ + $twig->addFunction(new \Twig_Function('f_clusters', function(){ + $request = new ModuleRequest('clusterDefault/getAll', [ + 'class' => 1 + ]); + + $answer = $request->dispatch(); - foreach($CLUSTERLIST as $c=>$cluster){ - $machinesReq = new ModuleRequest('clusterDefault/getMembers', [ - 'id_cluster' => $cluster['id_machine_cluster'], + // si erreur, on affiche rien par défaut + if( $answer->error != Error::Success ) + return []; + + return $answer->get('clusters'); + + })); + + $twig->addFunction(new \Twig_Function('f_machines', function($id_cluster){ + $usersReq = new ModuleRequest('clusterDefault/getMembers', [ + 'id_cluster' => (int) $id_cluster, 'class' => 1 ]); - $machinesRes = $machinesReq->dispatch(); + + $usersRes = $usersReq->dispatch(); + // si erreur, on affiche rien par défaut + if( $usersRes->error != Error::Success ) + return []; - /* (2) Gestion si erreur */ - if( $machinesRes->error == Error::Success ) $machines = $machinesRes->get('members'); - else $machines = []; - - $CLUSTERLIST[$c]['count'] = count($machines); - - $CLUSTERLIST[$c]['machines'] = Viewer::replaceMultiple( - self::template('machine'), - $machines, - [ 'id_cluster' => $cluster['id_machine_cluster'] ] - ); - } + return $usersRes->get('members'); + })); - $view_cluster = Viewer::replaceMultiple( - self::template('machine_cluster'), - $CLUSTERLIST, [ - 'icon_remove' => file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/remove.svg' ), - 'icon_edit' => file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/edit.svg' ), - 'icon_type' => file_get_contents( __PUBLIC__.'/src/static/menu-side/device.svg' ), - 'icon_group' => file_get_contents( __PUBLIC__.'/src/static/container/group.svg' ), + /* [4] Build the whole stuff + =========================================================*/ + return $twig->render('machine/machine_groups.twig', [ + 'p_icon' => $variables['p_icon'], + 'p_theme' => $variables['p_theme'] ]); - - - - - - return Viewer::replaceSingle(self::template(), [ 'clusterlist' => $view_cluster ]); } - - - - - - } diff --git a/build/viewer/view/machine/machine_groups.twig b/build/viewer/view/machine/machine_groups.twig new file mode 100644 index 0000000..928bafc --- /dev/null +++ b/build/viewer/view/machine/machine_groups.twig @@ -0,0 +1,29 @@ + + +{% for cluster in f_clusters() %} +
+ + {{ cluster.name }} + {{ p_icon.remove | raw }} + + {{ p_icon.edit | raw }} + + + {{ p_icon.device | raw }} + {{ f_machines(cluster.id_machine_cluster) | length }} machines + + + + {{ p_icon.group | raw }} + + {% for machine in f_machines(cluster.id_machine_cluster) %} + + {{ machine.name }} + + + {% endfor %} + + + + +
+{% endfor %} diff --git a/build/viewer/view/machine/machine_view.php b/build/viewer/view/machine/machine_view.php index c9ee3f9..3208c78 100755 --- a/build/viewer/view/machine/machine_view.php +++ b/build/viewer/view/machine/machine_view.php @@ -8,41 +8,58 @@ class machine_view{ - public static function template($type=null){ + public static function render(){ + /* [1] Init Twig + =========================================================*/ + $loader = new \Twig_Loader_Filesystem(__BUILD__.'/viewer/view'); + $twig = new \Twig_Environment($loader, []); + - switch($type){ - case 'cluster': return " - - @name - - "; - break; + /* [2] Store variables + =========================================================*/ + $variables = [ + 'p_icon' => [ + 'remove' => file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/remove.svg' ), + 'edit' => file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/edit.svg' ), + 'group' => file_get_contents( __PUBLIC__.'/src/static/container/group.svg' ) + ], + + 'p_theme' => $_SESSION['WAREHOUSE']['theme'] + ]; + + /* [3] Store functions + =========================================================*/ + $twig->addFunction(new \Twig_Function('f_machines', function(){ + $request = new ModuleRequest('machineDefault/getAll'); // On utilise la methode 'getAll' du module 'machineDefault' + $answer = $request->dispatch(); // On recupere la reponse + // si erreur, on affiche rien par défaut + if( $answer->error != Error::Success ) + return []; + + return $answer->get('machines'); + })); + + $twig->addFunction(new \Twig_Function('f_clusters', function($id_machine){ + $clustersReq = new ModuleRequest('machineDefault/getClusters', [ + 'id_machine' => (int) $id_machine + ]); + + $clustersRes = $clustersReq->dispatch(); + + // si erreur, on affiche rien par défaut + if( $clustersRes->error != Error::Success ) + return []; + + return $clustersRes->get('clusters'); + })); - - case 'machine': return " -
- - @name #@name - @icon_remove - - @icon_edit - - - @icon_group - @grouplist - - -
"; - break; - - - default: return " - - @machinelist"; - break; - - } + /* [4] Build the whole stuff + =========================================================*/ + return $twig->render('machine/machine_view.twig', [ + 'p_icon' => $variables['p_icon'], + 'p_theme' => $variables['p_theme'] + ]); } public static function view($params){ @@ -50,15 +67,7 @@ /* [1] On récupère la liste des machines =========================================================*/ - $request = new ModuleRequest('machineDefault/getAll'); // On utilise la methode 'getAll' du module 'machineDefault' - $answer = $request->dispatch(); // On recupere la reponse - - // si erreur, on affiche l'explicitation - if( $answer->error != Error::Success ) - return Viewer::$htmlError; - - $MACHINELIST = $answer->get('machines'); - + foreach($MACHINELIST as $u=>$machine){ $clustersReq = new ModuleRequest('machineDefault/getClusters', [ 'id_machine' => $machine['id_machine'] ]); diff --git a/build/viewer/view/machine/machine_view.twig b/build/viewer/view/machine/machine_view.twig new file mode 100644 index 0000000..d6fc032 --- /dev/null +++ b/build/viewer/view/machine/machine_view.twig @@ -0,0 +1,23 @@ + + +{% for machine in f_machines() %} +
+ + {{ machine.name }} #{{ machine.name }} + {{ p_icon.remove | raw }} + + {{ p_icon.edit | raw }} + + + {{ p_icon.group | raw }} + + {% for cluster in f_clusters(machine.id_machine) %} + + {{ cluster.name }} + + + {% endfor %} + + +
+{% endfor %} diff --git a/public_html/css/font.scss b/public_html/css/font.scss new file mode 100644 index 0000000..8987955 --- /dev/null +++ b/public_html/css/font.scss @@ -0,0 +1,46 @@ +@font-face{ + font-family: 'Open Sans'; + src: url('/css/font/Open Sans/r.ttf'); + font-weight: normal; + font-style: normal; +} + + +@font-face{ + font-family: 'Open Sans'; + src: url('/css/font/Open Sans/b.ttf'); + font-weight: bold; + font-style: normal; +} + + +@font-face{ + font-family: 'Open Sans'; + src: url('/css/font/Open Sans/i.ttf'); + font-weight: normal; + font-style: italic; +} + + +@font-face{ + font-family: 'Open Sans'; + src: url('/css/font/Open Sans/bi.ttf'); + font-weight: bold; + font-style: italic; +} + + +@font-face{ + font-family: 'Open Sans'; + src: url('/css/font/Open Sans/L.ttf'); + font-weight: lighter; + font-style: normal; +} + + +@font-face{ + font-family: 'Open Sans'; + src: url('/css/font/Open Sans/Li.ttf'); + font-weight: lighter; + font-style: italic; +} diff --git a/public_html/css/font/Open Sans/Apache License.txt b/public_html/css/font/Open Sans/Apache License.txt new file mode 100644 index 0000000..989e2c5 --- /dev/null +++ b/public_html/css/font/Open Sans/Apache License.txt @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/public_html/css/font/Open Sans/L.ttf b/public_html/css/font/Open Sans/L.ttf new file mode 100644 index 0000000..0d38189 Binary files /dev/null and b/public_html/css/font/Open Sans/L.ttf differ diff --git a/public_html/css/font/Open Sans/Li.ttf b/public_html/css/font/Open Sans/Li.ttf new file mode 100644 index 0000000..68299c4 Binary files /dev/null and b/public_html/css/font/Open Sans/Li.ttf differ diff --git a/public_html/css/font/Open Sans/R.ttf b/public_html/css/font/Open Sans/R.ttf new file mode 100644 index 0000000..db43334 Binary files /dev/null and b/public_html/css/font/Open Sans/R.ttf differ diff --git a/public_html/css/font/Open Sans/b.ttf b/public_html/css/font/Open Sans/b.ttf new file mode 100644 index 0000000..fd79d43 Binary files /dev/null and b/public_html/css/font/Open Sans/b.ttf differ diff --git a/public_html/css/font/Open Sans/bi.ttf b/public_html/css/font/Open Sans/bi.ttf new file mode 100644 index 0000000..9bc8009 Binary files /dev/null and b/public_html/css/font/Open Sans/bi.ttf differ diff --git a/public_html/css/font/Open Sans/i.ttf b/public_html/css/font/Open Sans/i.ttf new file mode 100644 index 0000000..c90da48 Binary files /dev/null and b/public_html/css/font/Open Sans/i.ttf differ diff --git a/public_html/css/min/fonts.css b/public_html/css/min/fonts.css new file mode 100644 index 0000000..7fb19bd --- /dev/null +++ b/public_html/css/min/fonts.css @@ -0,0 +1,38 @@ +@font-face { + font-family: 'Open Sans'; + src: url("/css/font/Open Sans/r.ttf"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'Open Sans'; + src: url("/css/font/Open Sans/b.ttf"); + font-weight: bold; + font-style: normal; +} +@font-face { + font-family: 'Open Sans'; + src: url("/css/font/Open Sans/i.ttf"); + font-weight: normal; + font-style: italic; +} +@font-face { + font-family: 'Open Sans'; + src: url("/css/font/Open Sans/bi.ttf"); + font-weight: bold; + font-style: italic; +} +@font-face { + font-family: 'Open Sans'; + src: url("/css/font/Open Sans/L.ttf"); + font-weight: lighter; + font-style: normal; +} +@font-face { + font-family: 'Open Sans'; + src: url("/css/font/Open Sans/Li.ttf"); + font-weight: lighter; + font-style: italic; +} + +/*# sourceMappingURL=fonts.css.map */ diff --git a/public_html/view/groups.php b/public_html/view/groups.php index 53d44f3..a355aef 100755 --- a/public_html/view/groups.php +++ b/public_html/view/groups.php @@ -61,7 +61,6 @@ echo "
"; - debug(); $clusterView = new Viewer('group.view', []); $clusterView->view(); diff --git a/public_html/view/js/machines.js b/public_html/view/js/machines.js index 8f5283f..93cc82c 100755 --- a/public_html/view/js/machines.js +++ b/public_html/view/js/machines.js @@ -1,8 +1,8 @@ // On referencie toutes les sections var section = { view: { - text: '#CONTAINER > section[data-sublink="view"] ', - element: document.querySelector('#CONTAINER > section[data-sublink="view"]'), + text: '#CONTAINER > section[data-sublink="view"] ', + element: document.querySelector('#CONTAINER > section[data-sublink="view"]'), searchbar: document.querySelector('#CONTAINER > section[data-sublink="view"] > .searchbar') },