diff --git a/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep index cd3f8f7..e699d8f 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep @@ -2,11 +2,12 @@
% if ( not defined $c->session->{username} ) { - + Login % } else { - + --> + Logout <%= $c->session->{username} %> % }
-
+ \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep index 6c735c8..27a78f2 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep @@ -65,80 +65,89 @@ % my $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure % my $password_text = l("PASSWORD_RESET"); % if ($useraccounts_user_name eq 'admin') { - % $actionModify = qq{ - % - % - % - % }; - % $actionResetPw = qq{ - % - % - % - % }; +% $actionModify = qq{ +% +% +% $modify_text +% +% }; +% $actionResetPw = qq{ +% +% +% $password_text +% +% }; % } else { - % $actionModify = qq{ - % - % - % - % }; +% $actionModify = qq{ +% +% +% $modify_text +% +% }; % } % if ($password_set ne 'yes') { % $actionLock = l('ACCOUNT_LOCKED'); - % $actionResetPw = qq{ - % - % - % - % }; +% $actionResetPw = qq{ +% +% +% $password_text +% +% }; % } elsif ($useraccounts_user_name ne 'admin') { - % my $lock_text = l('ACCOUNT LOCKED'); # Localized text + % my $lock_text = l('LOCK_ACCOUNT'); # Localized text % my $csrf_token = "TOKEN"; # CSRF token for security % my $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure - % $actionLock = qq{ - % - % - % - % }; - % $actionResetPw = qq{ - % - % - % - % }; +% $actionLock = qq{ +% +% +% $lock_text +% +% }; +% $actionResetPw = qq{ +% +% +% $password_text +% +% }; % } % if ( $removable eq 'yes' ) { % my $remove_text = l('REMOVE'); # Localized text % my $csrf_token = "TOKEN"; # CSRF token for security - % $actionRemove = qq{ - % - % - % - % }; +% $actionRemove = qq{ +% +% +% $remove_text +% +% }; % } % my $thisdomain = $c->req->url->to_abs->host; % my $roundcube_text = l('Webmail'); # Localized text % $csrf_token = "TOKEN"; # CSRF token for security % $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure - % $actionroundcube = qq{ - % - % - % - % }; +% $actionroundcube = qq{ +% +% +% $roundcube_text +% +% }; <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionResetPw ) %> @@ -155,4 +164,4 @@ %= hidden_field 'trt' => $usr_datas->{trt} - + \ No newline at end of file diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 6b5fd40..eabe4b3 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -2,7 +2,7 @@ Summary: Sme Server Configuration : Manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 114 +%define release 115 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -35,6 +35,7 @@ Requires: perl(Mojolicious::Plugin::CSRFDefender) >= 0.0.8 Requires: perl(Net::Netmask) >= 1.9 Requires: perl(DBM::Deep) >= 2.0011-1 Requires: perl(Mojo::JWT) >= 0.08-1 +#Requires: perl(IPS:Run) >= 0.99-1 - needed for enahnced qmailanalog run of pflogsumm #Requires: perl(Time::TAI64) >= 2.11 Requires: perl(Data::Validate::IP) Requires: mutt >= 1.5.21 @@ -146,6 +147,9 @@ true %defattr(-,root,root) %changelog +* Sat Sep 13 2025 Brian Read 11.0.0-115.sme +- Fix login and logout and user table buttons so that they are valid html and work for elinks [SME: 13113] + * Sat Sep 13 2025 Brian Read 11.0.0-114.sme - edit intial screen to suppress reconfig message unless admin logged in [SME: 13112]