Update usr and add host files

This commit is contained in:
John Crisp 2025-05-03 18:00:27 +02:00
parent 43f790de99
commit 07731ba442
17 changed files with 590 additions and 582 deletions

View File

@ -75,5 +75,6 @@
</div> </div>
%= hidden_field 'trt' => $grp_datas->{trt} %= hidden_field 'trt' => $grp_datas->{trt}
</form>
</div> </div>

View File

@ -66,6 +66,6 @@
%= hidden_field 'trt' => $grp_datas->{trt} %= hidden_field 'trt' => $grp_datas->{trt}
%= hidden_field 'groupName' => $grp_datas->{group} %= hidden_field 'groupName' => $grp_datas->{group}
</form>
</div> </div>

View File

@ -2,7 +2,8 @@
% my $btn = l('GROUP_ADD'); % my $btn = l('GROUP_ADD');
%= form_for '/groups' => (method => 'POST') => begin <form action="/smanager/groups2" method="POST">
%#= form_for '/groups' => (method => 'POST') => begin
%= hidden_field 'trt' => 'ADD' %= hidden_field 'trt' => 'ADD'
@ -11,8 +12,9 @@
<div> <div>
<button type="submit" class="btn btn-primary"><%= $btn %> </button> <button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div> </div>
</form>
% end %# end
<br> <br>
<h2><%=l 'grp_CURRENT_LIST' %></h2> <h2><%=l 'grp_CURRENT_LIST' %></h2>
@ -24,15 +26,9 @@
<table class="table table-bordered user-table-max-wdith"> <table class="table table-bordered user-table-max-wdith">
<thead> <thead>
<tr> <tr>
<th class="col-sm"> <th class="col-sm"><%= l 'GROUP' %></th>
%=l 'GROUP' <th class="col-sm"><%= l 'DESCRIPTION' %></th>
</th> <th class="user-valign-center col-sm" colspan="2"><%= l 'ACTION' %></th>
<th class="col-sm">
%=l 'DESCRIPTION'
</th>
<th class="user-valign-center col-sm" colspan="2">
%=l 'ACTION'
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

View File

@ -85,6 +85,6 @@
%= hidden_field 'trt' => $grp_datas->{trt} %= hidden_field 'trt' => $grp_datas->{trt}
%= hidden_field 'groupName' => $grp_datas->{group} %= hidden_field 'groupName' => $grp_datas->{group}
</form>
</div> </div>

View File

@ -1,29 +1,29 @@
<div> <div>
% my $btn = l('REMOVE'); % my $btn = l('REMOVE');
%= form_for '/hostentriesd' => (method => 'POST') => begin
<p>
<h2>
%=l 'hos_REMOVE_TITLE'
</h2>
</p>
<p> <form action="/smanager/hostentriesd" method="POST">
%= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname}); %#= form_for '/hostentriesd' => (method => 'POST') => begin
</p>
<p><b> <div>
%=l 'hos_ABOUT_TO_REMOVE' <h2><%= l 'hos_REMOVE_TITLE'%> </h2>
</b></p> </div>
<%= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname}); %>
<b><%= l 'hos_ABOUT_TO_REMOVE' %></b>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
<p>
<br>
%= submit_button "$btn", class => ""
</p>
%= hidden_field 'trt' => $hos_datas->{trt} %= hidden_field 'trt' => $hos_datas->{trt}
%= hidden_field 'Hostname' => $hos_datas->{hostname} %= hidden_field 'Hostname' => $hos_datas->{hostname}
% end %# end
</form>
</div> </div>

View File

