diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep index 54951a4..3bd1ef1 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep @@ -171,6 +171,7 @@ %= include 'partials/_panel_card_top' %= include 'partials/_panel_card_header' % } + %= content 'module' % if ($c->current_route ne 'login') { diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep index fde2a31..7ec5beb 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep @@ -5,10 +5,10 @@ %= form_for '/useraccounts' => (method => 'POST') => begin -
- -
- +
+ +
+ % end

@@ -16,6 +16,8 @@

+ %= dumper @$users + % my $numUsers = @$users; % if ($numUsers == 0){ %=l 'usr_NO_USER_ACCOUNTS' @@ -157,7 +159,3 @@ - -
- -
\ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep index 85c52d5..8d4b7c0 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep @@ -1,199 +1,325 @@ -
+% content_for 'module' => begin +
+
+

<%= l 'usr_P2_TITLE' %>

+
+ <%= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC')) %> +

+ + + + + + + % my $btn = l('ADD'); - %= form_for '/useraccountsd' => (method => 'POST') => begin -

-

- %=l 'usr_P2_TITLE' -

-
- %= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC')) -

- -

- - %=l 'usr_ACCOUNT_NAME' - - - % if ( $usr_datas->{trt} eq 'ADD' ) { - % param 'user' => $usr_datas->{user} unless param 'user'; - %= text_field 'user', class => "" - % } else { - % $btn = l('SAVE'); - %= $usr_datas->{user}, class => "" - % } - -

- -

- - %=l 'usr_FIRSTNAME' - - - % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName'; - %= text_field 'FirstName', class => "" - -

-

- - %=l 'usr_LASTNAME' - - - % param 'LastName' => $usr_datas->{lastname} unless param 'LastName'; - %= text_field 'LastName', class => "" - -

- -

- - %=l 'usr_DEPARTMENT' - - % param 'Dept' => $usr_datas->{dept} unless param 'Dept'; - %= text_field 'Dept', class => "" - -

-

- - %=l 'usr_COMPANY' - - - % param 'Company' => $usr_datas->{company} unless param 'Company'; - %= text_field 'Company', class => "" - -

-

- - %=l 'usr_STREET_ADDRESS' - - - % param 'Street' => $usr_datas->{street} unless param 'Street'; - %= text_field 'Street', class => "" - -

-

- - %=l 'usr_CITY' - - - % param 'City' => $usr_datas->{city} unless param 'City'; - %= text_field 'City', class => "" - -

-

- - %=l 'usr_PHONE_NUMBER' - - - % param 'Phone' => $usr_datas->{phone} unless param 'Phone'; - %= text_field 'Phone', class => "" - -

-

- - %=l 'usr_EMAIL_DELIVERY' - - - % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward'; - %= select_field 'EmailForward' => $c->emailForward_list(), class => "" - -

-

- - %=l 'usr_FORWARDING_ADDRESS' - - - % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress'; - %= text_field 'ForwardAddress', class => "" - -

- -

- - %=l 'usr_VPN_CLIENT_ACCESS' - - - % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess'; - %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "" - -

- - % if ( $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) { - % my $btn2 = $c->l('DOWNLOAD'); - %= form_for '/useraccountso' => (method => 'POST') => begin -

- - %=l 'usr_LABEL_IPSECRW_DOWNLOAD' - - - %= submit_button $btn2, class => "" - -

- %= hidden_field 'trt' => 'CRT' - %= hidden_field 'user' => $usr_datas->{user} - %end - % } - - % my @groups = @{$c->get_groups()}; - % if ( @groups ) { -

- - %=l 'usr_GROUP_MEMBERSHIPS' - - - - - - - - - - - % foreach my $g ( @groups) { - % my $user = $usr_datas->{user}; - % my $groupname = $g->key(); - % my $description = $g->prop('Description'); - % my $checked = ''; - % if ( $user and $c->is_user_in_group($user, $groupname) ) { - % $checked = 'checked'; - % } - - - - - %= t td => (class => "") => $groupname - %= t td => (class => "") => "$description" - - % } - -
- %=l 'usr_MEMBER' - - %=l 'GROUP' - - %=l 'DESCRIPTION' -
- % if ( $checked eq 'checked' ) { - - - %} else { - %= check_box 'groupMemberships' => $groupname - %} -
- -

- % } - -

-

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

- - %= hidden_field 'trt' => $usr_datas->{trt} - % if ( $usr_datas->{trt} eq 'UPD' ) { - %= hidden_field 'user' => $usr_datas->{user} - % } +
+ %#= form_for '/useraccountsd' => (method => 'POST') => begin - % end + % if ( $usr_datas->{trt} eq 'ADD' ) { + + % param 'user' => $usr_datas->{user} unless param 'user'; + +
+
+ +
+
+ +
+
+ + User + +
+
+ + %#= text_field 'user' + + % } else { + + % $btn = l('SAVE'); +
+
+ +
+
+ +
+ +
+ % } + +
+ +
+
+ +
+
+ +
+
+ + First Name + +
+
+
+ + % param 'LastName' => $usr_datas->{lastname} unless param 'LastName'; + +
+
+ +
+
+ +
+
+ + Last Name + +
+
+
+ + + % param 'Dept' => $usr_datas->{dept} unless param 'Dept'; + +
+
+ +
+
+ +
+
+ + Department + +
+
+
+ + + % param 'Company' => $usr_datas->{company} unless param 'Company'; + +
+
+ +
+
+ +
+
+ + Company + +
+
+
+ + + % param 'Street' => $usr_datas->{street} unless param 'Street'; + +
+
+ +
+
+ +
+
+ + Street + +
+
+
+ + % param 'City' => $usr_datas->{city} unless param 'City'; + +
+
+ +
+
+ +
+
+ + City + +
+
+
+ + + + % param 'Phone' => $usr_datas->{phone} unless param 'Phone'; + +
+
+ +
+
+ +
+
+ + Phone + +
+
+
+ + + % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward'; + +
+
+ +
+
+ %= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select" +
+
+
+ + % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress'; + +
+
+ +
+
+ {forwardaddress} %>> +
+
+ + Email forwarding address + +
+
+
+ + + % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess'; + +
+
+ +
+
+ %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select" +
+
+
+ + + + + + % if ( $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) { + % my $btn2 = $c->l('DOWNLOAD'); + %= form_for '/useraccountso' => (method => 'POST') => begin +

+ + %=l 'usr_LABEL_IPSECRW_DOWNLOAD' + + + %= submit_button $btn2, class => "" + +

+ %= hidden_field 'trt' => 'CRT' + %= hidden_field 'user' => $usr_datas->{user} + %end + % } + + + + +
+ % my @groups = @{$c->get_groups()}; + + %#= dumper @groups + + % if ( @groups ) { +

+ + %=l 'usr_GROUP_MEMBERSHIPS' + +

+ + + + + + + + + + % foreach my $g ( @groups) { + % my $user = $usr_datas->{user}; + % my $groupname = $g->key(); + % my $description = $g->prop('Description'); + % my $checked = ''; + % if ( $user and $c->is_user_in_group($user, $groupname) ) { + % $checked = 'checked'; + % } + + + + + %= t td => (class => "") => $groupname + %= t td => (class => "") => "$description" + + % } + +
+ %=l 'usr_MEMBER' + + %=l 'GROUP' + + %=l 'DESCRIPTION' +
+ % if ( $checked eq 'checked' ) { + + + %} else { + %= check_box 'groupMemberships' => $groupname + %} +
+ + % } + +
+ + + % $btn = l('SAVE'); + +
+
+ +
+
+ + + %= hidden_field 'trt' => $usr_datas->{trt} + + trt: <%= dumper $usr_datas->{trt} %> + user: <%= dumper $usr_datas->{user} %> + + % if ( $usr_datas->{trt} eq 'UPD' ) { + %= hidden_field 'user' => $usr_datas->{user} + % } + + % end +
+ + \ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep index 2cd2160..3873d6d 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep @@ -1,93 +1,111 @@ % content_for 'module' => begin
-
-

