Directory done. Odd fixes elsewhere

This commit is contained in:
John Crisp 2025-05-18 13:01:18 +02:00
parent 0878755714
commit 9d8b704b56
7 changed files with 145 additions and 63 deletions

View File

@ -6,11 +6,11 @@
%if (config->{debug} == 1) {
<div>
(DBG)route: <%= $c->current_route %><br>
(DBG)dir. access: <%= $dir_datas->{access}%><br>
<%= dumper $c->current_route %><br>
<%= dumper $dir_datas->{access}%><br>
</div>
% }
<h1><%= $title %></h1>
<br>
<%= $modul %>
@ -19,50 +19,116 @@
<form action="/smanager/directory" method="POST">
<br>
<div>
<div>
<%= l('dir_LABEL_ROOT') %>
<%= $dir_datas->{root} %>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l('dir_LABEL_ROOT') %>
</div>
<div class="col-auto">
<%= $dir_datas->{root} %>
</div>
</div>
<br>
<div>
<%= l 'dir_DESC_DIRECTORY_ACCESS' %>
<br>
<%= l 'dir_DIRECTORY_ACCESS' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'dir_DIRECTORY_ACCESS' %>
</div>
<div class="col-auto">
% param 'access' => $dir_datas->{access} unless param 'access';
<%= select_field 'access' => [[ (l 'NETWORKS_ALLOW_LOCAL') => 'private'], [ (l 'NETWORKS_ALLOW_PUBLIC') => 'public']] %>
<%= select_field 'access' => [[ (l 'NETWORKS_ALLOW_LOCAL') => 'private'], [ (l 'NETWORKS_ALLOW_PUBLIC') => 'public']], class => "form-select" %>
</div>
<br><br>
<div>
<%= l 'dir_DESC_DEPARTMENT' %>
<br><br>
<%= l 'dir_DEPARTMENT' %>
%= text_field 'department' => $dir_datas->{department}
<%= l 'dir_DESC_DEPARTMENT' %>
</div>
<div>
<%= l 'dir_COMPANY' %>
<%= text_field 'company', $dir_datas->{company} %>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputDirDepartment" class="col-form-label"><%= l 'dir_DEPARTMENT' %></label>
</div>
<div class="col-auto">
<input type="text" name="department" id="inputDirDepartment" class="form-control" aria-describedby="DirectoryDepartment" value="<%= $dir_datas->{department} %>">
</div>
</div>
<div>
<%= l 'dir_STREET'
<%= text_field 'street' => $dir_datas->{street} %>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputDirCompany" class="col-form-label"><%= l 'dir_COMPANY' %></label>
</div>
<div class="col-auto">
<input type="text" name="company" id="inputDirCompany" class="form-control" aria-describedby="DirectoryCompany" value="<%= $dir_datas->{company} %>">
</div>
</div>
<div>
<%= l 'dir_CITY' %>
<%= text_field 'city', $dir_datas->{city} %>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputDirStreet" class="col-form-label"><%= l 'dir_STREET' %></label>
</div>
<div class="col-auto">
<input type="text" name="street" id="inputDirStreet" class="form-control" aria-describedby="DirectoryStreet" value="<%= $dir_datas->{street} %>">
</div>
<div>
<%= l 'dir_PHONENUMBER' %>
<%= text_field 'phonenumber', $dir_datas->{phonenumber} %>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputDirCity" class="col-form-label"><%= l 'dir_CITY' %></label>
</div>
<div class="col-auto">
<input type="text" name="city" id="inputDirCity" class="form-control" aria-describedby="DirectoryCity" value="<%= $dir_datas->{city} %>">
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputDirPhoneNumber" class="col-form-label"><%= l 'dir_PHONENUMBER' %></label>
</div>
<div class="col-auto">
<input type="text" name="phonenumber" id="inputDirPhoneNumber" class="form-control" aria-describedby="DirectoryPhoneNmber" value="<%= $dir_datas->{phonenumber} %>">
</div>
<br><br>
<div>
<%= l 'dir_DESC_EXISTING' %>
<br><br>
</div>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'dir_EXISTING' %>
<%= select_field 'existing'=> [[ (l 'dir_LEAVE') => 'leave'], [ (l 'dir_UPDATE') => 'update' ]] %>
<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>
<div class="col-auto">
<%= select_field 'existing'=> [[ (l 'dir_LEAVE') => 'leave'], [ (l 'dir_UPDATE') => 'update' ]], class => "form-select" %>
</div>
<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>
</div>
</form>
</div>
%end

View File

@ -12,10 +12,11 @@
% }
% if ( stash 'error' ) {
<br><div class="">
%= $c->render_to_string(inline => stash 'error')
</div>
%}
<br>
<div class="text-danger">
<%= $c->render_to_string(inline => stash 'error') %>
</div>
% }
<h1><%= $title%></h1>

View File

@ -6,19 +6,19 @@
% if (config->{debug} == 1) {
<div>
%= dumper $c->current_route
%= dumper $hos_datas
<%= dumper $c->current_route %>
<%= dumper $hos_datas %>
</div>
% }
<h1><%= $title%></h1>
% if ( $notif ) {
<br>
<span class="">
<%= $c->render_to_string(inline => $notif) %>
</span>
%}
<div class="text-danger">
<%= $c->render_to_string(inline => $notif) %>
</div>
% }
<h1><%= $title%></h1>
% if ($hos_datas->{trt} eq 'ADD' or $hos_datas->{trt} eq 'UPD') {
%= include 'partials/_hos_upd'

View File

@ -6,8 +6,8 @@
% if (config->{debug} == 1) {
<div>
%= dumper $c->current_route
%= dumper $iba_datas
<%= dumper $c->current_route %>
<%= dumper $iba_datas %>
</div>
% }

View File

@ -1,22 +1,34 @@
<div>
% my $btn = l('REMOVE');
%= form_for '/ibaysd' => (method => 'POST') => begin
<p>
<h2>
%=l 'iba_REMOVE_TITLE'
</h2>
<br>
%= $c->render_to_string(inline => l('iba_REMOVE_DESC', $iba_datas->{ibay}, $iba_datas->{description}));
<br>
</p>
<p>
%= submit_button "$btn", class => ""
</p>
<form action="/smanager/ibaysd" method="POST">
<br>
<div>
<h2><%=l 'iba_REMOVE_TITLE' %></h2>
<div>
<br>
<div>
<%= $c->render_to_string(inline => l('iba_REMOVE_DESC', $iba_datas->{ibay}, $iba_datas->{description})); %>
</div>
<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' => $iba_datas->{trt}
%= hidden_field 'ibay' => $iba_datas->{ibay}
</form>
% end
<br><br>
</div>

View File

@ -6,8 +6,8 @@
% if (config->{debug} == 1) {
<div>
%= dumper $c->current_route
%= dumper $pse_datas
<%= dumper $c->current_route %>
<%= dumper $pse_datas %>
</div>
% }

View File

@ -1,6 +1,6 @@
%define name smeserver-manager-AdminLTE
%define version 11.0.0
%define release 20
%define release 21
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-21.sme
- Directory updated. More odd fixes.
* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-20.sme
- Ibays done. Updating some consistency elsewhere.