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

Hosts done and a few tweaks

Browse Source
This commit is contained in:
John Crisp 2025-05-18 22:58:06 +02:00
parent 9d8b704b56
commit 266d8b279c
8 changed files with 282 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep
View File

@ -4,7 +4,8 @@
<form action="/smanager/groups2" method="POST">
<br>
<div>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div>
<%= hidden_field 'trt' => 'ADD' %>

15
root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_del.html.ep
View File

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

35
root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_list.html.ep
View File

@ -3,43 +3,34 @@
% my $btn = l('hos_ADD_HOSTNAME');
<form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentries' => (method => 'POST') => begin
<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
<%= hidden_field 'trt' => $hos_datas->{trt} %>
</form>
% my %dom_hos = %{$dom_hosts};
% foreach my $domain ( sort ( keys %dom_hos ) ) {
<br>
<b>
<%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain); %>
</b>
<br>
<table class="table table-bordered">
<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 class="user-valign-center">
<th class="col-sm"><%= l 'hos_HOSTNAME' %></th>
<th class="col-auto"><%= l 'hos_HOSTTYPE' %></th>
<th class="col-auto"><%= l 'IP_ADDRESS_OR_FQDN' %></th>
<th class="col-auto"><%= l 'hos_ETHERNET_ADDRESS' %></th>
<th class="col-auto"><%= l 'COMMENT' %></th>
<th class="user-valign-center" colspan="2"><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
<tbody>
% foreach (@{$dom_hos{$domain}{'HOSTS'}}) {
<tr>
<td><%= $_->{'HostName'}; %></td>
@ -47,8 +38,7 @@
<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') {
@ -73,8 +63,9 @@
% </a>
%};
% }
<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
</td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr>
% }
</tbody>

22
root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_ulc.html.ep
View File

@ -4,16 +4,14 @@
% my $btn = l('NEXT');
<form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentriesd' => (method => 'POST') => begin
<h2>
% if ( $hos_datas->{trt} eq "ALC" ) {
%=l 'hos_CREATE_TYPE'
<h2><%=l 'hos_CREATE_TYPE' %></h2>
% } else {
%=l 'hos_MODIFY_TYPE'
<h2><%=l 'hos_MODIFY_TYPE' %></h2>
% $btn = l('MODIFY');
% }
</h2>
<div>
<%= l 'hos_LOCAL_PAGE_DESCRIPTION' %>
@ -22,6 +20,7 @@
<div>
<%= l 'hos_LOCAL_IP_DESCRIPTION' %>
</div>
<div>
<%= l 'hos_LOCAL_IP' %>
</div>
@ -50,15 +49,14 @@
</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 '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} %>
%#end
</form>
</div>

67
root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_upd.html.ep
View File

@ -3,60 +3,74 @@
% my $btn = l('NEXT');
<form action="/smanager/hostentriesd" method="POST">
%#= form_for '/hostentriesd' => (method => 'POST') => begin
<h2>
% if ( $hos_datas->{trt} eq "ADD" ) {
<%=l 'hos_CREATE_TITLE' %>
<h2><%=l 'hos_CREATE_TITLE' %></h2>
% } else {
<%=l 'hos_MODIFY_TITLE' %>
<h2><%=l 'hos_MODIFY_TITLE' %></h2>
% $btn = l('MODIFY');
% }
</h2>
<div><%= l 'hos_HOSTNAME_DESCRIPTION' %></div>
<div><%=l 'hos_HOSTNAME' %></div>
<div>
<%= l 'hos_HOSTNAME_DESCRIPTION' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%=l 'hos_HOSTNAME' %>
</div>
<div class="col-auto">
% if ( $hos_datas->{trt} eq "ADD" ) {
% param 'Name' => $hos_datas->{name} unless param 'Name';
<%= text_field 'Name' %>
% } else {
%= hidden_field 'Name' => $hos_datas->{name}
<%= hidden_field 'Name' => $hos_datas->{name} %>
<%= $hos_datas->{name} %>
% }
</div>
</div>
<div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'DOMAIN' %>
</div>
<div>
<div class="col-auto">
% 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}
<%= hidden_field 'Domain' => $hos_datas->{domain} %>
<%= $hos_datas->{domain} %>
% }
</div>
<div>
<%= $c->l('COMMENT', ''); %>
</div>
<div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputHostComment" class="col-form-label"><%= $c->l('COMMENT', ''); %></label>
</div>
<div class="col-auto">
% param 'Comment' => $hos_datas->{comment} unless param 'Comment';
<%= text_field 'Comment' %>
<input type="text" name="Comment" id="inputHostComment" class="form-control" aria-describedby="inputHostComment" value="<%= $hos_datas->{comment} %>">
</div>
</div>
<div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%=l 'LOCATION' %>
</div>
<div>
<div class="col-auto">
% param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype';
%= select_field 'Hosttype', $c->hosttype_list(), class => ""
<%= select_field 'Hosttype', $c->hosttype_list(), class => "form-select"; %>
</div>
</div>
<br>
@ -67,13 +81,12 @@
</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}
<%= 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
</form>
</div>

2
root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep
View File

@ -50,7 +50,7 @@
<tr>
<td><%= $ibay->key %>
<td><%= $ibay->prop('Name') %>
<td class="" style="min-width:15em">
<td class="">
% my ($actionModify, $actionResetPw, $actionRemove) = '&nbsp;';
% if ($modifiable eq 'yes') {
%my $modify_text = l('MODIFY'); # Localized text

35
root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
View File

@ -3,46 +3,31 @@
% my $btn = l('usr_ADD_USER');
<form action="/smanager/useraccounts" method="POST">
%#= form_for '/useraccounts' => (method => 'POST') => begin
<br>
<div>
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div>
</form>
%# end
<br>
%= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC'))
<%= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC')) %>
<br>
%#= dumper @$users
% my $numUsers = @$users;
% if ($numUsers == 0) {
%=l 'usr_NO_USER_ACCOUNTS'
<%=l 'usr_NO_USER_ACCOUNTS' %>
% } else {
<div class="table-responsive">
<table class="table table-bordered">
<thead>
<tr>
<th>
%=l 'ACCOUNT'
</th>
<th>
%=l 'USER_NAME'
</th>
<th>
%=l 'usr_VPN_CLIENT_ACCESS'
</th>
<th>
%=l 'usr_FORWARDING_ADDRESS'
</th>
<th class="user-valign-center" colspan="5">
%=l 'ACTION'
</th>
<tr class="">
<th><%=l 'ACCOUNT' %></th>
<th><%=l 'USER_NAME' %></th>
<th><%=l 'usr_VPN_CLIENT_ACCESS' %></th>
<th><%=l 'usr_FORWARDING_ADDRESS' %></th>
<th class="user-valign-center" colspan="5"><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
@ -168,9 +153,9 @@
</table>
</div>
<%} %>
% }
%= hidden_field 'trt' => $usr_datas->{trt}
<%= hidden_field 'trt' => $usr_datas->{trt} %>
</div>

5
smeserver-manager-AdminLTE.spec
View File

@ -1,6 +1,6 @@
%define name smeserver-manager-AdminLTE
%define version 11.0.0
%define release 21
%define release 22
Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
Name: %{name}
Version: %{version}
@ -26,6 +26,9 @@ AdminLTE is an html framework for admin consoles
wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
%changelog
* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-22.sme
- Hosts done and a few tweaks
* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-21.sme
- Directory updated. More odd fixes.