From ea3d6aa56614692fd489274072299351ed49d23a Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Fri, 21 Aug 2015 19:06:02 +0200 Subject: [PATCH] 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 8ef003fad..2196a2d65 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'); ?> + @@ -158,7 +159,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||' '||coalesce(me_description, '; return; } @@ -195,6 +196,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||' '||coalesce(me_description, + @@ -203,7 +205,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||' '||coalesce(me_description,
'; return; } diff --git a/include/ajax_create_menu.php b/include/ajax_create_menu.php index 73e8aa504..c074d019c 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 '
'; - +echo ''; +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 '
'; ?> diff --git a/include/ajax_get_menu_detail.php b/include/ajax_get_menu_detail.php index be0a88632..490b09080 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']); ?> -
?')"> + ?')"> + @@ -73,7 +74,7 @@ if ($array[0]['p_type_display']!='P'):
'; diff --git a/include/ajax_get_profile.php b/include/ajax_get_profile.php index ccc31c26e..cc7a0033a 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 '
'; } -echo ''; +echo ''; 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 ''; if ($profile->p_id > 0) { - echo '
'; + echo ''; 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 '
'; - echo '
'; + echo ''; 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 '
'; echo '
'; diff --git a/include/ajax_mod_menu.php b/include/ajax_mod_menu.php index 12e19ccba..8fd13e546 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 '
'; +echo ''; +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 '
'; ?> diff --git a/include/class_periode.php b/include/class_periode.php index fe0ff88b8..228ccea8a 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 '
'; + echo ''; echo HtmlInput::array_to_hidden(array('ac','gDossier','jrn_def_id','choose'), $_REQUEST); echo ''; echo ""; @@ -262,7 +262,7 @@ class Periode if ($l_line['count_op'] == 0 ) { $remove.=' Efface"; + $l_line['p_id']."&$str_dossier\" onclick=\"return confirm ('"._('Confirmez effacement ?')."')\" > Efface"; } else { @@ -279,7 +279,8 @@ class Periode } echo '
'; echo '

'; - 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 '

'; echo '
'; $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 '

Journal '.$jrn_name.'

'; - echo '
'; + echo ''; echo HtmlInput::array_to_hidden(array('ac','gDossier','jrn_def_id','choose'), $_REQUEST); echo ''; diff --git a/include/doc_state.inc.php b/include/doc_state.inc.php index 79844665d..914eac824 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")

Ajout d'un état

- +

Nom de l'état input()?>

Cochez la case si cet état ferme une action input()?> - + +

\ No newline at end of file diff --git a/include/template/fiche_list.php b/include/template/fiche_list.php index 43b201a55..957189341 100644 --- a/include/template/fiche_list.php +++ b/include/template/fiche_list.php @@ -27,7 +27,7 @@ */ ?> -
')"> +')">
diff --git a/include/template/periode_add_exercice.php b/include/template/periode_add_exercice.php index 620a54685..ff946f245 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 -')"> +')"> 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")); ?> diff --git a/include/template/stock_inv.php b/include/template/stock_inv.php index 5d12bd8a4..945cc1190 100644 --- a/include/template/stock_inv.php +++ b/include/template/stock_inv.php @@ -28,7 +28,7 @@ */ ?>
" class="content"> -
')"> + ')">
@@ -128,6 +128,7 @@
- + +