Fix users panels - missing css file - override default font size for Brian
This commit is contained in:
parent
927a95af3b
commit
e49e180ce0
@ -1,3 +1,6 @@
|
|||||||
|
html {
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
#busy-indicator {
|
#busy-indicator {
|
||||||
display: none;
|
display: none;
|
||||||
|
@ -5,5 +5,5 @@
|
|||||||
%#= stylesheet 'css/sme-jquery-overrides.css'
|
%#= stylesheet 'css/sme-jquery-overrides.css'
|
||||||
|
|
||||||
%= stylesheet 'dist/css/adminlte.min.css'
|
%= stylesheet 'dist/css/adminlte.min.css'
|
||||||
%= stylesheet 'dist/icons/font/bootstrap-icons.min.css'
|
%= stylesheet 'dist/font/bootstrap-icons.min.css'
|
||||||
%#= stylesheet 'dist/css/overlayscrollbars.min.css'
|
%#= stylesheet 'dist/css/overlayscrollbars.min.css'
|
@ -1,20 +1,20 @@
|
|||||||
|
|
||||||
<div class="container-sm">
|
<div>
|
||||||
<br>
|
<br>
|
||||||
<h2><%= l 'usr_P2_TITLE' %></h2>
|
<h2><%= l 'usr_P2_TITLE' %></h2>
|
||||||
<br>
|
<br>
|
||||||
<%= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC')) %>
|
<%= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC')) %>
|
||||||
<br><br>
|
<br><br>
|
||||||
|
|
||||||
% my $btn = l('ADD');
|
% my $btn = l('ADD');
|
||||||
|
|
||||||
<form action="/smanager/useraccountsd" method="POST">
|
<form action="/smanager/useraccountsd" method="POST">
|
||||||
%#= form_for '/useraccountsd' => (method => 'POST') => begin
|
%#= form_for '/useraccountsd' => (method => 'POST') => begin
|
||||||
|
|
||||||
% if ( $usr_datas->{trt} eq 'ADD' ) {
|
% if ( $usr_datas->{trt} eq 'ADD' ) {
|
||||||
|
|
||||||
% param 'user' => $usr_datas->{user} unless param 'user';
|
% param 'user' => $usr_datas->{user} unless param 'user';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputAccountName" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
|
<label for="inputAccountName" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
|
||||||
@ -28,7 +28,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
% } else {
|
% } else {
|
||||||
<!-- If not user set Button Save not Add -->
|
<!-- If not user set Button Save not Add -->
|
||||||
% $btn = l('SAVE');
|
% $btn = l('SAVE');
|
||||||
@ -40,12 +40,12 @@
|
|||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $usr_datas->{user} %>">
|
<input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $usr_datas->{user} %>">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
% }
|
% }
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputFirstName" class="col-form-label"><%= l 'usr_FIRSTNAME' %></label>
|
<label for="inputFirstName" class="col-form-label"><%= l 'usr_FIRSTNAME' %></label>
|
||||||
@ -60,9 +60,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
% param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
|
% param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputLastNAme" class="col-form-label"><%= l 'usr_LASTNAME' %></label>
|
<label for="inputLastNAme" class="col-form-label"><%= l 'usr_LASTNAME' %></label>
|
||||||
@ -77,10 +77,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
|
|
||||||
% param 'Dept' => $usr_datas->{dept} unless param 'Dept';
|
% param 'Dept' => $usr_datas->{dept} unless param 'Dept';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputDepartment" class="col-form-label"><%= l 'usr_DEPARTMENT' %></label>
|
<label for="inputDepartment" class="col-form-label"><%= l 'usr_DEPARTMENT' %></label>
|
||||||
@ -95,10 +95,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
|
|
||||||
% param 'Company' => $usr_datas->{company} unless param 'Company';
|
% param 'Company' => $usr_datas->{company} unless param 'Company';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputCompany" class="col-form-label"><%= l 'usr_COMPANY' %></label>
|
<label for="inputCompany" class="col-form-label"><%= l 'usr_COMPANY' %></label>
|
||||||
@ -113,10 +113,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
|
|
||||||
% param 'Street' => $usr_datas->{street} unless param 'Street';
|
% param 'Street' => $usr_datas->{street} unless param 'Street';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputStreet" class="col-form-label"><%= l 'usr_STREET_ADDRESS' %></label>
|
<label for="inputStreet" class="col-form-label"><%= l 'usr_STREET_ADDRESS' %></label>
|
||||||
@ -131,9 +131,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
% param 'City' => $usr_datas->{city} unless param 'City';
|
% param 'City' => $usr_datas->{city} unless param 'City';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputCity" class="col-form-label"><%= l 'usr_CITY' %></label>
|
<label for="inputCity" class="col-form-label"><%= l 'usr_CITY' %></label>
|
||||||
@ -148,9 +148,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
% param 'Phone' => $usr_datas->{phone} unless param 'Phone';
|
% param 'Phone' => $usr_datas->{phone} unless param 'Phone';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputPhone" class="col-form-label"><%= l 'usr_PHONE_NUMBER' %></label>
|
<label for="inputPhone" class="col-form-label"><%= l 'usr_PHONE_NUMBER' %></label>
|
||||||
@ -165,9 +165,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
% param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
|
% param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputEmailDelivery" class="col-form-label"><%= l 'usr_EMAIL_DELIVERY' %></label>
|
<label for="inputEmailDelivery" class="col-form-label"><%= l 'usr_EMAIL_DELIVERY' %></label>
|
||||||
@ -177,9 +177,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
% param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
|
% param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputEmail" class="col-form-label"><%= l 'usr_FORWARDING_ADDRESS' %></label>
|
<label for="inputEmail" class="col-form-label"><%= l 'usr_FORWARDING_ADDRESS' %></label>
|
||||||
@ -194,10 +194,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
|
|
||||||
% param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
|
% param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputVPNClientAccess" class="col-form-label"><%= l 'usr_VPN_CLIENT_ACCESS' %></label>
|
<label for="inputVPNClientAccess" class="col-form-label"><%= l 'usr_VPN_CLIENT_ACCESS' %></label>
|
||||||
@ -207,10 +207,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
<!-- fix from here -->
|
<!-- fix from here -->
|
||||||
|
|
||||||
|
|
||||||
<!-- Begin if ipsec needs fixing -->
|
<!-- Begin if ipsec needs fixing -->
|
||||||
% if ( $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) {
|
% if ( $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) {
|
||||||
% my $btn2 = $c->l('DOWNLOAD');
|
% my $btn2 = $c->l('DOWNLOAD');
|
||||||
@ -222,22 +222,22 @@
|
|||||||
% end
|
% end
|
||||||
% }
|
% }
|
||||||
<!-- End if ipsec -->
|
<!-- End if ipsec -->
|
||||||
|
|
||||||
|
|
||||||
<!-- Groups begin -->
|
<!-- Groups begin -->
|
||||||
<div>
|
<div>
|
||||||
% my @groups = @{$c->get_groups()};
|
% my @groups = @{$c->get_groups()};
|
||||||
|
|
||||||
%#= dumper @groups
|
%#= dumper @groups
|
||||||
|
|
||||||
% if ( @groups ) {
|
% if ( @groups ) {
|
||||||
|
|
||||||
<br><br>
|
<br><br>
|
||||||
|
|
||||||
%=l 'usr_GROUP_MEMBERSHIPS'
|
%=l 'usr_GROUP_MEMBERSHIPS'
|
||||||
|
|
||||||
<br><br>
|
<br><br>
|
||||||
|
|
||||||
<table class="table table-bordered user-table-max-wdith">
|
<table class="table table-bordered user-table-max-wdith">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
@ -247,7 +247,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|
||||||
% foreach my $g ( @groups) {
|
% foreach my $g ( @groups) {
|
||||||
% my $user = $usr_datas->{user};
|
% my $user = $usr_datas->{user};
|
||||||
% my $groupname = $g->key();
|
% my $groupname = $g->key();
|
||||||
@ -256,7 +256,7 @@
|
|||||||
% if ( $user and $c->is_user_in_group($user, $groupname) ) {
|
% if ( $user and $c->is_user_in_group($user, $groupname) ) {
|
||||||
% $checked = 'checked';
|
% $checked = 'checked';
|
||||||
% }
|
% }
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
% if ( $checked eq 'checked' ) {
|
% if ( $checked eq 'checked' ) {
|
||||||
@ -269,26 +269,26 @@
|
|||||||
<td><%= $description %></td>
|
<td><%= $description %></td>
|
||||||
</tr>
|
</tr>
|
||||||
% }
|
% }
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
% }
|
% }
|
||||||
<!-- Groups End -->
|
<!-- Groups End -->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<button type="submit" class="btn btn-primary"><%= $btn %></button>
|
<button type="submit" class="btn btn-primary"><%= $btn %></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
%= hidden_field 'trt' => $usr_datas->{trt}
|
%= hidden_field 'trt' => $usr_datas->{trt}
|
||||||
|
|
||||||
% if ( $usr_datas->{trt} eq 'UPD' ) {
|
% if ( $usr_datas->{trt} eq 'UPD' ) {
|
||||||
%= hidden_field 'user' => $usr_datas->{user}
|
%= hidden_field 'user' => $usr_datas->{user}
|
||||||
% }
|
% }
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
%#end
|
%#end
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,13 +1,12 @@
|
|||||||
% content_for 'module' => begin
|
|
||||||
|
|
||||||
<div class="container-sm">
|
|
||||||
<br>
|
<h2><%= l 'usr_MODIFY_ADMIN_TITLE' %></h2>
|
||||||
<h2><%= l 'usr_MODIFY_ADMIN_TITLE' %></h2>
|
|
||||||
|
<div>
|
||||||
<br><br>
|
<br><br>
|
||||||
|
|
||||||
<form action="/smanager/useraccountsd" method="POST">
|
<form action="/smanager/useraccountsd" method="POST">
|
||||||
%#= form_for '/useraccountsd' => (method => 'POST') => begin
|
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
@ -17,10 +16,11 @@
|
|||||||
<input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $usr_datas->{user} %>">
|
<input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $usr_datas->{user} %>">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
% param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
|
% param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputFirstName" class="col-form-label"><%= l 'usr_FIRSTNAME' %></label>
|
<label for="inputFirstName" class="col-form-label"><%= l 'usr_FIRSTNAME' %></label>
|
||||||
@ -35,9 +35,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
% param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
|
% param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputLastNAme" class="col-form-label"><%= l 'usr_LASTNAME' %></label>
|
<label for="inputLastNAme" class="col-form-label"><%= l 'usr_LASTNAME' %></label>
|
||||||
@ -51,22 +51,24 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
% param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
|
% param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputEmailDelivery" class="col-form-label"><%= l 'usr_EMAIL_DELIVERY' %></label>
|
<label for="inputEmailDelivery" class="col-form-label"><%= l 'usr_EMAIL_DELIVERY' %></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
%= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select"
|
<%= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select" %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
% param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
|
% param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputEmail" class="col-form-label"><%= l 'usr_FORWARDING_ADDRESS' %></label>
|
<label for="inputEmail" class="col-form-label"><%= l 'usr_FORWARDING_ADDRESS' %></label>
|
||||||
@ -80,21 +82,26 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
% param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
|
% param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="inputVPNClientAccess" class="col-form-label"><%= l 'usr_VPN_CLIENT_ACCESS' %></label>
|
<label for="inputVPNClientAccess" class="col-form-label"><%= l 'usr_VPN_CLIENT_ACCESS' %></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
%= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select"
|
<%= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select" %>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
% my $btn = l('SAVE');
|
% my $btn = l('SAVE');
|
||||||
|
%= hidden_field 'trt' => $usr_datas->{trt}
|
||||||
|
%= hidden_field 'user' => $usr_datas->{user}
|
||||||
|
|
||||||
<div class="row g-3 align-items-center">
|
<div class="row g-3 align-items-center">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
@ -103,13 +110,6 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
trt: <%= dumper $usr_datas->{trt} %>
|
|
||||||
user: <%= dumper $usr_datas->{user} %>
|
|
||||||
|
|
||||||
%= hidden_field 'trt' => $usr_datas->{trt}
|
|
||||||
%= hidden_field 'user' => $usr_datas->{user}
|
|
||||||
|
|
||||||
%# end
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
%define name smeserver-manager-AdminLTE
|
%define name smeserver-manager-AdminLTE
|
||||||
%define version 11.0.0
|
%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
|
Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
Version: %{version}
|
Version: %{version}
|
||||||
@ -29,6 +29,11 @@ AdminLTE is an html framework for admin consoles
|
|||||||
wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
|
wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 09 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 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 <jcrisp@safeandsoundit.co.uk> 11.0.0-30.sme
|
* Mon Jun 09 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-30.sme
|
||||||
- Add UTF8 support to network panel
|
- Add UTF8 support to network panel
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user