From 2d70a4d07e1d3f61ef71db81efd80abadced12de Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Mon, 8 Mar 2021 14:21:58 +0100
Subject: [PATCH] Do not close login modal when clicking on the backdrop

---
 CHANGELOG.md                                               | 1 +
 app/frontend/src/javascript/controllers/application.js.erb | 1 +
 app/frontend/src/stylesheets/app.layout.scss               | 6 ++++++
 app/frontend/templates/shared/deviseModal.html             | 1 +
 4 files changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a901f4e8..5536f8fb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Allow writing short rich descriptions for each subscription plan
 - Allow inserting hyperlinks in customized info messages
 - Use the primary color to display plans' price in the public view
+- Do not close login modal when clicking on the backdrop
 - Improved scripts for mounting volumes
 - Increased verbosity of upgrade script
 - Fix a bug: mounting the payment-schedules volume in the docker-compose file results in an invalid file
diff --git a/app/frontend/src/javascript/controllers/application.js.erb b/app/frontend/src/javascript/controllers/application.js.erb
index 9e9a58de0..c25601eb5 100644
--- a/app/frontend/src/javascript/controllers/application.js.erb
+++ b/app/frontend/src/javascript/controllers/application.js.erb
@@ -408,6 +408,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco
       <% else %>
       return $uibModal.open({
         templateUrl: '/shared/deviseModal.html',
+        backdrop: 'static',
         size: 'sm',
         resolve: {
           settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['confirmation_required']" }).$promise; }]
diff --git a/app/frontend/src/stylesheets/app.layout.scss b/app/frontend/src/stylesheets/app.layout.scss
index fb5d2bd17..549bda911 100644
--- a/app/frontend/src/stylesheets/app.layout.scss
+++ b/app/frontend/src/stylesheets/app.layout.scss
@@ -695,3 +695,9 @@ body.container {
     display: none;
   }
 }
+
+.close-modal-button {
+  position: absolute;
+  right: 13px;
+  cursor: pointer;
+}
diff --git a/app/frontend/templates/shared/deviseModal.html b/app/frontend/templates/shared/deviseModal.html
index ef8b95187..11e946442 100644
--- a/app/frontend/templates/shared/deviseModal.html
+++ b/app/frontend/templates/shared/deviseModal.html
@@ -1,6 +1,7 @@
   <div class="" id="loginModal">
     <div class="modal-header">
       <img ng-src="{{logoBlack.custom_asset_file_attributes.attachment_url}}" alt="{{logo.custom_asset_file_attributes.attachment}}" class="modal-logo"/>
+      <i class="fa fa-times close-modal-button" ng-click="dismiss()"></i>
       <h1 translate translate-default="Login">
         {{ 'app.public.common.connection' }}
       </h1>