From 51a083e112e23013af999bc6d5ea0ca621f89ebd Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 1 Apr 2014 22:51:26 +0000
Subject: [PATCH] Get rid of splitter

---
 admin/js/app.js                   | 22 ++++++++--------------
 admin/templates/default/index.xet |  6 ++----
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/admin/js/app.js b/admin/js/app.js
index e51fb0863d..c51f999c04 100644
--- a/admin/js/app.js
+++ b/admin/js/app.js
@@ -20,15 +20,9 @@ app.classes.admin = AppJS.extend(
  */
 {
 	appname: 'admin',
-	/**
-	 * reference to splitter
-	 *
-	 * {et2_splitter}
-	 */
-	splitter: null,
 
 	/**
-	 * reference to splitter
+	 * reference to iframe
 	 *
 	 * {et2_iframe}
 	 */
@@ -51,7 +45,6 @@ app.classes.admin = AppJS.extend(
 	destroy: function()
 	{
 		this.iframe = null;
-		this.splitter = null;
 
 		// call parent
 		this._super.apply(this, arguments);
@@ -74,21 +67,19 @@ app.classes.admin = AppJS.extend(
 		{
 			case 'admin.index':
 				var iframe = this.iframe = this.et2.getWidgetById('iframe');
+				this.nm = this.et2.getWidgetById('nm');
 				if (iframe)
 				{
 					var self = this;
 					jQuery(iframe.getDOMNode()).off('load.admin')
 						.bind('load.admin', function(){
 							self._hide_navbar.call(self);
-							self.splitter.dock();
-							self.splitter.resize();
 						}
 					);
 
 					// Register app refresh now that iframe is available
 					register_app_refresh('admin',jQuery.proxy(this.refresh,this));
 				}
-				this.splitter = this.et2.getWidgetById('splitter');
 				break;
 
 			case 'admin.categories.index':
@@ -234,7 +225,8 @@ app.classes.admin = AppJS.extend(
 
 		if (_id == '/accounts' || _id.substr(0, 8) == '/groups/')
 		{
-			this.splitter.undock();
+			this.nm.set_disabled(false);
+			this.iframe.set_disabled(true);
 			var parts = _id.split('/');
 			this.et2.getWidgetById('nm').applyFilters({ filter: parts[2] ? parts[2] : '', search: ''});
 		}
@@ -244,7 +236,8 @@ app.classes.admin = AppJS.extend(
 		}
 		else if (link[0] == '/' || link.substr(0,4) == 'http')
 		{
-			this.splitter.dock();
+			this.nm.set_disabled(true);
+			this.iframe.set_disabled(false);
 			this.iframe.set_src(link+(link.match(/\?/)?'&':'?')+'nonavbar=1');
 		}
 		else if (link.substr(0,11) == 'javascript:')
@@ -289,7 +282,8 @@ app.classes.admin = AppJS.extend(
 				}
 				else
 				{
-					this.splitter.dock();
+					this.nm.set_disabled(true);
+					this.iframe.set_disabled(false);
 					this.iframe.set_src(url);
 				}
 				break;
diff --git a/admin/templates/default/index.xet b/admin/templates/default/index.xet
index 1c4029e81c..f7e02dca39 100644
--- a/admin/templates/default/index.xet
+++ b/admin/templates/default/index.xet
@@ -45,9 +45,7 @@
 	</template>
 	<template id="admin.index" template="" lang="" group="0" version="1.9.001">
 		<tree autoloading="admin_ui::ajax_tree" id="tree" onclick="app.admin.run" parent_node="admin_tree_target" std_images="bullet"/>
-		<split dock_side="topDock" id="splitter" orientation="h">
-			<nextmatch id="nm" template="admin.index.rows"/>
-			<iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%"/>
-		</split>
+		<nextmatch id="nm" template="admin.index.rows"/>
+		<iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%" disabled="true"/>
 	</template>
 </overlay>