fix

build/generic/view/group/view/main.twig

@@ -1,12 +1,12 @@
 {% block search_bar %} <input type='text' class='searchbar' placeholder='Recherche'> {% endblock %}
 
-{% set noresult = true %}
+{% set count = 0 %}
 
-{% block user_cluster_list %}
+{# {% block user_cluster_list %} #}
 
 	{% for user_cluster in core.get_clusters(0) %}
 
-		{% set noresult = false %}
+		{% set count = count + 1 %}
 
 		{% set id_user_cluster = 'u' ~ user_cluster.id_user_cluster %}
 		{% set memlen = core.get_members(user_cluster.id_user_cluster,0) | length %}
@@ -58,15 +58,16 @@
 
 	{% endfor %}
 
-{% endblock %}
+{# {% endblock %} #}
 
 
 
-{% block machines_cluster_list %}
+{# {% block machines_cluster_list %} #}
 
 	{% for machine_cluster in core.get_clusters(1) %}
 
-		{% set noresult = false %}
+		{% set count = count + 1 %}
+
 
 		{% set id_machine_cluster = 'm' ~ machine_cluster.id_machine_cluster %}
 		{% set memlen = core.get_members(machine_cluster.id_machine_cluster,1) | length %}
@@ -132,16 +133,16 @@
 
 	{% endfor %}
 
-{% endblock %}
+{# {% endblock %} #}
 
 
 {# if no result #}
-{% if noresult %}
+{% if count <= 0 %}
 
 	{% block no_result %}
 
 		<article class='inline-box'>
-			<span>Aucun groupe trouvé</span>
+			<span>Aucun résultat {{ count }}</span>
 		</article>
 
 	{% endblock %}

build/generic/view/machine/group/main.twig

@@ -72,7 +72,7 @@
 		 {% block no_result %}
 
 			<article class='inline-box'>
-				<span>Aucun groupe trouvé.</span>
+				<span>Aucun groupe machine trouvé.</span>
 			</article>
 
 		{% endblock %}

build/generic/view/settings/admin/create/main.twig

@@ -12,7 +12,7 @@
 
 	{% block generated %}
 
-		<input id='admin_password' type='text' placeholder='Mot de passe généré...' disabled><br>
+		<input id='admin_password' type='text' placeholder='Mot de passe généré...'><br>
 
 	{% endblock %}
 

build/generic/view/user/group/main.twig

@@ -55,7 +55,7 @@
 		{% block no_result %}
 
 			<article class='inline-box'>
-				<span>Aucun groupe trouvé.</span>
+				<span>Aucun groupe utilisateur trouvé.</span>
 			</article>
 
 		{% endblock %}

build/orm/core/Rows.php

@@ -237,7 +237,7 @@
 			/* [3] If `IN` condition
 			=========================================================*/
 			$defaultWhere = $this->where;
-			$inCond = count($args[0]) > 1 && is_array($args[0][0]) && $args[0][1] == self::COND_IN;
+			$inCond = is_array($args[0]) && count($args[0]) > 1 && is_array($args[0][0]) && $args[0][1] == self::COND_IN;
 
 			// erreur
 			if( is_array($args[0][0]) && !$inCond )

public_html/css/container.scss

@@ -13,10 +13,11 @@
 	// @active + .list
 	& > section.active{
 		display: flex;
-		flex-direction: row;
+		flex-flow:       row wrap;
-		align-items: flex-start;
+
 		justify-content: flex-start;
-		flex-wrap: wrap;
+		align-items:     stretch;
+		align-content:   flex-start;
 
 		&.contain-check-table{
 			flex-direction: column;
@@ -25,11 +26,13 @@
 		}
 
 		.inline-box{
-			flex: 0 0 1;
+			flex: 1 1 20%;
+			height: auto;
+			min-height: 10em;
 		}
 
 		.inline-row{
-			flex: 3em 0 0;
+			flex: 0 0 2.3em;
 		}
 
 		// Barre de recherche
@@ -62,7 +65,7 @@
 		.error, .in-dev{
 			display: inline-block;
 			position: relative;
-				width: calc( 100% - 2*1em - 2*1em );
+				// width: calc( 100% - 2*1em - 2*1em );
 				height: 1em;
 			margin: 1em;
 			padding: 1em;
@@ -96,6 +99,7 @@
 		position: relative;
 			// width: calc( 50% - 2*1em - 2*1em );
 			flex: calc( 50% - 2*1em - 2*1em );
+			height: auto;
 			margin: 1em;
 			padding: 1em;
 

public_html/css/layout.scss

@@ -100,8 +100,11 @@
 
 		z-index: 101;
 
+		flex-flow: column nowrap;
+		justify-content: space-between;
+
 		&.active{
-			display: block;
+			display: flex;
 		}
 
 

public_html/css/min/constants.css

@@ -3,6 +3,4 @@
 /* COULEUR DES ERREURS */
 /* FORMULAIRES */
 /* GESTION DES LONGUEURS */
- 
+/*# sourceMappingURL=constants.css.map */
-
- /*# sourceMappingURL= constants.css.map */

public_html/css/min/container.css

@@ -20,18 +20,20 @@
     flex-grow: 1; }
   #WRAPPER > #CONTAINER > section.active {
     display: flex;
-    flex-direction: row;
+    flex-flow: row wrap;
-    align-items: flex-start;
     justify-content: flex-start;
-    flex-wrap: wrap; }
+    align-items: stretch;
+    align-content: flex-start; }
     #WRAPPER > #CONTAINER > section.active.contain-check-table {
       flex-direction: column;
       flex-wrap: nowrap;
       align-items: center; }
     #WRAPPER > #CONTAINER > section.active .inline-box {
-      flex: 0 0 1; }
+      flex: 1 1 20%;
+      height: auto;
+      min-height: 10em; }
     #WRAPPER > #CONTAINER > section.active .inline-row {
-      flex: 3em 0 0; }
+      flex: 0 0 2.3em; }
     #WRAPPER > #CONTAINER > section.active .searchbar {
       display: inline-block;
       position: relative;
