smecontribs/smeserver-manager-AdminLTE
6
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More group updates and quots done

Browse Source
This commit is contained in:
John Crisp 2025-05-16 11:57:27 +02:00
parent f90583b285
commit 613f17bb4f
8 changed files with 236 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
root/usr/share/smanager/themes/AdminLTE/templates/groups.html.ep
View File

@ -11,6 +11,8 @@
</div>
% }
<!-- reetp error here -->
% if ( stash 'error' ) {
<div class="text-danger">
<%= $c->render_to_string(inline => stash 'error') %>

8
root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep
View File

@ -3,19 +3,13 @@
% my $btn = l('GROUP_ADD');
<form action="/smanager/groups2" method="POST">
%#= form_for '/groups' => (method => 'POST') => begin
%= hidden_field 'trt' => 'ADD'
<%= hidden_field 'trt' => 'ADD' %>
<br>
<div>
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
</div>
</form>
%# end
<br>
<h2><%=l 'grp_CURRENT_LIST' %></h2>
<br><br>

52
root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep
View File

@ -3,13 +3,13 @@
% my $btn = l('SAVE');
<form action="/smanager/groups2" method="POST">
<br><br>
<h2><%= l 'MODIFY_USER_GROUP' %></h2>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputLastNAme" class="col-form-label"><%= l 'GROUP_NAME' %></label>
@ -18,15 +18,15 @@
<input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $grp_datas->{group} %>">
</div>
</div>
<br><br>
<%=l 'grp_GROUP_DESC_EXPL'%>
<%= l 'grp_GROUP_DESC_EXPL'%>
<br><br>
% param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputGroupDesc" class="col-form-label"><%= l 'grp_GROUP_DESC' %></label>
@ -40,15 +40,15 @@
</span>
</div>
</div>
<br><br>
<div>
<%=l 'GROUP_MEMBERS' %>
<%= l 'GROUP_MEMBERS' %>
</div>
<br>
<div>
% if ( $members->{'admin'} ) {
%= check_box 'groupMembers', value => 'admin', checked => undef
@ -57,9 +57,9 @@
% }
&nbspAdministrator (admin)
</div>
<br>
% my $users = $c->gen_users_list();
% foreach my $key ( sort keys %$users ) {
% if ( $members->{ $key } ) {
@ -68,23 +68,23 @@
%= check_box 'groupMembers' => $key
&nbsp
% }
%= $users->{$key}
%= " (" . $key . ")"
<%= $users->{$key} %>
<%= " (" . $key . ")" %>
<br>
% }
<br><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' => $grp_datas->{trt}
%= hidden_field 'groupName' => $grp_datas->{group}
<%= hidden_field 'trt' => $grp_datas->{trt} %>
<%= hidden_field 'groupName' => $grp_datas->{group} %>
</form>
</div>

10
root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_del.html.ep
View File

@ -5,17 +5,11 @@
<form action="/smanager/pseudonyms2" method="POST">
<h2><%= l 'pse_REMOVE_PSEUDONYM' %></h2>
<%#= $c->render_to_string(inline => l('pse_ABOUT_TO_REMOVE', $pse_datas->{pseudonym})); %>
Thisis the old test that needs fixing in the language files
<%= l('pse_ABOUT_TO_REMOVE') %>
<!--This is the old test that needs fixing in the language files-->
<br>
You are about to remove the pseudonym: <%= $pse_datas->{pseudonym} %>
<h6>Are you sure you wish to continue?</h6>
<%= $c->render_to_string(inline => l('pse_ABOUT_TO_REMOVE', $pse_datas->{pseudonym})); %>
<br><br>
<div class="row g-3 align-items-center">

101
root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_upd.html.ep
View File

@ -2,55 +2,70 @@
% my $btn = l('SAVE');
%= form_for '/pseudonyms2' => (method => 'POST') => begin
<p>
<h2>
%=l 'pse_MODIFY_PSEUDONYM'
</h2>
<br>
%=l 'pse_DESC_PSEUDONYM_NAME'
</p>
<form action="/smanager/pseudonyms2" method="POST">
<p>
<span class="">
%=l 'pse_PSEUDONYM_NAME', class => ""
</span>
<span class="">
%= $pse_datas->{pseudonym}, class => ""
</span>
</p>
<h2><%=l 'pse_MODIFY_PSEUDONYM' %></h2>
<br>
<p>
<span class="">
%=l 'pse_SELECT_ACCOUNT', class => ""
</span>
<span class="">
% param 'Account' => $pse_datas->{account} unless param 'Account';
%= select_field 'Account' => $c->existing_accounts_list(), class => ""
</span>
</p>
<div>
<%=l 'pse_DESC_PSEUDONYM_NAME' %>
</div>
%if ( $c->is_pseudonym_not_removable( $pse_datas->{pseudonym} ) ) {
<br>
<p>
<span class="">
%=l 'pse_SELECT_INTERNAL', class => ""
</span>
<span class="">
% param 'Internal' => $pse_datas->{internal} unless param 'Internal';
%= select_field 'Internal' => [ [(l 'YES') => 'YES'], [(l 'NO') => 'NO'] ], class => ""
</span>
</p>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%=l 'pse_PSEUDONYM_NAME' %>
</div>
%}
<p>
%= submit_button "$btn", class => ""
</p>
<div class="col-auto">
<%= $pse_datas->{pseudonym} %>
</div>
</div>
%= hidden_field 'trt' => $pse_datas->{trt}
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%=l 'pse_SELECT_ACCOUNT' %>
</div>
<div class="col-auto">
% param 'Account' => $pse_datas->{account} unless param 'Account';
<%= select_field 'Account' => $c->existing_accounts_list(); %>
</div>
</div>
% if ( $c->is_pseudonym_not_removable( $pse_datas->{pseudonym} ) ) {
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'pse_SELECT_INTERNAL' %>
</div>
<div class="col-auto">
% param 'Internal' => $pse_datas->{internal} unless param 'Internal';
<%= select_field 'Internal' => [ [(l 'YES') => 'YES'], [(l 'NO') => 'NO'] ] %>
</div>
</div>
% }
<br><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' => $pse_datas->{trt}
%= hidden_field 'Pseudonym' => $pse_datas->{pseudonym}
%end
</form>
</div>

134
root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep
View File

@ -1,84 +1,72 @@
<div>
<p>
% my $modul = $c->render_to_string(inline => $c->l('quo_QUOTA_DESC'));
%= $modul
<h3>
%=l 'quo_CURRENT_USAGE_AND_SETTINGS'
</h3>
% my $modul = $c->render_to_string(inline => $c->l('quo_QUOTA_DESC'));
<%= $modul %>
<h2><%= l 'quo_CURRENT_USAGE_AND_SETTINGS' %></h2>
<br>
% my $numUsers = @$userAccounts;
% if ($numUsers == 0){
%=l 'ACCOUNT_USER_NONE'
% } else {
% my $limit = l('quo_LIMIT_WITH_GRACE_MB'); $limit =~ s#(graceX)#<br>$1#;
% my $absolute = l('quo_ABS_LIMIT_MB'); $absolute =~ s#(limitX)#<br>$1#;
% my $current = l('quo_CURRENT_USAGE'); $current =~ s#(usageX)#<br>$1#;
% my $numUsers = @$userAccounts;
% if ($numUsers == 0){
<%= l 'ACCOUNT_USER_NONE' %>
% } else {
<table class="table table-bordered">
<thead>
<tr>
<th class="">
%=l 'ACCOUNT'
</th>
<th class="">
%=l 'USER_NAME'
</th>
<th class="">
%= $limit
</th>
<th class="">
%= $absolute
</th>
<th class="">
%= $current
</th>
<th class="">
%=l 'ACTION'
</th>
</tr>
</thead>
<tbody>
% my $limit = l('quo_LIMIT_WITH_GRACE_MB'); $limit =~ s#(graceX)#<br>$1#;
% my $absolute = l('quo_ABS_LIMIT_MB'); $absolute =~ s#(limitX)#<br>$1#;
% my $current = l('quo_CURRENT_USAGE'); $current =~ s#(usageX)#<br>$1#;
% foreach my $user (@$userAccounts)
% {
% my $uid = getpwnam($user->key);
% unless ($uid) {
% warn($self->localise('COULD_NOT_GET_UID'),$user->key);
% next;
% }
% my $name = $user->prop("FirstName")." ".$user->prop("LastName");
% my $dev = Quota::getqcarg('/home/e-smith/files');
% my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
<tr>
%= t td => (class => "") => $user->key
%= t td => (class => "") => $name
%= t td => (class => "") => sprintf("%.2f", $bs / 1024 )
%= t td => (class => "") => sprintf("%.2f", $bh / 1024 )
%= t td => (class => "") => sprintf("%.2f", $bc / 1024 )
<td class="">
%my $modify_text = l('MODIFY'); # Localized text
%my $csrf_token = "TOKEN"; # CSRF token for security
%my $quota_user_name = $user->key; # quotas_entry name extracted from the data structure
%my $actionModify = qq{
% <a href="quotad?CsrfDef=$csrf_token&trt=UPD&user=$quota_user_name">
% <button type='button' class="" title='$modify_text' >
% $modify_text
% </button>
% </a>
%};
<%= $c->render_to_string(inline => $actionModify) %>
</td>
</tr>
% }
</tbody>
<table class="table table-bordered">
<thead>
<tr>
<th class="col-sm"><%= l 'ACCOUNT' %></th>
<th class="col-sm"><%= l 'USER_NAME' %></th>
<th class="col-sm"><%= $limit %></th>
<th class="col-sm"><%= $absolute %></th>
<th class="col-sm"><%= $current %></th>
<th class="col-sm user-valign-center"><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
% foreach my $user (@$userAccounts) {
% my $uid = getpwnam($user->key);
% unless ($uid) {
% warn($self->localise('COULD_NOT_GET_UID'),$user->key);
% next;
% }
% my $name = $user->prop("FirstName")." ".$user->prop("LastName");
% my $dev = Quota::getqcarg('/home/e-smith/files');
% my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
<tr>
<td><%= $user->key %></td>
<td><%= $name %></td>
<td><%= sprintf("%.2f", $bs / 1024 ) %></td>
<td><%= sprintf("%.2f", $bh / 1024 ) %></td>
<td><%= sprintf("%.2f", $bc / 1024 ) %></td>
% my $modify_text = l('MODIFY'); # Localized text
% my $csrf_token = "TOKEN"; # CSRF token for security
% my $quota_user_name = $user->key; # quotas_entry name extracted from the data structure
% my $actionModify = qq{
% <a href="quotad?CsrfDef=$csrf_token&trt=UPD&user=$quota_user_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% $modify_text
% </button>
% </a>
%};
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
</tr>
% }
</tbody>
</table>
<%} %>
</p>
%= hidden_field 'trt' => $quo_datas->{trt}
% }
<%= hidden_field 'trt' => $quo_datas->{trt} %>
</div>

134
root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_upd.html.ep
View File

@ -1,16 +1,13 @@
<div>
% my $btn = l('SAVE');
% my $btn = l('SAVE');
%= form_for '/quota2' => (method => 'POST') => begin
<p>
<h2>
%=l 'quo_MODIFY_USER_TITLE'
</h2>
</p>
<form action="/smanager/quota2" method="POST">
% my $userid = $quo_datas->{user};
% my $user = $quo_datas->{userRec};
<h2><%= l 'quo_MODIFY_USER_TITLE' %></h2>
% my $userid = $quo_datas->{user};
% my $user = $quo_datas->{userRec};
<!--
for my $user @$userAccounts
{
@ -20,68 +17,81 @@
}
}
-->
% my $uid = getpwnam($user->key);
% unless ($uid) {
% warn(l('COULD_NOT_GET_UID'),$user->key);
% next;
% }
% my $uid = getpwnam($user->key);
% unless ($uid) {
% warn(l('COULD_NOT_GET_UID'),$user->key);
% next;
% }
% my $name = $user->prop("FirstName") . " " . $user->prop("LastName");
% my $dev = Quota::getqcarg('/home/e-smith/files');
% my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
% my $name = $user->prop("FirstName") . " " . $user->prop("LastName");
% my $dev = Quota::getqcarg('/home/e-smith/files');
% my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
<p>
%=l 'quo_USER'
%= "$name (\"$userid\")"
%=l 'quo_CURRENTLY_HAS'
%= $ic
%=l 'quo_FILES'
%=l 'quo_OCCUPYING'
%= $c->toMB($bc)
%=l 'quo_MEGABYTES'
</p>
<p>
%=l 'quo_INSTRUCTIONS'
</p>
<div>
<%= l 'quo_USER' %>&nbsp<%= "$name (\"$userid\")" %>
&nbsp
<%= l 'quo_CURRENTLY_HAS' %>&nbsp<%= $ic %>
<%= l 'quo_FILES' %>
&nbsp
<%= l 'quo_OCCUPYING' %>&nbsp<%= $c->toMB($bc) %>&nbsp<%= l 'quo_MEGABYTES' %>
</div>
<br>
<p>
<span class="">
%=l 'quo_USER', class => ""
</span>
<span class="">
%= $name, class => ""
</span>
</p>
<div>
<%= l 'quo_INSTRUCTIONS' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'quo_USER' %>
</div>
<div class="col-auto">
<%= $name %>
</div>
</div>
<br>
<p>
<span class="">
%=l 'quo_LIMIT_WITH_GRACE', class => ""
</span>
<span class="">
% param 'Soft' => $quo_datas->{softlim} unless param 'Soft';
%= text_field 'Soft', class => ""
</span>
</p>
<p>
<span class="">
%=l 'quo_ABS_LIMIT', class => ""
</span>
<span class="">
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputQuotaDesc" class="col-form-label"><%=l 'quo_LIMIT_WITH_GRACE' %></label>
</div>
<div class="col-auto">
<!-- text_field 'Soft' -->
<input type="text" name="Soft" id="inputQuotaDesc" class="form-control" aria-describedby="QuotaDesc" value="<%= $quo_datas->{softlim} %>">
</div>
</div>
<br>
% param 'Hard' => $quo_datas->{hardlim} unless param 'Hard';
%= text_field 'Hard', class => ""
</span>
</p>
<p>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputQuotaABS" class="col-form-label"><%= l 'quo_ABS_LIMIT' %></label>
</div>
<div class="col-auto">
<!-- text_field 'Hard' -->
<input type="text" name="Hard" id="inputQuotaABS" class="form-control" aria-describedby="QuotaABS" value="<%= $quo_datas->{hardlim} %>">
</div>
</div>
<br><br>
%= submit_button "$btn", class => ""
</p>
%= hidden_field 'trt' => $quo_datas->{trt}
%= hidden_field 'user' => $quo_datas->{user}
% end
<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' => $quo_datas->{trt} %>
<%= hidden_field 'user' => $quo_datas->{user} %>
</form>
</div>

26
root/usr/share/smanager/themes/AdminLTE/templates/quota.html.ep
View File

@ -5,26 +5,28 @@
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $quo_datas
</p>
<div>
%= dumper $c->current_route
%= dumper $quo_datas
</div>
% }
% 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>
% if ($quo_datas->{trt} eq 'UPD') {
%= include 'partials/_quo_upd'
%} else {
%= include 'partials/_quo_list'
%}
<%= include 'partials/_quo_upd' %>
% } else {
<%= include 'partials/_quo_list' %>
% }
</div>
%end