Cosmetic tweaks

This commit is contained in:
John Crisp
2025-06-13 16:44:09 +02:00
parent 91105c83c9
commit 9963a8836f
11 changed files with 71 additions and 76 deletions

View File

@@ -28,7 +28,7 @@
<th class="col-sm"><%=l 'DESCRIPTION_BRIEF' %></th>
<th class="col-sm"><%=l 'dom_CONTENT' %></th>
<th class="col-sm"><%=l 'dom_LABEL_NAMESERVERS'%></th>
<th class="col-sm user-valign-center" colspan="2"><%=l 'ACTION' %></th>
<th class="col-sm text-center" colspan="2"><%=l 'ACTION' %></th>
</tr>
</thead>
@@ -65,10 +65,10 @@
% </button>
% </a>
%};
%# $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
%# $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class="" title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
%};
<td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
<td class="col-auto user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="col-auto text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
<td class="col-auto text-center"><%= $c->render_to_string(inline => $actionModify) %></td>
</tr>
% }

View File

@@ -24,7 +24,7 @@
<tr>
<th class="col-sm"><%= l 'GROUP' %></th>
<th class="col-sm"><%= l 'DESCRIPTION' %></th>
<th class="col-sm user-valign-center" colspan="2"><%= l 'ACTION' %></th>
<th class="col-sm align-middle" colspan="2"><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
@@ -54,8 +54,8 @@
% </a>
%};
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
<td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr>
% }
</tbody>

View File

@@ -36,7 +36,7 @@
<tr>
<th class="col-sm"><%= l 'NAME' %></th>
<th class="col-sm"><%= l 'DESCRIPTION' %></th>
<th class="col-sm user-valign-center" colspan="3"><%= l 'ACTION' %></th>
<th class="col-sm align-middle" colspan="3"><%= l 'ACTION' %></th>
</tr>
</thead>
@@ -103,9 +103,9 @@
% </a>
%};
% }
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw)%></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
<td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="align-middle"><%= $c->render_to_string(inline => $actionResetPw)%></td>
<td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
</td>
</tr>
% }

View File

@@ -17,11 +17,11 @@
<form action="/smanager/localnetworkse" method="POST">
<div>
<h2><%=l "ln_REMOVE_TITLE" %></h2>
<h2><%= l "ln_REMOVE_TITLE" %></h2>
</div>
<div>
<%=l "ln_REMOVE_DESC" %>
<%= l "ln_REMOVE_DESC" %>
</div>
<br><br>
@@ -60,19 +60,20 @@
<br>
% if ($deletehosts) {
<br>
<br>
<b>tell me if you find this!</b>
<b>tell me if you find this!</b>
<b>Please opoen a bug and tell me</b>
<%= $c->l("ln_REMOVE_HOSTS_DESC") %>
<br>
<span class="">
<%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
</span>
<span class="">
<%= check_box deletehost=>1, checked=>1 %>
</span>
<br><br>
<%= $c->l("ln_REMOVE_HOSTS_DESC") %>
<br>
<span class="">
<%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
</span>
<span class="">
<%= check_box deletehost=>1, checked=>1 %>
</span>
<br><br>
% }
<div class="row g-3 align-items-center">

View File

