Compare commits

...

6 Commits

Author SHA1 Message Date
John Crisp
76cbe17b34 Tweaks and portforwarding 11.0.0-36.sme 2025-06-13 17:19:26 +02:00
John Crisp
ffe62c9951 Portforwarding panels modified 2025-06-13 16:49:27 +02:00
John Crisp
2ccc3b18cc Cosmetic tweaks 2025-06-13 16:48:11 +02:00
John Crisp
b356e9fabe Cosmetic tweaks 2025-06-13 16:47:49 +02:00
John Crisp
03eacd8e36 Fix localnetworks [SME: 13041] 2025-06-13 16:47:29 +02:00
John Crisp
9963a8836f Cosmetic tweaks 2025-06-13 16:44:09 +02:00
18 changed files with 296 additions and 280 deletions

View File

@@ -104,9 +104,12 @@ html {
border-left-width: 0px; border-left-width: 0px;
} }
.user-valign-center { /* .user-valign-center {
text-align: center; text-align: center;
} -- Use align-middle --
} */
.user-table-max-wdith { .user-table-max-wdith {
max-width: 50%; max-width: 50%;

View File

@@ -1,6 +1,6 @@
<% <%
my $backups = esmith::BackupHistoryDB->open; my $backups = esmith::BackupHistoryDB->open; # no UTF8
my $now = time(); my $now = time();
my $backup_rec = $backups->new_record($now, { my $backup_rec = $backups->new_record($now, {
type => 'backup_record', BackupType => 'desktop', type => 'backup_record', BackupType => 'desktop',

View File

@@ -28,7 +28,7 @@
<th class="col-sm"><%=l 'DESCRIPTION_BRIEF' %></th> <th class="col-sm"><%=l 'DESCRIPTION_BRIEF' %></th>
<th class="col-sm"><%=l 'dom_CONTENT' %></th> <th class="col-sm"><%=l 'dom_CONTENT' %></th>
<th class="col-sm"><%=l 'dom_LABEL_NAMESERVERS'%></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> </tr>
</thead> </thead>
@@ -67,8 +67,8 @@
%}; %};
%# $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 text-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 => $actionModify) %></td>
</tr> </tr>
% } % }

View File

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

View File

@@ -26,7 +26,7 @@
<th class="col-auto"><%= l 'IP_ADDRESS_OR_FQDN' %></th> <th class="col-auto"><%= l 'IP_ADDRESS_OR_FQDN' %></th>
<th class="col-auto"><%= l 'hos_ETHERNET_ADDRESS' %></th> <th class="col-auto"><%= l 'hos_ETHERNET_ADDRESS' %></th>
<th class="col-auto"><%= l 'COMMENT' %></th> <th class="col-auto"><%= l 'COMMENT' %></th>
<th class="user-valign-center" colspan="2"><%= l 'ACTION' %></th> <th class="align-middle" colspan="2"><%= l 'ACTION' %></th>
</tr> </tr>
</thead> </thead>
@@ -63,8 +63,8 @@
% </a> % </a>
%}; %};
% } % }
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td> <td class="align-middle"><%= $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 => $actionRemove) %></td>
</tr> </tr>
% } % }

View File

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

View File

