From 0e8f8042790c7d68f20e0d468d06ed533daad08f Mon Sep 17 00:00:00 2001
From: Ashesh Vashi <ashesh.vashi@enterprisedb.com>
Date: Wed, 30 Jan 2019 11:42:35 +0530
Subject: [PATCH] Show the help string separate block in the calendar control
 to align the input, and calendar button properly in case of help string is
 present.

---
 web/pgadmin/static/js/backform.pgadmin.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index 369243dcf..d313541be 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -42,6 +42,7 @@ define([
     accordianContentClassName: 'accordian-content pg-el-12',
     hiddenClassName: 'd-none',
     helpMessageClassName: 'form-text text-muted help-block',
+    helpBlockControlClass: 'pgadmin-controls offset-sm-3 pg-el-sm-9 pg-el-12',
   });
 
   Backform.controlMapper = {
@@ -2502,10 +2503,12 @@ define([
         ' <div class="input-group-append">',
         '   <span class="input-group-text fa fa-calendar"></span>',
         ' </div>',
-        '<% if (helpMessage && helpMessage.length) { %>',
-        '   <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
-        '<% } %>',
         '</div>',
+        '<% if (helpMessage && helpMessage.length) { %>',
+        '<div class="<%=Backform.helpBlockControlClass%>">',
+        ' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
+        '</div>',
+        '<% } %>',
       ].join('\n')),
       render: function() {
         var field = _.defaults(this.field.toJSON(), this.defaults),