<%= l 'usr_MODIFY_ADMIN_TITLE' %>

- - <%= l 'usr_ACCOUNT_NAME' %> : <%= $usr_datas->{user} %> - +
+

<%= l 'usr_MODIFY_ADMIN_TITLE' %>

+

-
- % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName'; - -
-
- + + %#= form_for '/useraccountsd' => (method => 'POST') => begin + + +
+
+ +
+
+ +
-
- {firstname} %> > + +
+ % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName'; + +
+
+ +
+
+ +
+
+ + First Name + +
-
- - First Name - +
+ + % param 'LastName' => $usr_datas->{lastname} unless param 'LastName'; + +
+
+ +
+
+ +
+
+ + Last Name + +
-
- - % param 'LastName' => $usr_datas->{lastname} unless param 'LastName'; - -
-
- +
+ + % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward'; + +
+
+ +
+
+ %= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select" +
-
- {lastname} %>> +
+ + % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress'; + +
+
+ +
+
+ +
+
+ + Email forwarding address + +
-
- - Last Name - -
-
- - % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward'; - -
-
- -
-
- %= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select" +
+ + % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess'; + +
+
+ +
+
+ %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select" +
+
- - % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress'; - -
-
- -
-
- {forwardaddress} %>> -
-
- - Email forwarding address - -
-
- - - % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess'; + % my $btn = l('SAVE');
-
- -
-
- %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select" +
+ +
+ - % my $btn = l('SAVE'); - -
-
- -
-
- - +trt: <%= dumper $usr_datas->{trt} %> +user: <%= dumper $usr_datas->{user} %> %= hidden_field 'trt' => $usr_datas->{trt} %= hidden_field 'user' => $usr_datas->{user} @@ -96,101 +114,3 @@
- - -
- - % my $btn = l('SAVE'); - - %= form_for '/useraccountsd' => (method => 'POST') => begin -