@@ -1,20 +1,21 @@
<div> <div>
% my $retref = $c->stash("ret"); % my $retref = $c->stash("ret");
% my %ret; % my %ret = $retref ? %$retref : (ret => "");
% unless (length($retref)) {%ret = (ret=>"");} % my @vars = split(/,/, $ret{vars} // '');
% else {%ret = %$retref;} % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
% my @vars = split(",",$ret{vars}); % if ($c->app->config->{debug}) {
% my $var1 = @vars[0]; <br>
% my $var2 = @vars[1]; <pre>
% my $var3 = @vars[2]; <%= dumper { ret_data => \%ret } %>
% my $var4 = @vars[3]; </pre>
% my $var5 = @vars[4]; % }
% my $var6 = @vars[5];
%if ($ret{'ret'} eq "") {
% if ($ret{ret} eq "") {
<br>
<%= l "ln_FIRSTPAGE_DESC" %>
<BR>
% } elsif (index($ret{ret},"SUCCESS") != -1) { % } elsif (index($ret{ret},"SUCCESS") != -1) {
<div class=""> <div class="">
<h2> Operation Status Report</h2> <h2> Operation Status Report</h2>
@@ -26,7 +27,9 @@
<%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %> <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
</div> </div>
% } % }
<br />
<br>
% my $btn = l('ADD'); % my $btn = l('ADD');
% my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db"; % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
@@ -37,7 +40,6 @@
</div> </div>
% } % }
<form action="/smanager/localnetworksb" method="POST"> <form action="/smanager/localnetworksb" method="POST">
<div> <div>
<h2><%=l "ln_ADD_TITLE" %></h2> <h2><%=l "ln_ADD_TITLE" %></h2>
@@ -54,7 +56,7 @@
<label for="inputNetwork" class="col-form-label"><%= l "NETWORK" %></label> <label for="inputNetwork" class="col-form-label"><%= l "NETWORK" %></label>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="inputNetwork" > <input type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="Network" >
</div> </div>
</div> </div>
@@ -65,7 +67,7 @@
<label for="inputNetworkMask" class="col-form-label"><%= l "ln_SUBNET_MASK" %></label> <label for="inputNetworkMask" class="col-form-label"><%= l "ln_SUBNET_MASK" %></label>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="inputNetworkMask" > <input type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="Network Subnet Mask" >
</div> </div>
</div> </div>
@@ -76,7 +78,7 @@
<label for="inputNetworkRouter" class="col-form-label"><%= l "ROUTER" %></label> <label for="inputNetworkRouter" class="col-form-label"><%= l "ROUTER" %></label>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="inputNetworkRouter" > <input type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="Network Router" >
</div> </div>
</div> </div>

View File

@@ -63,6 +63,7 @@
<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") %> <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
<br> <br>

View File

@@ -5,37 +5,31 @@
<br> <br>
% my $retref = $c->stash("ret"); % my $retref = $c->stash("ret");
% my %ret; % my %ret = $retref ? %$retref : (ret => "");
% unless (length($retref)) {%ret = (ret=>"");} % my @vars = split(/,/, $ret{vars} // '');
% else {%ret = %$retref;} % 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>
%# my $element_count = scalar(@ret); <pre>
<%= dumper { ret_data => \%ret } %>
%# if (length $element_count == 0) { </pre>
% 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" %> <%= l "ln_FIRSTPAGE_DESC" %>
% } elsif (index($ret{ret},"SUCCESS") != -1) { % } elsif (index($ret{ret},"SUCCESS") != -1) {
<h2> Operation Status Report</h2>
<br> <br>
<div> <div>
<h2> Operation Status Report</h2> <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
<%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
</div> </div>
% } else { % } else {
<div>
<h2> Operation Status Report - Error</h2> <h2> Operation Status Report - Error</h2>
<%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %> <br>
<div class="text-danger">
<h2> Operation Status Report - Error</h2>
<%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
</div> </div>
% } % }
@@ -63,7 +57,7 @@
<th><%= l 'ln_SUBNET_MASK' %></th> <th><%= l 'ln_SUBNET_MASK' %></th>
<th><%= l 'ln_NUMBER_OF_HOSTS' %></th> <th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
<th><%= l 'ROUTER' %></th> <th><%= l 'ROUTER' %></th>
<th><%= l 'ACTION' %></th> <th class="text-center"><%= l 'ACTION' %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -90,7 +84,7 @@
% </a> % </a>
%}; %};
% } % }
<td><%= $c->render_to_string(inline => $actionRemove) %></td> <td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr> </tr>
% } % }
</tbody> </tbody>

View File

