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

* Thu Mar 20 2025 Brian Read <brianr@koozali.org> 11.0.0-71.sme

Browse Source 
- Sort out navigation menu error on startup [SME: 12946]
- More places where floating panel needed
- Adjust floating panel to make space around it the same
- clean up some css
This commit is contained in:
Brian Read
2025-03-20 12:15:50 +00:00
parent 750ab7dd11
commit 36de44fcef
10 changed files with 462 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ use SrvMngr::Plugin::WithoutCache;
use esmith::I18N;
#this is overwrittrn with the "release" by the spec file - release can be "99.el8.sme"
our $VERSION = '51.el8.sme';
our $VERSION = '70.el8.sme';
#Extract the release value
if ($VERSION =~ /^(\d+)/) {
$VERSION = $1; # $1 contains the matched numeric digits
@@ -565,8 +565,8 @@ sub getNavigation {
# Determine the directory where the functions are kept
#-----------------------------------------------------
my $navigation_ctlr_ignore =
"(\.\.?|Swttheme\.pm|Login\.pm|Request\.pm|Modules\.pm|Legacypanel\.pm(-.*)?)";
# "(\.\.?|Initial\.pm|Manual\.pm|Swttheme\.pm|Request\.pm|Modules\.pm(-.*)?)";
"(\.\.?|.*\-Custom\.pm|Swttheme\.pm|Login\.pm|Request\.pm|Modules\.pm|Legacypanel\.pm(-.*)?)";
# "(\.\.?|Initial\.pm|.*Manual\.pm|Swttheme\.pm|Request\.pm|Modules\.pm(-.*)?)";
my $navigation_cgi_ignore =
"(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
@@ -925,4 +925,4 @@ sub get_reg_mask {
}
1;
1;

2
root/usr/share/smanager/themes/default/templates/exception_development.html.ep
View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id="central module" class="sme-error">
<div id="central" class="sme-error module">
<p><br>dev<br> Oups !!!
The page you were requesting
"<%= $self->req->url->path || '/' %>"

2
root/usr/share/smanager/themes/default/templates/not_found.development.html.ep
View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id="central module" class="sme-error">
<div id="central" class="sme-error module">
<p><br>dev<br> Oups !!!
The page you were requesting
"<%= $self->req->url->path || '/' %>"

4
root/usr/share/smanager/themes/default/templates/not_found.html.ep
View File

@@ -1,5 +1,5 @@
% layout 'defaultlight', title => 'Sme server 2 - Error P';
<div id='central' class='central not_found-panel'>
<div id='central' class='central not_found-panel module'>
<p><br><br>
The page you were requesting
"<%= $self->req->url->path || '/' %>"
@@ -7,4 +7,4 @@
<br><br>
%= link_to Welcome => '/'
</p>
</div>
</div>

4
root/usr/share/smanager/themes/default/templates/roundcube.html.ep
View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='roundcube' class='roundcube roundcube-panel'>
<div id='roundcube' class='roundcube roundcube-panel module'>
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
@@ -37,4 +37,4 @@
</div>
%end
%end

2
root/usr/share/smanager/themes/default/templates/welcome.html.ep
View File

@@ -1,7 +1,7 @@
% layout 'default', title => 'Sme server 2 - IndexT';
% content_for 'module' => begin
<div id='central' class='central welcome-panel'>
<div id='central' class='central welcome-panel module'>
<p>Index on line - Welcome page<br>
</p>
<p>

2
root/usr/share/smanager/themes/default/templates/whatever.html.ep
View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id="central module" class="sme-error">
<div id="central " class="sme-error module">
<p><br>dev<br> What else !!!
The page you were requesting
"<%= $self->req->url->path || '/' %>"