@@ -49,7 +51,6 @@
     #WRAPPER > #CONTAINER > section.active .error, #WRAPPER > #CONTAINER > section.active .in-dev {
       display: inline-block;
       position: relative;
-      width: calc( 100% - 2*1em - 2*1em);
       height: 1em;
       margin: 1em;
       padding: 1em;
@@ -67,6 +68,7 @@
     display: inline-block;
     position: relative;
     flex: calc( 50% - 2*1em - 2*1em);
+    height: auto;
     margin: 1em;
     padding: 1em;
     border-radius: 3px;
@@ -665,6 +667,4 @@
       color: #444; }
       #WRAPPER > #CONTAINER article.timeline.container div.timeline.infobox.active {
         display: block; }
- 
+/*# sourceMappingURL=container.css.map */
-
- /*# sourceMappingURL= container.css.map */

public_html/css/min/font.css

@@ -39,6 +39,4 @@
   src: url("/css/font/Open Sans/Li.ttf");
   font-weight: 100;
   font-style: italic; }
- 
+/*# sourceMappingURL=font.css.map */
-
- /*# sourceMappingURL= font.css.map */

public_html/css/min/global.css

@@ -272,6 +272,4 @@ hr.OR.search {
   .search > hr.OR:before,
   hr.OR.search:before {
     color: #5630ed; }
- 
+/*# sourceMappingURL=global.css.map */
-
- /*# sourceMappingURL= global.css.map */

public_html/css/min/header.css

@@ -34,6 +34,4 @@
     cursor: pointer; }
     #WRAPPER > #HEADER > .logout-icon:hover {
       background-image: url("/src/static/logout@ffffff.svg"); }
- 
+/*# sourceMappingURL=header.css.map */
-
- /*# sourceMappingURL= header.css.map */

public_html/css/min/layout.css

@@ -68,9 +68,11 @@
     box-shadow: -10px 10px 0 rgba(26, 33, 40, 0.8);
     -webkit-transform: translateX(-50%) translateY(-50%);
     transform: translateX(-50%) translateY(-50%);
-    z-index: 101; }
+    z-index: 101;
+    flex-flow: column nowrap;
+    justify-content: space-between; }
     #WRAPPER > #POPUP.active {
-      display: block; }
+      display: flex; }
     #WRAPPER > #POPUP > .header {
       display: block;
       position: relative;
@@ -114,6 +116,4 @@
     z-index: 100; }
   #WRAPPER #POPUP.active ~ #POPUP-BG {
     display: block; }
- 
+/*# sourceMappingURL=layout.css.map */
-
- /*# sourceMappingURL= layout.css.map */

public_html/css/min/menu-side.css

@@ -57,6 +57,4 @@
       fill: #000 !important; }
     #WRAPPER > #MENU-SIDE > span[data-link]:hover svg #stroke-stylisable, #WRAPPER > #MENU-SIDE > span[data-link].active svg #stroke-stylisable {
       stroke: #000 !important; }
- 
+/*# sourceMappingURL=menu-side.css.map */
-
- /*# sourceMappingURL= menu-side.css.map */

public_html/css/min/reset.css

@@ -370,6 +370,4 @@ table {
 td,
 th {
   padding: 0; }
- 
+/*# sourceMappingURL=reset.css.map */
-
- /*# sourceMappingURL= reset.css.map */

public_html/css/min/submenu-side.css

@@ -38,6 +38,4 @@
         fill: #121213 !important; }
   #CONTAINER > .sub-menu-side > span[data-sublink]:nth-child(1) {
     margin-top: 1em; }
- 
+/*# sourceMappingURL=submenu-side.css.map */
-
- /*# sourceMappingURL= submenu-side.css.map */