@@ -8,66 +8,82 @@
% my $cmmnt = $pf_datas->{cmmnt}; % my $cmmnt = $pf_datas->{cmmnt};
% my $allow = $pf_datas->{allow}; % my $allow = $pf_datas->{allow};
% if (config->{debug} == 1) { % if (config->{debug} == 0) {
<p> <pre>
%= dumper $c->current_route <%= dumper $c->current_route %>
%= dumper $c->stash("ret") <%= dumper $c->stash("ret") %>
%= dumper %$pf_datas <%= dumper %$pf_datas %>
</p> </pre>
% } % }
%= form_for '/portforwardinge' => (method => 'POST') => begin <form action="/smanager/portforwardinge" method="POST">
<br>
%= l "pf_SUMMARY_REMOVE_DESC"
</p><br>
<span class="">
%=l "pf_LABEL_PROTOCOL"
</span>
<span class="">
%=$proto
</span><br><br>
<span class="">
%=l "pf_LABEL_SOURCE_PORT"
</span>
<span class="">
%=$sport
</span>
<br><br>
<span class="">
%=l "pf_LABEL_DESTINATION_HOST"
</span>
<span class="">
%=$dport
</span>
<br><br>
<span class="">
%=l "pf_LABEL_DESTINATION_PORT"
</span>
<span class="">
%=$dhost
</span>
<br><br>
<span class="">
%=l "pf_RULE_COMMENT"
</span>
<span class="">
%=$cmmnt
</span>
<br><br>
<span class="">
%=l "pf_ALLOW_HOSTS"
</span>
<span class="">
%=$allow
</span>
<br><br>
%#}
%= hidden_field sport=>$sport
%= hidden_field proto=>$proto
<br>
%= submit_button "$btn", class => ""
</p>
%end <br>
<div>
<%= l 'pf_SUMMARY_REMOVE_DESC' %>
</div>
<table>
<tbody>
<tr>
<td>
<% l 'pf_LABEL_PROTOCOL' %>
</td>
<td>
<%= $proto %>
</td>
</tr>
<tr>
<td>
<% l 'pf_LABEL_SOURCE_PORT' %>
</td>
<td>
<%= $sport %>
</td>
<tr>
<tr>
<td>
<% l 'pf_LABEL_DESTINATION_HOST' %>
</td>
<td>
<%= $dport %>
</td>
</tr>
<tr>
<td>
<% l 'pf_LABEL_DESTINATION_PORT' %>
</td>
<td>
<%= $dhost %>
</td>
</tr>
<tr>
<td>
<% l 'pf_RULE_COMMENT' %>
</td>
<td>
<%= $cmmnt %>
</td>
</tr>
<tr>
<td>
<% l 'pf_ALLOW_HOSTS' %>
</td>
<td>
<%= $allow %>
</td>
</tr>
</tbody>
</table>
<%= hidden_field sport=>$sport %>
<%= hidden_field proto=>$proto %>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
</form>
</div> </div>

View File

