From 9d8b704b5649e3b6926a3e8d7fc3eb970739e4f7 Mon Sep 17 00:00:00 2001 From: John Crisp Date: Sun, 18 May 2025 13:01:18 +0200 Subject: [PATCH] Directory done. Odd fixes elsewhere --- .../AdminLTE/templates/directory.html.ep | 132 +++++++++++++----- .../themes/AdminLTE/templates/domains.html.ep | 9 +- .../AdminLTE/templates/hostentries.html.ep | 16 +-- .../themes/AdminLTE/templates/ibays.html.ep | 4 +- .../templates/partials/_iba_del.html.ep | 38 +++-- .../AdminLTE/templates/pseudonyms.html.ep | 4 +- smeserver-manager-AdminLTE.spec | 5 +- 7 files changed, 145 insertions(+), 63 deletions(-) diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep index e9bdeb6..cce90c6 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep @@ -6,11 +6,11 @@ %if (config->{debug} == 1) {
- (DBG)route: <%= $c->current_route %>
- (DBG)dir. access: <%= $dir_datas->{access}%>
+ <%= dumper $c->current_route %>
+ <%= dumper $dir_datas->{access}%>
% } - +

<%= $title %>


<%= $modul %> @@ -19,50 +19,116 @@

-
- <%= l('dir_LABEL_ROOT') %> - <%= $dir_datas->{root} %> +
+
+ <%= l('dir_LABEL_ROOT') %> +
+
+ <%= $dir_datas->{root} %> +
+ +
+
<%= l 'dir_DESC_DIRECTORY_ACCESS' %> -
- <%= l 'dir_DIRECTORY_ACCESS' %> +
+ +
+ +
+
+ <%= l 'dir_DIRECTORY_ACCESS' %> +
+
% 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" %>
+ +

+
- <%= l 'dir_DESC_DEPARTMENT' %> -

- <%= l 'dir_DEPARTMENT' %> - %= text_field 'department' => $dir_datas->{department} + <%= l 'dir_DESC_DEPARTMENT' %>
-
- <%= l 'dir_COMPANY' %> - <%= text_field 'company', $dir_datas->{company} %> + +
+
+ +
+
+ + +
-
- <%= l 'dir_STREET' - <%= text_field 'street' => $dir_datas->{street} %> + +
+ +
+
+ +
+
+ + +
-
- <%= l 'dir_CITY' %> - <%= text_field 'city', $dir_datas->{city} %> + +
+ +
+
+ +
+
+
-
- <%= l 'dir_PHONENUMBER' %> - <%= text_field 'phonenumber', $dir_datas->{phonenumber} %> + +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+ +

+
<%= l 'dir_DESC_EXISTING' %> -

+
+ +
+
<%= l 'dir_EXISTING' %> - <%= select_field 'existing'=> [[ (l 'dir_LEAVE') => 'leave'], [ (l 'dir_UPDATE') => 'update' ]] %> - -
-
-
- -
+ +
+ <%= select_field 'existing'=> [[ (l 'dir_LEAVE') => 'leave'], [ (l 'dir_UPDATE') => 'update' ]], class => "form-select" %> +
+ +
+
+ + +
+
+ +
+
+ +
+ %end \ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep index 978b579..86ce54c 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep @@ -12,10 +12,11 @@ % } % if ( stash 'error' ) { -
- %= $c->render_to_string(inline => stash 'error') -
- %} +
+
+ <%= $c->render_to_string(inline => stash 'error') %> +
+ % }

<%= $title%>

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep index 0afad9a..c0c5208 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep @@ -6,19 +6,19 @@ % if (config->{debug} == 1) {
- %= dumper $c->current_route - %= dumper $hos_datas + <%= dumper $c->current_route %> + <%= dumper $hos_datas %>
% } - -

<%= $title%>

% if ( $notif ) {
- - <%= $c->render_to_string(inline => $notif) %> - - %} +
+ <%= $c->render_to_string(inline => $notif) %> +
+ % } + +

<%= $title%>

% if ($hos_datas->{trt} eq 'ADD' or $hos_datas->{trt} eq 'UPD') { %= include 'partials/_hos_upd' diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep index d1c2fca..f754251 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep @@ -6,8 +6,8 @@ % if (config->{debug} == 1) {
- %= dumper $c->current_route - %= dumper $iba_datas + <%= dumper $c->current_route %> + <%= dumper $iba_datas %>
% } diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep index 29db2c0..3ee3dd0 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep @@ -1,22 +1,34 @@
% my $btn = l('REMOVE'); - %= form_for '/ibaysd' => (method => 'POST') => begin -

-

- %=l 'iba_REMOVE_TITLE' -

-
- %= $c->render_to_string(inline => l('iba_REMOVE_DESC', $iba_datas->{ibay}, $iba_datas->{description})); -
-

-

- %= submit_button "$btn", class => "" -

+ +
+ +
+ +
+

<%=l 'iba_REMOVE_TITLE' %>

+
+ +
+ +
+ <%= $c->render_to_string(inline => l('iba_REMOVE_DESC', $iba_datas->{ibay}, $iba_datas->{description})); %> +
+ +
+ + +
+
+ +
+
%= hidden_field 'trt' => $iba_datas->{trt} %= hidden_field 'ibay' => $iba_datas->{ibay} + - % end +

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/pseudonyms.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/pseudonyms.html.ep index bbcb9e7..9f05dd6 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/pseudonyms.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/pseudonyms.html.ep @@ -6,8 +6,8 @@ % if (config->{debug} == 1) {
- %= dumper $c->current_route - %= dumper $pse_datas + <%= dumper $c->current_route %> + <%= dumper $pse_datas %>
% } diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index 93fbba0..7c66a75 100644 --- a/smeserver-manager-AdminLTE.spec +++ b/smeserver-manager-AdminLTE.spec @@ -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 11.0.0-21.sme +- Directory updated. More odd fixes. + * Sun May 18 2025 John Crisp 11.0.0-20.sme - Ibays done. Updating some consistency elsewhere.