From e8097083471ef4d60d1f8e9034007549a64db7ac Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Thu, 16 Oct 2014 13:38:36 +0300
Subject: [PATCH 01/10] Remove disabled navigation

---
 administrator/templates/isis/index.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index 3703badbc6f17..f7043e593cfd1 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -257,17 +257,21 @@
 	<!-- End Status Module -->
 <?php endif; ?>
 <jdoc:include type="modules" name="debug" style="none" />
-<?php if ($stickyToolbar) : ?>
+<?php
+// Get the singular view
+$singular = preg_match('/&id=/', JURI::getInstance()->toString());
+if ($stickyToolbar) : ?>
 	<script>
 		(function($)
 		{
 			// fix sub nav on scroll
 			var $win = $(window)
 				, $nav    = $('.subhead')
-				, navTop  = $('.subhead').length && $('.subhead').offset().top - <?php if ($displayHeader || !$statusFixed) : ?>40<?php else:?>20<?php endif;?>
+				, navTop  = $('.subhead').length && $('.subhead').offset().top -50
 				, isFixed = 0
+				, edit = <?php echo $singular; ?>
 
-			processScroll()
+					processScroll()
 
 			// hack sad times - holdover until rewrite for 2.1
 			$nav.on('click', function()
@@ -280,6 +284,13 @@
 				}
 			})
 
+			// remove disabled nav
+			if (edit)
+			{
+				$('.navbar-fixed-top').addClass('hidden');
+				$('body').animate({ paddingTop: 0 });
+			}
+
 			$win.on('scroll', processScroll)
 
 			function processScroll()
