--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/01/21 07:34:29 1.9 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/01/27 09:34:11 1.12 @@ -1,10 +1,10 @@ -# $Id: smeserver-manager.spec,v 1.8 2020/01/12 20:09:06 michel Exp $ +# $Id: smeserver-manager.spec,v 1.11 2020/01/23 09:10:27 michel 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 6 +%define release 9 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -16,6 +16,9 @@ Patch2: smeserver-manager-0.1.0-mojo_str 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 +Patch7: smeserver-manager-0.1.0-navigation_errors.patch +Patch8: smeserver-manager-0.1.0-theme_navig_message.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools BuildRequires: gettext @@ -31,6 +34,22 @@ Requires: perl(Apache::AuthTkt) AutoReqProv: no %changelog +* Mon Jan 27 2020 Michel Begue 0.1.0-9.sme +- Fix messages without variables expansion +- add a theme switcher +- split navigation menu between controller and template +- template + event for .conf file + +* Thu Jan 23 2020 Michel Begue 0.1.0-8.sme +- Fix errors in Navigation + +* Wed Jan 22 2020 Michel Begue 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 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 @@ -781,6 +800,9 @@ This RPM contributes the navigation bars %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build # Force creation of potentially empty directories @@ -881,6 +903,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