-

- %=l 'usr_MODIFY_ADMIN_TITLE' -


-

- -

- - %=l 'usr_ACCOUNT_NAME' - - - % $btn = l('SAVE'); - %= $usr_datas->{user}, class => "" - -

- -

- - %=l 'usr_FIRSTNAME' - - - % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName'; - %= text_field 'FirstName', class => "" - -

-

- - %=l 'usr_LASTNAME' - - - % param 'LastName' => $usr_datas->{lastname} unless param 'LastName'; - %= text_field 'LastName', class => "" - -

- -

- - %=l 'usr_EMAIL_DELIVERY' - - - % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward'; - %= select_field 'EmailForward' => $c->emailForward_list(), class => "" - -

-

- - %=l 'usr_FORWARDING_ADDRESS' - - - % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress'; - %= text_field 'ForwardAddress', class => "" - -

- -

- - %=l 'usr_VPN_CLIENT_ACCESS' - - - % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess'; - %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "" - -

- - % if ( $c->ipsec_for_acct eq 'OK' ) { - % my $btn2 = $c->l('DOWNLOAD'); - %= form_for '/useraccountso' => (method => 'POST') => begin -

- - %=l 'usr_LABEL_IPSECRW_DOWNLOAD' - - - %= submit_button $btn2, class => "" - -

- %= hidden_field 'trt' => 'CRT' - %= hidden_field 'user' => $usr_datas->{user} - %end - % } - -

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

- - %= hidden_field 'trt' => $usr_datas->{trt} - %= hidden_field 'user' => $usr_datas->{user} - - % end - -
diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index 0589877..8be4248 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 12 +%define release 13 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 +* Fri Apr 25 2025 John Crisp 11.0.0-13.sme +- Tidy some useraccounts formatting but admin page will not save + * Thu Apr 24 2025 John Crisp 11.0.0.12.sme - Tidy user list