smeserver/smeserver-manager
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Thu May 09 2024 Brian Read <brianr@koozali.org> 11.0.0-9.sme

Browse Source 
- 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]
This commit is contained in:
Brian Read 2024-05-09 17:02:39 +01:00
parent 03955eecea
commit a428e91c92
12 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
root/usr/share/smanager/lib/SrvMngr.pm
View File

@ -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)

BIN
root/usr/share/smanager/themes/default/public/images/sme-mojo-logo-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

3
root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep
View File

@ -1,5 +1,6 @@
<div id="footer">
<div id="footer" width=100%>
<HR class="sme-copyrightbar">
<a href="https://mojolicious.org" target="_blank"><img src="images/sme-mojo-logo-white.png" style="position:relative;"></a>
<font class="sme-copyright">
% if ( $c->is_logged_in ) {
SME Server <%= session 'releaseVersion' %> - Manager <%= $c->app->VERSION %>

5
root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep
View File

@ -60,9 +60,10 @@
<span class=data>
%=text_field 'networkRouter'
</span><br><br>
<div class='center'>
<p>
<br>
%= submit_button "$btn", class => 'action'
</div>
</p>
%end
</div>

6
root/usr/share/smanager/themes/default/templates/partials/_ln_del.html.ep
View File

@ -49,9 +49,11 @@
</span><br><br>
%}
%= hidden_field localnetwork=>$localnetwork
<div class='center'>
<p>
<br>
%= submit_button "$btn", class => 'action'
</div>
</p>
%end
</div>

8
root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep
View File

@ -37,10 +37,12 @@
%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
</div>
%}
<br><br>
<div class='center'>
<p>
<br>
%= submit_button "$btn", class => 'action'
</div>
</p>
% end
<br>

6
root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep
View File

@ -77,9 +77,11 @@
<span class=data>
%=text_field 'cmmnt'
</span><br><br>
<div class='center'>
<p>
<br>
%= submit_button "$btn", class => 'action'
</div>
</p>
%end
</div>

5
root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep
View File

@ -57,9 +57,10 @@
%#}
%= hidden_field sport=>$sport
%= hidden_field proto=>$proto
<div class='center'>
<br>
%= submit_button "$btn", class => 'action'
</div>
</p>
%end
</div>

15
root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep
View File

@ -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,13 +31,14 @@
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
</div>
%}
<br><br>
<div class='center'>
%= submit_button "$btn", class => 'action'
</div>
% end
<p>
<br>
%= submit_button "$btn", class => 'action'
</p>
% end
% if ($empty){
<br>
@ -47,7 +46,7 @@
% } else {
<br>
%=l 'pf_SHOW_FORWARDS'
<br>
<br><br />
<table class="sme-border TableSort"><thead>
<tr>
<th class='sme-border'>

6
root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep
View File

@ -213,10 +213,10 @@
</p>
%}
<div class='center'>
<p>
<br>
%= submit_button "$btn", class => 'action'
</div>
</p>
% end

5
root/usr/share/smanager/themes/default/templates/userpassword.html.ep
View File

@ -66,9 +66,10 @@
</span>
<br><br></p>
<div class='center'>
<p>
<br>
%= submit_button "$btn", class => 'action'
</div>
</p>
% end

7
smeserver-manager.spec
View File

@ -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 <brianr@koozali.org> 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 <jpp@koozali.org> 11.0.0-8.sme
- create dedicated log files and logrotate [SME: 12664]