From a428e91c92e2c2949f6c8c55449ffcc5e714f983 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Thu, 9 May 2024 17:02:39 +0100 Subject: [PATCH] * Thu May 09 2024 Brian Read 11.0.0-9.sme - Add mojo logo to footer [SME: 12679] - Fix default for HeaderWeight to avoid noise in logs if no Nav header in file - Align buttons consistently [SME: 12680] --- root/usr/share/smanager/lib/SrvMngr.pm | 2 +- .../public/images/sme-mojo-logo-white.png | Bin 0 -> 10243 bytes .../default/templates/partials/_footer.html.ep | 3 ++- .../default/templates/partials/_ln_add.html.ep | 7 ++++--- .../default/templates/partials/_ln_del.html.ep | 8 +++++--- .../default/templates/partials/_ln_list.html.ep | 8 +++++--- .../default/templates/partials/_pf_add.html.ep | 8 +++++--- .../default/templates/partials/_pf_del.html.ep | 7 ++++--- .../default/templates/partials/_pf_list.html.ep | 15 +++++++-------- .../default/templates/remoteaccess.html.ep | 6 +++--- .../default/templates/userpassword.html.ep | 7 ++++--- smeserver-manager.spec | 7 ++++++- 12 files changed, 46 insertions(+), 32 deletions(-) create mode 100644 root/usr/share/smanager/themes/default/public/images/sme-mojo-logo-white.png diff --git a/root/usr/share/smanager/lib/SrvMngr.pm b/root/usr/share/smanager/lib/SrvMngr.pm index 31c0d7b..4c2454a 100644 --- a/root/usr/share/smanager/lib/SrvMngr.pm +++ b/root/usr/share/smanager/lib/SrvMngr.pm @@ -624,7 +624,7 @@ sub getNavigation { { $heading = $rec->prop('Heading'); $description = $rec->prop('Description'); - $headingWeight = $rec->prop('HeadingWeight'); + $headingWeight = $rec->prop('HeadingWeight') || 99999; #Stop noise in logs if file in dir does not have nav header. $descriptionWeight = $rec->prop('DescriptionWeight'); $urlpath = $rec->prop('UrlPath') || ''; $menucat = $rec->prop('MenuCat') || 'A'; # admin menu (default) diff --git a/root/usr/share/smanager/themes/default/public/images/sme-mojo-logo-white.png b/root/usr/share/smanager/themes/default/public/images/sme-mojo-logo-white.png new file mode 100644 index 0000000000000000000000000000000000000000..cf22f704fb6543698bffeda753b4054d1acbb159 GIT binary patch literal 10243 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 P-~eq6J@qH5wh{jWs_~C# literal 0 HcmV?d00001 diff --git a/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep index 58fc90b..53b8f4b 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep @@ -1,5 +1,6 @@ - diff --git a/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep index b1c2735..d4a3184 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep @@ -37,10 +37,12 @@ %= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %} -

-
+ +

+
%= submit_button "$btn", class => 'action' -

+

+ % end
diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep index 0c52075..aadddc9 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep @@ -77,9 +77,11 @@ %=text_field 'cmmnt'

-
- %= submit_button "$btn", class => 'action' -
+

+
+ %= submit_button "$btn", class => 'action' +

+ %end diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep index ff64469..d344eb7 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep @@ -57,9 +57,10 @@ %#} %= hidden_field sport=>$sport %= hidden_field proto=>$proto -
- %= submit_button "$btn", class => 'action' -
+
+ %= submit_button "$btn", class => 'action' +

+ %end diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep index e63e259..17936a3 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep @@ -18,8 +18,6 @@ % my $var5 = @vars[4]; % my $var6 = @vars[5]; - - %if ($ret{ret} eq "") { %= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %} elsif (index($ret{ret},"SUCCESS") != -1) { @@ -33,21 +31,22 @@ %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %} -

-
+ +

+
%= submit_button "$btn", class => 'action' -

+

+ + % end -
- % if ($empty){
%=l 'pf_NO_FORWARDS' % } else {
%=l 'pf_SHOW_FORWARDS' -
+

diff --git a/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep b/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep index 1a8ac96..a7b2185 100644 --- a/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep +++ b/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep @@ -213,10 +213,10 @@

%} - -
+

+
%= submit_button "$btn", class => 'action' -

+

% end diff --git a/root/usr/share/smanager/themes/default/templates/userpassword.html.ep b/root/usr/share/smanager/themes/default/templates/userpassword.html.ep index 0939adb..9020cdf 100644 --- a/root/usr/share/smanager/themes/default/templates/userpassword.html.ep +++ b/root/usr/share/smanager/themes/default/templates/userpassword.html.ep @@ -66,9 +66,10 @@

-
- %= submit_button "$btn", class => 'action' -
+

+
+ %= submit_button "$btn", class => 'action' +

% end diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 5db4ce2..02d9652 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 8 +%define release 9 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -108,6 +108,11 @@ true %defattr(-,root,root) %changelog +* Thu May 09 2024 Brian Read 11.0.0-9.sme +- Add mojo logo to footer [SME: 12679] +- Fix default for HeaderWeight to avoid noise in logs if no Nav header in file +- Align buttons consistently [SME: 12680] + * Tue Apr 30 2024 Jean-Philippe Pialasse 11.0.0-8.sme - create dedicated log files and logrotate [SME: 12664]