From 9e775e2b706e6c41cc1550ecdbb14f21c1629b3f Mon Sep 17 00:00:00 2001
From: Ian <ian@sproink.co.uk>
Date: Sat, 24 May 2014 14:07:20 +0100
Subject: [PATCH] dvr.js: Changed layout to group like options

---
 src/webui/static/app/dvr.js | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js
index ab606116..520c8ffa 100644
--- a/src/webui/static/app/dvr.js
+++ b/src/webui/static/app/dvr.js
@@ -971,6 +971,7 @@ tvheadend.dvrsettings = function() {
 		width: 700,
 		autoHeight: true,
 		collapsible: true,
+		animCollapse : true,
 		items : [ recordingContainer, cacheScheme, logRetention, timeBefore, timeAfter, postProcessing ]
 	});
 
@@ -981,6 +982,7 @@ tvheadend.dvrsettings = function() {
 		width: 700,
 		autoHeight: true,
 		collapsible: true,
+		animCollapse : true,
 		items : [ recordingPath, recordingPermissions, PATrewrite, PMTrewrite, tagMetadata, skipCommercials ]
 	});
 
@@ -991,18 +993,37 @@ tvheadend.dvrsettings = function() {
 		width: 700,
 		autoHeight: true,
 		collapsible: true,
+		animCollapse : true,
 		items : [ directoryPermissions, dirsPerDay, dirsPerChannel, dirsPerTitle ]
 	});
 		
-/* Sub-Panel - File operations */
+/* Sub-Panel - File operations - Break into two 4-item panels */
+
+	var FileHandlingPanelA = new Ext.form.FieldSet({
+		width: 350,
+		border: false,
+		autoHeight: true,
+		items : [ incChannelInTitle, incDateInTitle, incTimeInTitle, incEpisodeInTitle ]
+	});
+
+	var FileHandlingPanelB = new Ext.form.FieldSet({
+		width: 350,
+		border: false,
+		autoHeight: true,
+		items : [ incSubtitleInTitle, episodeFirst, stripUnsafeChars, stripWhitespace ]
+	});
 
 	var FileHandlingPanel = new Ext.form.FieldSet({
 		title: 'Filename Options',
 		width: 700,
 		autoHeight: true,
 		collapsible: true,
-		items : [ incChannelInTitle, incDateInTitle, incTimeInTitle, incEpisodeInTitle,
-			incSubtitleInTitle, episodeFirst, stripUnsafeChars, stripWhitespace ]
+		animCollapse : true,
+		items : [{ 
+			layout: 'column', 
+			border: false, 
+			items : [FileHandlingPanelA, FileHandlingPanelB ] 
+		}]
 	});
 
 /* Main (form) panel */