[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 03/03: Task #1153 - Boite de dialogue modale
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 03/03: Task #1153 - Boite de dialogue modale #1153 Dialog box : implement alert + confirm_form |
|
Date: |
Fri, 21 Aug 2015 15:51:29 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 404aeebdb60187f0ff4eef0fd1ad86e9fef817da
Author: Dany De Bontridder <address@hidden>
Date: Fri Aug 21 17:46:28 2015 +0200
Task #1153 - Boite de dialogue modale
#1153 Dialog box : implement alert + confirm_form
---
html/admin/setup.js | 2 +-
html/js/acc_ledger.js | 44 ++++----
html/js/accounting_item.js | 16 ++--
html/js/admin.js | 6 +-
html/js/ajax_fiche.js | 12 +-
html/js/anc_script.js | 22 ++--
html/js/calc.js | 2 +-
html/js/card.js | 34 +++---
html/js/compute.js | 4 +-
html/js/compute_direct.js | 4 +-
html/js/confirm.js | 33 ------
html/js/gestion.js | 40 +++---
html/js/modele_document.js | 6 +-
html/js/scripts.js | 180 ++++++++++++++++++-----------
html/js/todo_list.js | 14 +-
html/style-classic.css | 5 +-
html/style-light.css | 7 +-
include/ac_common.php | 6 +-
include/ajax_add_menu.php | 4 +-
include/ajax_create_menu.php | 2 +-
include/ajax_get_menu_detail.php | 2 +-
include/ajax_get_profile.php | 6 +-
include/ajax_mod_menu.php | 2 +-
include/class_extension.php | 13 ++-
include/class_periode.php | 6 +-
include/class_profile_menu_sql.php | 2 +
include/doc_state.inc.php | 2 +-
include/function_javascript.php | 2 +-
include/payment_middle.inc.php | 49 ++++----
include/template/fiche_list.php | 2 +-
include/template/periode_add_exercice.php | 2 +-
include/template/stock_inv.php | 2 +-
32 files changed, 284 insertions(+), 249 deletions(-)
diff --git a/html/admin/setup.js b/html/admin/setup.js
index 6595f6f..3e0d95c 100644
--- a/html/admin/setup.js
+++ b/html/admin/setup.js
@@ -25,6 +25,6 @@ function show_dbname(obj) {
this.document.getElementById('div_db').style.visibility= 'hidden';
}
} catch (e) {
- alert(e.getMessage);
+ alert_box(e.getMessage);
}
}
diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js
index df53133..e071c8c 100644
--- a/html/js/acc_ledger.js
+++ b/html/js/acc_ledger.js
@@ -49,7 +49,7 @@ function update_predef(p_type, p_direct, p_ac)
if (a.length == 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var code_html = getNodeText(html[0]);
code_html = unescape_xml(code_html);
@@ -113,7 +113,7 @@ function update_name()
*/
function error_get_predef(request, json)
{
- alert("Erreur mise à jour champs non possible");
+ alert_box("Erreur mise à jour champs non possible");
}
/**
@@ -201,13 +201,13 @@ function update_row(ctl)
}
}
} catch (e) {
- alert(e.getMessage);
+ alert_box(e.getMessage);
}
}
}
);
} catch (e) {
- alert(e.getMessage);
+ alert_box(e.getMessage);
}
}
/**
@@ -224,7 +224,7 @@ function success_update_bank(req)
if (a.length == 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var name_ctl = a[0].firstChild.nodeValue;
var code_html = getNodeText(html[0]);
@@ -233,7 +233,7 @@ function success_update_bank(req)
}
catch (e)
{
- alert("success_update_bank" + e.message);
+ alert_box("success_update_bank" + e.message);
}
}
/**
@@ -267,7 +267,7 @@ function success_get_last_date(req)
if (a.length == 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var name_ctl = a[0].firstChild.nodeValue;
var code_html = getNodeText(html[0]);
@@ -276,7 +276,7 @@ function success_get_last_date(req)
}
catch (e)
{
- alert(e.message);
+ alert_box(e.message);
}
}
/**
@@ -298,7 +298,7 @@ function success_get_pj(request, json)
*/
function error_get_pj(request, json)
{
- alert("Ajax a echoue");
+ alert_box("Ajax a echoue");
}
/**
@@ -383,7 +383,7 @@ function ledger_add_row()
new_tt.evalScripts();
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
/**
@@ -518,7 +518,7 @@ function success_compute_ledger(request, json)
*/
function error_compute_ledger(request, json)
{
- alert('Ajax does not work');
+ alert_box('Ajax does not work');
}
function compute_all_ledger()
{
@@ -691,7 +691,7 @@ function update_history_account(obj)
});
} catch (e)
{
- alert("update_history_account error " + e.message);
+ alert_box("update_history_account error " + e.message);
}
return false;
@@ -744,7 +744,7 @@ function update_history_card(obj)
});
} catch (e)
{
- alert("update_history_account error " + e.message);
+ alert_box("update_history_account error " + e.message);
}
return false;
@@ -894,7 +894,7 @@ function dsp_letter(obj)
}
catch (e)
{
- alert('dsp_letter failed ' + e.message);
+ alert_box('dsp_letter failed ' + e.message);
}
}
@@ -908,7 +908,7 @@ function success_dsp_letter(req)
if (a.length == 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var name_ctl = a[0].firstChild.nodeValue;
var code_html = getNodeText(html[0]);
@@ -917,7 +917,7 @@ function success_dsp_letter(req)
}
catch (e)
{
- alert(e.message);
+ alert_box(e.message);
}
try
{
@@ -925,13 +925,13 @@ function success_dsp_letter(req)
}
catch (e)
{
- alert("Impossible executer script de la reponse\n" + e.message);
+ alert_box("Impossible executer script de la reponse\n" + e.message);
}
}
function error_dsp_letter(req)
{
- alert('Erreur AJAX DSP_LETTER');
+ alert_box('Erreur AJAX DSP_LETTER');
}
function search_letter(obj)
@@ -975,7 +975,7 @@ function search_letter(obj)
}
catch (e)
{
- alert('search_letter ' + e.message);
+ alert_box('search_letter ' + e.message);
}
}
/**
@@ -1021,7 +1021,7 @@ function op_save(obj)
return false;
} catch (e)
{
- alert(e.message);
+ alert_box(e.message);
}
}
function get_history_account(ctl, dossier) {
@@ -1059,7 +1059,7 @@ function show_reconcile(p_div, p_let)
} catch (e)
{
- alert(e.message);
+ alert_box(e.message);
}
@@ -1108,7 +1108,7 @@ function gestion_add_row()
new_tt.evalScripts();
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
\ No newline at end of file
diff --git a/html/js/accounting_item.js b/html/js/accounting_item.js
index d27eac9..acbe0ef 100644
--- a/html/js/accounting_item.js
+++ b/html/js/accounting_item.js
@@ -66,7 +66,7 @@ function pcmn_update(p_dossier, p_val)
if (a.length == 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var name_ctl = getNodeText(a[0]);
@@ -86,7 +86,7 @@ function pcmn_update(p_dossier, p_val)
}
catch (e)
{
- alert("Impossible executer script de la reponse\n" +
e.message);
+ alert_box("Impossible executer script de la reponse\n"
+ e.message);
}
}
@@ -185,7 +185,7 @@ function search_poste(obj)
}
catch (e)
{
- alert(e.getMessage);
+ alert_box(e.getMessage);
}
}
/**
@@ -258,7 +258,7 @@ function result_poste_search(req)
if ( a.length == 0 )
{
var rec=req.responseText;
- alert ('erreur :'+rec);
+ alert_box ('erreur :'+rec);
}
var html=answer.getElementsByTagName('code');
@@ -270,7 +270,7 @@ function result_poste_search(req)
}
catch (e)
{
- alert(e.message);
+ alert_box(e.message);
}
try
{
@@ -278,7 +278,7 @@ function result_poste_search(req)
}
catch(e)
{
- alert("Impossible executer script de la reponse\n"+e.message);
+ alert_box("Impossible executer script de la reponse\n"+e.message);
}
}
@@ -287,7 +287,7 @@ function result_poste_search(req)
*/
function errorPoste()
{
- alert('Ajax failed');
+ alert_box('Ajax failed');
}
function pausecomp(millis)
{
@@ -350,7 +350,7 @@ function pcmn_save()
var ctl =
answer.getElementsByTagName('ctl')[0].textContent;
if (html.length == 0) {
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var code_html = getNodeText(html[0]); // Firefox
ne prend que les 4096 car.
code_html = unescape_xml(code_html);
diff --git a/html/js/admin.js b/html/js/admin.js
index f4b7667..d700aae 100644
--- a/html/js/admin.js
+++ b/html/js/admin.js
@@ -55,7 +55,7 @@ function folder_display(p_user)
var html = answer.getElementsByTagName('content');
if (a.length == 0) {
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var content = getNodeText(html[0]);
@@ -110,7 +110,7 @@ function folder_add(p_user, p_dossier)
var html = answer.getElementsByTagName('content');
if (a.length == 0) {
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var content = getNodeText(html[0]);
@@ -143,7 +143,7 @@ function display_admin_answer(p_dossier,p_action)
var html = answer.getElementsByTagName('content');
if (a.length == 0) {
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var folder;
diff --git a/html/js/ajax_fiche.js b/html/js/ajax_fiche.js
index 4375951..88503ed 100644
--- a/html/js/ajax_fiche.js
+++ b/html/js/ajax_fiche.js
@@ -53,7 +53,7 @@ function clean_Fid(p_ctl)
}
function errorFid(request,json)
{
- alert('erreur : ajax fiche');
+ alert_box('erreur : ajax fiche');
}
/*!\brief this function fills the data from fid.php,
* \param p_ctl object : field of the input,
@@ -128,8 +128,8 @@ function ajaxFid(p_ctl)
);
}catch (e) {
- alert(e.message);
- alert(p_ctl);
+ alert_box(e.message);
+ alert_box(p_ctl);
}
}
@@ -183,7 +183,7 @@ function successFid(request,json)
}
function ajax_error_saldo(request,json)
{
- alert('erreur : ajax solde ');
+ alert_box('erreur : ajax solde ');
}
/*!\brief this function get the saldo
* \param p_ctl the ctrl where we take the quick_code
@@ -196,7 +196,7 @@ function ajax_saldo(p_ctl)
queryString="FID="+ctl_value+"&op=saldo";
queryString=queryString+'&gDossier='+gDossier+'&j='+jrn;
queryString=queryString+'&ctl='+ctl_value;
- /* alert(queryString); */
+ /* alert_box(queryString); */
var action=new Ajax.Request (
"ajax_misc.php",
{
@@ -245,7 +245,7 @@ function ajax_get_success(request,json)
*/
function ajax_get_failure(request,json)
{
- alert("Ajax do not work for ajax_get");
+ alert_box("Ajax do not work for ajax_get");
}
diff --git a/html/js/anc_script.js b/html/js/anc_script.js
index 84e90c9..0b1ed5e 100644
--- a/html/js/anc_script.js
+++ b/html/js/anc_script.js
@@ -41,13 +41,13 @@ function add_row(p_table, p_seq)
if (mytable.rows.length > 15)
{
- alert("Maximum 15 lignes ");
+ alert_box("Maximum 15 lignes ");
return;
}
var amount = compute_total_table(p_table, p_seq);
if (max < amount)
{
- alert('Montant incorrect : max = ' + max + " calculé=" + amount);
+ alert_box('Montant incorrect : max = ' + max + " calculé=" + amount);
return;
}
// For the detail view (modify_op) there is several form and then several
time the
@@ -89,7 +89,7 @@ function compute_total_table(p_table, seq)
}
catch (e)
{
- alert(e.message);
+ alert_box(e.message);
}
}
/**
@@ -119,7 +119,7 @@ function anc_refresh_remain(p_table, p_seq)
}
} catch (a)
{
- alert(a.message);
+ alert_box(a.message);
}
}
/*!
@@ -175,14 +175,14 @@ function verify_ca(div)
}
if (amount_error != 0)
{
- alert('Désolé, les montants pour la comptabilité analytique sont
incorrects');
+ alert_box('Désolé, les montants pour la comptabilité analytique
sont incorrects');
return false;
}
return true;
}
catch (e)
{
- alert(e.message);
+ alert_box(e.message);
return false;
}
}
@@ -221,7 +221,7 @@ function search_ca(p_dossier, p_target, p_source)
$('searchanc').innerHTML = req.responseText;
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -246,7 +246,7 @@ function search_anc_form(obj)
req.responseText.evalScripts();
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -403,7 +403,7 @@ function anc_key_compute(p_dossier, p_table, p_amount,
p_key_id)
var html = answer.getElementsByTagName('code');
if (html.length == 0) {
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var code_html = getNodeText(html[0]); // Firefox
ne prend que les 4096 car.
@@ -453,7 +453,7 @@ function anc_key_choice(p_dossier, p_table,
p_amount,p_ledger)
var html = answer.getElementsByTagName('code');
if (html.length == 0) {
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var code_html = getNodeText(html[0]); // Firefox
ne prend que les 4096 car.
@@ -489,7 +489,7 @@ function add_row_key(p_table)
var table_length=mytable.rows.length ;
if ( table_length > 15)
{
- alert("Maximum 15 lignes ");
+ alert_box("Maximum 15 lignes ");
return;
}
var rowToCopy = mytable.rows[1];
diff --git a/html/js/calc.js b/html/js/calc.js
index ed8be57..37477c5 100644
--- a/html/js/calc.js
+++ b/html/js/calc.js
@@ -49,7 +49,7 @@ function cal()
}
catch(exception)
{
- alert("Mauvaise formule\n"+p_variable);
+ alert_box("Mauvaise formule\n"+p_variable);
return false;
}
p_history=p_history+'<hr>'+p_variable;
diff --git a/html/js/card.js b/html/js/card.js
index db483fe..14b59a5 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -51,7 +51,7 @@ function boxsearch_card(p_dossier)
);
}catch( e)
{
- alert(e.getMessage);
+ alert_box(e.getMessage);
}
}
/**
@@ -110,7 +110,7 @@ function search_card(obj)
}
catch(e)
{
- alert('search_card failed'+e.message);
+ alert_box('search_card failed'+e.message);
}
}
/**
@@ -177,7 +177,7 @@ function action_add_concerned_card(obj)
if (a.length == 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var html = answer.getElementsByTagName('code');
var namectl = a[0].firstChild.nodeValue;
@@ -199,7 +199,7 @@ function action_add_concerned_card(obj)
$('search_card').innerHTML = code_html;
$('query').focus();
}catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -207,7 +207,7 @@ function action_add_concerned_card(obj)
}
catch (e)
{
- alert('search_card failed' + e.message);
+ alert_box('search_card failed' + e.message);
return false;
}
return false;
@@ -283,7 +283,7 @@ function result_card_search(req)
if ( a.length == 0 )
{
var rec=req.responseText;
- alert ('erreur :'+rec);
+ alert_box ('erreur :'+rec);
}
var html=answer.getElementsByTagName('code');
@@ -309,7 +309,7 @@ function result_card_search(req)
}
catch (e)
{
- alert(e.message);
+ alert_box(e.message);
}
try
{
@@ -317,7 +317,7 @@ function result_card_search(req)
}
catch(e)
{
- alert("Impossible executer script de la reponse\n"+e.message);
+ alert_box("Impossible executer script de la reponse\n"+e.message);
}
}
@@ -374,7 +374,7 @@ function clean_Fid(p_ctl)
}
function errorFid(request,json)
{
- alert('erreur : ajax fiche');
+ alert_box('erreur : ajax fiche');
}
function update_value(text,li)
{
@@ -496,7 +496,7 @@ function successFill_ipopcard(req,json)
if ( a.length == 0 )
{
var rec=req.responseText;
- alert ('erreur :'+rec);
+ alert_box ('erreur :'+rec);
}
var name_ctl=a[0].firstChild.nodeValue;
var code_html=getNodeText(html[0]);
@@ -506,7 +506,7 @@ function successFill_ipopcard(req,json)
}
catch (e)
{
- alert(e.message);
+ alert_box(e.message);
}
try
{
@@ -514,7 +514,7 @@ function successFill_ipopcard(req,json)
}
catch(e)
{
- alert("Impossible executer script de la reponse\n"+e.message);
+ alert_box("Impossible executer script de la reponse\n"+e.message);
}
}
/**
@@ -758,7 +758,7 @@ function save_card_category(obj)
{
if ( ! $(obj).ipopup)
{
- alert('Erreur pas d\' attribut ipopup '+obj.id);
+ alert_box('Erreur pas d\' attribut ipopup '+obj.id);
return;
};
try {
@@ -780,7 +780,7 @@ function save_card_category(obj)
);
} catch(e)
{
- alert(e.message);
+ alert_box(e.message);
return false;
}
return false;
@@ -828,7 +828,7 @@ try {
}
);
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
return false;
}
}
@@ -856,7 +856,7 @@ function action_save_concerned(p_dossier, p_fiche_id,
p_action_id) {
if (a.length == 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var html = answer.getElementsByTagName('code');
var namectl = a[0].firstChild.nodeValue;
@@ -889,7 +889,7 @@ function
action_remove_concerned(p_dossier,p_fiche_id,p_action_id)
if (a.length == 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var html = answer.getElementsByTagName('code');
var namectl = a[0].firstChild.nodeValue;
diff --git a/html/js/compute.js b/html/js/compute.js
index c35bfa5..430d252 100644
--- a/html/js/compute.js
+++ b/html/js/compute.js
@@ -58,7 +58,7 @@ function checkTotal()
{
if ( side[e].checked == true)
{
- // alert('checked !!! '+side[e].value);
+ // alert_box('checked !!! '+side[e].value);
deb=side[e].value;
}
}
@@ -71,7 +71,7 @@ function checkTotal()
total_deb+=amount;
}
- // alert("amount ="+i+"="+amount+" cred/deb = "+deb+"total
d/b"+total_deb+"/"+total_cred);
+ // alert_box("amount ="+i+"="+amount+" cred/deb = "+deb+"total
d/b"+total_deb+"/"+total_cred);
}
diff --git a/html/js/compute_direct.js b/html/js/compute_direct.js
index a3ccc2b..04a534d 100644
--- a/html/js/compute_direct.js
+++ b/html/js/compute_direct.js
@@ -59,7 +59,7 @@ function checkTotalDirect()
{
if ( side[e].checked == true)
{
- // alert('checked !!! '+side[e].value);
+ // alert_box('checked !!! '+side[e].value);
total_deb+=amount;
}
else
@@ -68,7 +68,7 @@ function checkTotalDirect()
}
}
- // alert("amount ="+i+"="+amount+" cred/deb = "+deb+"total
d/b"+total_deb+"/"+total_cred);
+ // alert_box("amount ="+i+"="+amount+" cred/deb = "+deb+"total
d/b"+total_deb+"/"+total_cred);
}
diff --git a/html/js/confirm.js b/html/js/confirm.js
deleted file mode 100644
index 5bcc6f7..0000000
--- a/html/js/confirm.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of NOALYSS.
- *
- * NOALYSS is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * NOALYSS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NOALYSS; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder address@hidden
-
-/*!\file
- * \brief Manage the confirmation process for deleting a template
- *
- */
-
-// \brief Confirm the removal of a template
-function confirm_remove(p_obj_id,p_type)
-{
- var
- a=open('confirm_remove.php?ob_id='+p_obj_id+'&p_type='+p_type,'Confirmez
effacement','toolbar=no,width=500,height=400,scrollbars=yes,resizable=yes');
-
-}
diff --git a/html/js/gestion.js b/html/js/gestion.js
index 4cc9760..231a2e8 100644
--- a/html/js/gestion.js
+++ b/html/js/gestion.js
@@ -96,16 +96,16 @@ function successRemoveOp(request,json)
{
try{
var answer=request.responseText.evalJSON(true);
- if ( answer.ago_id == -1 ) { alert ('Effacement non
autorisé');return;}
+ if ( answer.ago_id == -1 ) { alert_box ('Effacement non
autorisé');return;}
var action="acop"+answer.ago_id;
$(action).innerHTML="";
var doc="op"+answer.ago_id;
$(doc).style.color="red";
- $(doc).href="javascript:alert('Commentaire Effacé')";
+ $(doc).href="javascript:alert_box('Commentaire Effacé')";
$(doc).style.textDecoration="line-through";
}catch(e){
- alert(e.message);
+ alert_box(e.message);
}
}
/**
@@ -125,14 +125,14 @@ function remove_action(p_dossier,p_id,ag_id)
onSuccess:function(request,json) {
try{
var answer=request.responseText.evalJSON(true);
- if ( answer.act_id == -1 ) { alert ('Effacement
non autorisé');return;}
+ if ( answer.act_id == -1 ) { alert_box
('Effacement non autorisé');return;}
var action="acact"+answer.act_id;
$(action).innerHTML="";
var doc="act"+answer.act_id;
$(doc).style.color="red";
- $(doc).href="javascript:alert('Action
Effacée')";
+ $(doc).href="javascript:alert_box('Action
Effacée')";
$(doc).style.textDecoration="line-through";
- } catch (e){ alert(e.message);}
+ } catch (e){ alert_box(e.message);}
}
}
@@ -162,12 +162,12 @@ function remove_comment(p_dossier,p_id)
function successRemoveComment(request,json)
{
var answer=request.responseText.evalJSON(true);
- if ( answer.agc_id == -1 ) { alert ('Effacement non autorisé');return;}
+ if ( answer.agc_id == -1 ) { alert_box ('Effacement non
autorisé');return;}
var action="accom"+answer.agc_id;
$(action).innerHTML="";
var doc="com"+answer.agc_id;
$(doc).style.color="red";
- $(doc).href="javascript:alert('Commentaire Effacé')";
+ $(doc).href="javascript:alert_box('Commentaire Effacé')";
$(doc).style.textDecoration="line-through";
}
@@ -176,7 +176,7 @@ function successRemoveComment(request,json)
*/
function errorRemoveDoc()
{
- alert('Impossible d\'effacer ce document');
+ alert_box('Impossible d\'effacer ce document');
}
/**
address@hidden success when removing a document
@@ -184,12 +184,12 @@ function errorRemoveDoc()
function successRemoveDoc(request,json)
{
var answer=request.responseText.evalJSON(true);
- if ( answer.d_id == -1 ) { alert ('Effacement non autorisé');return;}
+ if ( answer.d_id == -1 ) { alert_box ('Effacement non
autorisé');return;}
var action="ac"+answer.d_id;
$(action).innerHTML="";
var doc="doc"+answer.d_id;
$(doc).style.color="red";
- $(doc).href="javascript:alert('Document Effacé')";
+ $(doc).href="javascript:alert_box('Document Effacé')";
$(doc).style.textDecoration="line-through";
$('desc'+answer.d_id).innerHTML="";
@@ -205,11 +205,11 @@ function check_hour(p_ctl)
var h=document.getElementById(p_ctl);
var re = /^\d{1,2}:\d{2}$/;
if ( trim(h.value) !='' && ! h.value.match(re))
- alert("Format de l'heure est HH:MM ")
+ alert_box("Format de l'heure est HH:MM ")
}
catch (erreur)
{
- alert('fct : check_hour '+erreur);
+ alert_box('fct : check_hour '+erreur);
}
}
@@ -243,7 +243,7 @@ function removeStock(s_id,p_dossier)
*/
function errorRemoveStock()
{
- alert('Impossible d\'effacer ');
+ alert_box('Impossible d\'effacer ');
}
/**
address@hidden success when removing a document
@@ -258,11 +258,11 @@ function successRemoveStock(request,json)
$(href).innerHTML='';
$(doc).style.color="red";
- // $(doc).href="javascript:alert('Stock Effacé')";
+ // $(doc).href="javascript:alert_box('Stock Effacé')";
$(doc).style.textDecoration="line-through";
} catch (e)
{
- alert("success_box"+e.message);
+ alert_box("success_box"+e.message);
}
}
/**
@@ -286,7 +286,7 @@ function action_show(p_dossier)
});
} catch (e)
{
- alert('action_show '+e.message);
+ alert_box('action_show '+e.message);
}
}
/**
@@ -297,7 +297,7 @@ function action_show(p_dossier)
function action_add(p_dossier) {
try {
if ( $('action_add_div')) {
- alert('Désolé, événement en cours de création à sauver');
+ alert_box('Désolé, événement en cours de création à sauver');
return;
}
waiting_box();
@@ -316,7 +316,7 @@ function action_add(p_dossier) {
});
} catch (e)
{
- alert('action_add '+e.message);
+ alert_box('action_add '+e.message);
}
}
/**
@@ -379,7 +379,7 @@ function action_save_short()
});
} catch (e)
{
- alert('action_add ' + e.message);
+ alert_box('action_add ' + e.message);
}
return false;
}
\ No newline at end of file
diff --git a/html/js/modele_document.js b/html/js/modele_document.js
index 0df0a5c..31b9b28 100644
--- a/html/js/modele_document.js
+++ b/html/js/modele_document.js
@@ -65,7 +65,7 @@ function modify_document_success_box(req,json)
if ( a.length == 0 )
{
var rec=req.responseText;
- alert ('erreur :'+rec);
+ alert_box ('erreur :'+rec);
}
var name_ctl=a[0].firstChild.nodeValue;
var code_html=getNodeText(html[0]);
@@ -76,7 +76,7 @@ function modify_document_success_box(req,json)
}
catch (e)
{
- alert("success_box"+e.message);
+ alert_box("success_box"+e.message);
}
try
{
@@ -84,6 +84,6 @@ function modify_document_success_box(req,json)
}
catch(e)
{
- alert("answer_box Impossible executer script de la
reponse\n"+e.message);
+ alert_box("answer_box Impossible executer script de la
reponse\n"+e.message);
}
}
diff --git a/html/js/scripts.js b/html/js/scripts.js
index b5faf7a..d2e9c8b 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -41,7 +41,7 @@ function infodiv(req, json)
if (a.length === 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var name_ctl = a[0].firstChild.nodeValue;
var code_html = getNodeText(html[0]);
@@ -51,7 +51,7 @@ function infodiv(req, json)
}
catch (e)
{
- alert("success_box" + e.message);
+ alert_box("success_box" + e.message);
}
try
{
@@ -59,7 +59,7 @@ function infodiv(req, json)
}
catch (e)
{
- alert("answer_box Impossible executer script de la reponse\n" +
e.message);
+ alert_box("answer_box Impossible executer script de la reponse\n" +
e.message);
}
}
@@ -154,7 +154,7 @@ function encodeJSON(obj)
{
if (typeof obj != 'object')
{
- alert('encodeParameter obj n\'est pas un objet');
+ alert_box('encodeParameter obj n\'est pas un objet');
}
try
{
@@ -177,7 +177,7 @@ function encodeJSON(obj)
}
catch (e)
{
- alert('encodeParameter ' + e.message);
+ alert_box('encodeParameter ' + e.message);
return "";
}
}
@@ -372,7 +372,7 @@ function success_misc(req)
if (html.length === 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var nodeXml = html[0];
var code_html = getNodeText(nodeXml);
@@ -381,7 +381,7 @@ function success_misc(req)
}
catch (e)
{
- alert(e.message);
+ alert_box(e.message);
}
try
{
@@ -389,7 +389,7 @@ function success_misc(req)
}
catch (e)
{
- alert("Impossible executer script de la reponse\n" + e.message);
+ alert_box("Impossible executer script de la reponse\n" + e.message);
}
@@ -403,7 +403,7 @@ function loading()
function ajax_misc_failure()
{
- alert('Ajax Misc failed');
+ alert_box('Ajax Misc failed');
}
/**
address@hidden remove a document_modele
@@ -451,13 +451,13 @@ function success_cat_doc_remove(req)
if (html.length === 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
nodeXML = html[0];
row_id = getNodeText(nodeXML);
if (row_id === 'nok')
{
- alert('Error');
+ alert_box('Error');
return;
}
$('row' + row_id).style.textDecoration = "line-through";
@@ -465,7 +465,7 @@ function success_cat_doc_remove(req)
}
catch (e)
{
- alert(e.message);
+ alert_box(e.message);
}
}
/**
@@ -500,7 +500,7 @@ function popup_select_tva(obj)
if (popup.length === 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var html = answer.getElementsByTagName('code');
@@ -519,7 +519,7 @@ function popup_select_tva(obj)
}
catch (e)
{
- alert("success_popup_select_tva " + e.message);
+ alert_box("success_popup_select_tva " + e.message);
}
}
}
@@ -527,7 +527,7 @@ function popup_select_tva(obj)
}
catch (e)
{
- alert("popup_select_tva " + e.message);
+ alert_box("popup_select_tva " + e.message);
}
}
/**
@@ -562,7 +562,7 @@ function set_tva_label(obj)
}
catch (e)
{
- alert("set_tva_label " + e.message);
+ alert_box("set_tva_label " + e.message);
}
}
/**
@@ -579,7 +579,7 @@ function success_set_tva_label(req)
if (code.length === 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var label_code = code[0].firstChild.nodeValue;
@@ -588,7 +588,7 @@ function success_set_tva_label(req)
}
catch (e)
{
- alert("success_set_tva_label " + e.message);
+ alert_box("success_set_tva_label " + e.message);
}
}
@@ -693,7 +693,7 @@ function add_div(obj)
}
catch (e)
{
- alert("add_div " + e.message);
+ alert_box("add_div " + e.message);
}
}
/**
@@ -798,7 +798,7 @@ function success_box(req, json)
if (a.length === 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var name_ctl = a[0].firstChild.nodeValue;
var code_html = getNodeText(html[0]);
@@ -812,7 +812,7 @@ function success_box(req, json)
}
catch (e)
{
- alert("success_box" + e.message);
+ alert_box("success_box" + e.message);
}
try
{
@@ -820,13 +820,13 @@ function success_box(req, json)
}
catch (e)
{
- alert("answer_box Impossible executer script de la reponse\n" +
e.message);
+ alert_box("answer_box Impossible executer script de la reponse\n" +
e.message);
}
}
function error_box()
{
- alert('[error_box] ajax not implemented');
+ alert_box('[error_box] ajax not implemented');
}
/**
* show the ledger choice
@@ -873,7 +873,7 @@ function show_ledger_choice(json_obj)
var html = answer.getElementsByTagName('code');
if (a.length === 0) {
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var name_ctl = a[0].firstChild.nodeValue;
var code_html = getNodeText(html[0]);
@@ -884,13 +884,13 @@ function show_ledger_choice(json_obj)
}
catch (e) {
- alert("show_ledger_callback" + e.message);
+ alert_box("show_ledger_callback" + e.message);
}
try {
code_html.evalScripts();
}
catch (e) {
- alert("answer_box Impossible executer script de la
reponse\n" + e.message);
+ alert_box("answer_box Impossible executer script
de la reponse\n" + e.message);
}
}
@@ -898,7 +898,7 @@ function show_ledger_choice(json_obj)
}
);
} catch (e) {
- alert('show_ledger_choice' + e.message);
+ alert_box('show_ledger_choice' + e.message);
}
}
/**
@@ -928,7 +928,7 @@ function hide_ledger_choice(p_frm_search)
removeDiv(div + 'jrn_search');
return false;
} catch (e) {
- alert('hide_ledger_choice' + e.message);
+ alert_box('hide_ledger_choice' + e.message);
return false;
}
@@ -1082,7 +1082,7 @@ function display_periode(p_dossier, p_id)
}
catch (e)
{
- alert("display_periode " + e.message);
+ alert_box("display_periode " + e.message);
}
}
@@ -1097,7 +1097,7 @@ function success_display_periode(req)
if (html.length === 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var code_html = getNodeText(html[0]);
@@ -1107,7 +1107,7 @@ function success_display_periode(req)
}
catch (e)
{
- alert("success_display_periode".e.message);
+ alert_box("success_display_periode".e.message);
}
try
{
@@ -1115,7 +1115,7 @@ function success_display_periode(req)
}
catch (e)
{
- alert("success_display_periode Impossible executer script de la
reponse\n" + e.message);
+ alert_box("success_display_periode Impossible executer script de la
reponse\n" + e.message);
}
}
@@ -1137,7 +1137,7 @@ function save_periode(obj)
}
catch (e)
{
- alert("display_periode " + e.message);
+ alert_box("display_periode " + e.message);
}
return false;
@@ -1161,7 +1161,7 @@ function fill_box(req)
var html = answer.getElementsByTagName('code');
if (a.length === 0) {
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var name_ctl = a[0].firstChild.nodeValue;
var code_html = getNodeText(html[0]); // Firefox ne prend que les 4096
car.
@@ -1169,13 +1169,13 @@ function fill_box(req)
$(name_ctl).innerHTML = code_html;
}
catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
try {
code_html.evalScripts();
}
catch (e) {
- alert("Impossible executer script de la reponse\n" + e.message);
+ alert_box("Impossible executer script de la reponse\n" + e.message);
}
@@ -1314,7 +1314,7 @@ function search_operation(obj)
} catch (e)
{
remove_waiting_box();
- alert(e.message);
+ alert_box(e.message);
}
}
/**
@@ -1357,7 +1357,7 @@ function set_reconcile(obj)
}
catch (e)
{
- alert(e.message)
+ alert_box(e.message)
}
}
function remove_waiting_node()
@@ -1458,7 +1458,7 @@ function mod_menu(gdossier, pm_id)
add_div({id: "divdm" + pm_id, drag: 1, cssclass:
"inner_box", style: pos});
$('divdm' + pm_id).innerHTML = req.responseText;
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -1494,7 +1494,7 @@ function
display_sub_menu(p_dossier,p_profile,p_dep,p_level)
new_row.innerHTML = req.responseText;
$('menu_table').appendChild(new_row);
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
})
@@ -1523,7 +1523,7 @@ function remove_sub_menu(p_dossier,profile_menu_id)
$('sub'+profile_menu_id).remove();
} catch(e)
{
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -1566,7 +1566,7 @@ function add_menu(obj)
add_div({id: "divdm" + p_id, drag: 1, "cssclass":
"inner_box", "style": pos});
$('divdm' + p_id).innerHTML = req.responseText;
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -1596,7 +1596,7 @@ function add_plugin(p_dossier)
add_div({id: "divplugin", drag: 1, cssclass:
"inner_box", style: pos});
$('divplugin').innerHTML = req.responseText;
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -1627,7 +1627,7 @@ function mod_plugin(p_dossier, me_code)
$('divplugin').innerHTML = req.responseText;
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -1656,7 +1656,7 @@ function create_menu(p_dossier)
});
$('divmenu').innerHTML = req.responseText;
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -1686,7 +1686,7 @@ function modify_menu(p_dossier, me_code)
$('divmenu').innerHTML = req.responseText;
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -1700,7 +1700,7 @@ function get_properties(obj)
{
a_array.push(m);
}
- alert(s_type + a_array.join(","));
+ alert_box(s_type + a_array.join(","));
}
/**
* @brief add a line in the form for the report
@@ -1765,13 +1765,13 @@ function search_action(dossier, ctl_concern)
$('search_action_div').innerHTML =
req.responseText;
req.responseText.evalScripts();
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
}
);
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
@@ -1791,7 +1791,7 @@ function result_search_action(obj)
$('search_action_div').innerHTML =
req.responseText;
req.responseText.evalScripts();
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -1800,7 +1800,7 @@ function result_search_action(obj)
}
catch (e)
{
- alert("display_periode " + e.message);
+ alert_box("display_periode " + e.message);
}
return false;
@@ -1836,7 +1836,7 @@ function set_action_related(p_obj)
}
catch (e)
{
- alert(e.message);
+ alert_box(e.message);
return false;
}
}
@@ -1915,7 +1915,7 @@ function show_fin_chdate(obj_id)
}
}
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
/**
@@ -1931,7 +1931,7 @@ function profile_show(p_div)
$(p_div).show();
} catch (e)
{
- alert(e.message)
+ alert_box(e.message)
}
}
function detail_category_show(p_div, p_dossier, p_id)
@@ -2017,7 +2017,7 @@ function view_action(ag_id, dossier, modify)
if (html.length === 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var code_html = getNodeText(html[0]);
code_html = unescape_xml(code_html);
@@ -2031,7 +2031,7 @@ function view_action(ag_id, dossier, modify)
$(id).innerHTML = code_html;
compute_all_ledger();
} catch (e) {
- alert('view_action' + e.message);
+ alert_box('view_action' + e.message);
}
}
}
@@ -2154,7 +2154,7 @@ function ask_navigator(p_dossier) {
}
catch (e)
{
- alert("answer_box Impossible executer script de la
reponse\n" + e.message);
+ alert_box("answer_box Impossible executer script
de la reponse\n" + e.message);
}
}
@@ -2189,7 +2189,7 @@ function set_preference(p_dossier) {
}
catch (e)
{
- alert("answer_box Impossible executer script de la
reponse\n" + e.message);
+ alert_box("answer_box Impossible executer script
de la reponse\n" + e.message);
}
}
@@ -2226,7 +2226,7 @@ function show_bookmark(p_dossier) {
}
catch (e)
{
- alert("answer_box Impossible executer script de la
reponse\n" + e.message);
+ alert_box("answer_box Impossible executer script
de la reponse\n" + e.message);
}
}
@@ -2260,7 +2260,7 @@ function save_bookmark() {
}
catch (e)
{
- alert("answer_box Impossible executer script de la
reponse\n" + e.message);
+ alert_box("answer_box Impossible executer script
de la reponse\n" + e.message);
}
}
@@ -2292,7 +2292,7 @@ function remove_bookmark() {
}
catch (e)
{
- alert("answer_box Impossible executer script de la
reponse\n" + e.message);
+ alert_box("answer_box Impossible executer script
de la reponse\n" + e.message);
}
}
@@ -2332,7 +2332,7 @@ function show_tag(p_dossier, p_ac, p_tag_id, p_post)
if (html.length === 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var code_html = getNodeText(html[0]);
code_html = unescape_xml(code_html);
@@ -2345,7 +2345,7 @@ function show_tag(p_dossier, p_ac, p_tag_id, p_post)
}
catch (e)
{
- alert("answer_box Impossible executer script de la
reponse\n" + e.message);
+ alert_box("answer_box Impossible executer script
de la reponse\n" + e.message);
}
}
@@ -2721,7 +2721,7 @@ function stock_add_row()
new_tt.evalScripts();
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
@@ -2768,7 +2768,7 @@ function show_tabs(a_tabs, p_display_tab)
}
$(p_display_tab).show();
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
@@ -2845,6 +2845,54 @@ function init_scroll()
}
}
/**
+ * Confirm a form thanks a modal dialog Box, it returns true if we agree
otherwise
+ * false
+ * @code
+<form onsubmit="return confirm_form(this,'message')">
+</form>
+ * @endcode
+ * @param p_obj form element id
+ * @param p_message message to display
+ * @returns true or false
+ */
+function confirm_form(p_obj, p_message)
+{
+ try {
+ var name="";
+ if ( typeof (p_obj) == "object") {
+ name=p_obj.id;
+ } else {
+ name=p_obj;
+ }
+ var background_block = document.createElement('DIV');
+ background_block.id = 'background_block';
+ background_block.addClassName('popup_back');
+ document.body.appendChild(background_block);
+
+ var newdiv = document.createElement('DIV');
+ newdiv.id = 'confirm_12';
+ newdiv.addClassName("inner_box");
+ newdiv.setStyle('z-index:101;width:50%;left:25%;');
+ //newdiv.innerHTML="<h2 class='title'></h2>";
+ newdiv.innerHTML += '<p style="text-align:center">';
+ newdiv.innerHTML += p_message;
+ newdiv.innerHTML += '</p>';
+ newdiv.innerHTML += '<p style="text-align:center">';
+ newdiv.innerHTML += '<input type="button" class="button" value="ok"
onclick="$(\'' + name + '\').submit()">';
+ newdiv.innerHTML += '<input type="button" class="button"
value="cancel"
onclick="$(\'background_block\').remove();$(\'confirm_12\').remove()">';
+ newdiv.innerHTML += '</p>';
+ document.body.appendChild(newdiv);
+
+ } catch (e) {
+ console.debug(e);
+ }
+ return false;
+}
+function alert_box(p_message)
+{
+ smoke.alert(p_message,false , {ok:'ok',classname:"inner_box"});
+}
+/**
* All the onload must be here otherwise the other will overwritten
* @returns {undefined}
*/
@@ -2853,4 +2901,4 @@ window.onload=function ()
create_anchor_up();
init_scroll();
sorttable.init
-}
\ No newline at end of file
+}
diff --git a/html/js/todo_list.js b/html/js/todo_list.js
index 80e11e6..f2a94c9 100644
--- a/html/js/todo_list.js
+++ b/html/js/todo_list.js
@@ -65,7 +65,7 @@ function todo_list_show(p_id)
if (tl_id.length == 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var content =
unescape_xml(getNodeText(tl_content[0]));
todo_div.innerHTML=content;
@@ -76,7 +76,7 @@ function todo_list_show(p_id)
}
catch (e)
{
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -84,13 +84,13 @@ function todo_list_show(p_id)
}
catch (e)
{
- alert(" Envoi ajax non possible" + e.message);
+ alert_box(" Envoi ajax non possible" + e.message);
}
return false;
}
function todo_list_show_error(request_json)
{
- alert('failure');
+ alert_box('failure');
}
function add_todo()
{
@@ -140,7 +140,7 @@ function todo_list_save(p_form)
if (tl_id.length == 0)
{
var rec = req.responseText;
- alert('erreur :' + rec);
+ alert_box('erreur :' + rec);
}
var tr = $('tr'+p_form);
if ( p_form == 0)
@@ -232,7 +232,7 @@ function todo_list_share(p_note, p_dossier)
$(shared_note).show();
} catch (e) {
- alert(e.message);
+ alert_box(e.message);
}
}
}
@@ -268,7 +268,7 @@ function todo_list_remove_share(note_id,p_login,p_dossier)
var answer=p_xml.responseXML;
var status=answer.getElementsByTagName('status');
if ( status.length == 0) {
- alert ('erreur reponse ');
+ alert_box ('erreur reponse ');
}
var status_code=getNodeText(status[0]);
if ( status_code == 'ok') {
diff --git a/html/style-classic.css b/html/style-classic.css
index 949d61c..11d0716 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -677,11 +677,12 @@ div.popup_back{
position:absolute;
top:0px;
left:0px;
- opacity:0.6;
+ opacity:0.30;
width:100%;
height:100%;
z-index:1;
- display:none;
+ display:block;
+ background: #3f4c6b;
}
div.popup_border_title {
diff --git a/html/style-light.css b/html/style-light.css
index 6c79df3..8e9efac 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -703,11 +703,12 @@ div.popup_back{
position:absolute;
top:0px;
left:0px;
- opacity:0.6;
+ opacity:0.3;
width:100%;
height:100%;
- z-index:1;
- display:none;
+ z-index:100;
+ display:block;
+ background: #909BA7;
}
div.popup_border_title {
diff --git a/include/ac_common.php b/include/ac_common.php
index 57f686e..07c25bb 100644
--- a/include/ac_common.php
+++ b/include/ac_common.php
@@ -293,7 +293,10 @@ function html_page_start($p_theme="", $p_script="",
$p_script2="")
$is_msie=is_msie();
if ($is_msie == 0 )
+ {
echo '<!doctype html>';
+ echo '<meta name="viewport" content="width=device-width,
initial-scale=1.0">';
+ }
else
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 FINAL//EN" >';
@@ -315,7 +318,8 @@ function html_page_start($p_theme="", $p_script="",
$p_script2="")
echo '<script language="javascript" src="js/calendar.js"></script>
<script type="text/javascript" src="js/lang/calendar-en.js"></script>
<script language="javascript" src="js/calendar-setup.js"></script>
- <LINK REL="stylesheet" type="text/css" href="./calendar-blue.css"
media="screen">';
+ <LINK REL="stylesheet" type="text/css" href="./calendar-blue.css"
media="screen">
+ <LINK REL="stylesheet" type="text/css" href="./smoke.css" media="screen">';
echo ' </HEAD> ';
diff --git a/include/ajax_add_menu.php b/include/ajax_add_menu.php
index 72086a9..8ef003f 100644
--- a/include/ajax_add_menu.php
+++ b/include/ajax_add_menu.php
@@ -133,7 +133,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||'
'||coalesce(me_description,
$pm_default=new ICheckBox('pm_default');
echo HtmlInput::title_box(_("Nouveau"), $ctl);
?>
- <form method="POST" onsubmit="return confirm('<?php echo _('Vous
confirmez'); ?> ?')">
+ <form method="POST" id="menu_new_frm" onsubmit="return
confirm_form('menu_new_frm','<?php echo _('Vous confirmez'); ?> ?')">
<?php
echo HtmlInput::hidden('tab', 'profile_menu_div');
?>
@@ -187,7 +187,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||'
'||coalesce(me_description,
return;
}
?>
- <form method="POST" onsubmit="return confirm('<?php echo _('Vous
confirmez ?') ?>">
+ <form method="POST" id="menu_new2_frm" onsubmit="return
confirm_form('menu_new2_frm','<?php echo _('Vous confirmez ?') ?>">
<?php
echo HtmlInput::hidden('tab', 'profile_print_div');
?>
diff --git a/include/ajax_create_menu.php b/include/ajax_create_menu.php
index 347b4aa..73e8aa5 100644
--- a/include/ajax_create_menu.php
+++ b/include/ajax_create_menu.php
@@ -6,7 +6,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas
permis');
require_once NOALYSS_INCLUDE.'/class_menu_ref.php';
$msg="Création";
$m=new Menu_Ref($cn);
-echo '<form method="POST" onsubmit="return confirm(\'Vous confirmez ?\')">';
+echo '<form method="POST" onsubmit="return confirm_form(this,(this,\'Vous
confirmez ?\')">';
require_once 'template/menu_detail.php';
echo HtmlInput::submit('create_menu','Sauver');
diff --git a/include/ajax_get_menu_detail.php b/include/ajax_get_menu_detail.php
index 1af6e30..be0a886 100644
--- a/include/ajax_get_menu_detail.php
+++ b/include/ajax_get_menu_detail.php
@@ -50,7 +50,7 @@ $pm_default=new ICheckBox('pm_default','1');
$pm_default->set_check($array[0]['pm_default']);
?>
-<form method="POST" onsubmit="return confirm('<?php echo _("Vous confirmez")?>
?')">
+<form method="POST" onsubmit="return confirm_form(this,'<?php echo _("Vous
confirmez")?> ?')">
<?php echo HtmlInput::hidden('pm_id',$array[0]['pm_id'])?>
<?php echo HtmlInput::hidden('p_id',$array[0]['p_id'])?>
<?php echo HtmlInput::hidden('tab',"profile_menu_div")?>
diff --git a/include/ajax_get_profile.php b/include/ajax_get_profile.php
index d4c461b..ccc31c2 100644
--- a/include/ajax_get_profile.php
+++ b/include/ajax_get_profile.php
@@ -76,7 +76,7 @@ else
{
echo '<div class="myfieldset" id="profile_gen_div">';
}
-echo '<form method="POST" onsubmit="return confirm (\'vous confirmez\')">';
+echo '<form method="POST" onsubmit="return confirm_form(this,\'vous
confirmez\')">';
echo HtmlInput::hidden('tab','profile_gen_div');
echo HtmlInput::hidden('p_id',$profile->p_id);
require_once("template/profile.php");
@@ -84,7 +84,7 @@ echo HtmlInput::submit("save_name",_("Modifier"));
echo '</form>';
if ($profile->p_id > 0)
{
- echo '<form method="POST" onsubmit="return confirm (\''._("vous
confirmez").'\')">';
+ echo '<form method="POST" onsubmit="return
confirm_form(this,\''._("vous confirmez").'\')">';
echo _('Vous pouvez aussi copier ce profil et puis le corriger');
@@ -92,7 +92,7 @@ if ($profile->p_id > 0)
echo HtmlInput::submit("clone", "Copier");
echo '</form>';
- echo '<form method="POST" onsubmit="return confirm (\''._("vous
confirmez").'\')">';
+ echo '<form method="POST" onsubmit="return
confirm_form(this,\''._("vous confirmez").'\')">';
echo _('Effacer ce profil');
diff --git a/include/ajax_mod_menu.php b/include/ajax_mod_menu.php
index dae0f4d..12e19cc 100644
--- a/include/ajax_mod_menu.php
+++ b/include/ajax_mod_menu.php
@@ -6,7 +6,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas
permis');
require_once NOALYSS_INCLUDE.'/class_menu_ref.php';
$m=new Menu_Ref($cn,$me_code);
$msg="Modification ".$m->me_code.' '.h($m->me_menu);
-echo '<form method="POST" onsubmit="return confirm(\'Vous confirmez ?\')">';
+echo '<form method="POST" onsubmit="return confirm_form(this,\'Vous confirmez
?\')">';
require_once NOALYSS_INCLUDE.'/template/menu_detail.php';
diff --git a/include/class_extension.php b/include/class_extension.php
index 48c369c..7ca07c3 100644
--- a/include/class_extension.php
+++ b/include/class_extension.php
@@ -105,7 +105,7 @@ class Extension extends Menu_Ref_sql
* @global type $cn
* @param type $p_id profile.p_id
* @param type $p_module menu_ref.me_code
- * @throws Exception 10 : profile absent 20 module absent
+ * @throws Exception 10 : profile absent , 20 module absent , 30 No parent
menu
*/
function insert_profile_menu($p_id=1,$p_module='EXT')
{
@@ -120,12 +120,23 @@ class Extension extends Menu_Ref_sql
if ($module->me_code==null) {
throw new Exception(_('Module inexistant'),20);
}
+ // Dependency
+ $dep_id=$cn->get_value('select pm_id from profile_menu
+ where
+ p_id=$1
+ and me_code = $2 ',array($p_id,$p_module));
+ // throw an exception if there is no dependency
+ if ($dep_id=="") {
+ throw new Exception(_('Pas de menu ').$p_module,30);
+ }
$profil_menu=new Profile_Menu($cn);
$profil_menu->me_code=$this->me_code;
$profil_menu->me_code_dep=$p_module;
$profil_menu->p_type_display='S';
$profil_menu->p_id=$p_id;
+ $profil_menu->pm_id_dep=$dep_id;
+
$cnt=$profil_menu->count(' where p_id=$1 and me_code =
$2',array($p_id,$this->me_code));
if ( $cnt==0) {
$profil_menu->insert();
diff --git a/include/class_periode.php b/include/class_periode.php
index 49c4cec..fe0ff88 100644
--- a/include/class_periode.php
+++ b/include/class_periode.php
@@ -201,7 +201,7 @@ class Periode
from parm_periode
order by p_start,p_end");
$Max=Database::num_row($Res);
- echo '<form id="periode_frm" method="POST"
onsubmit="confirm(\'Confirmez-vous la fermeture des périodes choisies ?\')" >';
+ echo '<form id="periode_frm" method="POST"
onsubmit="confirm_form(this,\'Confirmez-vous la fermeture des périodes choisies
?\')" >';
echo
HtmlInput::array_to_hidden(array('ac','gDossier','jrn_def_id','choose'),
$_REQUEST);
echo '<TABLE ALIGN="CENTER">';
echo "</TR>";
@@ -262,7 +262,7 @@ class Periode
if ($l_line['count_op'] == 0 )
{
$remove.='<A class="mtitle"
HREF="?ac='.$_REQUEST['ac'].'&action=delete_per&p_per='.
- $l_line['p_id']."&$str_dossier\"
onclick=\"return confirm('"._('Confirmez effacement ?')."')\" > Efface</A>";
+ $l_line['p_id']."&$str_dossier\"
onclick=\"return confirm_form(this,'"._('Confirmez effacement ?')."')\" >
Efface</A>";
}
else
{
@@ -326,7 +326,7 @@ class Periode
$this->jrn_def_id);
$jrn_name=Database::fetch_result($r,0,0);
echo '<h2> Journal '.$jrn_name.'</h2>';
- echo '<form id="periode_frm" method="POST"
onsubmit="confirm(\'Confirmez-vous la fermeture des périodes choisies ?\')" >';
+ echo '<form id="periode_frm" method="POST"
onsubmit="confirm_form(this,\'Confirmez-vous la fermeture des périodes choisies
?\')" >';
echo
HtmlInput::array_to_hidden(array('ac','gDossier','jrn_def_id','choose'),
$_REQUEST);
echo '<TABLE ALIGN="CENTER">';
diff --git a/include/class_profile_menu_sql.php
b/include/class_profile_menu_sql.php
index b9579c6..846ff13 100644
--- a/include/class_profile_menu_sql.php
+++ b/include/class_profile_menu_sql.php
@@ -50,6 +50,7 @@ class Profile_Menu_sql extends Noalyss_SQL
, "p_order"=>"p_order"
, "p_type_display"=>"p_type_display"
, "pm_default"=>"pm_default"
+ ,"pm_id_dep"=>"pm_id_dep"
);
$this->type=array(
@@ -60,6 +61,7 @@ class Profile_Menu_sql extends Noalyss_SQL
, "p_order"=>"number"
, "p_type_display"=>"text"
, "pm_default"=>"text"
+ , "pm_id_dep"=>"number"
);
$this->default=array(
diff --git a/include/doc_state.inc.php b/include/doc_state.inc.php
index 7e031f2..7984466 100644
--- a/include/doc_state.inc.php
+++ b/include/doc_state.inc.php
@@ -60,7 +60,7 @@ $a_stat=$cn->get_array("select s_value,s_status from
document_state order by 1")
<?php endfor;?>
</table>
<h2>Ajout d'un état</h2>
-<form method="post" onsubmit="return confirm ('Vous confirmez ?'); ">
+<form method="post" onsubmit="return confirm_form(this,'Vous confirmez ?'); ">
<p>
Nom de l'état <?php $value=new IText("s_value",""); echo
$value->input()?>
</p>
diff --git a/include/function_javascript.php b/include/function_javascript.php
index 684702d..ad77641 100644
--- a/include/function_javascript.php
+++ b/include/function_javascript.php
@@ -2756,6 +2756,7 @@ function load_all_script()
$already_call=1;
echo JS_INFOBULLE;
+ echo js_include('smoke.js');
echo js_include('prototype.js');
echo js_include('scriptaculous.js');
echo js_include('scripts.js');
@@ -2772,7 +2773,6 @@ function load_all_script()
echo js_include('card.js');
echo js_include('compute_direct.js');
echo js_include('compute.js');
- echo js_include('confirm.js');
echo js_include('forecast.js');
echo js_include('gestion.js');
echo js_include('todo_list.js');
diff --git a/include/payment_middle.inc.php b/include/payment_middle.inc.php
index 4362c58..c398c54 100644
--- a/include/payment_middle.inc.php
+++ b/include/payment_middle.inc.php
@@ -43,19 +43,18 @@ if ( $sb=='change')
if ( !isset($_GET['id'])) exit;
$row=new Acc_Payment($cn,$_GET['id']);
$row->load();
- $javascript="return confirm('"._('Vous confirmez')."')";
- echo '<form method="post" onsubmit="'.$javascript.'">';
+ echo '<form method="post" id="modify_acc_pay_frm" onsubmit="return
confirm_form(\'modify_acc_pay_frm\',\''._('Vous confirmez').'\')">';
echo dossier::hidden();
echo HtmlInput::hidden('sa','mp');
echo HtmlInput::hidden('sb','save');
echo HtmlInput::hidden('id',$row->get_parameter("id"));
-
+ echo HtmlInput::hidden('delete_ck',0);
echo $row->form();
- echo HtmlInput::submit('save',_('Sauve'));
- echo HtmlInput::submit('delete',_('Efface'));
+ echo HtmlInput::submit('save',_('Sauve'), '
onclick="$(\'delete_ck\').value=0"');
+ echo HtmlInput::submit('delete',_('Efface'),'
onclick="$(\'delete_ck\').value=1"');
echo HtmlInput::button_anchor(_('Retour sans sauver'),
-
'?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac']
- );
+
'?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac'],
+ "","","smallbutton");
echo '</form>';
return;
}
@@ -64,19 +63,21 @@ if ( $sb=='change')
//
if ( $sb=='save')
{
- $row=new Acc_Payment($cn,$_POST ['id']);
- $row->from_array($_POST);
- $row->update();
-
-}
+ $delete=HtmlInput::default_value_post("delete_ck", 0);
+ if ( $delete == 0 )
+ {
+ $row=new Acc_Payment($cn,$_POST ['id']);
+ $row->from_array($_POST);
+ $row->update();
+ } else {
//---------------------------------------------------------------------------
// Delete a card
//---------------------------------------------------------------------------
-if (isset($_POST['delete']))
-{
$row=new Acc_Payment($cn,$_POST['id']);
$row->from_array($_POST);
$row->delete();
+
+ }
}
//---------------------------------------------------------------------------
// Insert a new mod of payment
@@ -96,14 +97,14 @@ if ($sb=='ins')
{
$mp=new Acc_Payment($cn);
$r=$mp->blank();
- echo '<form method="POST" onsubmit="return confirm(\'Vous confirmez
?\')">';
+ echo '<form method="POST" id="payment_frm" onsubmit="return
confirm_form(this,\'Vous confirmez ?\')">';
echo dossier::hidden();
-
HtmlInput::hidden('ac',$_REQUEST['ac']).HtmlInput::hidden('sb','insert');
+ echo HtmlInput::hidden('ac',$_REQUEST['ac']),HtmlInput::hidden('insert',0);
echo $r;
- echo HtmlInput::submit('insert',_('Enregistre'));
+ echo HtmlInput::submit('insertsub',_('Enregistre'));
echo HtmlInput::button_anchor(_('Retour sans sauver'),
-
'?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac']
- );
+
'?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac'],
+ "","","smallbutton");
echo '</form>';
return;
@@ -115,11 +116,11 @@ if ($sb=='ins')
$header=new Sort_Table();
$base_url=$_SERVER['PHP_SELF']."?".Dossier::get()."&ac=".$_REQUEST['ac'];
-$header->add("Libelle",$base_url,"order by mp_lib asc","order by mp_lib
desc",'la','ld');
-$header->add("Pour le journal",$base_url,"order by jrn_def_name asc","order by
jrn_def_name desc",'ja','jd');
-$header->add("Type de fiche",$base_url,"order by fd_label asc","order by
fd_label desc",'tc','td');
-$header->add("Enregistré dans le journal",$base_url,"order by jrn_target
asc","order by jrn_target desc",'jta','jtd');
-$header->add("Avec la fiche",$base_url,"order by vw_name asc","order by
vw_name desc",'na','nd');
+$header->add(_("Libelle"),$base_url,"order by mp_lib asc","order by mp_lib
desc",'la','ld');
+$header->add(_("Pour le journal"),$base_url,"order by jrn_def_name asc","order
by jrn_def_name desc",'ja','jd');
+$header->add(_("Type de fiche"),$base_url,"order by fd_label asc","order by
fd_label desc",'tc','td');
+$header->add(_("Enregistré dans le journal"),$base_url,"order by jrn_target
asc","order by jrn_target desc",'jta','jtd');
+$header->add(_("Avec la fiche"),$base_url,"order by vw_name asc","order by
vw_name desc",'na','nd');
$order=(isset($_REQUEST['ord']))?$_REQUEST['ord']:'la';
diff --git a/include/template/fiche_list.php b/include/template/fiche_list.php
index 9571893..43b201a 100644
--- a/include/template/fiche_list.php
+++ b/include/template/fiche_list.php
@@ -27,7 +27,7 @@
*/
?>
<?php echo $bar?>
-<form method="POST" class="print" style="display:inline" onsubmit="return
confirm('<?php echo _("Vous confirmez ?")?>')">
+<form method="POST" class="print" style="display:inline" onsubmit="return
confirm_form(this,'<?php echo _("Vous confirmez ?")?>')">
<table class="sortable" id="fiche_list_table_id">
<tr>
<th >
diff --git a/include/template/periode_add_exercice.php
b/include/template/periode_add_exercice.php
index 219bd47..620a546 100644
--- a/include/template/periode_add_exercice.php
+++ b/include/template/periode_add_exercice.php
@@ -12,7 +12,7 @@ pour faire toutes les écritures de fin d'exercice:
amortissements, régulations
</li>
</ul>
-<form method="post" onsubmit="return confirm('<?php echo _("Confirmez vous
l'ajout d\'un exercice comptable ?")?>')">
+<form method="post" onsubmit="return confirm_form(this,'<?php echo
_("Confirmez vous l'ajout d\'un exercice comptable ?")?>')">
<?php
echo HtmlInput::hidden("ac",$_REQUEST['ac']);
echo $nb_exercice->input();
diff --git a/include/template/stock_inv.php b/include/template/stock_inv.php
index 2886d70..5d12bd8 100644
--- a/include/template/stock_inv.php
+++ b/include/template/stock_inv.php
@@ -28,7 +28,7 @@
*/
?>
<div style="<?php if ( ! $p_readonly) echo "position:absolute";?>"
class="content">
- <form method="POST" class="print" onsubmit="return confirm('<?php echo
_("Vous confirmez ?")?>')">
+ <form method="POST" class="print" onsubmit="return
confirm_form(this,'<?php echo _("Vous confirmez ?")?>')">
<table>
<tr><td>
<?php echo _("Date")?>