@@ -288,6 +299,11 @@ function processScroll()
 				if (scrollTop >= navTop && !isFixed) {
 					isFixed = 1
 					$nav.addClass('subhead-fixed')
+					// remove disabled nav
+					if (edit)
+					{
+						$('.subhead-fixed').css("top", "0");
+					}
 				} else if (scrollTop <= navTop && isFixed) {
 					isFixed = 0
 					$nav.removeClass('subhead-fixed')

From c23d948d452c0c043532837f82c3cd19083abd87 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Thu, 16 Oct 2014 13:52:03 +0300
Subject: [PATCH 02/10] oops

---
 administrator/templates/isis/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index f7043e593cfd1..60915a801ea23 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -267,7 +267,7 @@
 			// fix sub nav on scroll
 			var $win = $(window)
 				, $nav    = $('.subhead')
-				, navTop  = $('.subhead').length && $('.subhead').offset().top -50
+				, navTop  = $('.subhead').length && $('.subhead').offset().top -  <?php if ($displayHeader || !$statusFixed) : ?>50<?php else:?>30<?php endif;?>
 				, isFixed = 0
 				, edit = <?php echo $singular; ?>
 

From 859cbf3ae461ddafb631c343a94ef25935e56373 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Thu, 16 Oct 2014 13:52:47 +0300
Subject: [PATCH 03/10] cs

---
 administrator/templates/isis/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index 60915a801ea23..826558a38182a 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -267,11 +267,11 @@
 			// fix sub nav on scroll
 			var $win = $(window)
 				, $nav    = $('.subhead')
-				, navTop  = $('.subhead').length && $('.subhead').offset().top -  <?php if ($displayHeader || !$statusFixed) : ?>50<?php else:?>30<?php endif;?>
+				, navTop  = $('.subhead').length && $('.subhead').offset().top - <?php if ($displayHeader || !$statusFixed) : ?>50<?php else:?>30<?php endif;?>
 				, isFixed = 0
 				, edit = <?php echo $singular; ?>
 
-					processScroll()
+			processScroll()
 
 			// hack sad times - holdover until rewrite for 2.1
 			$nav.on('click', function()

From 9193dfb0855171113ea66510dfb465df1758b251 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Thu, 16 Oct 2014 14:02:24 +0300
Subject: [PATCH 04/10] wrong regex

---
 administrator/templates/isis/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index 826558a38182a..827c3faddb80a 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -259,7 +259,7 @@
 <jdoc:include type="modules" name="debug" style="none" />
 <?php
 // Get the singular view
-$singular = preg_match('/&id=/', JURI::getInstance()->toString());
+$singular = preg_match('/&id=|&layout=edit/', JURI::getInstance()->toString());
 if ($stickyToolbar) : ?>
 	<script>
 		(function($)

From d0c2f30394177fcb2b012ea2009f34630eb8ebeb Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Thu, 16 Oct 2014 15:08:45 +0300
Subject: [PATCH 05/10] remove animation

---
 administrator/templates/isis/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index 827c3faddb80a..455948ae5f49b 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -259,7 +259,7 @@
 <jdoc:include type="modules" name="debug" style="none" />
 <?php
 // Get the singular view
-$singular = preg_match('/&id=|&layout=edit/', JURI::getInstance()->toString());
+$singular = preg_match('/&id=|=com_config|&view=mail|&layout=edit/', JURI::getInstance()->toString());
 if ($stickyToolbar) : ?>
 	<script>
 		(function($)
@@ -288,7 +288,7 @@
 			if (edit)
 			{
 				$('.navbar-fixed-top').addClass('hidden');
-				$('body').animate({ paddingTop: 0 });
+				$('body').css("padding-top", "0");
 			}
 
 			$win.on('scroll', processScroll)

From 18aed57291588dedb00cea42442907d3db19ddaf Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Thu, 16 Oct 2014 16:55:43 +0300
Subject: [PATCH 06/10] Disable istead of hide

---
 administrator/templates/isis/index.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index 455948ae5f49b..04004042c76bd 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -259,7 +259,7 @@
 <jdoc:include type="modules" name="debug" style="none" />
 <?php
 // Get the singular view
-$singular = preg_match('/&id=|=com_config|&view=mail|&layout=edit/', JURI::getInstance()->toString());
+$singular = preg_match('/&id=|&view=mail|&layout=edit/', JURI::getInstance()->toString());
 if ($stickyToolbar) : ?>
 	<script>
 		(function($)
@@ -267,7 +267,7 @@
 			// fix sub nav on scroll
 			var $win = $(window)
 				, $nav    = $('.subhead')
-				, navTop  = $('.subhead').length && $('.subhead').offset().top - <?php if ($displayHeader || !$statusFixed) : ?>50<?php else:?>30<?php endif;?>
+				, navTop  = $('.subhead').length && $('.subhead').offset().top - <?php if ($displayHeader || !$statusFixed) : ?>40<?php else:?>20<?php endif;?>
 				, isFixed = 0
 				, edit = <?php echo $singular; ?>
 
@@ -284,11 +284,11 @@
 				}
 			})
 
-			// remove disabled nav
+			// Hide cpanel and user menu
 			if (edit)
 			{
-				$('.navbar-fixed-top').addClass('hidden');
-				$('body').css("padding-top", "0");
+				$('.icon-joomla').addClass('disabled');
+				$('.nav-user').addClass('disabled');
 			}
 
 			$win.on('scroll', processScroll)
@@ -299,10 +299,11 @@ function processScroll()
 				if (scrollTop >= navTop && !isFixed) {
 					isFixed = 1
 					$nav.addClass('subhead-fixed')
-					// remove disabled nav
+					// Hide cpanel and user menu
 					if (edit)
 					{
-						$('.subhead-fixed').css("top", "0");
+						$('.icon-joomla').addClass('disabled');
+						$('.nav-user').addClass('disabled');
 					}
 				} else if (scrollTop <= navTop && isFixed) {
 					isFixed = 0

From 0308667ade9a092e9d294d18fd780e703e460d66 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Thu, 16 Oct 2014 17:34:25 +0300
Subject: [PATCH 07/10] Remove the functionality as well

---
 administrator/templates/isis/index.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index 04004042c76bd..00dfca082616a 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -289,6 +289,8 @@
 			{
 				$('.icon-joomla').addClass('disabled');
 				$('.nav-user').addClass('disabled');
+				$(".admin-logo").attr("href", "#");
+				$('ul.nav-user > li > a').attr("data-toggle","");
 			}
 
 			$win.on('scroll', processScroll)
@@ -304,6 +306,8 @@ function processScroll()
 					{
 						$('.icon-joomla').addClass('disabled');
 						$('.nav-user').addClass('disabled');
+						$(".admin-logo").attr("href", "#");
+						$('ul.nav-user > li > a').attr("data-toggle","");
 					}
 				} else if (scrollTop <= navTop && isFixed) {
 					isFixed = 0

From 3aa2926e9d383aec87c87ff54063a437cac134ee Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Thu, 16 Oct 2014 17:59:32 +0300
Subject: [PATCH 08/10] rearrange the code.  remove duplicate if

---
 administrator/templates/isis/index.php | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index 00dfca082616a..921a41a5c8fb5 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -271,6 +271,15 @@
 				, isFixed = 0
 				, edit = <?php echo $singular; ?>
 
+			// Disable cpanel and user menu
+			if (edit)
+			{
+				$('.icon-joomla').addClass('disabled');
+				$('.nav-user').addClass('disabled');
+				$(".admin-logo").attr("href", "#");
+				$('ul.nav-user > li > a').attr("data-toggle","");
+			}
+
 			processScroll()
 
 			// hack sad times - holdover until rewrite for 2.1
@@ -284,15 +293,6 @@
 				}
 			})
 
