logauth
/
SMMP
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: logauth:master
Branches Tags
logauth:master
logauth:nginx
logauth:dev
logauth:history-details
logauth:api-refactor
logauth:generic-view
logauth:session-guard
logauth:generic
logauth:kahlan
logauth:phpunit
logauth:feature/SATS/raspberry-clone
logauth:feature/SMMP/end-design
logauth:feature/sha512
logauth:origin/feature/sha512
logauth:feature/SATS/gpio-devices
logauth:upgrade-2.0
logauth:0.9-2
..
compare: logauth:nginx
Branches Tags
logauth:master
logauth:nginx
logauth:dev
logauth:history-details
logauth:api-refactor
logauth:generic-view
logauth:session-guard
logauth:generic
logauth:kahlan
logauth:phpunit
logauth:feature/SATS/raspberry-clone
logauth:feature/SMMP/end-design
logauth:feature/sha512
logauth:origin/feature/sha512
logauth:feature/SATS/gpio-devices
logauth:upgrade-2.0
logauth:0.9-2

No commits in common. "master" and "nginx" have entirely different histories.
master ... nginx

16 changed files with 55 additions and 49 deletions
Show Stats Expand all files Collapse all files

19
build/generic/view/group/view/main.twig
View File

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

2
build/generic/view/machine/group/main.twig
View File

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

2
build/generic/view/settings/admin/create/main.twig
View File

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

2
build/generic/view/user/group/main.twig
View File

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

2
build/orm/core/Rows.php
View File

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

16
public_html/css/container.scss
View File

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

5
public_html/css/layout.scss
View File

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

4
public_html/css/min/constants.css
View File

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

18
public_html/css/min/container.css
View File

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

4
public_html/css/min/font.css
View File

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

4
public_html/css/min/global.css
View File

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

4
public_html/css/min/header.css
View File

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

10
public_html/css/min/layout.css
View File

@ -68,11 +68,9 @@
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;
flex-flow: column nowrap;
justify-content: space-between; }
z-index: 101; }
#WRAPPER > #POPUP.active {
display: flex; }
display: block; }
#WRAPPER > #POPUP > .header {
display: block;
position: relative;
@ -116,4 +114,6 @@
z-index: 100; }
#WRAPPER #POPUP.active ~ #POPUP-BG {
display: block; }
/*# sourceMappingURL=layout.css.map */
/*# sourceMappingURL= layout.css.map */

4
public_html/css/min/menu-side.css
View File

@ -57,4 +57,6 @@
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 */

4
public_html/css/min/reset.css
View File

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

4
public_html/css/min/submenu-side.css
View File

@ -38,4 +38,6 @@
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 */