From e7d7b6afb80eb0e1f0e7052032537dddf3dc77ac Mon Sep 17 00:00:00 2001
From: Brian Read <brianr@koozali.org>
Date: Mon, 29 Apr 2024 11:08:21 +0100
Subject: [PATCH] * Mon Apr 29 2024 Brian Read <brianr@koozali.org>
 11.0.0-6.sme - Update layout for table extras [SME: 12656]

---
 .../default/templates/layouts/default.html.ep | 57 +++----------------
 smeserver-manager.spec                        |  5 +-
 2 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep b/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep
index 4a978cd..290cb98 100644
--- a/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep
@@ -19,16 +19,18 @@
     %= content_for 'refresh'
     
     %= stylesheet '/js/datatables.min.css'
+
 	%= javascript '/js/datatables.min.js'
+
 	%= stylesheet '/js/jquery-ui.min.css'
+
 	%= javascript '/js/jquery-ui.min.js'
-	
-	%= stylesheet '/js/dataTables.buttons.min.js'
-	%= stylesheet '/js/jszip.min.js'
-	%= stylesheet '/js/pdfmake.min.js'
-	%= stylesheet '/js/vfs_fonts.js'
-	%= stylesheet '/js/buttons.html5.min.js'
-	%= stylesheet '/js/buttons.print.min.js'
+	%= javascript '/js/dataTables.buttons.min.js'
+	%= javascript '/js/jszip.min.js'
+	%= javascript '/js/pdfmake.min.js'
+	%= javascript '/js/vfs_fonts.js'
+	%= javascript '/js/buttons.html5.min.js'
+	%= javascript '/js/buttons.print.min.js'
 
 	%= stylesheet '/css/sme-jquery-overrides.css'
 
@@ -90,47 +92,6 @@
     % }
 
 %= javascript '/js/sme-dataTable-setup.js'
-
-%= javascript begin
-//Set menu to initial condition based on localStorage
-$(document).ready(function() {
-	let menunavflag = window.localStorage.getItem('menunav');
-	if (menunavflag != "false"){
-		$('#menunav').toggle(true);	
-	} else {
-		$('#menunav').toggle(false);	      
-	}
-	
-	let menuadmflag = window.localStorage.getItem('menuadm');
-	if (menuadmflag != "false"){
-		$('#menuadm').toggle(true);	
-	} else {
-		$('#menuadm').toggle(false);	      
-	}
-
-	let menuuserflag = window.localStorage.getItem('menuuser');
-	if (menuuserflag != "false"){
-		$('#menuuser').toggle(true);	
-	} else {
-		$('#menuuser').toggle(false);	      
-	}
-	
-	var sections = document.getElementsByClassName("section-title");
-	for (var i = 0, len = sections.length; i < len; i++) {
-		var jqObj = $(sections[i]);
-		var $section = jqObj.parent().next('div');
-		if(!$section.length){
-			return false;
-		}
-		let localStorageTag = "admSection-"+sections[i].innerHTML;
-		if (window.localStorage.getItem(localStorageTag) != "false"){
-			$section.toggle(true);
-		} else {
-			$section.toggle(false);	      
-		}
-	}
-})
-%end
   
 </body>
 </html>
diff --git a/smeserver-manager.spec b/smeserver-manager.spec
index 2444514..bc60330 100644
--- a/smeserver-manager.spec
+++ b/smeserver-manager.spec
@@ -2,7 +2,7 @@ Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 11.0.0
-%define release 5
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -108,6 +108,9 @@ true
 %defattr(-,root,root)
 
 %changelog
+* Mon Apr 29 2024 Brian Read <brianr@koozali.org> 11.0.0-6.sme
+- Update layout for table extras [SME: 12656]
+
 * Sun Apr 28 2024 Brian Read <brianr@koozali.org> 11.0.0-5.sme
 - Ibay create not getting into panel [SME: 12652]