[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 02/03: Task #1153 - Boite de dialogue modale
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 02/03: Task #1153 - Boite de dialogue modale #1153 Dialog box : confirm_form |
|
Date: |
Fri, 21 Aug 2015 17:13:03 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit ea3d6aa56614692fd489274072299351ed49d23a
Author: Dany De Bontridder <address@hidden>
Date: Fri Aug 21 19:06:02 2015 +0200
Task #1153 - Boite de dialogue modale
#1153 Dialog box : confirm_form
---
include/ajax_add_menu.php | 6 ++++--
include/ajax_create_menu.php | 6 +++---
include/ajax_get_menu_detail.php | 5 +++--
include/ajax_get_profile.php | 15 +++++++++------
include/ajax_mod_menu.php | 5 +++--
include/class_periode.php | 9 +++++----
include/doc_state.inc.php | 5 +++--
include/template/fiche_list.php | 2 +-
include/template/periode_add_exercice.php | 5 +++--
include/template/stock_inv.php | 5 +++--
10 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/include/ajax_add_menu.php b/include/ajax_add_menu.php
index 8ef003f..2196a2d 100644
--- a/include/ajax_add_menu.php
+++ b/include/ajax_add_menu.php
@@ -138,6 +138,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||'
'||coalesce(me_description,
echo HtmlInput::hidden('tab', 'profile_menu_div');
?>
<?php echo HtmlInput::hidden('p_id', $p_id) ?>
+ <?php echo HtmlInput::hidden('add_menu', 1) ?>
<?php echo HtmlInput::hidden('p_level', $p_level) ?>
<?php echo HtmlInput::hidden('type', $type) ?>
<?php echo HtmlInput::hidden('dep', $dep) ?>
@@ -158,7 +159,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||'
'||coalesce(me_description,
</table>
<?php
- echo HtmlInput::submit('add_menu', _("Valider"));
+ echo HtmlInput::submit('add_menubt', _("Valider"));
echo '</form>';
return;
}
@@ -195,6 +196,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||'
'||coalesce(me_description,
<?php echo HtmlInput::hidden('p_order', 10) ?>
<?php echo HtmlInput::hidden('me_code_dep', '') ?>
<?php echo HtmlInput::hidden('p_type', 'PR') ?>
+ <?php echo HtmlInput::hidden('add_impress', 1) ?>
<table>
<tr>
<td><?php echo _("Code") ?></td>
@@ -203,7 +205,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||'
'||coalesce(me_description,
</table>
<?php
- echo HtmlInput::submit('add_impress', _("Valider"));
+ echo HtmlInput::submit('add_impressbt', _("Valider"));
echo '</form>';
return;
}
diff --git a/include/ajax_create_menu.php b/include/ajax_create_menu.php
index 73e8aa5..c074d01 100644
--- a/include/ajax_create_menu.php
+++ b/include/ajax_create_menu.php
@@ -6,10 +6,10 @@ 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_form(this,(this,\'Vous
confirmez ?\')">';
-
+echo '<form method="POST" id="ajax_create_menu_frm" onsubmit="return
confirm_form(this,\'Vous confirmez ?\')">';
+echo HtmlInput::hidden('create_menu', 1);
require_once 'template/menu_detail.php';
-echo HtmlInput::submit('create_menu','Sauver');
+echo HtmlInput::submit('create_menubt','Sauver');
echo HtmlInput::button_close('divmenu');
echo '</form>';
?>
diff --git a/include/ajax_get_menu_detail.php b/include/ajax_get_menu_detail.php
index be0a886..490b090 100644
--- a/include/ajax_get_menu_detail.php
+++ b/include/ajax_get_menu_detail.php
@@ -50,10 +50,11 @@ $pm_default=new ICheckBox('pm_default','1');
$pm_default->set_check($array[0]['pm_default']);
?>
-<form method="POST" onsubmit="return confirm_form(this,'<?php echo _("Vous
confirmez")?> ?')">
+<form method="POST" id="ajax_get_menu_detail_frm" 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")?>
+ <?php echo HtmlInput::hidden('mod',"1")?>
<table>
<tr>
<td><?php echo _("Code");?></td>
@@ -73,7 +74,7 @@ if ($array[0]['p_type_display']!='P'):
<?php endif;?>
</table>
<?php
-echo HtmlInput::submit('mod',_("Valider"));
+echo HtmlInput::submit('modbt',_("Valider"));
echo '</form>';
diff --git a/include/ajax_get_profile.php b/include/ajax_get_profile.php
index ccc31c2..cc7a003 100644
--- a/include/ajax_get_profile.php
+++ b/include/ajax_get_profile.php
@@ -34,7 +34,7 @@ if ( $g_user->check_module('CFGPRO') == 0 ) die();
require_once NOALYSS_INCLUDE.'/class_profile_sql.php';
require_once NOALYSS_INCLUDE.'/class_profile_menu.php';
require_once NOALYSS_INCLUDE.'/class_html_input.php';
-
+$p_id=HtmlInput::default_value_request('p_id', -1);
$profile=new Profile_sql($cn,$p_id);
$gDossier=Dossier::id();
$add_impression=HtmlInput::button("add", _("Ajout
Menu"),"onclick=\"add_menu({dossier:$gDossier,p_id:$p_id,type:'pr'})\"");
@@ -76,27 +76,30 @@ else
{
echo '<div class="myfieldset" id="profile_gen_div">';
}
-echo '<form method="POST" onsubmit="return confirm_form(this,\'vous
confirmez\')">';
+echo '<form method="POST" id="profile_save_name_frm" onsubmit="return
confirm_form(this,\'vous confirmez\')">';
echo HtmlInput::hidden('tab','profile_gen_div');
echo HtmlInput::hidden('p_id',$profile->p_id);
+echo HtmlInput::hidden('save_name',1);
require_once("template/profile.php");
-echo HtmlInput::submit("save_name",_("Modifier"));
+echo HtmlInput::submit("save_namebt",_("Modifier"));
echo '</form>';
if ($profile->p_id > 0)
{
- echo '<form method="POST" onsubmit="return
confirm_form(this,\''._("vous confirmez").'\')">';
+ echo '<form method="POST" id="profile_clone_frm" onsubmit="return
confirm_form(this,\''._("vous confirmez").'\')">';
echo _('Vous pouvez aussi copier ce profil et puis le corriger');
echo HtmlInput::hidden('p_id', $profile->p_id);
- echo HtmlInput::submit("clone", "Copier");
+ echo HtmlInput::hidden('clone', 1);
+ echo HtmlInput::submit("clonebt", "Copier");
echo '</form>';
- echo '<form method="POST" onsubmit="return
confirm_form(this,\''._("vous confirmez").'\')">';
+ echo '<form method="POST" id="delete_profile_frm" onsubmit="return
confirm_form(this,\''._("vous confirmez").'\')">';
echo _('Effacer ce profil');
echo HtmlInput::hidden('p_id', $profile->p_id);
+ echo HtmlInput::hidden('delete_profil', 1);
echo HtmlInput::submit("delete_profil", _("Effacer ce profil"));
echo '</form>';
echo '</div>';
diff --git a/include/ajax_mod_menu.php b/include/ajax_mod_menu.php
index 12e19cc..8fd13e5 100644
--- a/include/ajax_mod_menu.php
+++ b/include/ajax_mod_menu.php
@@ -6,11 +6,12 @@ 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_form(this,\'Vous confirmez
?\')">';
+echo '<form method="POST" id="ajax_mod_menu_frm" onsubmit="return
confirm_form(this,\'Vous confirmez ?\')">';
+echo HtmlInput::hidden('modify_menu', 1);
require_once NOALYSS_INCLUDE.'/template/menu_detail.php';
-echo HtmlInput::submit('modify_menu',_('Sauver'));
+echo HtmlInput::submit('modify_menutb',_('Sauver'));
echo HtmlInput::button_close('divmenu');
echo '</form>';
?>
diff --git a/include/class_periode.php b/include/class_periode.php
index fe0ff88..228ccea 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_form(this,\'Confirmez-vous la fermeture des périodes choisies
?\')" >';
+ echo '<form id="periode_frm" method="POST" onsubmit="return
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_form(this,'"._('Confirmez effacement ?')."')\" >
Efface</A>";
+ $l_line['p_id']."&$str_dossier\"
onclick=\"return confirm ('"._('Confirmez effacement ?')."')\" > Efface</A>";
}
else
{
@@ -279,7 +279,8 @@ class Periode
}
echo '</table>';
echo '<p style="text-align:center">';
- echo HtmlInput::submit('close_per','Fermeture des périodes
sélectionnées');
+ echo HtmlInput::hidden("close_per", 1);
+ echo HtmlInput::submit('close_per_bt','Fermeture des périodes
sélectionnées');
echo '</p>';
echo '</form>';
$but=new IButton('show_per_add','Ajout d\'une période');
@@ -326,7 +327,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_form(this,\'Confirmez-vous la fermeture des périodes choisies
?\')" >';
+ echo '<form id="periode_frm" method="POST" onsubmit="return
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/doc_state.inc.php b/include/doc_state.inc.php
index 7984466..914eac8 100644
--- a/include/doc_state.inc.php
+++ b/include/doc_state.inc.php
@@ -60,12 +60,13 @@ $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_form(this,'Vous confirmez ?'); ">
+<form method="post" id='etat_add_frm' onsubmit="return confirm_form(this,'Vous
confirmez ?'); ">
<p>
Nom de l'état <?php $value=new IText("s_value",""); echo
$value->input()?>
</p>
<p>
Cochez la case si cet état ferme une action <?php $state=new
ICheckBox("s_state",""); echo $state->input()?>
- <?php echo HtmlInput::submit("add", "Ajouter")?>
+ <input type='hidden' name='add' value='1'>
+ <?php echo HtmlInput::submit("addbt", "Ajouter")?>
</p>
</form>
\ No newline at end of file
diff --git a/include/template/fiche_list.php b/include/template/fiche_list.php
index 43b201a..9571893 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_form(this,'<?php echo _("Vous confirmez ?")?>')">
+<form method="POST" class="print" style="display:inline" onsubmit="return
confirm('<?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 620a546..ff946f2 100644
--- a/include/template/periode_add_exercice.php
+++ b/include/template/periode_add_exercice.php
@@ -12,13 +12,14 @@ pour faire toutes les écritures de fin d'exercice:
amortissements, régulations
</li>
</ul>
-<form method="post" onsubmit="return confirm_form(this,'<?php echo
_("Confirmez vous l'ajout d\'un exercice comptable ?")?>')">
+<form method="post" id="exercice_frm" 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();
echo HtmlInput::hidden("jrn_def_id","0");
+echo HtmlInput::hidden("add_exercice","1");
echo Dossier::hidden();
-echo HtmlInput::submit("add_exercice",_("Ajout d'un exercice comptable"));
+echo HtmlInput::submit("add_exercicebt",_("Ajout d'un exercice comptable"));
?>
</form>
diff --git a/include/template/stock_inv.php b/include/template/stock_inv.php
index 5d12bd8..945cc11 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_form(this,'<?php echo _("Vous confirmez ?")?>')">
+ <form method="POST" id="stock_reprise" class="print" onsubmit="return
confirm_form(this,'<?php echo _("Vous confirmez ?")?>')">
<table>
<tr><td>
<?php echo _("Date")?>
@@ -128,6 +128,7 @@
</td>
</tr>
</table>
- <?php echo HtmlInput::submit("reprise_frm", _('Reprise inventaire'));?>
+ <?php echo HtmlInput::hidden('reprise_frm',1);?>
+ <?php echo HtmlInput::submit("reprise_frm_bt", _('Reprise
inventaire'));?>
</form>
</div>