diff --git a/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep index 6a2f94a..185dc77 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep @@ -51,73 +51,77 @@ % my $csrf_token = "TOKEN"; # CSRF token for security % my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure % my $actionModify = qq{ - % - % - % - % }; - % my $removable = ( $domain->{Removable} || 'yes' ); - % my $actionRemove = ' '; - % if ($removable eq 'yes') { - % my $remove_text = l('REMOVE'); # Localized text - % my $csrf_token = "TOKEN"; # CSRF token for security - % my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure - % $actionRemove = qq{ - % - % - % - % }; - %# $actionRemove = "" . "" . ""; + % + % + % $modify_text + % % }; - - <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %> - - - % } + % my $removable = ( $domain->{Removable} || 'yes' ); + % my $actionRemove = ' '; + % if ($removable eq 'yes') { + % my $remove_text = l('REMOVE'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure + % $actionRemove = qq{ + % + % + % $remove_text + % + % }; + %# $actionRemove = "" . "" . ""; + % }; + + <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %> + + + % } - - + + - %= hidden_field 'trt' => 'ADD' +%= hidden_field 'trt' => 'ADD' - %= form_for '/domains' => ( method => 'POST' ) => begin +%= form_for '/domains' => ( method => 'POST' ) => begin - -
+ +
- % my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS'); + % my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS'); -

- %= l 'dom_DESC_CORPORATE_DNS_CURRENT' -

- -

- - %= l 'dom_LABEL_CORPORATE_DNS_PRIMARY' - - %= $dom_datas->{forwarder} - -

- - % if ($dom_datas->{forwarder2}) { -

- - %= l 'dom_LABEL_CORPORATE_DNS_SECONDARY' - - %= $dom_datas->{forwarder2} - -

- % } +

+ %= l 'dom_DESC_CORPORATE_DNS_CURRENT' +

- %= submit_button "$btn2", class => 'action' + + %= l 'dom_LABEL_CORPORATE_DNS_PRIMARY' + + %= $dom_datas->{forwarder} +

- %= hidden_field 'trt' => 'UP2' - % end + + % if ($dom_datas->{forwarder2}) { +

+ + %= l 'dom_LABEL_CORPORATE_DNS_SECONDARY' + + %= $dom_datas->{forwarder2} + +

+ % } + +

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

+%= hidden_field 'trt' => 'UP2' +% end - + \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep index 6d8f406..29589d9 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep @@ -43,30 +43,34 @@ % my $csrf_token = "TOKEN"; # CSRF token for security % my $group_name = $group->key; # group name extracted from the data structure % my $actionModify = qq{ - % - % - % - % }; - % my $remove_text = l('REMOVE'); # Localized text - % my $csrf_token = "TOKEN"; # CSRF token for security - % my $group_name = $group->key; # group name extracted from the data structure - % my $actionRemove = qq{ - % - % + % + % + % $modify_text % % }; - <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %> - - - % } - - - <% } %> -

