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 0000000..cf22f70 Binary files /dev/null and b/root/usr/share/smanager/themes/default/public/images/sme-mojo-logo-white.png differ 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]