Modifs mail 20 oct

parent a388b21a
......@@ -196,7 +196,7 @@
<div id="create_hive_contenu" class="contenu">
<div class="sizing"></div>
<form class="formulaire" id="form-create-hive">
<span style="color: red">*</span>Champ obligatoire
<span style="color: red">*</span>Champ obligatoire<div style="width:10px;height:10px;"></div>
<div>
<label for="apibundle_pshive_name">Nom<span style="color: red">*</span></label>
<input type="text" id="apibundle_pshive_name" name="apibundle_pshive[name]" maxlength="64" />
......@@ -264,7 +264,6 @@
</div>
<div style="display: inline-block;">
<div class="bouton" id="creer_ruche" style="display: inline-block; vertical-align : top;"><span>CREER</span></div>
<div class="bouton" id="creer_sans_boitier" style="display: inline-block; vertical-align : top;"><span>CREER SANS BOITIER</span></div>
</div>
</form>
<div style="clear:left;"></div>
......@@ -286,7 +285,7 @@
<h1></h1>
</div>
<div id="add_logger_contenu" class="contenu formulaire">
<span style="color: red">*</span>Champ obligatoire
<span style="color: red">*</span>Champ obligatoire<div style="width:10px;height:10px;"></div>
<div class="sizing"></div>
<form class="formulaire" id="form-add-logger">
<div>
......@@ -296,7 +295,6 @@
<div class="bouton"><span>ENREGISTRER</span></div>
</form>
<div style="clear:left;"></div>
<div id="procurerBoitier" class="bouton2" style="text-align:center;clear:none;" >Me procurer un boitier</div>
</div>
</div>
</div>
......
......@@ -375,7 +375,7 @@ function liensAccueil(r){
idHiveGroup = i;
idHive = j;
if(donneesRuches.hivegroups[i].hives[j].data)goToDataHive();
if(donneesRuches.hivegroups[i].hives[j].data.idLogger!=null)goToDataHive();
});
}
}
......@@ -469,13 +469,14 @@ function organiserRuches(rucher){
$("#ruche"+rucher+"_"+i).children(".fond_ruche_selectionnee").css("opacity","0");
$("#ruche"+rucher+"_"+i).children(".ruche_contenu").children(".ruche_selectionnee").css("opacity","0");
if(i==rucheSelect[rucher]){
if(donneesRuches.hivegroups[rucher-1].hives[rucheSelect[rucher]-1].data.idLogger==null){griser(rucher,rucheSelect[rucher]);}
$("#ruche"+rucher+"_"+rucheSelect[rucher]).css('width','100%');
$("#ruche"+rucher+"_"+rucheSelect[rucher]).children(".fond_ruche_selectionnee").css("opacity","1");
$("#ruche"+rucher+"_"+rucheSelect[rucher]).children(".fond_ruche_grise").css("opacity","0");
$("#ruche"+rucher+"_"+rucheSelect[rucher]).children(".ruche_contenu").children(".ruche_selectionnee").css("opacity","1");
$("#ruche"+rucher+"_"+rucheSelect[rucher]).children(".ruche_contenu").children(".ruche_grise").css("opacity","0");
$("#ruche"+rucher+"_"+rucheSelect[rucher]).css({"top":(h*(0.76*(i-1))+decalTop)+'px',"right":"0"});
if(!donneesRuches.hivegroups[rucher-1].hives[i-1].data){griser(rucher,i);}
if(donneesRuches.hivegroups[rucher-1].hives[i-1].data.idLogger==null){griser(rucher,i);}
}else{
d=0;
if(i>rucheSelect[rucher])d=(h2-h);
......
......@@ -17,7 +17,7 @@ function createHive() {
if(mm<10){
mm='0'+mm
}
var today = dd+mm+yyyy;
var today = dd+''+mm+''+yyyy;
$("#apibundle_pshive_date_installation").val(today);
//
......@@ -57,19 +57,12 @@ function createHive() {
console.log(donneesRuches.hivegroups[idHiveGroup].hives[idHive]);
console.log(bouton);
console.log(bouton[0].id);
donneesRuches.hivegroups[idHiveGroup].hives[idHive].data=new Object();
donneesRuches.hivegroups[idHiveGroup].hives[idHive].data.idLogger=null;
if(bouton[0].id == "creer_ruche") {
console.log("goToAddLogger");
goToAddLogger(); // add if needed a logger to the hive
}
else {
console.log("no need to add a logguer");
getListHiveGroups(function() {
console.log("récupération des listes de ruches par rucher");
getHivesForHiveGroups(1);
});
}
goToAddLogger(); // add if needed a logger to the hive
},
error: function (xhr, ajaxOptions, thrownError) {
console.log(xhr.responseText);
......
......@@ -95,7 +95,7 @@ function debut(){
_("btReglages").addEventListener(evtclick,function(){goToGeneralParameters();});
_("sitemobile").addEventListener(evtclick,function(){
_("ch").style.visibility="visible";
var ref=window.open('http://www.label-abeille.org', '_blank', 'location=yes,closebuttoncaption=Fermer');
detectExitExternalPage(window, ref);
......@@ -104,14 +104,14 @@ function debut(){
});
_("faq").addEventListener(evtclick,function(){
_("ch").style.visibility="visible";
var ref = window.open('http://www.label-abeille.org/faq', '_blank', 'location=yes,closebuttoncaption=Fermer');
detectExitExternalPage(window, ref);
ref.addEventListener('loaderror', function(event) { afficherBd("Erreur de chargement","OK"); } );
});
_("fb").addEventListener(evtclick,function(){
_("ch").style.visibility="visible";
var ref=window.open('https://www.facebook.com/Label-Abeille-679782012107769/?fref=ts', '_blank', 'location=yes,closebuttoncaption=Fermer');
detectExitExternalPage(window, ref);
......@@ -119,17 +119,17 @@ function debut(){
});
_("twitter").addEventListener(evtclick,function(){
_("ch").style.visibility="visible";
var ref=window.open('https://twitter.com/labelabeille', '_blank', 'location=yes,closebuttoncaption=Fermer');
var ref=window.open('https://twitter.com/Label_Abeille', '_blank', 'location=yes,closebuttoncaption=Fermer');
detectExitExternalPage(window, ref);
ref.addEventListener('loaderror', function(event) { afficherBd("Erreur de chargement","OK"); } );
});
_("gplus").addEventListener(evtclick,function(){
_("ch").style.visibility="visible";
var ref=window.open('http://plus.google.com/share?url=https://www.label-abeille.org/fr', '_blank', 'location=yes,closebuttoncaption=Fermer');
var ref=window.open('https://plus.google.com/107368747597374012258', '_blank', 'location=yes,closebuttoncaption=Fermer');
detectExitExternalPage(window, ref);
ref.addEventListener('loaderror', function(event) { afficherBd("Erreur de chargement","OK"); } );
......
......@@ -213,7 +213,7 @@
</script>
<script type="text/html" id="tpl-params-generaux">
<form class="formulaire" id="form-params-generaux" method="POST">
<span style="color: red">*</span>Champ obligatoire
<span style="color: red">*</span>Champ obligatoire<div style="width:10px;height:10px;"></div>
<div id="apibundle_pscustomer">
<div>
<label for="apibundle_pscustomer_firstname" class="required">Prénom<span style="color: red">*</span></label>
......@@ -234,15 +234,15 @@
</div>
<div class="bouton"><span>MODIFIER</span></div>
<br />
<div id="deconnexion" class="bouton2" style="text-align:center;clear:none;" >Me déconnecter</div>
<div id="desinscription" class="bouton2" style="text-align:center;clear:none;background-color:black;color:white;">Me désinscrire</div>
<div id="deconnexion" class="bouton2" style="text-align:center;clear:none;font-weight:bold;" >DECONNEXION</div>
<div id="desinscription" class="bouton2" style="text-align:center;clear:none;background-color:white;color:black;">Me désinscrire</div>
</form>
</script>
<script type="text/html" id="tpl-params-rucher">
<form class="formulaire" method="POST" id="form-params-ruchers">
<div id="apibundle_pshivegroup">
<span style="color: red">*</span>Champ obligatoire
<span style="color: red">*</span>Champ obligatoire<div style="width:10px;height:10px;"></div>
<!--<div>
<label for="apibundle_pshivegroup_idClient" class="required">Id client</label>-->
<!--<input type="hidden" id="apibundle_pshivegroup_idClient" name="apibundle_pshivegroup[idClient]" value="" />
......@@ -276,7 +276,7 @@
<div id="goToSeuils" class="bouton2" style="text-align:center;clear:none;" >Notifications</div>
<form class="formulaire" id="form-params-hive" >
<span style="color: red">*</span>Champ obligatoire
<span style="color: red">*</span>Champ obligatoire<div style="width:10px;height:10px;"></div>
<div id="apibundle_pshive">
<!--<div>
<label for="apibundle_pshive_idClient" class="required">Id client</label>
......
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