+ % my $remove_text = l('REMOVE'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $group_name = $group->key; # group name extracted from the data structure + % my $actionRemove = qq{ + % + % + % $remove_text + % + % }; + <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %> + + + % } + + +<% } %> +

- + \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep index da9d03c..f72387d 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep @@ -57,28 +57,32 @@ % my $csrf_token = "TOKEN"; # CSRF token for security % my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure % $actionModify = qq{ - % - % - % - % }; - % my $remove_text = l('REMOVE'); # Localized text - % $csrf_token = "TOKEN"; # CSRF token for security - %# my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure - % $actionRemove = qq{ - % - % + % + % + % $modify_text % % }; - % } - <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %> - - + % my $remove_text = l('REMOVE'); # Localized text + % $csrf_token = "TOKEN"; # CSRF token for security + %# my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure + % $actionRemove = qq{ + % + % + % $remove_text + % + % }; % } - - + <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %> + + % } - + + +% } + \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep index b41374b..5654f96 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep @@ -53,59 +53,65 @@ % my $csrf_token = "TOKEN"; # CSRF token for security % my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure % $actionModify = qq{ - % - % - % - % }; - % } + % + % + % $modify_text + % + % }; + % } - % if ($passwordable eq 'yes') { - % my $password_text = l('PASSWORD_RESET'); # Localized text - % my $csrf_token = "TOKEN"; # CSRF token for security - % my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure - % if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) { - % $actionResetPw = qq{ - % - % - % - % }; - % } else { - % $actionResetPw = qq{ - % - % - % - % }; - % } - - % } - - % if ($removable eq 'yes') { - % my $remove_text = l('REMOVE'); # Localized text - % my $csrf_token = "TOKEN"; # CSRF token for security - % my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure - % $actionRemove = qq{ - % - % % % }; - % } - <%= $c->render_to_string( inline => $actionModify ) %> - <%= $c->render_to_string( inline => $actionResetPw ) %> - <%= $c->render_to_string( inline => $actionRemove ) %> - - + % } else { + % $actionResetPw = qq{ + % + % + % $password_text + % + % }; % } - - - <% } %> + + % } + + % if ($removable eq 'yes') { + % my $remove_text = l('REMOVE'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure + % $actionRemove = qq{ + % + % + % $remove_text + % + % }; + % } + <%= $c->render_to_string( inline => $actionModify ) %> + <%= $c->render_to_string( inline => $actionResetPw ) %> + <%= $c->render_to_string( inline => $actionRemove ) %> + + +% } + + +<% } %> - + \ No newline at end of file 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 e293066..7798f52 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 @@ -80,18 +80,20 @@ % my $local_network_entry = $localnetwork->key; % my $csrf_token = "TOKEN"; # CSRF token for security % $actionRemove = qq{ - % - % - % - % }; - % } - <%= $c->render_to_string( inline => $actionRemove ) %> - + % + % + % $remove_text + % + % }; % } - - - %= hidden_field 'trt' => $ln_datas->{trt} - % } - + <%= $c->render_to_string( inline => $actionRemove ) %> + + % } + + +%= hidden_field 'trt' => $ln_datas->{trt} +% } + \ No newline at end of file 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 7091fcb..4a0c0d5 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 @@ -96,21 +96,23 @@ % my $remove_text = l('REMOVE'); # Localized text % my $csrf_token = "TOKEN"; # CSRF token for security % my $actionRemove = qq{ - % - % - % - % }; - <%= $c->render_to_string( inline => $actionRemove ) %> - - - % } + % + % + % $remove_text + % + % }; + <%= $c->render_to_string( inline => $actionRemove ) %> + + % } - % } - % } - - - %= hidden_field 'trt' => $pf_datas->{trt} + % } + % } + % } + + +%= hidden_field 'trt' => $pf_datas->{trt} - + \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep index d76eb85..b3426ed 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep @@ -62,20 +62,22 @@ % my $csrf_token = "TOKEN"; # CSRF token for security % my $printer_name = $printer->key; % my $actionRemove = qq{ - % - % - % - % }; - <%= $c->render_to_string( inline => $actionRemove ) %> - - - % } - - - <% } %> -

+ % + % + % $remove_text + % + % }; + <%= $c->render_to_string( inline => $actionRemove ) %> + + + % } + + + <% } %> +

- + \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep index ae5c322..3882078 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep @@ -61,36 +61,40 @@ % my $csrf_token = "TOKEN"; # CSRF token for security % my $pseudonyms_entry_name = $pseudonym->key; # pseudonyms_entry name extracted from the data structure % $actionModify = qq{ - % - % - % - % }; - % } - - % if ($removable eq 'yes') { - % my $remove_text = l('REMOVE'); # Localized text - % my $csrf_token = "TOKEN"; # CSRF token for security - % my $pseudonyms_entry_name = $pseudonym->key; # pseudonyms_entry name extracted from the data structure - % $actionRemove = qq{ - % - % + % + % + % $modify_text % % }; - % } - <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %> + % } - - + % if ($removable eq 'yes') { + % my $remove_text = l('REMOVE'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $pseudonyms_entry_name = $pseudonym->key; # pseudonyms_entry name extracted from the data structure + % $actionRemove = qq{ + % + % + % $remove_text + % + % }; % } - - - <% } %> -

