Commit 9451fd49 authored by Eric Seigne's avatar Eric Seigne
Browse files

user switcher ok

parent f7701c0f
......@@ -90,6 +90,7 @@ function feedKMBefore(ispro){myDebug("feedKMBefore");$("#feedKMBefore").empty();
else{html+=" <label for=\"kmbefore\">Kilométrage réalisé cette année dans le cadre de votre travail avec ce véhicule avant l'utilisation de doliscan (c'est pour pouvoir établir la base de calcul des indemnités qui doit prendre en compte le total de l'année civile en cours)</label>";html+=" <ons-input name=\"kmbefore\" id=\"kmbefore\" type=\"number\" placeholder=\"km\"></ons-input>";}
html+=" </ons-col>";html+=" </ons-row>";$("#feedKMBefore").append(html);return;}
function feedDoliscanInfos(){let htmlInfos="";myDebug("feedDoliscanInfos");$("#feedDoliscanInfos").empty();myDebug("feedDoliscanInfos empty ok -> feed with html now");htmlInfos+="<p>";htmlInfos+="Compte "+localGetData("email")+"<br />";htmlInfos+="Serveur "+localGetData("name_server")+"<br />";htmlInfos+="Version "+globalAppVersion+"<br />";htmlInfos+="</p>";$("#feedDoliscanInfos").append(htmlInfos);myDebug("feedDoliscanInfos append: "+htmlInfos);myDebug("feedDoliscanInfos append, hide and show ok");return htmlInfos;}
function feedDoliscanAccount(){let htmlInfos="";$("#feedDoliscanAccount").empty();htmlInfos+=translateStrings('account')+" : "+localGetData("email");$("#feedDoliscanAccount").append(htmlInfos);myDebug("feedDoliscanAccount append: "+htmlInfos);return htmlInfos;}
function feedToAgendaIK(formField,dateStart,dateEnd){let htmlFTS="";myDebug("feedToAgendaIK pour "+formField);$(formField).empty();window.plugins.calendar.hasReadWritePermission(function(result){if(result==false){window.plugins.calendar.requestReadWritePermission();}})
showWait();var title=null;var loc=null;var notes=null;var startDate=new Date(dateStart);var endDate=new Date(dateEnd);window.plugins.calendar.findEvent(title,loc,notes,startDate,endDate,onSuccessAgendaIK,onErrorAgendaIK);myDebug("end feedToAgendaIK ..."+htmlFTS);}
function onSuccessAgendaIK(events){hideWait();var formField='#feedToAgendaIK';var html="";$(formField).empty();if(events.length==0){html+="<h2>Aucun rdv sur cette période</h2>";$(formField).append(html);return;}
......@@ -105,8 +106,8 @@ html+="</ul>";html+="<ons-button modifier='material large' onclick='createIK(\""
$(formField).append(html);}
function onErrorAgendaIK(msg){hideWait();ons.notification.alert("Erreur d'accès à l'agenda"+JSON.stringify(msg),{title:"Erreur"});}
function createIK(titre,ladate,message,arrivee,depart){myDebug("createIK : "+titre);dataIK={label:titre+" "+message,ladate:ladate,arrivee:arrivee,depart:depart,};myDebug("createIK : avant le Goto : "+JSON.stringify(dataIK));gotoPage("frais-ik.html",true);}
function makeOneAccount(id,title,mail){let html="";html="<ons-row>\n";html+=" <ons-col>\n";html+=" <ons-card>\n";html+=" <ons-row>\n";html+=" <ons-col>\n";html+=" <ons-icon icon=\"fa-user-tie\" size=\"50px\"></ons-icon>\n";html+=" </ons-col>\n";html+=" <ons-col>\n";html+=" <div class=\"title\">\n";html+=" "+title+"\n";html+=" </div>\n";html+=" </ons-col>\n";html+=" </ons-row>\n";html+=" <ons-row>\n";html+=" <ons-col style=\"text-align: center;\">\n";html+=" <ons-button modifier=\"material large\" onclick=\"loginAPIKeyErrorInProgress=false;loginWithAPIToken("+id+");\" class=\"menubutton\">\n";html+=" <ons-icon icon=\"md-sign-in\"></ons-icon>\n";html+=" <span class=\"menulabel translate\">AUTH</span>\n";html+=" </ons-button>\n";html+=" </ons-col>\n";html+=" </ons-row>\n";html+=" </ons-card>\n";html+=" </ons-col>\n";html+="</ons-row>\n";return html;}
function feedMyAccounts(){let formField='#feedMyAccounts';let html="";$(formField).empty();let accounts=JSON.parse(localGetData("accounts"));if(accounts!==null){for(let f=0;f<accounts.length;f++){lemail=accounts[f]['email'];html+=makeOneAccount(f,lemail,lemail);}}
function makeOneAccount(id,title,mail){let html="";html="<ons-row>\n";html+=" <ons-col>\n";html+=" <ons-card>\n";html+=" <ons-row>\n";html+=" <ons-col width=\"20%\">\n";html+=" <ons-icon icon=\"fa-user-tie\" size=\"50px\"></ons-icon>\n";html+=" </ons-col>\n";html+=" <ons-col style=\"text-align: center;\">\n";html+=" <div class=\"title\">\n";html+=" "+title+"\n";html+=" </div>\n";html+=" </ons-col>\n";html+=" </ons-row>\n";html+=" <ons-row>\n";html+=" <ons-col style=\"text-align: center;\">\n";html+=" <ons-button modifier=\"material large\" onclick=\"loginAPIKeyErrorInProgress=false;loginWithAPIToken("+id+");\" class=\"menubutton\">\n";html+=" <ons-icon icon=\"md-sign-in\"></ons-icon>\n";html+=" <span class=\"menulabel translate\">AUTH</span>\n";html+=" </ons-button>\n";html+=" </ons-col>\n";html+=" </ons-row>\n";html+=" </ons-card>\n";html+=" </ons-col>\n";html+="</ons-row>\n";return html;}
function feedMyAccounts(fieldName){let formField='#'+fieldName;let html="";$(formField).empty();let accounts=JSON.parse(localGetData("accounts"));if(accounts!==null){for(let f=0;f<accounts.length;f++){lemail=accounts[f]['email'];html+=makeOneAccount(f,lemail,lemail);}}
$(formField).append(html);}
function sendForm(leformName){myDebug("sendForm "+leformName);showWait();$.ajaxSetup({timeout:10000,headers:{'X-CSRF-TOKEN':localGetData("api_token")}});if(document.getElementById('ladate')){myDebug("on a ladate : "+document.getElementById('ladate').value);localStoreData("ladate",document.getElementById('ladate').value);}
var moyenPaiement=null;var els=document.getElementsByName('moyenPaiement');for(var i=0;i<els.length;i++){if(els[i].checked){moyenPaiement=els[i].value;myDebug("on a moyenPaiement : "+moyenPaiement);localStoreData("moyenPaiement",moyenPaiement);break;}}
......@@ -174,14 +175,14 @@ function blinkElement(elem,times,speed){if(times>0||times<0){if($(elem).hasClass
$(elem).removeClass("blink");else
$(elem).addClass("blink");}
clearTimeout(function(){blinkElement(elem,times,speed);});if(times>0||times<0){setTimeout(function(){blinkElement(elem,times,speed);},speed);times-=.5;}}
var app={initialize:function(){document.addEventListener('deviceready',this.onDeviceReady.bind(this),false);},onDeviceReady:function(){document.addEventListener("backKeyDown",function(){fn.back();},false);this.receivedEvent('deviceready');},receivedEvent:function(id){var parentElement=document.getElementById(id);if(parentElement!==null){var listeningElement=parentElement.querySelector('.listening');var receivedElement=parentElement.querySelector('.received');listeningElement.setAttribute('style','display:unset;');receivedElement.setAttribute('style','display:block;');}}};app.initialize();Date.prototype.toDateInputValue=(function(){var local=new Date(this);local.setMinutes(this.getMinutes()-this.getTimezoneOffset());return local.toJSON().slice(0,10);});function loadLangFile(file,callback,errorCallback){var rawFile=new XMLHttpRequest();rawFile.overrideMimeType("application/json");rawFile.open("GET",file,true);rawFile.onreadystatechange=function(){if(rawFile.readyState===4&&rawFile.status=="200"){callback(rawFile.responseText);}
else{if(rawFile.status!="200"){myDebug("Lecture du fichier error : "+rawFile.status);errorCallback();}}};rawFile.onLangFileErrorLoaded=function(){myDebug("Lecture du fichier eonLangFileErrorLoadednd, retour null");errorCallback();};rawFile.onerror=function(){myDebug("Lecture du fichier onerror, retour null");errorCallback();};rawFile.send(null);}
function onErrorDefaultLangLoaded(){myDebug(" onErrorDefaultLangLoaded");}
function onLangFileErrorLoaded(){myDebug(" onLangFileErrorLoaded");loadLangFile("langs/en.json",onLangFileLoaded,onErrorDefaultLangLoaded);}
function translateUI(){$('.translate').each(function(i,obj){myDebug("traduction de "+$(obj).html());if($(obj).html()){let t=trans($(obj).html());$(obj).html(t.trim());}});}
var app={initialize:function(){document.addEventListener('deviceready',this.onDeviceReady.bind(this),false);},onDeviceReady:function(){document.addEventListener("backKeyDown",function(){fn.back();},false);this.receivedEvent('deviceready');},receivedEvent:function(id){var parentElement=document.getElementById(id);if(parentElement!==null){var listeningElement=parentElement.querySelector('.listening');var receivedElement=parentElement.querySelector('.received');listeningElement.setAttribute('style','display:unset;');receivedElement.setAttribute('style','display:block;');}}};app.initialize();Date.prototype.toDateInputValue=(function(){var local=new Date(this);local.setMinutes(this.getMinutes()-this.getTimezoneOffset());return local.toJSON().slice(0,10);});function loadLangFile(file,callback,errorCallback){myDebug("langs : Lecture du fichier "+file);var rawFile=new XMLHttpRequest();rawFile.overrideMimeType("application/json");rawFile.open("GET",file,true);rawFile.onreadystatechange=function(){if(rawFile.readyState===4&&rawFile.status=="200"){callback(rawFile.responseText);}
else{if(rawFile.status!="200"){myDebug("langs : Lecture du fichier error : "+rawFile.status);errorCallback();}}};rawFile.onLangFileErrorLoaded=function(){myDebug("langs : Lecture du fichier eonLangFileErrorLoadednd, retour null");errorCallback();};rawFile.onerror=function(){myDebug("langs : Lecture du fichier onerror, retour null");errorCallback();};rawFile.send(null);}
function onErrorDefaultLangLoaded(){myDebug("langs : onErrorDefaultLangLoaded");}
function onLangFileErrorLoaded(){myDebug("langs : onLangFileErrorLoaded");loadLangFile("langs/en.json",onLangFileLoaded,onErrorDefaultLangLoaded);}
function translateUI(){$('.translate').each(function(i,obj){myDebug("langs : traduction de "+$(obj).html());if($(obj).html()){let t=trans($(obj).html());$(obj).html(t.trim());}});}
function trans(str){return translateStrings(str);}
function onLangFileLoaded(text){if(text===null||typeof text==="undefined"){}
else{var data=JSON.parse(text);translateStrings=i18n.create({values:data});translateUI();}}
function onLangFileLoaded(text){myDebug("langs : onLangFileLoaded text "+text);if(text===null||typeof text==="undefined"){myDebug("langs : onLangFileLoaded null ou indef");}
else{var data=JSON.parse(text);myDebug("langs : onLangFileLoaded ok : "+text);translateStrings=i18n.create({values:data});translateUI();}}
function CreateAccount(){window.open("https://doliscan.fr/webRegister","_system");return false;}
function loginWithAPIToken(accountID=null){myDebug("loginWithAPIToken : "+accountID);let lemail="";if(accountID!==null){let accounts=JSON.parse(localGetData("accounts"));if(accounts!==null){lemail=accounts[accountID]['email'];api_token=accounts[accountID]['apikey'];let api_server=accounts[accountID]['server'];localStoreData("email",lemail);localStoreData("api_token",api_token);localStoreData("api_server",api_server);}
else{myDebug("auto user switch NULL");}}
......@@ -211,10 +212,12 @@ if(result.status=="503"){ons.notification.alert("Serveur indisponible, veuillez
else{$("#erreurLogin").show();}
myDebug("loginJson error : ERR -> end session : "+msg);myDebug("loginJson error : ERR -> end session : "+result.status);localStoreData("api_token",null);myDebug("carouselLogin call 10");carouselLogin();}});}
function switchServer(formId,nom,adresse){$(formId).empty();$(formId).append('Serveur: <b>'+nom+"</b>");localStoreData("api_server",adresse);localStoreData("name_server",nom);}
function carouselLogin(){myDebug("carouselLogin... loginAPIKeyErrorInProgress="+loginAPIKeyErrorInProgress);let defaultCarouselIndex=0;if(localGetData("accounts")!==null){defaultCarouselIndex=2;}
function carouselLogin(forceIndex=-1){myDebug("carouselLogin... loginAPIKeyErrorInProgress="+loginAPIKeyErrorInProgress);if(globalMyNavigator.topPage.data.name!="login.html"){gotoPage('login.html');}
let defaultCarouselIndex=0;if(localGetData("accounts")!==null){defaultCarouselIndex=2;}
if(loginAPIKeyErrorInProgress==true){defaultCarouselIndex=0;}
if(forceIndex>=0){defaultCarouselIndex=forceIndex;}
if(localGetData("email")!==null){$('input[name="email"]').val(localGetData("email"));}
try{carousel=document.querySelector('ons-carousel');if(typeof carousel=='object'){myDebug("carouselLogin... on est sur l'index "+carousel.getActiveIndex());if(carousel.getActiveIndex()!=defaultCarouselIndex){myDebug("carouselLogin... set Active Index : "+defaultCarouselIndex);carousel.setActiveIndex(defaultCarouselIndex);}
try{carousel=document.querySelector('ons-carousel');if(typeof carousel=='object'){myDebug("carouselLogin... on est sur l'index "+carousel.getActiveIndex());if(carousel.getActiveIndex()!=defaultCarouselIndex){myDebug("carouselLogin... set Active Index : "+defaultCarouselIndex);carousel.setActiveIndex(defaultCarouselIndex);carousel.refresh();}
myDebug("carouselLogin... on est maintenant sur l'index "+carousel.getActiveIndex());}
else{myDebug("carouselLogin not ready...");}}catch(e){myDebug("carouselLogin not ready catched ... ",e)}}
function carouselPassword(){let carousel=document.getElementById('carousel');if(typeof carousel=='object'){if(carousel.getActiveIndex()!=1){myDebug("carouselLogin... set Active Index : 1");carousel.setActiveIndex(1);document.getElementById('emailForget').value=document.getElementById('email').value;}}}
......@@ -347,7 +350,7 @@ var loadthis="<ons-button modifier=\"material large\" onclick=\"localStoreData('
else{closePage();}}},error:function(result){hideWait();closePage();}});return;}
if(lapage=='ONSlogin'){myDebug("ons show login.html ...");if(localGetData("api_server")!==null){myDebug("Login with API token...");loginWithAPIToken();}
$(".toggle-password").click(function(){myDebug("Clic sur l'affichage du mot de passe ...");$(this).toggleClass("fa-eye fa-eye-slash");var input=$($(this).attr("toggle"));if(input.attr("type")=="password"){input.attr("type","text");}else{input.attr("type","password");}});return;}
if(lapage=='ONSMenu'){dataLDF="";}
if(lapage=='ONSMenu'){dataLDF="";feedDoliscanAccount();}
if(lapage=='ONSMessageDone'){return;}
if(lapage=='ONSMessageError'){return;}
if(lapage=='ONSMessageUploadProgress'){$('#titreDoliScan').replaceWith('<div id="titreDoliScan" class="left" onclick="gotoPage(\'menu.html\', false);">Téléversement...</div>');return;}
......
......@@ -287,6 +287,16 @@ function feedDoliscanInfos() {
return htmlInfos;
}
//Ajoute l'adresse mail du compte
function feedDoliscanAccount() {
let htmlInfos = "";
$("#feedDoliscanAccount").empty();
htmlInfos += translateStrings('account') + " : " + localGetData("email");
$("#feedDoliscanAccount").append(htmlInfos);
myDebug("feedDoliscanAccount append: " + htmlInfos);
return htmlInfos;
}
//Liste des rdv de l'agenda qu'on peut transformer automatiquement en IK
function feedToAgendaIK(formField, dateStart, dateEnd) {
......@@ -389,10 +399,10 @@ function makeOneAccount(id, title, mail) {
html += " <ons-col>\n";
html += " <ons-card>\n";
html += " <ons-row>\n";
html += " <ons-col>\n";
html += " <ons-col width=\"20%\">\n";
html += " <ons-icon icon=\"fa-user-tie\" size=\"50px\"></ons-icon>\n";
html += " </ons-col>\n";
html += " <ons-col>\n";
html += " <ons-col style=\"text-align: center;\">\n";
html += " <div class=\"title\">\n";
html += " " + title + "\n";
html += " </div>\n";
......@@ -412,8 +422,8 @@ function makeOneAccount(id, title, mail) {
return html;
}
function feedMyAccounts() {
let formField = '#feedMyAccounts';
function feedMyAccounts(fieldName) {
let formField = '#' + fieldName;
let html = "";
$(formField).empty();
......
......@@ -2,7 +2,7 @@
* (c) Éric Seigne <eric.seigne@cap-rel.fr> - 2019-2021 - GNU AGPLv3
*/
function loadLangFile(file, callback, errorCallback) {
// myDebug("Lecture du fichier " + file);
myDebug("langs : Lecture du fichier " + file);
var rawFile = new XMLHttpRequest();
rawFile.overrideMimeType("application/json");
rawFile.open("GET", file, true);
......@@ -13,28 +13,28 @@ function loadLangFile(file, callback, errorCallback) {
}
else {
if (rawFile.status != "200") {
myDebug("Lecture du fichier error : " + rawFile.status);
myDebug("langs : Lecture du fichier error : " + rawFile.status);
errorCallback();
}
}
};
rawFile.onLangFileErrorLoaded = function () {
myDebug("Lecture du fichier eonLangFileErrorLoadednd, retour null");
myDebug("langs : Lecture du fichier eonLangFileErrorLoadednd, retour null");
errorCallback();
};
rawFile.onerror = function () {
myDebug("Lecture du fichier onerror, retour null");
myDebug("langs : Lecture du fichier onerror, retour null");
errorCallback();
};
rawFile.send(null);
}
function onErrorDefaultLangLoaded() {
myDebug(" onErrorDefaultLangLoaded");
myDebug("langs : onErrorDefaultLangLoaded");
}
function onLangFileErrorLoaded() {
myDebug(" onLangFileErrorLoaded");
myDebug("langs : onLangFileErrorLoaded");
//Back to default lang file
loadLangFile("langs/en.json", onLangFileLoaded, onErrorDefaultLangLoaded);
}
......@@ -42,7 +42,7 @@ function onLangFileErrorLoaded() {
function translateUI() {
//On cherche tous les objets a traduire dans l'html
$('.translate').each(function (i, obj) {
myDebug("traduction de " + $(obj).html());
myDebug("langs : traduction de " + $(obj).html());
// alert("on traduit [" + i + "] et " + $(obj).html());
if ($(obj).html()) {
let t = trans($(obj).html());
......@@ -56,13 +56,13 @@ function trans(str) {
}
function onLangFileLoaded(text) {
// myDebug(" onLangFileLoaded text " + text);
myDebug("langs : onLangFileLoaded text " + text);
if (text === null || typeof text === "undefined") {
// myDebug(" onLangFileLoaded null ou indef");
myDebug("langs : onLangFileLoaded null ou indef");
}
else {
var data = JSON.parse(text);
// myDebug(" onLangFileLoaded ok : " + text);
myDebug("langs : onLangFileLoaded ok : " + text);
translateStrings = i18n.create({
values: data
});
......
......@@ -344,9 +344,13 @@ function switchServer(formId, nom, adresse) {
}
//Passe sur la page de Login
function carouselLogin() {
function carouselLogin(forceIndex = -1) {
myDebug("carouselLogin... loginAPIKeyErrorInProgress=" + loginAPIKeyErrorInProgress);
if (globalMyNavigator.topPage.data.name != "login.html") {
gotoPage('login.html');
}
let defaultCarouselIndex = 0;
if (localGetData("accounts") !== null) {
defaultCarouselIndex = 2;
......@@ -354,6 +358,9 @@ function carouselLogin() {
if (loginAPIKeyErrorInProgress == true) {
defaultCarouselIndex = 0;
}
if (forceIndex >= 0) {
defaultCarouselIndex = forceIndex;
}
if (localGetData("email") !== null) {
// $("#autoLoginText").append("Compte " + localGetData("email") + " sur " + localGetData("name_server"));
......@@ -368,6 +375,7 @@ function carouselLogin() {
if (carousel.getActiveIndex() != defaultCarouselIndex) {
myDebug("carouselLogin... set Active Index : " + defaultCarouselIndex);
carousel.setActiveIndex(defaultCarouselIndex);
carousel.refresh();
}
myDebug("carouselLogin... on est maintenant sur l'index " + carousel.getActiveIndex());
}
......
......@@ -1033,6 +1033,7 @@ document.addEventListener('init', function (event) {
//Un petit reset des données de mise à jour
dataLDF = "";
feedDoliscanAccount();
}
// ------------- upload ok
......
......@@ -8,7 +8,7 @@
"checkNetwork": "Überprüfen Sie, ob Ihre Geräte gut mit dem Internet verbunden sind",
"OK": "OK",
"warning": "Achtung",
"password": "Passwort",
"loginPassword": "Passwort",
"passwordForget": "Passwort vergessen ...",
"AUTH": "AUTHENTICATION",
"didYouHaveQR": "HABEN SIE EINEN QRCODE?",
......
......@@ -8,7 +8,7 @@
"checkNetwork": "Check that your smartphone is well connected to the Internet",
"OK": "OK",
"warning": "Attention",
"password": "Password",
"loginPassword": "Password",
"passwordForget": "Password forgotten...",
"AUTH": "AUTHENTICATION",
"didYouHaveQR": "DO YOU HAVE A QRCODE ?",
......@@ -129,6 +129,9 @@
"vatRate4": "Tx 4:",
"vatIntroMessage": "You can modify the VAT rates used by DoliSCAN to adapt them to your local specificities. Leave the field blank to deactivate a rate. <br /> <u> Note: </u> The changes will be applied to the next scanned charges, this change is NOT retroactive.",
"userSwitch": "User switcher",
"rememberMe": "Remember me",
"myAccounts": "My accounts"
"rememberThisAccount": "Remember me",
"myAccounts": "My accounts",
"OtherAccount": "Other account",
"AddAccount": "Add",
"account": "Account"
}
......@@ -8,7 +8,7 @@
"checkNetwork": "Compruebe que su equipo esté bien conectado a Internet",
"OK": "BIEN",
"warning": "Atención",
"password": "Contraseña",
"loginPassword": "Contraseña",
"passwordForget": "Contraseña olvidada ...",
"AUTH": "AUTENTICACIÓN",
"didYouHaveQR": "¿TIENE UN QRCODE?",
......
......@@ -8,7 +8,7 @@
"checkNetwork": "Vérifiez que votre équipement est bien connecté à internet",
"OK": "OK",
"warning": "Attention",
"password": "Mot de passe",
"loginPassword": "Mot de passe",
"passwordForget": "Mot de passe oublié...",
"AUTH": "AUTHENTIFICATION",
"didYouHaveQR": "VOUS AVEZ UN QRCODE ?",
......@@ -129,6 +129,11 @@
"vatRate4": "Taux 4:",
"vatIntroMessage": "Vous pouvez modifier les taux de TVA utilisés par DoliSCAN pour les adapter à vos spécificités locales. Laissez le champ vide pour désactiver un taux.<br /> <u>Note:</u> Les modifications seront appliquées aux prochains frais scannés, cette modification n'est PAS rétroactive.",
"userSwitch": "Changer d'identité",
"rememberMe": "Mémoriser cet identifiant",
"myAccounts": "Mes comptes"
"rememberThisAccount": "Mémoriser cet identifiant",
"myAccounts": "Mes comptes",
"aboutUserSwitch": "Liste des comptes:",
"useThisAccount": "Utiliser ce compte",
"OtherAccount": "Autre compte",
"AddAccount": "Ajouter",
"account": "Compte"
}
......@@ -8,7 +8,7 @@
"checkNetwork": "Verifica che la tua apparecchiatura sia ben collegata a Internet",
"OK": "OK",
"warning": "Attenzione",
"password": "Password",
"loginPassword": "Password",
"passwordForget": "Password dimenticata ...",
"AUTH": "AUTHENTICATION",
"didYouHaveQR": "HAI UN QRCODE?",
......
......@@ -48,7 +48,7 @@
<span class="deleteicon2" onclick="email.value='';email.focus();"><i style="font-size: x-large;" class="zmdi zmdi-close-circle-o"></i></span>
</span>
<label style="margin-top: 20px;" for="password" class="translate">password
<label style="margin-top: 20px;" for="password"><span class="translate">loginPassword</span>
<span toggle="#password" class="fa fa-fw fa-eye field-pass-icon toggle-password"></span>
</label>
<span class="deleteicon">
......@@ -64,9 +64,7 @@
<label class="left">
<ons-checkbox input-id="rememberMe" value="1" checked></ons-checkbox>
</label>
<label for="rememberMe" class="translate">
rememberMe
</label>
<label for="rememberMe" class="translate">rememberThisAccount</label>
</ons-list-item>
</ons-list>
</div>
......@@ -133,7 +131,7 @@
<ons-carousel-item>
<div class="container">
<h3 class="translate">MyAccounts</h3>
<h3 class="translate">myAccounts</h3>
<form id="leformAccounts">
<div id='feedMyAccounts'></div>
</form>
......@@ -143,7 +141,7 @@
<script>
ons.getScriptPage().onInit = function () {
feedMyAccounts();
feedMyAccounts('feedMyAccounts');
this.onShow = function () {
myDebug("2° lancement de carousel ...");
carouselLogin();
......
......@@ -14,9 +14,8 @@
</ons-toolbar>
<div id="container">
<ons-row>
<p style="margin:0; width:100%; text-align: right;"><span id="feedDoliscanAccount"></span></p>
<div class="one-half column">
<div id="interobjets"></div>
<ons-button modifier="material large" onclick="gotoPage('frais-ik.html', true);" class="menubutton">
<ons-icon icon="md-car"></ons-icon>
<span class="menulabel translate">menuIK</span>
......@@ -73,4 +72,4 @@
</div>
<script type="text/javascript">
</script>
</ons-page>
</ons-page>
\ No newline at end of file
......@@ -16,41 +16,12 @@
<ons-row>
<ons-col>
<h2 class="translate">aboutUserSwitch</h2>
&nbsp;
</ons-col>
</ons-row>
<ons-row>
<ons-col>
<div id='feedUserSwitch'></div>
</ons-col>
</ons-row>
<ons-row>
<ons-col>
<ons-card>
<ons-row>
<ons-col>
<ons-icon icon="fa-user-tie" size="50px"></ons-icon>
</ons-col>
<ons-col>
<div class="title">
CAP-REL
</div>
</ons-col>
</ons-row>
<ons-row>
<ons-col style="text-align: center;">
<ons-button class="translate">
useThisAccount
</ons-button>
</ons-col>
</ons-row>
</ons-card>
</ons-col>
</ons-row>
<form id="leformAccountsUS">
<div id='feedMyAccountsUS'></div>
</form>
<ons-row>
<ons-col>
......@@ -60,25 +31,27 @@
<ons-icon icon="fa-user-plus" size="50px"></ons-icon>
</ons-col>
<ons-col>
<div class="title" class="translate">
OtherAccount
<div class="title">
<span class="translate">OtherAccount</span>
</div>
</ons-col>
</ons-row>
<ons-row>
<ons-col style="text-align: center;">
<ons-button class="translate">
AddAccount
<ons-button modifier="material large" onclick="localStoreData('email','');carouselLogin(0);" class="menubutton">
<span class="menulabel translate">AddAccount</span>
</ons-button>
</ons-col>
</ons-row>
</ons-card>
</ons-col>
</ons-row>
</div>
<script type="text/javascript">
ons.getScriptPage().onInit = function () {
feedMyAccounts('feedMyAccountsUS');
};
</script>
</ons-page>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment