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

@ -10,70 +10,71 @@
% my $btn = l('ADD');
<form action="/smanager/groups2" method="POST">
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputGroupName" class="col-form-label"><%= l 'GROUP_NAME' %></label>
</div>
<div class="col-auto">
<input type="text" name="groupName" id="inputGroupName" class="form-control" aria-describedby="GroupName" >
</div>
<div class="col-auto">
<span id="passwordHelpInline" class="form-text">
Group
</span>
</div>
</div>
<br><br>
<%= l 'grp_GROUP_DESC_EXPL' %>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputGroupDesc" class="col-form-label"><%= l 'grp_GROUP_DESC' %></label>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputGroupName" class="col-form-label"><%= l 'GROUP_NAME' %></label>
</div>
<div class="col-auto">
<input type="text" name="groupName" id="inputGroupName" class="form-control" aria-describedby="GroupName" >
</div>
<div class="col-auto">
<span id="passwordHelpInline" class="form-text">
Group
</span>
</div>
</div>
<div class="col-auto">
<input type="text" name="groupDesc" id="inputGroupDesc" class="form-control" aria-describedby="GroupDesc" >
<br><br>
<%= l 'grp_GROUP_DESC_EXPL' %>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputGroupDesc" class="col-form-label"><%= l 'grp_GROUP_DESC' %></label>
</div>
<div class="col-auto">
<input type="text" name="groupDesc" id="inputGroupDesc" class="form-control" aria-describedby="GroupDesc" >
</div>
<div class="col-auto">
<span id="passwordHelpInline" class="form-text">
Group Alias
</span>
</div>
</div>
<div class="col-auto">
<span id="passwordHelpInline" class="form-text">
Group Alias
</span>
</div>
</div>
<br>
<div>
<%= l 'GROUP_MEMBERS' %>
</div>
<br>
<div>
%= check_box 'groupMembers' => 'admin'
&nbspAdministrator (admin)
<br>
% my $users = $c->gen_users_list();
% foreach my $key ( sort keys %$users ) {
%= check_box 'groupMembers' => $key
&nbsp
%= $users->{$key}
%= " (" . $key . ")"
<br>
% }
</div>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<div>
<%= l 'GROUP_MEMBERS' %>
</div>
</div>
%= hidden_field 'trt' => $grp_datas->{trt}
<br>
<div>
%= check_box 'groupMembers' => 'admin'
&nbspAdministrator (admin)
<br>
% my $users = $c->gen_users_list();
% foreach my $key ( sort keys %$users ) {
%= check_box 'groupMembers' => $key
&nbsp
%= $users->{$key}
%= " (" . $key . ")"
<br>
% }
</div>
<br><br>
<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' => $grp_datas->{trt}
</form>
</div>

View File

@ -3,69 +3,69 @@
% my $btn = l('REMOVE');
<form action="/smanager/groups2" method="POST">
<br><br>
<h2><%=l 'REMOVE_USER_GROUP' %></h2>
<br>
<br><br>
<%=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) %>
<h2><%=l 'REMOVE_USER_GROUP' %></h2>
<br><br>
<div>
% my $size = keys %$members;
% if ( ! $size ){
%= l 'ACCOUNT_GROUP_NONE'
% } else {
%= l 'grp_GROUP_HAS_MEMBERS'
<br><br>
<ul>
% foreach my $key ( keys %$members) {
<li>
%=$key
( <%=$members->{$key} %> )
</li>
% }
</ul>
% }
</div>
<br><br>
<div>
% $size = keys %$ibays;
% if ( $size ) {
%=l 'grp_IBAYS_WILL_BE_CHANGED'
<br>
<ul>
% foreach my $key (sort ( keys %$ibays )) {
<li>
%=$key
(
%=$ibays->{$key}
)
</li>
% }
</ul>
% }
</div>
<%=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) %>
<br><br>
<div>
% my $size = keys %$members;
% if ( ! $size ){
%= l 'ACCOUNT_GROUP_NONE'
% } else {
%= l 'grp_GROUP_HAS_MEMBERS'
<br><br>
<ul>
% foreach my $key ( keys %$members) {
<li>
%=$key
( <%=$members->{$key} %> )
</li>
% }
</ul>
% }
<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' => $grp_datas->{trt}
%= hidden_field 'groupName' => $grp_datas->{group}
<br><br>
<div>
% $size = keys %$ibays;
% if ( $size ) {
%=l 'grp_IBAYS_WILL_BE_CHANGED'
<br>
<ul>
% foreach my $key (sort ( keys %$ibays )) {
<li>
%=$key
(
%=$ibays->{$key}
)
</li>
% }
</ul>
% }
</div>
<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' => $grp_datas->{trt}
%= hidden_field 'groupName' => $grp_datas->{group}
</form>
</div>

View File

@ -2,17 +2,19 @@
% 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'
<br>
<div>
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div>
%= hidden_field 'trt' => 'ADD'
% end
<br>
<div>
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div>
</form>
%# end
<br>
<h2><%=l 'grp_CURRENT_LIST' %></h2>
@ -23,19 +25,13 @@
% } else {
<table class="table table-bordered user-table-max-wdith">
<thead>
<tr>
<th class="col-sm">
%=l 'GROUP'
</th>
<th class="col-sm">
%=l 'DESCRIPTION'
</th>
<th class="user-valign-center col-sm" colspan="2">
%=l 'ACTION'
</th>
<tr>
<th class="col-sm"><%= l 'GROUP' %></th>
<th class="col-sm"><%= l 'DESCRIPTION' %></th>
<th class="user-valign-center col-sm" colspan="2"><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
</thead>
<tbody>
% foreach my $group ( @$groups )
% {
@ -57,11 +53,11 @@
%my $csrf_token = "TOKEN"; # CSRF token for security
%my $group_name = $group->key; # group name extracted from the data structure
%my $actionRemove = qq{
%<a href="groups2?CsrfDef=$csrf_token&trt=DEL&group=$group_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text
% </button>
%</a>
%<a href="groups2?CsrfDef=$csrf_token&trt=DEL&group=$group_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text
% </button>
%</a>
%};
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>

View File

@ -4,87 +4,87 @@
<form action="/smanager/groups2" method="POST">
<br><br>
<br><br>
<h2><%= l 'MODIFY_USER_GROUP' %></h2>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputLastNAme" class="col-form-label"><%= l 'GROUP_NAME' %></label>
</div>
<div class="col-auto">
<input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $grp_datas->{group} %>">
</div>
</div>
<h2><%= l 'MODIFY_USER_GROUP' %></h2>
<br><br>
<br><br>
<%=l 'grp_GROUP_DESC_EXPL'%>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputLastNAme" class="col-form-label"><%= l 'GROUP_NAME' %></label>
<br><br>
% param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputGroupDesc" class="col-form-label"><%= l 'grp_GROUP_DESC' %></label>
</div>
<div class="col-auto">
<input type="text" name="groupDesc" id="inputGroupDesc" class="form-control" aria-describedby="GroupDesc" value="<%= $grp_datas->{description} %>">
</div>
<div class="col-auto">
<span id="passwordHelpInline" class="form-text">
Group Alias
</span>
</div>
</div>
<div class="col-auto">
<input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $grp_datas->{group} %>">
<br><br>
<div>
<%=l 'GROUP_MEMBERS' %>
</div>
</div>
<br><br>
<%=l 'grp_GROUP_DESC_EXPL'%>
<br><br>
% param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputGroupDesc" class="col-form-label"><%= l 'grp_GROUP_DESC' %></label>
</div>
<div class="col-auto">
<input type="text" name="groupDesc" id="inputGroupDesc" class="form-control" aria-describedby="GroupDesc" value="<%= $grp_datas->{description} %>">
</div>
<div class="col-auto">
<span id="passwordHelpInline" class="form-text">
Group Alias
</span>
</div>
</div>
<br><br>
<div>
<%=l 'GROUP_MEMBERS' %>
</div>
<br>
<div>
% if ( $members->{'admin'} ) {
%= check_box 'groupMembers', value => 'admin', checked => undef
% } else {
%= check_box 'groupMembers' => 'admin'
% }
&nbspAdministrator (admin)
</div>
<br>
% my $users = $c->gen_users_list();
% foreach my $key ( sort keys %$users ) {
% if ( $members->{ $key } ) {
<input type='checkbox' name='groupMembers' checked value='<%= $key %>'>
% } else {
%= check_box 'groupMembers' => $key
&nbsp
% }
%= $users->{$key}
%= " (" . $key . ")"
<br>
% }
<br><br>
<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' => $grp_datas->{trt}
%= hidden_field 'groupName' => $grp_datas->{group}
<div>
% if ( $members->{'admin'} ) {
%= check_box 'groupMembers', value => 'admin', checked => undef
% } else {
%= check_box 'groupMembers' => 'admin'
% }
&nbspAdministrator (admin)
</div>
<br>
% my $users = $c->gen_users_list();
% foreach my $key ( sort keys %$users ) {
% if ( $members->{ $key } ) {
<input type='checkbox' name='groupMembers' checked value='<%= $key %>'>
% } else {
%= check_box 'groupMembers' => $key
&nbsp
% }
%= $users->{$key}
%= " (" . $key . ")"
<br>
% }
<br><br>
<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' => $grp_datas->{trt}
%= hidden_field 'groupName' => $grp_datas->{group}
</form>
</div>

View File

@ -1,29 +1,29 @@
<div>
% my $btn = l('REMOVE');
%= form_for '/hostentriesd' => (method => 'POST') => begin
<p>
<h2>
%=l 'hos_REMOVE_TITLE'
</h2>
</p>
<p>
%= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname});
</p>
<p><b>
%=l 'hos_ABOUT_TO_REMOVE'
</b></p>
<p>
<br>
%= submit_button "$btn", class => ""
</p>
<form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentriesd' => (method => 'POST') => begin
<div>
<h2><%= l 'hos_REMOVE_TITLE'%> </h2>
</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>
%= hidden_field 'trt' => $hos_datas->{trt}
%= hidden_field 'Hostname' => $hos_datas->{hostname}
% end
%# end
</form>
</div>

View File

@ -2,85 +2,82 @@
% 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>
%= submit_button "$btn", class => ""
<br></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}
% end
%# end
</form>
% my %dom_hos = %{$dom_hosts};
% foreach my $domain ( sort ( keys %dom_hos ) ) {
<p><br><b>
%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);
</b><br></p>
<br>
<b>
<%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain); %>
</b>
<br>
<table class="table table-bordered">
<thead>
<tr>
<th class="">
%=l 'hos_HOSTNAME'
</th>
<th class="">
%=l 'hos_HOSTTYPE'
</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>
</thead>
<tbody>
% foreach (@{$dom_hos{$domain}{'HOSTS'}}) {
<tr>
%= t td => (class => "") => $_->{'HostName'};
%= t td => (class => "") => $_->{'HostType'};
%= t td => (class => "") => $_->{'IP'};
%= t td => (class => "") => $_->{'MACAddress'};
%= t td => (class => "") => $_->{'Comment'};
<td class="" style="min-width:15em">
%my ($actionModify, $actionRemove) = '&nbsp;';
%my $static = $_->{'static'} || "no";
%if ($static ne 'yes') {
%my $modify_text = l('MODIFY'); # Localized text
%my $csrf_token = "TOKEN"; # CSRF token for security
%my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure
%$actionModify = qq{
% <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name">
% <button type='button' class="" title='$modify_text' >
% $modify_text
% </button>
% </a>
%};
%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{
% <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name">
% <button type='button' class="" title='$remove_text' >
% $remove_text
% </button>
% </a>
%};
%}
<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
</td>
</tr>
% }
</tbody>
<thead>
<tr>
<th><%= l 'hos_HOSTNAME' %></th>
<th><%= l 'hos_HOSTTYPE' %></th>
<th><%= l 'IP_ADDRESS_OR_FQDN' %></th>
<th><%= l 'hos_ETHERNET_ADDRESS' %></th>
<th><%= l 'COMMENT' %></th>
<th><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
% foreach (@{$dom_hos{$domain}{'HOSTS'}}) {
<tr>
<td><%= $_->{'HostName'}; %></td>
<td><%= $_->{'HostType'}; %></td>
<td><%= $_->{'IP'}; %></td>
<td><%= $_->{'MACAddress'}; %></td>
<td><%= $_->{'Comment'}; %></td>
<!--Need a fix? -->
<td style="min-width:15em">
%my ($actionModify, $actionRemove) = '&nbsp;';
%my $static = $_->{'static'} || "no";
%if ($static ne 'yes') {
%my $modify_text = l('MODIFY'); # Localized text
%my $csrf_token = "TOKEN"; # CSRF token for security
%my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure
%$actionModify = qq{
% <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% $modify_text
% </button>
% </a>
%};
%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{
% <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text
% </button>
% </a>
%};
%}
<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
</td>
</tr>
% }
</tbody>
</table>
% }
</div>

View File

@ -1,62 +1,64 @@
<div>
<!-- UPDATE HOST TYPE -->
% my $btn = l('NEXT');
% my $btn = l('NEXT');
%= form_for '/hostentriesd' => (method => 'POST') => begin
<p><h2>
% if ( $hos_datas->{trt} eq "ALC" ) {
%=l 'hos_CREATE_TYPE'
% } else {
%=l 'hos_MODIFY_TYPE'
% $btn = l('MODIFY');
% }
</h2></p>
<form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentriesd' => (method => 'POST') => begin
<p>
%=l 'hos_LOCAL_PAGE_DESCRIPTION'
</p>
<p>
%=l 'hos_LOCAL_IP_DESCRIPTION'
</p>
<p>
<span class="">
%=l 'hos_LOCAL_IP', class => ""
</span>
<span class="">
% param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip';
%= text_field 'Internalip', class => ""
</span>
</p>
<p>
%=l 'hos_ETHERNET_ADDRESS_DESCRIPTION'
</p>
<p>
<span class="">
%=l 'hos_ETHERNET_ADDRESS', class => ""
</span>
<span class="">
% param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress';
%= text_field 'Macaddress', class => ""
</span>
</p>
<p><br>
%= submit_button "$btn", class => ""
</p>
%= hidden_field 'trt' => $hos_datas->{trt}
%= hidden_field 'Hostname' => $hos_datas->{hostname}
<h2>
% if ( $hos_datas->{trt} eq "ALC" ) {
%=l 'hos_CREATE_TYPE'
% } else {
%=l 'hos_MODIFY_TYPE'
% $btn = l('MODIFY');
% }
</h2>
<div>
<%= l 'hos_LOCAL_PAGE_DESCRIPTION' %>
</div>
<div>
<%= l 'hos_LOCAL_IP_DESCRIPTION' %>
</div>
<div>
<%= l 'hos_LOCAL_IP' %>
</div>
<div>
% param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip';
<%= text_field 'Internalip' %>
</div>
<div>
<%= l 'hos_ETHERNET_ADDRESS_DESCRIPTION' %>
</div>
<div>
<%= l 'hos_ETHERNET_ADDRESS' %>
</div>
<div>
% param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress';
<%= text_field 'Macaddress' %>
</div>
<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 'Hostname' => $hos_datas->{hostname}
%= hidden_field 'Name' => $hos_datas->{name}
%= hidden_field 'Domain' => $hos_datas->{domain}
%= hidden_field 'Comment'=> $hos_datas->{comment}
%= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
%= hidden_field 'Externalip' => $hos_datas->{externalip}
%= hidden_field 'Comment'=> $hos_datas->{comment}
%= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
%= hidden_field 'Externalip' => $hos_datas->{externalip}
%end
%#end
</form>
</div>

View File

@ -1,81 +1,79 @@
<div>
% my $btn = l('NEXT');
% my $btn = l('NEXT');
%= form_for '/hostentriesd' => (method => 'POST') => begin
<p><h2>
% if ( $hos_datas->{trt} eq "ADD" ) {
%=l 'hos_CREATE_TITLE'
% } else {
%=l 'hos_MODIFY_TITLE'
% $btn = l('MODIFY');
% }
</h2></p>
<form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentriesd' => (method => 'POST') => begin
<p>
%=l 'hos_HOSTNAME_DESCRIPTION'
</p>
<h2>
% if ( $hos_datas->{trt} eq "ADD" ) {
<%=l 'hos_CREATE_TITLE' %>
% } else {
<%=l 'hos_MODIFY_TITLE' %>
% $btn = l('MODIFY');
% }
</h2>
<div><%= l 'hos_HOSTNAME_DESCRIPTION' %></div>
<div><%=l 'hos_HOSTNAME' %></div>
<div>
% if ( $hos_datas->{trt} eq "ADD" ) {
% param 'Name' => $hos_datas->{name} unless param 'Name';
<%= text_field 'Name' %>
% } else {
%= hidden_field 'Name' => $hos_datas->{name}
<%= $hos_datas->{name} %>
% }
</div>
<div>
<%= l 'DOMAIN' %>
</div>
<p>
<span class="">
%=l 'hos_HOSTNAME', class => ""
</span>
<span class="">
% if ( $hos_datas->{trt} eq "ADD" ) {
% param 'Name' => $hos_datas->{name} unless param 'Name';
%= text_field 'Name', class => ""
% } else {
%= hidden_field 'Name' => $hos_datas->{name}
%= $hos_datas->{name}, class => ""
% }
</span>
</p>
<div>
% if ( $hos_datas->{trt} eq "ADD" ) {
% param 'Domain' => $hos_datas->{domain} unless param 'Domain';
<%= select_field 'Domain', $c->domains_list() %>
% } else {
%= hidden_field 'Domain' => $hos_datas->{domain}
<%= $hos_datas->{domain} %>
% }
</div>
<div>
<%= $c->l('COMMENT', ''); %>
</div>
<p>
<span class="">
%=l 'DOMAIN', class => ""
</span>
<span class="">
% if ( $hos_datas->{trt} eq "ADD" ) {
% param 'Domain' => $hos_datas->{domain} unless param 'Domain';
%= select_field 'Domain', $c->domains_list(), class => ""
% } else {
%= hidden_field 'Domain' => $hos_datas->{domain}
%= $hos_datas->{domain}, class => ""
% }
</span>
</p>
<div>
% param 'Comment' => $hos_datas->{comment} unless param 'Comment';
<%= text_field 'Comment' %>
</div>
<p>
<span class="">
%= $c->l('COMMENT', '');
</span>
<span class="">
% param 'Comment' => $hos_datas->{comment} unless param 'Comment';
%= text_field 'Comment', class => ""
</span>
</p>
<div>
<%=l 'LOCATION' %>
</div>
<p>
<span class="">
%=l 'LOCATION', class => ""
</span>
<span class="">
% param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype';
%= select_field 'Hosttype', $c->hosttype_list(), class => ""
</span>
</p>
<div>
% param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype';
%= select_field 'Hosttype', $c->hosttype_list(), class => ""
</div>
<p><br>
%= submit_button "$btn", class => ""
</p>
<br>
%= hidden_field 'trt' => $hos_datas->{trt}
%= hidden_field 'Hostname' => $hos_datas->{hostname}
%= hidden_field 'Internalip' => $hos_datas->{internalip}
%= hidden_field 'Externalip' => $hos_datas->{externalip}
%= hidden_field 'Macaddress' => $hos_datas->{macaddress}
<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 'Hostname' => $hos_datas->{hostname}
%= hidden_field 'Internalip' => $hos_datas->{internalip}
%= hidden_field 'Externalip' => $hos_datas->{externalip}
%= hidden_field 'Macaddress' => $hos_datas->{macaddress}
%end
%#end
</form>
</div>

View File

@ -3,36 +3,38 @@
% my $btn = l('MODIFY');
%= form_for '/hostentriesd' => (method => 'POST') => begin
<p>
%=l 'hos_REMOTE_PAGE_DESCRIPTION'
</p>
<p>
<span class="">
%=l 'IP_ADDRESS_OR_FQDN', class => ""
</span>
<span class="">
% param 'Externalip' => $hos_datas->{externalip} unless param 'Externalip';
%= text_field 'Externalip', class => ""
</span>
</p>
<p><br>
%= submit_button "$btn", class => ""
</p>
%= hidden_field 'trt' => $hos_datas->{trt}
%= hidden_field 'Hostname' => $hos_datas->{hostname}
<form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentriesd' => (method => 'POST') => begin
<div>
<%= l 'hos_REMOTE_PAGE_DESCRIPTION' %>
</div>
<div>
<%= l 'IP_ADDRESS_OR_FQDN' %>
</div>
<div>
% param 'Externalip' => $hos_datas->{externalip} unless param 'Externalip';
<%= text_field 'Externalip' %>
</div>
<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 'Hostname' => $hos_datas->{hostname}
%= hidden_field 'Name' => $hos_datas->{name}
%= hidden_field 'Domain' => $hos_datas->{domain}
%= hidden_field 'Comment'=> $hos_datas->{comment}
%= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
%= hidden_field 'Internalip' => $hos_datas->{internalip}
%= hidden_field 'Macaddress' => $hos_datas->{macaddress}
%= hidden_field 'Comment'=> $hos_datas->{comment}
%= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
%= hidden_field 'Internalip' => $hos_datas->{internalip}
%= hidden_field 'Macaddress' => $hos_datas->{macaddress}
%end
%#end
</form>
</div>

View File

@ -2,51 +2,55 @@
% my $btn = l('REMOVE');
%= form_for '/useraccountsd' => (method => 'POST') => begin
<div>
<h2><%= l 'usr_REMOVE_ACCOUNT_TITLE' %></h2>
</div>
<br>
<div>
Needs a text change in the Lex files
<br>
%= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
</div>
<br><br>
<table class="table table-bordered user-table-max-wdith">
<thead>
<tr>
<th class="col-sm">
%=l 'ACCOUNT'
</th>
<th class="col-sm">
%=l 'USER_NAME'
</th>
</tr>
</thead>
<tbody>
<tr>
<td><%= $usr_datas->{user} %></td>
<td><%= $usr_datas->{name} %></td>
</tr>
</tbody>
</table>
<br>
%= $c->render_to_string(inline => $c->l('usr_REMOVE_DESC2'))
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<form action="/smanager/useraccountsd" method="POST">
%#= form_for '/useraccountsd' => (method => 'POST') => begin
<div>
<h2><%= l 'usr_REMOVE_ACCOUNT_TITLE' %></h2>
</div>
<br>
<div>
Needs a text change in the Lex files
<br>
%= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
</div>
</div>
%= hidden_field 'trt' => $usr_datas->{trt}
%= hidden_field 'user' => $usr_datas->{user}
%= hidden_field 'name' => $usr_datas->{name}
% end
<br><br>
<table class="table table-bordered user-table-max-wdith">
<thead>
<tr>
<th class="col-sm">
%=l 'ACCOUNT'
</th>
<th class="col-sm">
%=l 'USER_NAME'
</th>
</tr>
</thead>
<tbody>
<tr>
<td><%= $usr_datas->{user} %></td>
<td><%= $usr_datas->{name} %></td>
</tr>
</tbody>
</table>
<br>
%= $c->render_to_string(inline => $c->l('usr_REMOVE_DESC2'))
<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' => $usr_datas->{trt}
%= hidden_field 'user' => $usr_datas->{user}
%= hidden_field 'name' => $usr_datas->{name}
%# end
</form>
</div>

