From 530f58e66bc0b04ec80be891767e26513b850ea0 Mon Sep 17 00:00:00 2001
From: Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com>
Date: Fri, 18 Mar 2016 16:54:43 +0000
Subject: [PATCH] Add support for inline fieldsets.

---
 web/pgadmin/static/css/overrides.css      |  9 +++++++++
 web/pgadmin/static/js/backform.pgadmin.js | 24 +++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/web/pgadmin/static/css/overrides.css b/web/pgadmin/static/css/overrides.css
index fdefc7401..4dcff33ad 100755
--- a/web/pgadmin/static/css/overrides.css
+++ b/web/pgadmin/static/css/overrides.css
@@ -685,6 +685,12 @@ fieldset.inline-fieldset {
     border: 2px solid; border-radius: 5px;
 }
 
+fieldset.inline-fieldset-without-border {
+    margin: 0px; margin-left: 0px; margin-right: 0px;
+    padding-right: 0px; padding-left: 0px; padding-top: 0px; padding-bottom: 0px;
+    border: 0px solid; border-radius: 0px; display: inline-block;
+}
+
 fieldset.inline-fieldset > legend {
     display: block; border: 0px solid black; box-shadow: none;
     box-sizing: content-box; top: auto; bottom: auto; left: auto;
@@ -694,6 +700,9 @@ fieldset.inline-fieldset > legend {
     vertical-align: middle; width: auto;
 }
 
+fieldset.inline-fieldset-without-border legend {
+    border: none; margin-bottom: 0px !important;
+ }
 
 fieldset.inline-fieldset > div {
     padding: 0px; margin: 0px; border: 0px;
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index 39e323337..66d8dab2d 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -1721,6 +1721,30 @@
     template: Backform.Dialog.prototype.template
   });
 
+
+  // Backform Tab Control (in bootstrap tabbular)
+  // A collection of field models.
+  var PlainFieldsetControl = Backform.PlainFieldsetControl = Backform.FieldsetControl.extend({
+    initialize: function(opts) {
+      Backform.FieldsetControl.prototype.initialize.apply(
+        this, arguments
+        );
+    },
+    template: {
+      'header': _.template([
+        '<fieldset class="<%=fieldsetClass%>" <%=disabled ? "disabled" : ""%>>',
+        ' <% if (legend != false) { %>',
+        '  <legend class="<%=legendClass%>" <%=collapse ? "data-toggle=\'collapse\'" : ""%> data-target="#<%=cId%>"><%=collapse ? "<span class=\'caret\'></span>" : "" %></legend>',
+        ' <% } %>',
+        '</fieldset>'
+      ].join("\n")),
+      'content': _.template(
+        '  <div id="<%= cId %>" class="<%=contentClass%>"></div>'
+    )},
+    fieldsetClass: 'inline-fieldset-without-border',
+    legend: false,
+  });
+
   /*
    * Control For Code Mirror SQL text area.
    */