@@ -5,37 +5,31 @@
<br>
% my $retref = $c->stash("ret");
% my %ret;
% unless (length($retref)) {%ret = (ret=>"");}
% else {%ret = %$retref;}
% my %ret = $retref ? %$retref : (ret => "");
% my @vars = split(/,/, $ret{vars} // '');
% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
<!-- So at this point the next section is only relevant it ret is not defined -->
% if ($c->app->config->{debug}) {
<br>
<pre>
<%= dumper { ret_data => \%ret } %>
</pre>
% }
%# my $element_count = scalar(@ret);
%# if (length $element_count == 0) {
% my @vars = split(",",$ret{vars});
% my $var1 = $vars[0];
% my $var2 = $vars[1];
% my $var3 = $vars[2];
% my $var4 = $vars[3];
% my $var5 = $vars[4];
% my $var6 = $vars[5];
% my $var7 = $vars[6];
%# }
%if ($ret{ret} eq "") {
% if ($ret{ret} eq "") {
<%= l "ln_FIRSTPAGE_DESC" %>
% } elsif (index($ret{ret},"SUCCESS") != -1) {
<h2> Operation Status Report</h2>
<br>
<div>
<h2> Operation Status Report</h2>
<%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
<%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
</div>
% } else {
<div>
<h2> Operation Status Report - Error</h2>
<br>
<div class="text-danger">
<h2> Operation Status Report - Error</h2>
<%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
<%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
</div>
% }
@@ -63,7 +57,7 @@
<th><%= l 'ln_SUBNET_MASK' %></th>
<th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
<th><%= l 'ROUTER' %></th>
<th><%= l 'ACTION' %></th>
<th class="text-center"><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
@@ -90,7 +84,7 @@
% </a>
%};
% }
<td><%= $c->render_to_string(inline => $actionRemove) %></td>
<td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr>
% }
</tbody>

View File

@@ -17,7 +17,7 @@
</div>
<div class="col-auto">
<input type="text" name="pseudonymDesc" id="inputPseudonymDesc" class="form-control" aria-describedby="PseudonymDesc" >
<input type="text" name="pseudonymDesc" id="inputPseudonymDesc" class="form-control" aria-describedby="Pseudonym Description" >
</div>
</div>

View File

@@ -22,9 +22,9 @@
<table class="table table-bordered user-table-max-width">
<thead>
<tr>
<th class="col-sm"><%= l 'pse_PSEUDONYM' %></th>
<th class="col-sm"><%= l 'pse_USER_OR_GROUP' %></th>
<th class="col-sm user-valign-center" colspan="2"><%= l 'ACTION' %></th>
<th class="col-sm"><%= l 'pse_PSEUDONYM' %></th>
<th class="col-sm"><%= l 'pse_USER_OR_GROUP' %></th>
<th class="col-sm align-middle" colspan="2"><%= l 'ACTION' %></th>
<!-- <th class="" style="display: normal;"></th> -->
</tr>
</thead>
@@ -57,7 +57,7 @@
% $modify_text
% </button>
% </a>
%};
% };
% }
% if ($removable eq 'yes') {
@@ -70,11 +70,11 @@
% $remove_text
% </button>
% </a>
%};
% };
% }
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
<td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="align-middle"><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr>
% }

View File

@@ -36,7 +36,7 @@
<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>
<th class="col-sm align-middle"><%= l 'ACTION' %></th>
</tr>
</thead>
@@ -77,7 +77,7 @@
% </a>
%};
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="align-middle"><%= $c->render_to_string(inline => $actionModify) %></td>
</tr>
% }
</tbody>

View File

@@ -23,11 +23,11 @@
<table class="table table-bordered">
<thead>
<tr>
<th><%=l 'ACCOUNT' %></th>
<th><%=l 'USER_NAME' %></th>
<th><%=l 'usr_VPN_CLIENT_ACCESS' %></th>
<th><%=l 'usr_FORWARDING_ADDRESS' %></th>
<th class="user-valign-center" colspan="5"><%= l 'ACTION' %></th>
<th><%= l 'ACCOUNT' %></th>
<th><%= l 'USER_NAME' %></th>
<th><%= l 'usr_VPN_CLIENT_ACCESS' %></th>
<th><%= l 'usr_FORWARDING_ADDRESS' %></th>
<th class="text-center text-center" colspan="5"><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
@@ -136,17 +136,17 @@
<!-- If webmail disabled??? -->
% $actionroundcube = qq{
%<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name&height=600px">
% <button type='button' class="btn btn-primary" title='$roundcube_text' >
% <button type='button' class="btn btn-primary" title='$roundcube_text' >
% $roundcube_text
% </button>
%</a>
%};
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionLock) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionroundcube) %></td>
<td class="text-center"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="text-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
<td class="text-center"><%= $c->render_to_string(inline => $actionLock) %></td>
<td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
<td class="text-center"><%= $c->render_to_string(inline => $actionroundcube) %></td>
</tr>
% }
</tbody>