--- rpms/smeserver-manager/sme10/smeserver-manager.spec	2020/01/12 20:09:06	1.8
+++ rpms/smeserver-manager/sme10/smeserver-manager.spec	2020/01/22 13:50:10	1.10
@@ -1,10 +1,10 @@
-# $Id: smeserver-manager.spec,v 1.7 2020/01/12 20:07:49 michel Exp $
+# $Id: smeserver-manager.spec,v 1.9 2020/01/21 07:34:29 brianr Exp $
 
-Summary: smeserver manager 2 navigation module
+Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 0.1.0
-%define release 5
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,6 +15,8 @@ Patch1: smeserver-manager-add-basic-file
 Patch2: smeserver-manager-0.1.0-mojo_struct.patch
 Patch3: smeserver-manager-0.1.0-setuid_groups.patch
 Patch4: smeserver-manager-0.1.0-reboot_ibays_theme.patch
+Patch5: smeserver-manager-0.1.0-add-adminlte.patch
+Patch6: smeserver-manager-0.1.0-navigation_header_listes.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
@@ -30,6 +32,17 @@ Requires: perl(Apache::AuthTkt)
 AutoReqProv: no
 
 %changelog
+* Wed Jan 22 2020 Michel Begue <mab974@gmail.com> 0.1.0-7.sme
+- Fix link between Navigation and Theme
+- Add System and Domain names to available data (header)
+- Move some data lists from template to controller (select_field)
+- Integrate last Brian's changes in server-manager2.css (AdminLTE)
+- Fix some warnings and typos
+
+* Fri Jan 17 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-6.sme
+- Add in theme based on AdminLTE html template
+- Fixes Server name in header (Needs Template expansion - added to Console-Save
+
 * Sun Jan 12 2020 Michel Begue <mab974@gmail.com> 0.1.0-5.sme
 - new theme to come
 - css enhancement (thanks to B. Read)
@@ -775,6 +788,8 @@ This RPM contributes the navigation bars
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 # Force creation of potentially empty directories
@@ -784,7 +799,6 @@ mkdir -p root/home/e-smith/db/navigation
 mkdir -p root/etc/e-smith/web/common/css
 mkdir -p root/etc/e-smith/web/panels/manager2/{cgi-bin,html}
 mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images
-
 mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public{css,images,js,tmp}
 mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/templates/{layouts,partials}
 
@@ -876,6 +890,8 @@ chown root:admin /etc/e-smith/web/panels
 chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/log/development.log
 chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js
 chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js
+chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public/js/navigation.js
+chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public/js/navigation.js
 chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_navig.html.ep
 chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_navig.html.ep
 chown root:admin /etc/e-smith/web/functions2/wrapper2