diff --git a/assets/js/coInput/co-input.js b/assets/js/coInput/co-input.js index b3e472a07db65b34444b309383dbaa5c07daa1ee..95ae74cb0c55b4f7948aaf330dd52e1d1c350b49 100755 --- a/assets/js/coInput/co-input.js +++ b/assets/js/coInput/co-input.js @@ -3442,9 +3442,9 @@ ${ options.label ? `<label>${options.label}</label>`:"" } <div class="formLocality-${name}"> <div id='divNewAddress' class='text-dark col-xs-12 no-padding '> - <a href='javascript:;' class='btn btn-success col-xs-12' style='margin-bottom: 10px;' type='text' id='newAddress${generateID}'> + <button class='btn btn-success col-xs-12' style='margin-bottom: 10px;' type='text' id='newAddress${generateID}'> <i class="fa fa-plus"></i>${tradDynForm.addANewAddress} - </a> + </button> </div> </div> <div class='coInput-form-list-formLocality-${generateID}' style="max-height:140px; overflow-y:auto" ></div> diff --git a/controllers/ActionController.php b/controllers/ActionController.php index 626c9769d562b851a9f0e5fbfdcb4b50988b1681..02f1a70a4f5763e83c873d512fc417909305633c 100755 --- a/controllers/ActionController.php +++ b/controllers/ActionController.php @@ -27,7 +27,9 @@ class ActionController extends CommunecterController { "reorder" => \PixelHumain\PixelHumain\modules\citizenToolKit\controllers\action\ReorderAction::class, "cornerdev" => \PixelHumain\PixelHumain\modules\citizenToolKit\controllers\action\CornerdevAction::class, "getactionsbyallidsparentwithrange" => \PixelHumain\PixelHumain\modules\citizenToolKit\controllers\action\GetActionsByAllIdsParentWithRangeAction::class, - "getrangeactionsbyidparent" => \PixelHumain\PixelHumain\modules\citizenToolKit\controllers\action\GetActionsByIdParentWithRangeAction::class + "getrangeactionsbyidparent" => \PixelHumain\PixelHumain\modules\citizenToolKit\controllers\action\GetActionsByIdParentWithRangeAction::class, + 'getprojectbypoleandparentid' => \PixelHumain\PixelHumain\modules\citizenToolKit\controllers\action\GetByPoleAndParentIdAction::class, + 'getprojectbyidwithlimit' => \PixelHumain\PixelHumain\modules\citizenToolKit\controllers\action\GetActionsByIdWithLimit::class, ); } } \ No newline at end of file diff --git a/views/person/dashboard.php b/views/person/dashboard.php index 5c5803de6e10975bf01c4f652d05cef1df4b7eae..feec79433393f01b83d10d202020858c48ea3677 100755 --- a/views/person/dashboard.php +++ b/views/person/dashboard.php @@ -905,6 +905,10 @@ $me = isset(Yii::app()->session['userId']) ? Person::getById(Yii::app()->session dashEvenCalendar.options.personalAgenda = true dashEvenCalendar.results.add(dashEvenCalendar, myContacts.events); + $(".dashboard-account .lbh").on('click', function() { + $(".dashboard-account").hide(); + }) + }); //afficher la notification mylog.log("pageProfil.views.notifications"); diff --git a/views/translation/trad.php b/views/translation/trad.php index 07103bdf2856327897576c3fdeeea2ae9972cb21..62732570a788cc8712a3d1641c0479da77916f3b 100755 --- a/views/translation/trad.php +++ b/views/translation/trad.php @@ -3198,6 +3198,8 @@ var tradCms = { "filterBtn" : "<?= Yii::t("cms","Filter button") ?>", "line" : "<?= Yii::t("cms","Line") ?>", "numberOfDay": "<?= Yii::t("cms","Number of days") ?>", + "existantRole": "<?= Yii::t("cms","Role already existing") ?>", + "usedRole": "<?= Yii::t("cms","Role already existing") ?>", } var tradBadge = {