+ <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %> + + + + % } + + +<% } %> +

- + \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep index 9af19d2..986cc4a 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep @@ -62,21 +62,23 @@ % my $csrf_token = "TOKEN"; # CSRF token for security % my $quota_user_name = $user->key; # quotas_entry name extracted from the data structure % my $actionModify = qq{ - % - % - % - % }; - <%= $c->render_to_string( inline => $actionModify ) %> - - - % } - - - <% } %> -

+ % + % + % $modify_text + % + % }; + <%= $c->render_to_string( inline => $actionModify ) %> + + + % } + + + <% } %> +

- %= hidden_field 'trt' => $quo_datas->{trt} +%= hidden_field 'trt' => $quo_datas->{trt} - + \ 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 27a78f2..52da6f3 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,103 +65,103 @@ % 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{ -% -% -% $modify_text -% -% }; -% $actionResetPw = qq{ -% -% -% $password_text -% -% }; - % } else { -% $actionModify = qq{ -% -% -% $modify_text -% -% }; - % } - % if ($password_set ne 'yes') { - % $actionLock = l('ACCOUNT_LOCKED'); -% $actionResetPw = qq{ -% -% -% $password_text -% -% }; - % } elsif ($useraccounts_user_name ne 'admin') { - % 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 + % $actionModify = qq{ + % + % + % $modify_text + % + % }; + % $actionResetPw = qq{ + % + % + % $password_text + % + % }; + % } else { + % $actionModify = qq{ + % + % + % $modify_text + % + % }; + % } + % if ($password_set ne 'yes') { + % $actionLock = l('ACCOUNT_LOCKED'); + % $actionResetPw = qq{ + % + % + % $password_text + % + % }; +% } elsif ($useraccounts_user_name ne 'admin') { +% 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{ -% -% -% $lock_text -% + % + % + % $lock_text + % % }; % $actionResetPw = qq{ -% -% -% $password_text -% + % + % + % $password_text + % % }; - % } - % if ( $removable eq 'yes' ) { - % my $remove_text = l('REMOVE'); # Localized text - % my $csrf_token = "TOKEN"; # CSRF token for security -% $actionRemove = qq{ -% -% -% $remove_text -% -% }; - % } +% } +% if ( $removable eq 'yes' ) { + % my $remove_text = l('REMOVE'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % $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 +% 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{ -% -% -% $roundcube_text -% + % + % + % $roundcube_text + % % }; - - <%= $c->render_to_string( inline => $actionModify ) %> - <%= $c->render_to_string( inline => $actionResetPw ) %> - <%= $c->render_to_string( inline => $actionLock ) %> - <%= $c->render_to_string( inline => $actionRemove ) %> - <%= $c->render_to_string( inline => $actionroundcube ) %> - - - % } - - + + <%= $c->render_to_string( inline => $actionModify ) %> + <%= $c->render_to_string( inline => $actionResetPw ) %> + <%= $c->render_to_string( inline => $actionLock ) %> + <%= $c->render_to_string( inline => $actionRemove ) %> + <%= $c->render_to_string( inline => $actionroundcube ) %> + + +% } + + - <% } %> +<% } %> - %= hidden_field 'trt' => $usr_datas->{trt} +%= hidden_field 'trt' => $usr_datas->{trt} \ No newline at end of file diff --git a/smeserver-manager.spec b/smeserver-manager.spec index eabe4b3..673ff64 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 115 +%define release 116 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -147,6 +147,9 @@ true %defattr(-,root,root) %changelog +* Mon Sep 15 2025 Brian Read 11.0.0-116.sme +- Fix other buttons in lists for elinks [SME: 13113] + * 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]