-			// Hide cpanel and user menu
-			if (edit)
-			{
-				$('.icon-joomla').addClass('disabled');
-				$('.nav-user').addClass('disabled');
-				$(".admin-logo").attr("href", "#");
-				$('ul.nav-user > li > a').attr("data-toggle","");
-			}
-
 			$win.on('scroll', processScroll)
 
 			function processScroll()
@@ -301,14 +301,6 @@ function processScroll()
 				if (scrollTop >= navTop && !isFixed) {
 					isFixed = 1
 					$nav.addClass('subhead-fixed')
-					// Hide cpanel and user menu
-					if (edit)
-					{
-						$('.icon-joomla').addClass('disabled');
-						$('.nav-user').addClass('disabled');
-						$(".admin-logo").attr("href", "#");
-						$('ul.nav-user > li > a').attr("data-toggle","");
-					}
 				} else if (scrollTop <= navTop && isFixed) {
 					isFixed = 0
 					$nav.removeClass('subhead-fixed')

From ee7516c1bd841f2c5e8ea4477047437f54fbbb04 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Thu, 16 Oct 2014 21:26:18 +0300
Subject: [PATCH 09/10] use removeAttr

---
 administrator/templates/isis/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index 921a41a5c8fb5..ab8f8136a11ef 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -276,7 +276,7 @@
 			{
 				$('.icon-joomla').addClass('disabled');
 				$('.nav-user').addClass('disabled');
-				$(".admin-logo").attr("href", "#");
+				$(".admin-logo").removeAttr("href");
 				$('ul.nav-user > li > a').attr("data-toggle","");
 			}
 

From 1401285621b46c63fb59c8c6a5d07f95876514d4 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Thu, 16 Oct 2014 22:04:59 +0300
Subject: [PATCH 10/10] Consistency across the navbar on disable

---
 administrator/templates/isis/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index ab8f8136a11ef..039febec7549c 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -277,7 +277,8 @@
 				$('.icon-joomla').addClass('disabled');
 				$('.nav-user').addClass('disabled');
 				$(".admin-logo").removeAttr("href");
-				$('ul.nav-user > li > a').attr("data-toggle","");
+				$('ul.nav-user > li > a').removeAttr("data-toggle").removeAttr("href");
+				$('ul.nav-user > li > .dropdown-menu').empty();
 			}
 
 			processScroll()