diff --git a/include/ajax/ajax_calendar_zoom.php b/include/ajax/ajax_calendar_zoom.php index f30e0f60c..a95198ba5 100644 --- a/include/ajax/ajax_calendar_zoom.php +++ b/include/ajax/ajax_calendar_zoom.php @@ -29,6 +29,11 @@ if ( $in == "") { } $cal->set_periode($in); echo $cal->zoom($distype,$notitle); +if ( $notitle== 0 ) { + echo '
'; + echo HtmlInput::button_close("calendar_zoom_div"); + echo '
'; +} $response= ob_get_clean(); $html=escape_xml($response); diff --git a/include/class/class_calendar.php b/include/class/class_calendar.php index a36fac77a..a68537280 100644 --- a/include/class/class_calendar.php +++ b/include/class/class_calendar.php @@ -91,7 +91,11 @@ class Calendar { $this->action_div[$day].=''; + $this->action_div[$day].=HtmlInput::button_hide('tsk'.$day); + $this->action_div[$day].='
'; + $this->action_div[$day].=''; } } else if ( $p_style == "long") diff --git a/include/class/class_pre_operation.php b/include/class/class_pre_operation.php index 8d8fc8290..b0192fcbf 100644 --- a/include/class/class_pre_operation.php +++ b/include/class/class_pre_operation.php @@ -251,6 +251,9 @@ class Pre_operation_detail $r.=$hid->input("action","use_opd"); $r.=$hid->input("jrn_type",$this->get("ledger_type")); $r.= $this->show_button($p_url); + $r.=''. + HtmlInput::button_hide('modele_op_div'). + '
'; $r.=''; return $r; diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php index d23f18394..9c17bc4c7 100644 --- a/include/lib/ac_common.php +++ b/include/lib/ac_common.php @@ -1182,6 +1182,9 @@ function display_dashboard_operation($p_array,$p_title,$p_div) endfor; ?> ++ +
label=_("Fermer"); + $a->javascript="$('".$div_name."').hide()"; + $html=$a->input(); + + return $html; + } /** * Return a html string with an anchor which close the inside popup. (top-right corner) diff --git a/include/template/action_display_short.php b/include/template/action_display_short.php index f9dc76bc0..abe0b49fc 100644 --- a/include/template/action_display_short.php +++ b/include/template/action_display_short.php @@ -119,6 +119,15 @@ echo HtmlInput::hidden('gDossier',Dossier::id()); echo HtmlInput::hidden('op','action_save'); ?>+
+ +
diff --git a/include/template/todo_list_display.php b/include/template/todo_list_display.php index 1970411e1..38eb21436 100644 --- a/include/template/todo_list_display.php +++ b/include/template/todo_list_display.php @@ -100,7 +100,14 @@ echo HtmlInput::title_box("Note","todo_list_div".$this->tl_id,'close',$close_sha tl_id) ?> use_login == $_SESSION['g_user']) : ?>- +