From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 26 Nov 2015 08:15:29 +0000 (+0100)
Subject: WEBUI: Fix the DVR config column layout
X-Git-Tag: v4.2.1~1461
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3346bcbc928c080c8edb6b097623f7cb4ebd8154;p=thirdparty%2Ftvheadend.git

WEBUI: Fix the DVR config column layout
---

diff --git a/src/webui/static/app/extensions.js b/src/webui/static/app/extensions.js
index ef4f5b4ca..8d6ccea48 100644
--- a/src/webui/static/app/extensions.js
+++ b/src/webui/static/app/extensions.js
@@ -1830,3 +1830,19 @@ Ext.ux.Window = Ext.extend(Ext.Window, {
   },
 
 });
+
+// create namespace
+Ext.ns('Ext.ux');
+
+Ext.layout.Column2Layout = Ext.extend(Ext.layout.ColumnLayout, {
+
+  getLayoutTargetSize : function() {
+    var ret = Ext.layout.ColumnLayout.prototype.getLayoutTargetSize.call(this);
+    if (ret && ret.width > 20)
+      ret.width -= 20;
+    return ret;
+  }
+
+});
+
+Ext.Container.LAYOUTS['column2'] = Ext.layout.Column2Layout;
diff --git a/src/webui/static/app/idnode.js b/src/webui/static/app/idnode.js
index 47396c765..e54958a79 100644
--- a/src/webui/static/app/idnode.js
+++ b/src/webui/static/app/idnode.js
@@ -850,7 +850,7 @@ tvheadend.idnode_editor_form = function(d, meta, panel, conf)
                         columns = met[k].column;
             met[number].columns = columns;
             if (columns) {
-                var p = newFieldSet({ title: m.name || _("Settings"), layout: 'column', border: false });
+                var p = newFieldSet({ title: m.name || _("Settings"), layout: 'column2', border: false });
                 cfs[number] = newFieldSet({ nocollapse: true, style: 'border-width: 0px', bodyStyle: ' ' });
                 p.add(cfs[number]);
                 fs[number] = p;