@ -2,56 +2,53 @@
% my $btn = l('hos_ADD_HOSTNAME'); % my $btn = l('hos_ADD_HOSTNAME');
%= form_for '/hostentries' => (method => 'POST') => begin <form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentries' => (method => 'POST') => begin
<p> <div class="row g-3 align-items-center">
%= submit_button "$btn", class => "" <div class="col-md-2">
<br></p> <button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
%= hidden_field 'trt' => $hos_datas->{trt} %= hidden_field 'trt' => $hos_datas->{trt}
% end %# end
</form>
% my %dom_hos = %{$dom_hosts}; % my %dom_hos = %{$dom_hosts};
% foreach my $domain ( sort ( keys %dom_hos ) ) { % foreach my $domain ( sort ( keys %dom_hos ) ) {
<p><br><b> <br>
%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);
</b><br></p> <b>
<%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain); %>
</b>
<br>
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
<th class=""> <th><%= l 'hos_HOSTNAME' %></th>
%=l 'hos_HOSTNAME' <th><%= l 'hos_HOSTTYPE' %></th>
</th> <th><%= l 'IP_ADDRESS_OR_FQDN' %></th>
<th class=""> <th><%= l 'hos_ETHERNET_ADDRESS' %></th>
%=l 'hos_HOSTTYPE' <th><%= l 'COMMENT' %></th>
</th> <th><%= l 'ACTION' %></th>
<th class="">
%=l 'IP_ADDRESS_OR_FQDN'
</th>
<th class="">
%=l 'hos_ETHERNET_ADDRESS'
</th>
<th class="">
%=l 'COMMENT'
</th>
<th class="">
%=l 'ACTION'
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
% foreach (@{$dom_hos{$domain}{'HOSTS'}}) { % foreach (@{$dom_hos{$domain}{'HOSTS'}}) {
<tr> <tr>
%= t td => (class => "") => $_->{'HostName'}; <td><%= $_->{'HostName'}; %></td>
%= t td => (class => "") => $_->{'HostType'}; <td><%= $_->{'HostType'}; %></td>
%= t td => (class => "") => $_->{'IP'}; <td><%= $_->{'IP'}; %></td>
%= t td => (class => "") => $_->{'MACAddress'}; <td><%= $_->{'MACAddress'}; %></td>
%= t td => (class => "") => $_->{'Comment'}; <td><%= $_->{'Comment'}; %></td>
<td class="" style="min-width:15em"> <!--Need a fix? -->
<td style="min-width:15em">
%my ($actionModify, $actionRemove) = '&nbsp;'; %my ($actionModify, $actionRemove) = '&nbsp;';
%my $static = $_->{'static'} || "no"; %my $static = $_->{'static'} || "no";
%if ($static ne 'yes') { %if ($static ne 'yes') {
@ -60,7 +57,7 @@
%my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure %my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure
%$actionModify = qq{ %$actionModify = qq{
% <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name"> % <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name">
% <button type='button' class="" title='$modify_text' > % <button type='button' class="btn btn-primary" title='$modify_text' >
% $modify_text % $modify_text
% </button> % </button>
% </a> % </a>
@ -70,7 +67,7 @@
%#my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure %#my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure
%$actionRemove = qq{ %$actionRemove = qq{
% <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name"> % <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name">
% <button type='button' class="" title='$remove_text' > % <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text % $remove_text
% </button> % </button>
% </a> % </a>

View File

@ -3,51 +3,52 @@
% my $btn = l('NEXT'); % my $btn = l('NEXT');
%= form_for '/hostentriesd' => (method => 'POST') => begin <form action="/smanager/hostentriesd" method="POST">
<p><h2> %#= form_for '/hostentriesd' => (method => 'POST') => begin
<h2>
% if ( $hos_datas->{trt} eq "ALC" ) { % if ( $hos_datas->{trt} eq "ALC" ) {
%=l 'hos_CREATE_TYPE' %=l 'hos_CREATE_TYPE'
% } else { % } else {
%=l 'hos_MODIFY_TYPE' %=l 'hos_MODIFY_TYPE'
% $btn = l('MODIFY'); % $btn = l('MODIFY');
% } % }
</h2></p> </h2>
<p> <div>
%=l 'hos_LOCAL_PAGE_DESCRIPTION' <%= l 'hos_LOCAL_PAGE_DESCRIPTION' %>
</p> </div>
<p> <div>
%=l 'hos_LOCAL_IP_DESCRIPTION' <%= l 'hos_LOCAL_IP_DESCRIPTION' %>
</p> </div>
<div>
<%= l 'hos_LOCAL_IP' %>
</div>
<p> <div>
<span class="">
%=l 'hos_LOCAL_IP', class => ""
</span>
<span class="">
% param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip'; % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip';
%= text_field 'Internalip', class => "" <%= text_field 'Internalip' %>
</span> </div>
</p>
<p> <div>
%=l 'hos_ETHERNET_ADDRESS_DESCRIPTION' <%= l 'hos_ETHERNET_ADDRESS_DESCRIPTION' %>
</p> </div>
<p> <div>
<span class=""> <%= l 'hos_ETHERNET_ADDRESS' %>
%=l 'hos_ETHERNET_ADDRESS', class => "" </div>
</span>
<span class=""> <div>
% param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress'; % param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress';
%= text_field 'Macaddress', class => "" <%= text_field 'Macaddress' %>
</span> </div>
</p>
<p><br> <div class="row g-3 align-items-center">
%= submit_button "$btn", class => "" <div class="col-md-2">
</p> <button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
%= hidden_field 'trt' => $hos_datas->{trt} %= hidden_field 'trt' => $hos_datas->{trt}
%= hidden_field 'Hostname' => $hos_datas->{hostname} %= hidden_field 'Hostname' => $hos_datas->{hostname}
@ -57,6 +58,7 @@
%= hidden_field 'Hosttype'=> $hos_datas->{hosttype} %= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
%= hidden_field 'Externalip' => $hos_datas->{externalip} %= hidden_field 'Externalip' => $hos_datas->{externalip}
%end %#end
</form>
</div> </div>

View File

@ -2,73 +2,70 @@
% my $btn = l('NEXT'); % my $btn = l('NEXT');
%= form_for '/hostentriesd' => (method => 'POST') => begin <form action="/smanager/hostentriesd" method="POST">
<p><h2> %#= form_for '/hostentriesd' => (method => 'POST') => begin
<h2>
% if ( $hos_datas->{trt} eq "ADD" ) { % if ( $hos_datas->{trt} eq "ADD" ) {
%=l 'hos_CREATE_TITLE' <%=l 'hos_CREATE_TITLE' %>
% } else { % } else {
%=l 'hos_MODIFY_TITLE' <%=l 'hos_MODIFY_TITLE' %>
% $btn = l('MODIFY'); % $btn = l('MODIFY');
% } % }
</h2></p> </h2>
<p> <div><%= l 'hos_HOSTNAME_DESCRIPTION' %></div>
%=l 'hos_HOSTNAME_DESCRIPTION' <div><%=l 'hos_HOSTNAME' %></div>
</p>
<p> <div>
<span class="">
%=l 'hos_HOSTNAME', class => ""
</span>
<span class="">
% if ( $hos_datas->{trt} eq "ADD" ) { % if ( $hos_datas->{trt} eq "ADD" ) {
% param 'Name' => $hos_datas->{name} unless param 'Name'; % param 'Name' => $hos_datas->{name} unless param 'Name';
%= text_field 'Name', class => "" <%= text_field 'Name' %>
% } else { % } else {
%= hidden_field 'Name' => $hos_datas->{name} %= hidden_field 'Name' => $hos_datas->{name}
%= $hos_datas->{name}, class => "" <%= $hos_datas->{name} %>
% } % }
</span> </div>
</p>
<p> <div>
<span class=""> <%= l 'DOMAIN' %>
%=l 'DOMAIN', class => "" </div>
</span>
<span class=""> <div>
% if ( $hos_datas->{trt} eq "ADD" ) { % if ( $hos_datas->{trt} eq "ADD" ) {
% param 'Domain' => $hos_datas->{domain} unless param 'Domain'; % param 'Domain' => $hos_datas->{domain} unless param 'Domain';
%= select_field 'Domain', $c->domains_list(), class => "" <%= select_field 'Domain', $c->domains_list() %>
% } else { % } else {
%= hidden_field 'Domain' => $hos_datas->{domain} %= hidden_field 'Domain' => $hos_datas->{domain}
%= $hos_datas->{domain}, class => "" <%= $hos_datas->{domain} %>
% } % }
</span> </div>
</p>
<p> <div>
<span class=""> <%= $c->l('COMMENT', ''); %>
%= $c->l('COMMENT', ''); </div>
</span>
<span class=""> <div>
% param 'Comment' => $hos_datas->{comment} unless param 'Comment'; % param 'Comment' => $hos_datas->{comment} unless param 'Comment';
%= text_field 'Comment', class => "" <%= text_field 'Comment' %>
</span> </div>
</p>
<p> <div>
<span class=""> <%=l 'LOCATION' %>
%=l 'LOCATION', class => "" </div>
</span>
<span class=""> <div>
% param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype'; % param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype';
%= select_field 'Hosttype', $c->hosttype_list(), class => "" %= select_field 'Hosttype', $c->hosttype_list(), class => ""
</span> </div>
</p>
<p><br> <br>
%= submit_button "$btn", class => ""
</p> <div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
%= hidden_field 'trt' => $hos_datas->{trt} %= hidden_field 'trt' => $hos_datas->{trt}
%= hidden_field 'Hostname' => $hos_datas->{hostname} %= hidden_field 'Hostname' => $hos_datas->{hostname}
@ -76,6 +73,7 @@
%= hidden_field 'Externalip' => $hos_datas->{externalip} %= hidden_field 'Externalip' => $hos_datas->{externalip}
%= hidden_field 'Macaddress' => $hos_datas->{macaddress} %= hidden_field 'Macaddress' => $hos_datas->{macaddress}
%end %#end
</form>
</div> </div>

View File

@ -3,26 +3,27 @@
% my $btn = l('MODIFY'); % my $btn = l('MODIFY');
%= form_for '/hostentriesd' => (method => 'POST') => begin <form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentriesd' => (method => 'POST') => begin
<p> <div>
%=l 'hos_REMOTE_PAGE_DESCRIPTION' <%= l 'hos_REMOTE_PAGE_DESCRIPTION' %>
</p> </div>
<p> <div>
<span class=""> <%= l 'IP_ADDRESS_OR_FQDN' %>
%=l 'IP_ADDRESS_OR_FQDN', class => "" </div>
</span>
<span class=""> <div>
% param 'Externalip' => $hos_datas->{externalip} unless param 'Externalip'; % param 'Externalip' => $hos_datas->{externalip} unless param 'Externalip';
%= text_field 'Externalip', class => "" <%= text_field 'Externalip' %>
</span> </div>
</p>
<div class="row g-3 align-items-center">
<p><br> <div class="col-md-2">
%= submit_button "$btn", class => "" <button type="submit" class="btn btn-primary"><%= $btn %></button>
</p> </div>
</div>
%= hidden_field 'trt' => $hos_datas->{trt} %= hidden_field 'trt' => $hos_datas->{trt}
%= hidden_field 'Hostname' => $hos_datas->{hostname} %= hidden_field 'Hostname' => $hos_datas->{hostname}
@ -33,6 +34,7 @@
%= hidden_field 'Internalip' => $hos_datas->{internalip} %= hidden_field 'Internalip' => $hos_datas->{internalip}
%= hidden_field 'Macaddress' => $hos_datas->{macaddress} %= hidden_field 'Macaddress' => $hos_datas->{macaddress}
%end %#end
</form>
</div> </div>

View File

@ -2,7 +2,9 @@
% my $btn = l('REMOVE'); % my $btn = l('REMOVE');
%= form_for '/useraccountsd' => (method => 'POST') => begin <form action="/smanager/useraccountsd" method="POST">
%#= form_for '/useraccountsd' => (method => 'POST') => begin
<div> <div>
<h2><%= l 'usr_REMOVE_ACCOUNT_TITLE' %></h2> <h2><%= l 'usr_REMOVE_ACCOUNT_TITLE' %></h2>
</div> </div>
@ -47,6 +49,8 @@
%= hidden_field 'user' => $usr_datas->{user} %= hidden_field 'user' => $usr_datas->{user}
%= hidden_field 'name' => $usr_datas->{name} %= hidden_field 'name' => $usr_datas->{name}
% end %# end
</form>
</div> </div>

View File

@ -1,17 +1,17 @@
<div> <div>
% my $btn = l('usr_ADD_USER'); % my $btn = l('usr_ADD_USER');
%= form_for '/useraccounts' => (method => 'POST') => begin <form action="/smanager/useraccounts" method="POST">
%#= form_for '/useraccounts' => (method => 'POST') => begin
<br> <br>
<div> <div>
<button type="submit" class="btn btn-primary"><%= $btn %> </button> <button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div> </div>
</form>
% end %# end
<br> <br>
%= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC')) %= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC'))

View File

@ -2,7 +2,10 @@
% my $btn = l('usr_LOCK'); % my $btn = l('usr_LOCK');
%= form_for '/useraccountsd' => (method => 'POST') => begin <form action="/smanager/useraccountsd" method="POST">
%#= form_for '/useraccountsd' => (method => 'POST') => begin
<div> <div>
<h2><%= l 'usr_LOCK_ACCOUNT_TITLE' %></h2> <h2><%= l 'usr_LOCK_ACCOUNT_TITLE' %></h2>
</div> </div>
@ -48,6 +51,7 @@
%= hidden_field 'user' => $usr_datas->{user} %= hidden_field 'user' => $usr_datas->{user}
%= hidden_field 'name' => $usr_datas->{name} %= hidden_field 'name' => $usr_datas->{name}
% end </form>
%# end
</div> </div>

View File

@ -2,7 +2,8 @@
% my $btn = l('SAVE'); % my $btn = l('SAVE');
%= form_for '/useraccountsd' => (method => 'POST') => begin <form action="/smanager/useraccountsd" method="POST">
%#= form_for '/useraccountsd' => (method => 'POST') => begin
<div> <div>
<h2><%= l 'RESET_PASSWORD_TITLE' %></h2> <h2><%= l 'RESET_PASSWORD_TITLE' %></h2>
@ -81,6 +82,7 @@
%= hidden_field 'user' => $usr_datas->{user} %= hidden_field 'user' => $usr_datas->{user}
%= hidden_field 'name' => $usr_datas->{name} %= hidden_field 'name' => $usr_datas->{name}
% end </form>
%# end
</div> </div>

View File

@ -1,8 +1,8 @@
<div> <div>
% my $btn = l('SAVE'); % my $btn = l('SAVE');
<form action="/smanager/useraccountsd" method="POST">
%= form_for '/useraccountsd' => (method => 'POST') => begin %#= form_for '/useraccountsd' => (method => 'POST') => begin
<div> <div>
<h2><%= l 'PASSWORD_RESET' %></h2> <h2><%= l 'PASSWORD_RESET' %></h2>
@ -72,6 +72,7 @@
%= hidden_field 'user' => $usr_datas->{user} %= hidden_field 'user' => $usr_datas->{user}
%= hidden_field 'name' => $usr_datas->{name} %= hidden_field 'name' => $usr_datas->{name}
% end %# end
</form>
</div> </div>

View File

@ -149,8 +149,6 @@
</div> </div>
<br> <br>
% param 'Phone' => $usr_datas->{phone} unless param 'Phone'; % param 'Phone' => $usr_datas->{phone} unless param 'Phone';
<div class="row g-3 align-items-center"> <div class="row g-3 align-items-center">
@ -168,7 +166,6 @@
</div> </div>
<br> <br>
% param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward'; % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
<div class="row g-3 align-items-center"> <div class="row g-3 align-items-center">
@ -293,6 +290,7 @@
% } % }
</form> </form>
%#end
</div> </div>
<!-- End of containers-sm --> <!-- End of containers-sm -->

View File

@ -9,7 +9,6 @@
<form action="/smanager/useraccountsd" method="POST"> <form action="/smanager/useraccountsd" method="POST">
%#= form_for '/useraccountsd' => (method => 'POST') => begin %#= form_for '/useraccountsd' => (method => 'POST') => begin
<div class="row g-3 align-items-center"> <div class="row g-3 align-items-center">
<div class="col-md-2"> <div class="col-md-2">
<label for="inputLastNAme" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label> <label for="inputLastNAme" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
@ -110,7 +109,7 @@
%= hidden_field 'trt' => $usr_datas->{trt} %= hidden_field 'trt' => $usr_datas->{trt}
%= hidden_field 'user' => $usr_datas->{user} %= hidden_field 'user' => $usr_datas->{user}
% end %# end
</form> </form>
</div> </div>

View File

@ -1,6 +1,6 @@
%define name smeserver-manager-AdminLTE %define name smeserver-manager-AdminLTE
%define version 11.0.0 %define version 11.0.0
%define release 18 %define release 19
Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
@ -26,6 +26,10 @@ AdminLTE is an html framework for admin consoles
wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
%changelog %changelog
* Thu May 01 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-19.sme
- Fix more stuff with usr templates
- Update jhost templates
* Thu May 01 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-18.sme * Thu May 01 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-18.sme
- Trying to make _user_list more logical. Needs 'UNLOCK' translation - Trying to make _user_list more logical. Needs 'UNLOCK' translation
- Big cleanup of dupplicate % my= but needs more work - Big cleanup of dupplicate % my= but needs more work