diff --git a/html/js/noalyss_script.js b/html/js/noalyss_script.js index 836b0e182..7c3933c85 100644 --- a/html/js/noalyss_script.js +++ b/html/js/noalyss_script.js @@ -4400,7 +4400,7 @@ Widget.prototype.manage = function () { var y = calcy(200); style = style + ' ;top : ' + y + 'px'; - add_div({id: box, cssclass: 'inner_box', html: loading(), style: style,drag:true}) + add_div({id: box, cssclass: 'inner_box', html: loading(), style: style,drag:false}) $(box).update(req.responseText); } diff --git a/include/admin_repo.inc.php b/include/admin_repo.inc.php index 1fab37313..55ea8ba45 100644 --- a/include/admin_repo.inc.php +++ b/include/admin_repo.inc.php @@ -76,7 +76,7 @@ if ( $action=="user_mgt" ) //---------------------------------------------------------------------- require_once NOALYSS_INCLUDE."/user.inc.php"; } -// action=user_mgt + if ( $action=="dossier_mgt") { //----------------------------------------------------------------------- diff --git a/include/dashboard.inc.php b/include/dashboard.inc.php index 90903bf23..bfba7f420 100644 --- a/include/dashboard.inc.php +++ b/include/dashboard.inc.php @@ -7,7 +7,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_TEMPLATE.'/dashboard.php'; -echo \HtmlInput::button_action(_('Elements du tableau de bord'), "widget.manage()"); +echo \HtmlInput::button_action(_('Personnaliser le tableau de bord'), "widget.manage()"); ?> diff --git a/include/impress_bilan.inc.php b/include/impress_bilan.inc.php index f72f7ed7a..6b846c951 100644 --- a/include/impress_bilan.inc.php +++ b/include/impress_bilan.inc.php @@ -46,9 +46,9 @@ if ( ! isset ($_GET['verif'])) /* * Let you change the exercice */ - echo '
'._('Exercice').'';; + echo '
';; echo '
'; - echo _('Choisissez un autre exercice'); + echo _('Choisissez un exercice'); $ex=new Exercice($cn); $wex=$ex->select('exercice',$exercice,' onchange="submit(this)"'); echo $wex->input(); diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php index 16c2c2608..1bb2a1371 100644 --- a/include/impress_jrn.inc.php +++ b/include/impress_jrn.inc.php @@ -92,9 +92,9 @@ echo '
'; * Let you change the exercice */ echo ''; -echo '
' . _('Exercice') . ''; +echo '
' ; ; -echo _('Choisissez un autre exercice').' :'; +echo _('Choisissez un exercice').' :'; $ex = new Exercice($cn); $wex = $ex->select('exercice', $exercice, ' onchange="waiting_box();submit(this)"'); echo $wex->input(); diff --git a/include/impress_rapport.inc.php b/include/impress_rapport.inc.php index fe3bd0cf2..16e6139b2 100644 --- a/include/impress_rapport.inc.php +++ b/include/impress_rapport.inc.php @@ -217,11 +217,11 @@ $exercice=$http->get("exercice","number",$g_user->get_exercice()); /* * Let you change the exercice */ -echo '
'._('Exercice').'';; +echo '
';; echo ''); -echo 'Choisissez un autre exercice :'; +echo 'Choisissez un exercice :'; $ex=new Exercice($cn); $wex=$ex->select('exercice',$exercice, sprintf(' onchange="updatePeriode(\'%s\',\'exercice\',\'from_periode\',\'to_periode\',1)"',Dossier::id(),$exercice)); diff --git a/include/widget/ajax.php b/include/widget/ajax.php index 66ab5d894..cbf57fbac 100644 --- a/include/widget/ajax.php +++ b/include/widget/ajax.php @@ -67,10 +67,12 @@ if ( $w != "widget") { return; } } +/************************************************************************** // action == manage , display a dialog box to add , remove or change parameter of widget // if must possible to add several time the same widget , example mini-report + *************************************************************************/ if ( $action == 'widget.manage') { - echo \HtmlInput::title_box(_("Elements"), 'widget_box_id',p_mod: 'none'); + echo \HtmlInput::title_box(_("Elements"), 'widget_box_id',p_mod: 'none',p_draggable: 'y'); echo '
'; echo span(_('Organiser les éléments en utilisant la souris (Drag & Drop) puis sauver'),'class="text-muted text-center"'); \Noalyss\Widget\Widget::display_available(); @@ -115,7 +117,7 @@ if ($action == 'widget.refresh') { return; } if ($action == "widget.input") { - echo \HtmlInput::title_box(_("Elements à ajouter"), 'widget_box_select_id'); + echo \HtmlInput::title_box(_("Elements à ajouter"), 'widget_box_select_id',p_draggable: 'y'); echo '
'; \Noalyss\Widget\Widget::select_available(); echo '
';