Skip to content

Commit

Permalink
Merge pull request #371 from npds/v16.0.2-beta-dev
Browse files Browse the repository at this point in the history 
V16.0.2 beta dev
  • Loading branch information
@jipexu
jipexu committed Oct 20, 2018
2 parents 9cb59c5 + c247419 commit c0b0a4e
Show file tree
Hide file tree
Showing 8 changed files with 125 additions and 74 deletions.
5 changes: 2 additions & 3 deletions revolution_16/admin/authors.php
View file
Expand Up @@ -227,7 +227,7 @@ function displayadmins() {
callback: {
message: "Ce surnom n\'est pas disponible",
callback: function(input) {
if($.inArray(input.value, admin) !== -1)
if($.inArray(btoa(input.value), admin) !== -1)
return false;
else
return true;
Expand All @@ -240,7 +240,7 @@ function displayadmins() {
callback: {
message: "Ce nom n\'est pas disponible",
callback: function(input) {
if($.inArray(input.value, adminname) !== -1)
if($.inArray(btoa(input.value), adminname) !== -1)
return false;
else
return true;
Expand All @@ -256,7 +256,6 @@ function displayadmins() {
}
},';


adminfoot('fv',$fv_parametres,$arg1,'');
}

Expand Down
12 changes: 7 additions & 5 deletions revolution_16/mainfile.php
View file
Expand Up @@ -3043,17 +3043,19 @@ function auto_complete ($nom_array_js, $nom_champ, $nom_tabl, $id_inpu, $temps_c
$res = Q_select("SELECT ".$nom_champ." FROM ".$NPDS_Prefix.$nom_tabl,$temps_cache);
while (list(,$ar_data)=each($res)) {
foreach ($ar_data as $val_champ) {
$list_json.='"'.$val_champ.'",';
if($id_inpu =='')
$list_json.='"'.base64_encode($val_champ).'",';
else
$list_json.='"'.$val_champ.'",';
}
}
$list_json= rtrim($list_json,',');
$list_json.='];';
$scri_js ='';
if($id_inpu =='') {
$scri_js .=$list_json;
}
if($id_inpu =='')
$scri_js .= $list_json;
else {
$scri_js.='
$scri_js.='
<script type="text/javascript">
//<![CDATA[
$(function() {
Expand Down
3 changes: 1 addition & 2 deletions revolution_16/modules/archive-stories/admin/archive-stories_set.php
View file
Expand Up @@ -107,8 +107,7 @@ function ConfigureArchive($ModPath, $ModStart, $f_meta_nom, $f_titre, $adminimg)
message: "0-9"
}
}
},
';
},';
$arg1='
var formulid=["archiveadm"];
inpandfieldlen("arch_titre",400);';
Expand Down
7 changes: 0 additions & 7 deletions revolution_16/modules/sform/extend-user/extender/formulaire.php
View file
Expand Up @@ -49,22 +49,15 @@


$m->add_comment(aff_langue('<div class="row"><p class="lead">[french]En savoir plus[/french][english]More[/english][spanish]M&#xE1;s[/spanish][german]Mehr[/german]</p></div>'));

$m->add_field('C1', aff_langue('[french]Activit&#x00E9; professionnelle[/french][english]Professional activity[/english][spanish]Actividad profesional[/spanish][german]Berufliche T&#xE4;tigkeit[/german]'),$C1,'text',false,100,'','');
$m->add_extender('C1', '', '<span class="help-block text-right" id="countcar_C1"></span>');

$m->add_field('C2',aff_langue('[french]Code postal[/french][english]Postal code[/english][spanish]C&#xF3;digo postal[/spanish][german]Postleitzahl[/german]'), $C2, 'text',false,5,'','');
$m->add_extender('C2', '', '<span class="help-block text-right" id="countcar_C2"></span>');

//$m->add_extra('<div class="input-group date">');
$m->add_date('T1', aff_langue('[french]Date de naissance[/french][english]Birth date[/english][spanish]Fecha de nacimiento[/spanish][german]Geburtsdatum[/german]'),$T1,'date','',false,20);
$m->add_extender('T1', '','<span class="help-block">JJ/MM/AAAA</span>');
//$m->add_extra('</div>');

$m->add_extra('<div class="form-group row collapse">');
$m->add_field('M2',"R&#x00E9;seaux sociaux",$M2,'text',false);
$m->add_extra('</div>');

include('modules/geoloc/geoloc_conf.php');
$m->add_comment(aff_langue('<div class="row"><p class="lead"><a href="modules.php?ModPath=geoloc&amp;ModStart=geoloc"><i class="fa fa-map-marker fa-2x" title="[french]Modifier ou d&#xE9;finir votre position[/french][english]Define or change your geolocation[/english][chinese]Define or change your geolocation[/chinese][spanish]Definir o cambiar la geolocalizaci&#243;n[/spanish][german]Definieren oder &#xE4;ndern Sie Ihre Geolokalisierung[/german]" data-toggle="tooltip" data-placement="right"></i></a>&nbsp;[french]G&#xE9;olocalisation[/french][english]Geolocation[/english][chinese]&#x5730;&#x7406;&#x5B9A;&#x4F4D;[/chinese][spanish]Geolocalizaci&#243;n[/spanish][german]Geolokalisierung[/german]</p></div>'));
$m->add_field($ch_lat,aff_langue('[french]Latitude[/french][english]Latitude[/english][chinese]&#x7ECF;&#x5EA6;[/chinese][spanish]Latitud[/spanish][german]Breitengrad[/german]'),$$ch_lat,'text',false);
Expand Down
97 changes: 57 additions & 40 deletions revolution_16/modules/sform/extend-user/formulaire.php
View file
Expand Up @@ -58,7 +58,7 @@
// --- MEMBER-PASS
if ($memberpass) {
$m->add_field('pass', translate("Password"),'','password',true,40,'','');
$m->add_extra('<div class="form-group row"><div class="col-sm-8 ml-sm-auto" ><div class="progress" style="height: 0.2rem;"><div id="passwordMeter_cont" class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div></div></div></div>');
$m->add_extra('<div class="form-group row"><div class="col-sm-8 ml-sm-auto" ><div class="progress" style="height: 0.2rem;"><div id="passwordMeter_cont" class="progress-bar bg-danger" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%;"></div></div></div></div>');
$m->add_field('vpass', translate("Retype Password"),'','password',true,40,'','');
}

Expand Down Expand Up @@ -104,80 +104,97 @@
inpandfieldlen("user_sig",255);
inpandfieldlen("pass",40);
inpandfieldlen("vpass",40);
inpandfieldlen("C2",40);
inpandfieldlen("C2",5);
inpandfieldlen("C1",100);
inpandfieldlen("T1",40);
})
//]]>
</script>');
/*
test encodage de l'input : btoa(input.value) dans la recherche dans tableau is ok from IE9
encodé en php dans la fonction autocomplete du mainfile ...
*/
$fv_parametres ='
/*
T1: {
excluded: false,
uname: {
validators: {
date: {
format: "DD/MM/YYYY",
message: "The date is not a valid"
callback: {
message: "Ce surnom n\'est pas disponible",
callback: function(input) {
if($.inArray(btoa(input.value), aruser) !== -1)
return false;
else
return true;
}
}
}
},
*/
/*
pass: {
validators: {
callback: {
callback: function(value, validator, $field) {
var score = 0;
if (value === "") {
return {
valid: true,
score: null
};
}
// Check the password strength
score += ((value.length >= 8) ? 1 : -1);
if (/[A-Z]/.test(value)) {score += 1;}
if (/[a-z]/.test(value)) {score += 1;}
if (/[0-9]/.test(value)) {score += 1;}
if (/[!#$%&^~*_]/.test(value)) {score += 1;}
return {
valid: true,
score: score // We will get the score later
};
}
}
checkPassword: {
message: "Le mot de passe est trop simple."
},
}
},
vpass: {
validators: {
identical: {
field: "pass",
message: "The password and its confirm are not the same"
compare: function() {
return register.querySelector(\'[name="pass"]\').value;
},
}
}
},
*/
'.$ch_lat.': {
'.$ch_lat.': {
validators: {
regexp: {
regexp: /^[-]?([1-8]?\d(\.\d+)?|90(\.0+)?)$/,
message: "La latitude doit être entre -90.0 and 90.0"
},
numeric: {
thousandsSeparator: "",
decimalSeparator: "."
},
between: {
min: -90,
max: 90,
message: "The latitude must be between -90.0 and 90.0"
message: "La latitude doit être entre -90.0 and 90.0"
}
}
},
'.$ch_lon.': {
validators: {
regexp: {
regexp: /^[-]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)$/,
message: "La longitude doit être entre -180.0 and 180.0"
},
numeric: {
thousandsSeparator: "",
decimalSeparator: "."
},
between: {
min: -180,
max: 180,
message: "The longitude must be between -180.0 and 180.0"
message: "La longitude doit être entre -180.0 and 180.0"
}
}
},';
},
!###!
register.querySelector(\'[name="pass"]\').addEventListener("input", function() {
fvitem.revalidateField("vpass");
});
flatpickr("#T1", {
altInput: true,
altFormat: "l j F Y",
maxDate:"today",
minDate:"'.date("Y-m-d",(time()-3784320000)).'",
dateFormat:"d/m/Y",
"locale": "'.language_iso(1,'','').'",
});
';
$arg1='
var formulid = ["register"];
'
var formulid = ["register"];
'.auto_complete ('aruser', 'uname', 'users', '', '0')
;