@@ -1,6 +1,10 @@
<div> <div>
% my $btn = l('pf_CREATE_RULE');
%= form_for '/portforwardinga' => (method => 'POST') => begin
<form action="/smanager/portforwardinga" method="POST">
<br>
% my $retref= $c->stash("ret"); % my $retref= $c->stash("ret");
% my %ret; % my %ret;
@@ -19,60 +23,52 @@
% my $var6 = @vars[5]; % my $var6 = @vars[5];
% if ($ret{ret} eq "") { % if ($ret{ret} eq "") {
%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
% } elsif (index($ret{ret},"SUCCESS") != -1) { % } elsif (index($ret{ret},"SUCCESS") != -1) {
<br> <br>
<div class=""> <div>
<!--<h2> Operation Status Report</h2>--> <h2> Operation Status Report</h2>
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
</div> </div>
% } else { % } else {
<br> <br>
<div class=""> <div class="text-danger">
<!--<h2> Operation Status Report - Error</h2>--> <h2> Operation Status Report - Error</h2>
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
</div> </div>
% } % }
<p>
<br> <br>
%= submit_button "$btn", class => ""
</p> % my $btn = l('pf_CREATE_RULE');
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
</form>
% end
% if ($empty){ % if ($empty){
<br> <br>
%=l 'pf_NO_FORWARDS' <%= l 'pf_NO_FORWARDS' %>
% } else { % } else {
<br> <br>
%=l 'pf_SHOW_FORWARDS' <%= l 'pf_SHOW_FORWARDS' %>
<br><br /> <br><br>
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
<th class=""> <th><%= l 'pf_LABEL_PROTOCOL' %></th>
%=l 'pf_LABEL_PROTOCOL' <th><%= l 'pf_LABEL_SOURCE_PORT' %></th>
</th> <th><%= l 'pf_LABEL_DESTINATION_HOST' %></th>
<th class=""> <th><%= l 'pf_LABEL_DESTINATION_PORT' %></th>
%=l 'pf_LABEL_SOURCE_PORT' <th><%= l 'pf_ALLOW_HOSTS' %></th>
</th> <th><%= l 'pf_RULE_COMMENT' %></th>
<th class=""> <th class="text-center"><%= l 'ACTION' %></th>
%=l 'pf_LABEL_DESTINATION_HOST'
</th>
<th class="">
%=l 'pf_LABEL_DESTINATION_PORT'
</th>
<th class="">
%=l 'pf_ALLOW_HOSTS'
</th>
<th class="">
%=l 'pf_RULE_COMMENT'
</th>
<th class="" '>
%=l 'ACTION'
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -84,30 +80,29 @@
% if (@{ $forwards{$proto} }) { % if (@{ $forwards{$proto} }) {
% foreach my $entry (@{ $forwards{$proto} }) { % foreach my $entry (@{ $forwards{$proto} }) {
<tr> <tr class="align-middle">
% my $sport = $entry->key; % my $sport = $entry->key;
% my $dhost = $entry->prop('DestHost'); % my $dhost = $entry->prop('DestHost');
% my $dport = $entry->prop('DestPort') || ''; % my $dport = $entry->prop('DestPort') || '';
% my $cmmnt = $entry->prop('Comment') || ''; % my $cmmnt = $entry->prop('Comment') || '';
% my $allow = $entry->prop('AllowHosts') || ''; % my $allow = $entry->prop('AllowHosts') || '';
%= t td => (class => "") => $proto <td><%= $proto %></td>
%= t td => (class => "") => $sport <td><%= $sport %></td>
%= t td => (class => "") => $dhost <td><%= $dhost %></td>
%= t td => (class => "") => $dport <td><%= $dport %></td>
%= t td => (class => "") => $allow <td><%= $allow %></td>
%= t td => (class => "") => $cmmnt <td><%= $cmmnt %></td>
<td class="">
% my $remove_text = l('REMOVE'); # Localized text % my $remove_text = l('REMOVE'); # Localized text
% my $csrf_token = "TOKEN"; # CSRF token for security % my $csrf_token = "TOKEN"; # CSRF token for security
% my $actionRemove = qq{ % my $actionRemove = qq{
% <a href="portforwardingd?CsrfDef=$csrf_token&trt=DEL&sport=$sport&proto=$proto"> % <a href="portforwardingd?CsrfDef=$csrf_token&trt=DEL&sport=$sport&proto=$proto">
% <button type='button' class="" title='$remove_text' > % <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text % $remove_text
% </button> % </button>
% </a> % </a>
% }; % };
<%= $c->render_to_string(inline => $actionRemove) %>
</td> <td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr> </tr>
% } % }
% } % }
@@ -115,6 +110,6 @@
% } % }
</tbody> </tbody>
</table> </table>
%= hidden_field 'trt' => $pf_datas->{trt} <%= hidden_field 'trt' => $pf_datas->{trt} %>
</div> </div>

View File

@@ -17,7 +17,7 @@
</div> </div>
<div class="col-auto"> <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>
</div> </div>

View File

@@ -24,7 +24,7 @@
<tr> <tr>
<th class="col-sm"><%= l 'pse_PSEUDONYM' %></th> <th class="col-sm"><%= l 'pse_PSEUDONYM' %></th>
<th class="col-sm"><%= l 'pse_USER_OR_GROUP' %></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 align-middle" colspan="2"><%= l 'ACTION' %></th>
<!-- <th class="" style="display: normal;"></th> --> <!-- <th class="" style="display: normal;"></th> -->
</tr> </tr>
</thead> </thead>
@@ -73,8 +73,8 @@
% }; % };
% } % }
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td> <td class="align-middle"><%= $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 => $actionRemove) %></td>
</tr> </tr>
% } % }

