diff --git a/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css b/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css index 93cd36c..97eb8be 100644 --- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css +++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css @@ -1,3 +1,6 @@ +html { + font-size: 14px; +} #busy-indicator { display: none; diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep index f4fe3f1..d1a5773 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep @@ -5,5 +5,5 @@ %#= stylesheet 'css/sme-jquery-overrides.css' %= stylesheet 'dist/css/adminlte.min.css' -%= stylesheet 'dist/icons/font/bootstrap-icons.min.css' -%#= stylesheet 'dist/css/overlayscrollbars.min.css' \ No newline at end of file +%= stylesheet 'dist/font/bootstrap-icons.min.css' +%#= stylesheet 'dist/css/overlayscrollbars.min.css' \ 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 1077608..ce37fb1 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,20 +1,20 @@ -
+

<%= l 'usr_P2_TITLE' %>


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

- - % my $btn = l('ADD'); + + % my $btn = l('ADD');
%#= form_for '/useraccountsd' => (method => 'POST') => begin - + % if ( $usr_datas->{trt} eq 'ADD' ) { - + % param 'user' => $usr_datas->{user} unless param 'user'; - +
@@ -28,7 +28,7 @@
- + % } else { % $btn = l('SAVE'); @@ -40,12 +40,12 @@
- +
% } - +
- +
@@ -60,9 +60,9 @@

- + % param 'LastName' => $usr_datas->{lastname} unless param 'LastName'; - +
@@ -77,10 +77,10 @@

- - + + % param 'Dept' => $usr_datas->{dept} unless param 'Dept'; - +
@@ -95,10 +95,10 @@

- - + + % param 'Company' => $usr_datas->{company} unless param 'Company'; - +
@@ -113,10 +113,10 @@

- - + + % param 'Street' => $usr_datas->{street} unless param 'Street'; - +
@@ -131,9 +131,9 @@

- + % param 'City' => $usr_datas->{city} unless param 'City'; - +
@@ -148,9 +148,9 @@

- + % param 'Phone' => $usr_datas->{phone} unless param 'Phone'; - +
@@ -165,9 +165,9 @@

- + % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward'; - +
@@ -177,9 +177,9 @@

- + % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress'; - +
@@ -194,10 +194,10 @@

- - + + % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess'; - +
@@ -207,10 +207,10 @@

- + - - + + % if ( $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) { % my $btn2 = $c->l('DOWNLOAD'); @@ -222,22 +222,22 @@ % end % } - - + +
% my @groups = @{$c->get_groups()}; - + %#= dumper @groups - + % if ( @groups ) {

- + %=l 'usr_GROUP_MEMBERSHIPS' - +

- + @@ -247,7 +247,7 @@ - + % foreach my $g ( @groups) { % my $user = $usr_datas->{user}; % my $groupname = $g->key(); @@ -256,7 +256,7 @@ % if ( $user and $c->is_user_in_group($user, $groupname) ) { % $checked = 'checked'; % } - + % } - +
% if ( $checked eq 'checked' ) { @@ -269,26 +269,26 @@ <%= $description %>
- + % }
- +
- + %= hidden_field 'trt' => $usr_datas->{trt} - + % if ( $usr_datas->{trt} eq 'UPD' ) { %= hidden_field 'user' => $usr_datas->{user} % } - + %#end
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 a8e1779..41613b0 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,13 +1,12 @@ -% content_for 'module' => begin -
-
-

<%= l 'usr_MODIFY_ADMIN_TITLE' %>

- -

- + +

<%= l 'usr_MODIFY_ADMIN_TITLE' %>

+ +
+

+
- %#= form_for '/useraccountsd' => (method => 'POST') => begin +
@@ -17,10 +16,11 @@
- +
+ % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName'; - +
@@ -35,9 +35,9 @@

- + % param 'LastName' => $usr_datas->{lastname} unless param 'LastName'; - +
@@ -51,22 +51,24 @@
+
- + % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward'; - +
- %= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select" + <%= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select" %>
+
- + % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress'; - +
@@ -80,21 +82,26 @@
+
- + % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess'; - +
- %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select" + <%= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select" %>

+
+ % my $btn = l('SAVE'); + %= hidden_field 'trt' => $usr_datas->{trt} + %= hidden_field 'user' => $usr_datas->{user}
@@ -103,13 +110,6 @@
- trt: <%= dumper $usr_datas->{trt} %> - user: <%= dumper $usr_datas->{user} %> - - %= 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 f3a156e..6cde11d 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 30 +%define release 31 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Name: %{name} Version: %{version} @@ -29,6 +29,11 @@ AdminLTE is an html framework for admin consoles wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip %changelog +* Mon Jun 09 2025 John Crisp 11.0.0.31.sme +- Fix some issues with user panel +- Fix missing bootstrap icons +- Reduce font size to keep Brian happy + * Mon Jun 09 2025 John Crisp 11.0.0-30.sme - Add UTF8 support to network panel