// ----------------------------------------------------------------
?>
17 changes: 13 additions & 4 deletions revolution_16/modules/sform/extend-user/mod_formulaire.php
View file
Expand Up @@ -176,8 +176,7 @@ function readURL(input) {
</script>
');
$arg1 ='
var formulid = ["Register"];
';
var formulid = ["Register"];';
$fv_parametres ='
B1: {
validators: {
Expand Down Expand Up @@ -214,30 +213,40 @@ function readURL(input) {
}
}
},
'.$ch_lat.': {
'.$ch_lat.': {
validators: {
regexp: {
regexp: /^[-]?([1-8]?\d(\.\d+)?|90(\.0+)?)$/,
message: "La latitude doit être entre -90.0 and 90.0"
},
numeric: {
thousandsSeparator: "",
decimalSeparator: "."
},
between: {
min: -90,
max: 90,
message: "La latitude doit être entre -90.0 and 90.0"
}
}
},
'.$ch_lon.': {
validators: {
regexp: {
regexp: /^[-]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)$/,
message: "La longitude doit être entre -180.0 and 180.0"
},
numeric: {
thousandsSeparator: "",
decimalSeparator: "."
},
between: {
min: -180,
max: 180,
message: "La longitude doit être entre -180.0 and 180.0"
}
}
}
},
!###!
register.querySelector(\'[name="pass"]\').addEventListener("input", function() {
fvitem.revalidateField("vpass");
Expand Down
49 changes: 41 additions & 8 deletions revolution_16/themes/npds-blocs_sk/style/style.css
View file
Expand Up @@ -1770,17 +1770,50 @@ a.tooltip_ws:hover em span {
input[required='required'] {
border: 1px solid ;
}
textarea[required='required'] {
border: 1px solid ;
}

.custom-file-input:lang(fr) ~ .custom-file-label::after {
content: "Choisir ..."
}
.custom-file-input:lang(es) ~ .custom-file-label::after {
content: "Elegir ..."
}
.custom-file-input:lang(de) ~ .custom-file-label::after {
content: "Wählen ..."
}
.custom-file-input:lang(en) ~ .custom-file-label::after {
content: "Browse ..."
}
.custom-file-input:lang(zh) ~ .custom-file-label::after {
content: "选择 ..."
}

.n-irl {
max-width: 100%;
height: auto;
}
/* ==> personalisation responsivité des colonnes de card */

@media (min-width: 576px) and (max-width: 767.98px) {
.card-columns {
column-count: 2;
}
@media (min-width: 576px) and (max-width: 640px) {
.card-columns {
column-count: 2;
}
}
@media (min-width: 992px) {
.card-columns {
column-count: 4;
}
@media (min-width: 760px) and (max-width: 991px) {
.card-columns {
column-count: 4;
}
}
@media (min-width: 991px) and (max-width: 1080px) {
.card-columns {
column-count: 2;
}
}


@media (min-width: 1200px) { card-columns {
column-count: 3;
}}
/* <== personalisation responsivité des colonnes de card */
9 changes: 4 additions & 5 deletions revolution_16/user.php
View file
Expand Up @@ -158,7 +158,7 @@ function Only_NewUser() {
include ("modules/sform/extend-user/extend-user.php");
echo '
</div>';
$fv_parametres = '
/* $fv_parametres = '
add_aid: {
validators: {
callback: {
Expand Down Expand Up @@ -215,11 +215,10 @@ function Only_NewUser() {
}
}
},';

adminfoot('fv',$fv_parametres,'','');
} else {
*/
adminfoot('fv',$fv_parametres,$arg1,'');
} else
header("location: user.php");
}
}
function hidden_form() {
global $uname, $name, $email, $user_avatar, $user_occ, $user_from, $user_intrest, $user_sig, $user_viewemail, $pass, $vpass, $C1,$C2,$C3,$C4,$C5,$C6,$C7,$C8,$M1,$M2,$T1,$T2,$B1,$charte,$user_lnl;
Expand Down

0 comments on commit c0b0a4e

Please sign in to comment.