View File

@ -1,17 +1,17 @@
<div>
% 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>
<div>
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div>
% end
</form>
%# end
<br>
%= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC'))

View File

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

View File

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

View File

@ -1,77 +1,78 @@
<div>
% my $btn = l('SAVE');
%= form_for '/useraccountsd' => (method => 'POST') => begin
<div>
<h2><%= l 'PASSWORD_RESET' %></h2>
</div>
<form action="/smanager/useraccountsd" method="POST">
%#= form_for '/useraccountsd' => (method => 'POST') => begin
<br>
<div>
<%= l 'usr_SYSTEM_PASSWORD_DESCRIPTION' %>
</div>
<br>
<div>
<%=l 'usr_CURRENT_SYSTEM_PASSWORD' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<input name="CurPass" id="Pass" type="password" class="form-control sme-password" placeholder="Current Password">
<div>
<h2><%= l 'PASSWORD_RESET' %></h2>
</div>
</div>
<br>
<div>
<%= l 'usr_NEW_SYSTEM_PASSWORD' %>
</div>
<br>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<input name="Pass" id="Pass" type="password" class="form-control sme-password" placeholder="New Password">
<div>
<%= l 'usr_SYSTEM_PASSWORD_DESCRIPTION' %>
</div>
</div>
<br>
<div>
<%= l 'usr_NEW_SYSTEM_PASSWORD_VERIFY' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<input name="PassVerify" id="PassVerify" type="password" class="form-control sme-password" placeholder="New Password verify">
</div>
</div>
<br>
<br>
<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' => $usr_datas->{trt}
%= hidden_field 'user' => $usr_datas->{user}
%= hidden_field 'name' => $usr_datas->{name}
<br>
% end
<div>
<%=l 'usr_CURRENT_SYSTEM_PASSWORD' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<input name="CurPass" id="Pass" type="password" class="form-control sme-password" placeholder="Current Password">
</div>
</div>
<br>
<div>
<%= l 'usr_NEW_SYSTEM_PASSWORD' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<input name="Pass" id="Pass" type="password" class="form-control sme-password" placeholder="New Password">
</div>
</div>
<br>
<div>
<%= l 'usr_NEW_SYSTEM_PASSWORD_VERIFY' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<input name="PassVerify" id="PassVerify" type="password" class="form-control sme-password" placeholder="New Password verify">
</div>
</div>
<br>
<br>
<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' => $usr_datas->{trt}
%= hidden_field 'user' => $usr_datas->{user}
%= hidden_field 'name' => $usr_datas->{name}
%# end
</form>
</div>

View File

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

View File

@ -7,9 +7,8 @@
<br><br>
<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="col-md-2">
<label for="inputLastNAme" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
@ -110,7 +109,7 @@
%= hidden_field 'trt' => $usr_datas->{trt}
%= hidden_field 'user' => $usr_datas->{user}
% end
%# end
</form>
</div>

View File

@ -1,6 +1,6 @@
%define name smeserver-manager-AdminLTE
%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
Name: %{name}
Version: %{version}
@ -26,6 +26,10 @@ AdminLTE is an html framework for admin consoles
wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
%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
- Trying to make _user_list more logical. Needs 'UNLOCK' translation
- Big cleanup of dupplicate % my= but needs more work