View File

@@ -36,7 +36,7 @@
<th class="col-sm"><%= $limit %></th> <th class="col-sm"><%= $limit %></th>
<th class="col-sm"><%= $absolute %></th> <th class="col-sm"><%= $absolute %></th>
<th class="col-sm"><%= $current %></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> </tr>
</thead> </thead>
@@ -77,7 +77,7 @@
% </a> % </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> </tr>
% } % }
</tbody> </tbody>

View File

@@ -27,7 +27,7 @@
<th><%= l 'USER_NAME' %></th> <th><%= l 'USER_NAME' %></th>
<th><%= l 'usr_VPN_CLIENT_ACCESS' %></th> <th><%= l 'usr_VPN_CLIENT_ACCESS' %></th>
<th><%= l 'usr_FORWARDING_ADDRESS' %></th> <th><%= l 'usr_FORWARDING_ADDRESS' %></th>
<th class="user-valign-center" colspan="5"><%= l 'ACTION' %></th> <th class="text-center text-center" colspan="5"><%= l 'ACTION' %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -142,11 +142,11 @@
%</a> %</a>
%}; %};
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td> <td class="text-center"><%= $c->render_to_string(inline => $actionModify) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw) %></td> <td class="text-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionLock) %></td> <td class="text-center"><%= $c->render_to_string(inline => $actionLock) %></td>
<td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td> <td class="text-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 => $actionroundcube) %></td>
</tr> </tr>
% } % }
</tbody> </tbody>

View File

@@ -5,28 +5,29 @@
<div class="card-body"> <div class="card-body">
% if (config->{debug} == 1) { % if (config->{debug} == 1) {
<p> <pre>
%= dumper "<pf>".$c->current_route <%= dumper "<pf>".$c->current_route %>
%= dumper $c->stash("ret") <%= dumper $c->stash("ret") %>
%= dumper $c->stash("portforwarding") <%= dumper $c->stash("portforwarding") %>
% my $ref = $pf_datas->{portforwarding}; % my $ref = $pf_datas->{portforwarding}; %>
%= dumper $ref->{TCP}->[0]."</pf>" <%= dumper $ref->{TCP}->[0]."</pf>" %>
</p> </pre>
% } % }
<h1><%= $title%></h1> <h1><%= $title%></h1>
%= $modul %= $modul
% if ($pf_datas->{trt} eq 'ADD') { % if ($pf_datas->{trt} eq 'ADD') {
%= include 'partials/_pf_add' <%= include 'partials/_pf_add' %>
% } elsif ($pf_datas->{trt} eq 'ADD1') { % } elsif ($pf_datas->{trt} eq 'ADD1') {
%= include 'partials/_pf_add' <%= include 'partials/_pf_add' %>
% } elsif ($pf_datas->{trt} eq 'DEL') { % } elsif ($pf_datas->{trt} eq 'DEL') {
%= include 'partials/_pf_del' <%= include 'partials/_pf_del' %>
% } elsif ($pf_datas->{trt} eq 'DEL1'){ % } elsif ($pf_datas->{trt} eq 'DEL1'){
%= include 'partials/_pf_list' <%= include 'partials/_pf_list' %>
% } else { % } else {
%= include 'partials/_pf_list' <%= include 'partials/_pf_list' %>
%} %}
</div> </div>

View File

@@ -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 35 %define release 36
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}
@@ -11,7 +11,6 @@ URL: https://adminlte.io/
Group: SMEserver/addon Group: SMEserver/addon
source: %{name}-%{version}.tar.gz source: %{name}-%{version}.tar.gz
Packager: Brian Read <brianr@koozali.org> Packager: Brian Read <brianr@koozali.org>
BuildArchitectures: noarch BuildArchitectures: noarch
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
@@ -29,6 +28,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
* Fri Jun 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-36.sme
- Cosmetic tweaks
- Localnetworking fix via [SME: 13041]
- Portforwarding panels done but require fix to module similar to 13041 above.
* Thu Jun 12 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-35.sme * Thu Jun 12 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-35.sme
- Finish backup panels - Finish backup panels
- Finish printer panels - Finish printer panels