Update email templates, mai_data, button sizes, numerous tweaks

This commit is contained in:
John Crisp
2025-07-06 13:37:49 +02:00
parent b5b7645ebc
commit 305e7b75d2
93 changed files with 244 additions and 1435 deletions

View File

@@ -96,7 +96,7 @@
% my $btn = l('bac_UPDATE_CONF');
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary" value="<%=$c->l('bac_UPDATE_CONF')%>"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('bac_UPDATE_CONF')%>"><%= $btn %></button>
</div>
</div>

View File

@@ -40,7 +40,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary" value="<%=$c->l('bac_RESTORE_FROM_TAPE')%>"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('bac_RESTORE_FROM_TAPE')%>"><%= $btn %></button>
</div>
</div>

View File

@@ -65,7 +65,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary" value="<%=$c->l('NEXT')%>"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('NEXT')%>"><%= $btn %></button>
</div>
</div>

View File

@@ -259,7 +259,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary" value="<%=$c->l('NEXT')%>"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('NEXT')%>"><%= $btn %></button>
</div>
</div>

View File

@@ -58,7 +58,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -44,7 +44,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
</form>

View File

@@ -67,7 +67,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -65,7 +65,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary" value="<%=$c->l('bac_RESTORE_FROM_TAPE')%>"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm" value="<%=$c->l('bac_RESTORE_FROM_TAPE')%>"><%= $btn %></button>
</div>
</div>

View File

@@ -38,7 +38,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -70,7 +70,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
</form>

View File

@@ -40,7 +40,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -93,7 +93,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -81,7 +81,7 @@
<form action="/smanager/bugreport" method="POST">
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => $bugr_datas->{trt} %>

View File

@@ -20,7 +20,7 @@
<form action="/smanager/bugreportD" method="POST">
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => $bugr_datas->{trt} %>

View File

@@ -59,7 +59,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -1,9 +1,16 @@
<!-- common_css.html.ep -->
%= stylesheet 'koozali/css/adminlte.koozali.css'
%= stylesheet 'koozali/css/flag-icon.min.css'
%#= stylesheet 'css/sme-jquery-overrides.css'
<!-- Generic to AdminLTE -->
%= stylesheet 'dist/css/adminlte.min.css'
%= stylesheet 'dist/font/bootstrap-icons.min.css'
%#= stylesheet 'dist/css/overlayscrollbars.min.css'
<!-- Specific to Koozali from smanager/default -->
%= stylesheet 'css/flag-icon.min.css'
<!-- Specific Koozali AdminLTE overrides -->
%= stylesheet 'koozali/css/adminlte.koozali.css'
%#= stylesheet 'dist/css/overlayscrollbars.min.css'
%#= stylesheet 'css/sme-jquery-overrides.css'

View File

@@ -1,11 +1,16 @@
<!-- common_js.html.ep -->
%= javascript 'dist/js/jquery.min.js'
%= javascript 'dist/js/bootstrap.min.js'
%= javascript 'dist/js/popper.min.js'
%= javascript 'dist/js/adminlte.min.js'
%= javascript 'koozali/js/datetime.js'
%= javascript 'koozali/js/nutups.js'
%= javascript 'koozali/js/flag-by-locale.js'
<!-- Specific to AdminLTE -->
%= javascript 'dist/js/adminlte.min.js'
%= javascript 'dist/js/bootstrap.min.js'
<!-- Generic JS -->
%= javascript 'dist/js/jquery.min.js'
%= javascript 'dist/js/popper.min.js'
<!-- Specific to Koozali from smanager/default -->
%= javascript 'js/flag-by-locale.js'
<!-- Specific to Koozali AdminLTE -->
%= javascript 'koozali/js/sme-password.js'

View File

@@ -31,6 +31,19 @@
<br>
<%= $modul %>
<br><br>
<div div class="row g-3 align-items-center">
<div class="col-md-2">
<%= $c->l('dat_The_time_is_currently') %>
</div>
<br>
<div>
<%= text_field 'clock', id => 'real-time-clock', readonly => 'readonly', class => 'col-md-2' , value => $dat_data->{currentdatetime} %>
</div>
</div>
<br>
% if ($dat_data->{ntpstatus} eq 'disabled') {
<div class='datetime-set-ntp'>
@@ -49,7 +62,7 @@
% [ $c->l('dat_manually_set'), 'dat_manually_set' ]
% ];
<br><br>
<br>
<h2><%= $c->l('Time Configuration') %></h2>
@@ -59,7 +72,7 @@
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<div class="col-md-2">
<%= label_for time_mode => $c->l('Time Setting Mode:') %>
</div>
<div class="col-auto">
@@ -68,9 +81,7 @@
</div>
</div>
<br>
<br><br>
<div id='ntp_section'>
<div>
@@ -80,13 +91,18 @@
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<div class="col-md-2">
<label for="inputNTPServerURL" class="col-form-label"><%=$c->l('dat_NTP_Server_URL') %></label>
</div>
<div class="col-auto">
% my $server_check = '^([a-zA-Z0-9][a-zA-Z0-9\.\-]{0,253}[a-zA-Z0-9]|(\d{1,3}\.){3}\d{1,3})$';
% param 'ntpserver' => $dat_data->{ntpserver} unless param 'ntpserver';
<input type="text" name="ntpserver" id="inputNTPServerURL" class="form-control" aria-describedby="NTP Server URL" pattern="<%= $server_check %>" value="<%= $dat_data->{ntpserver} %>">
</div>
<div class="col-auto">
<button type="button" id="test-ntp-btn" class="btn btn-primary btn-sm ml-2">Test Server</button>
<span id="ntp-test-result" class="ntp-test-result ml-2"></span>
</div>
</div>
</div>
@@ -142,7 +158,7 @@
</div>
<br>
<br>
<div class="row g-3 align-items-center">
@@ -155,7 +171,7 @@
</div>
<div class="col-auto">
% param 'hour' => ($dat_data->{hour}) unless param 'hour';
%= select_field hour => ($hour_options, id => 'hour'), required => 'required', class=> "form-select"
<%= select_field hour => ($hour_options, id => 'hour'), required => 'required', class=> "form-select" %>
</div>
<div class="col-auto">
@@ -163,7 +179,7 @@
</div>
<div class="col-auto">
% param 'minute' => ($dat_data->{minute}) unless param 'minute';
%= select_field minute => ($minute_options, id => 'minute'), required => 'required', class=> "form-select", inputmode => 'numeric'
<%= select_field minute => ($minute_options, id => 'minute'), required => 'required', class=> "form-select", inputmode => 'numeric' %>
%#= text_field minute => id => 'minute', size => 2, maxlength => 2, placeholder => 'MM', pattern => '^[0-5][0-9]$', title => 'Minute (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off'
</div>
@@ -173,44 +189,41 @@
</div>
<div class="col-auto">
% param 'second' => ($dat_data->{second}) unless param 'second';
%= select_field minute => ($second_options, id => 'minute'), required => 'required', class=> "form-select" , inputmode => 'numeric'
<%= select_field minute => ($second_options, id => 'minute'), required => 'required', class=> "form-select" , inputmode => 'numeric' %>
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l 'dat_TZ' %>
</div>
<div class="col-auto">
% param 'Timezone' => $c->getTimezone() unless param 'Timezone';
<%= select_field 'Timezone' => $c->getZone_list(), class => "form-select" %>
</div>
</div>
</div>
<br>
<%= hidden_field 'Old_ntpstatus' => $dat_data->{ntpstatus}; %>
<%= hidden_field 'trt' => $dat_data->{trt}; %>
<% my $btn = l('SAVE'); %>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l 'dat_TZ' %>
</div>
<div class="col-auto">
% param 'Timezone' => $c->getTimezone() unless param 'Timezone';
<%= select_field 'Timezone' => $c->getZone_list(), class => "form-select" %>
<div class="col-md-2">
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
</div>
<br>
<%= hidden_field 'Old_ntpstatus' => $dat_data->{ntpstatus}; %>
<%= hidden_field 'trt' => $dat_data->{trt}; %>
<% my $btn = l('SAVE'); %>
<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>
</form>
% }

View File

@@ -123,7 +123,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -1,95 +0,0 @@
% layout 'AdminLTE', title => "Sme server 2 - emailaccess";
% content_for 'module' => begin
<div class="card-body">
% if (config->{debug} == 1) {
<pre>
%= dumper $c->current_route
%= dumper $mai_datas
</pre>
% }
% if ( stash 'error' ) {
<br>
<div class="text-danger">
<%= $c->render_to_string(inline => stash 'error') %>
</div>
% }
<h1><%= $title%></h1>
<br>
<form action="/smanager/emailsettingd" method="POST">
<div>
<%= l 'mai_DESC_POP_ACCESS_CONTROL' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%=l 'mai_LABEL_POP_ACCESS_CONTROL' %>
</div>
<div class="col-auto">
% param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess';
<%= select_field 'POPAccess' => $c->get_pop_opt(), class => "form-select" %>
</div>
</div>
<br>
<div>
<%=l 'mai_DESC_IMAP_ACCESS_CONTROL' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%=l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
</div>
<div class="col-auto">
% param 'IMAPAccess' => $c->get_current_imap_access() unless param 'IMAPAccess';
<%= select_field 'IMAPAccess' => $c->get_imap_opt(), class => "form-select" %>
</div>
</div>
<br>
<div>
<%= l 'mai_DESC_WEBMAIL' %>
<div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%=l 'mai_LABEL_WEBMAIL' %>
</div>
<div class="col-auto">
% param 'WebMail' => $c->get_current_webmail_status() unless param 'WebMail';
<%= select_field 'WebMail' => $c->get_webmail_opt(), class => "form-select" %>
</div>
</div>
<br>
% my $btn = l('SAVE');
<%= hidden_field 'trt' => 'ACC' %>
<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>
<br>
</div>
%end

View File

@@ -1,151 +0,0 @@
% layout 'AdminLTE', title => "Sme server 2 - emaildeliver";
% content_for 'module' => begin
<div class="card-body">
% if (config->{debug} == 1) {
<pre>
<%= dumper $c->current_route %>
<%= dumper $mai_datas %>
</pre>
% }
% if ( stash 'error' ) {
<br>
<div class="text-danger">
<%= $c->render_to_string(inline => stash 'error') %>
</div>
% }
<h1><%= $title %></h1>
<br>
<form action="/smanager/emailsettingd" method="POST">
<h2><%= l 'mai_TITLE_UNKNOWN' %></h2>
<br>
<div>
<%= l 'mai_DESC_UNKNOWN' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_UNKNOWN' %>
</div>
<div class="col-auto">
% param 'EmailUnknownUser' => $mai_datas->{emailunknownuser} unless param 'EmailUnknownUser';
<%= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => "form-select" %>
</div>
</div>
<br>
<!--<hr class="" />-->
<h2><%= l 'mai_TITLE_DELEGATE' %></h2>
<br>
<div>
<%= l 'mai_DESC_DELEGATE' %>
</div>
<br>
% param 'DelegateMailServer' => $mai_datas->{delegatemailserver} unless param 'DelegateMailServer';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputDelegateMailServer" class="col-form-label"><%= l 'mai_LABEL_DELEGATE' %></label>
</div>
<div class="col-auto">
<input type="text" name="DelegateMailServer" id="inputDelegateMailServer" class="form-control" aria-describedby="DelegateMailServer" value="<%= $mai_datas->{delegatemailserver} %>">
</div>
</div>
<br>
<!--<hr class="" />-->
<h2><%= l 'mai_TITLE_SMARTHOST' %></h2>
<br>
<div>
<%= l 'mai_DESC_SMARTHOST' %>
</div>
<br>
% param 'SMTPSmartHost' => $mai_datas->{smtpsmarthost} unless param 'SMTPSmartHost';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputSMTPSmartHost" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST' %></label>
</div>
<div class="col-auto">
<input type="text" name="SMTPSmartHost" id="inputSMTPSmartHost" class="form-control" aria-describedby="SMTPSmartHost" value="<%= $mai_datas->{smtpsmarthost} %>">
</div>
</div>
<br>
% param 'SMTPAUTHPROXY_status' => $mai_datas->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS' %>
</div>
<div class="col-auto">
<%= select_field 'SMTPAUTHPROXY_status' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => "form-select" %>
</div>
</div>
<br>
% param 'SMTPAUTHPROXY_Userid' => $mai_datas->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputSMTPAuthproxy" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID' %></label>
</div>
<div class="col-auto">
<input type="text" name="SMTPAUTHPROXY_Userid" id="inputSMTPAuthproxy" class="form-control" aria-describedby="SMTPAuthproxy" value="<%= $mai_datas->{smtpauthproxyuserid} %>">
</div>
</div>
<br>
% param 'SMTPAUTHPROXY_Passwd' => $mai_datas->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="password" class="col-form-label"><%= l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD' %></label>
</div>
<div class="col-auto">
<input type="password" name="SMTPAUTHPROXY_Passwd" id="password" class="form-control" aria-describedby="SMTPAuthProxyPassword" value="<%= $mai_datas->{smtpauthproxypassword} %>">
</div>
<div class="col-auto">
<span id="togglePassword" class="bi bi-eye"></span>
</div>
</div>
<br>
% my $btn = l('SAVE');
<%= hidden_field 'trt' => 'DEL' %>
<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>
</div>
%end

View File

@@ -1,175 +0,0 @@
% layout 'AdminLTE', title => "Sme server 2 - emailfilter";
% content_for 'module' => begin
<div class="card-body">
% if (config->{debug} == 1) {
<pre>
<%= dumper $c->current_route %>
<%= dumper $mai_datas %>
</pre>
% }
% if ( stash 'error' ) {
<br>
<div class="text-danger">
<%= $c->render_to_string(inline => stash 'error') %>
</div>
% }
<h1><%= $title%></h1>
<br>
<form action="/smanager/emailsettingd" method="POST">
<div>
<%= l 'mai_DESC_VIRUS_SCAN' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l 'mai_LABEL_VIRUS_SCAN' %>
</div>
<div class="col-auto">
% param 'VirusStatus' => $mai_datas->{virusstatus} unless param 'VirusStatus';
<%= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
</div>
</div>
<br>
<div>
<%= l 'mai_DESC_SPAM_SCAN' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l 'mai_LABEL_SPAM_SCAN' %>
</div>
<div class="col-auto">
% param 'Spamstatus' => $mai_datas->{spamstatus} unless param 'Spamstatus';
<%= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l 'mai_LABEL_SPAM_SENSITIVITY' %>
</div>
<div class="col-auto">
% param 'SpamSensitivity' => $mai_datas->{spamsensitivity} unless param 'SpamSensitivity';
<%= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => "form-select" %>
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l 'mai_LABEL_SPAM_TAGLEVEL' %>
</div>
<div class="col-auto">
% param 'SpamTagLevel' => $mai_datas->{spamtaglevel} unless param 'SpamTagLevel';
<%= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => "form-select" %>
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l 'mai_LABEL_SPAM_REJECTLEVEL' %>
</div>
<div class="col-auto">
% param 'SpamRejectLevel' => $mai_datas->{spamrejectlevel} unless param 'SpamRejectLevel';
<%= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => "form-select" %>
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l 'mai_LABEL_SORTSPAM' %>
</div>
<div class="col-auto">
% param 'SpamSortSpam' => $mai_datas->{spamsortspam} unless param 'SpamSortSpam';
<%= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
</div>
</div>
<br>
<div>
<%= l 'mai_DESC_SPAM_SUBJECT' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l 'mai_LABEL_SPAM_SUBJECTTAG' %>
</div>
<div class="col-auto">
% param 'SpamSubjectTag' => $mai_datas->{spamsubjecttag} unless param 'SpamSubjectTag';
<%= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select" %>
</div>
</div>
<br>
% param 'SpamSubject' => $mai_datas->{spamsubject} unless param 'SpamSubject';
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputSpamSubjectTag" class="col-form-label"><%= l 'mai_LABEL_SPAM_SUBJECT' %></label>
</div>
<div class="col-auto">
<!-- text_field 'Soft' -->
<input type="text" name="SpamSubject" id="inputSpamSubjectTag" class="form-control" aria-describedby="SpamSubjectTag" value="<%= $mai_datas->{spamsubject} %>">
</div>
</div>
<br>
<div>
<%= l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l 'mai_LABEL_CONTENT_TO_BLOCK' %>
</div>
<div class="col-auto">
% param 'BlockExecutableContent' => $c->get_patterns_current_opt() unless param 'BlockExecutableContent';
<%= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => "form-select", multiple => "1" %>
</div>
</div>
<br>
% my $btn = l('SAVE');
<%= hidden_field 'trt' => 'FIL' %>
<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>
%end

View File

@@ -1,286 +0,0 @@
% layout 'AdminLTE', title => "Sme server 2 - emailreceive";
% content_for 'module' => begin
% use constant FALSE => 0;
% use constant TRUE => 1;
<div class="card-body">
% if (config->{debug} == 1) {
<pre>
<<%= dumper $c->current_route %>
<<%= dumper $mai_datas %>
<<%= dumper $c->param('SMTPAuth') %>
</pre>
% }
% if ( stash 'error' ) {
<br>
<div class="text-danger">
<<%= $c->render_to_string(inline => stash 'error') %>
</div>
% }
<h1><%= $title %></h1>
<br>
<form action="/smanager/emailsettingd" method="POST">
<div>
<%= l 'mai_DESC_MODE' %>
</div>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_MODE' %>
</div>
<div class="col-auto">
% param 'FetchmailMethod' => $mai_datas->{fetchmailmethod} unless param 'FetchmailMethod';
<!--
<pre>
<%= dumper $mai_datas->{fetchmailmethod} %>
<%= dumper $c->get_retrieval_opt() %>
<%= param 'FetchmailMethod' %>
</pre>
-->
<%= select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class =>"form-select" %>
</div>
</div>
<br>
<div>
<div>
<b><i>Note - this first line was disabled?</b></i>
<br>
<%= l 'mai_DESC_SMTP_AUTH_CONTROL' %>
<br>
<b><i>/end</b></i>
</div>
<br>
<div>
<%= l "SMTP port (25) main purpose is to receive emails from another server, STARTTLS is always offered, but auth if offered is only if STARTTLS is also used by client." %>
</div>
<br>
<div>
<%= l "SMTPS port (465) will require implicit SSL/TLS then authenticate to send." %>
</div>
<br>
<div>
<%= l "SMTP Submission port (587) will require STARTTLS, then authenticate to send." %>
</div>
</div>
<br>
% my $smtp_mesg=l('SMTP port %u allow client to authenticate:');
% param 'SMTPAuth' => $c->get_current_smtp_auth( FALSE ) unless param 'SMTPAuth';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %>
</div>
<div class="col-auto">
<!--
<pre>
<%= dumper $c->get_smtp_auth_opt() %>
<%= dumper $c->get_current_smtp_auth(FALSE) %>
<%= dumper $c->get_db_prop("qpsmtpd","Authentication") %>
<%= param 'SMTPAuth' %>
</pre>
-->
<%= select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => "form-select" %>
</div>
</div>
<br>
% my $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
% param 'sSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) unless param 'sSMTPAuth';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); %>
</div>
<div class="col-auto">
<%= select_field 'sSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => "form-select" %>
</div>
</div>
<br>
% my $smtp_mesg=l('Submission port %u status:');
% param 'uSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) unless param 'uSMTPAuth';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); %>
</div>
<div class="col-auto">
<!--
<pre>
<%= dumper $c->get_smtp_ssl_auth_opt() %>
<%= dumper $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) %>
<%= dumper $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) %>
<%= dumper $c->get_db_prop("uqpsmtpd","access") %>
<%= param 'uSMTPAuth' %>
</pre>
-->
<%= select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => "form-select" %>
</div>
</div>
<br>
<h2><%= l 'mai_TITLE_SECONDARY' %></h2>
<br>
<div>
<%= l 'mai_DESC_SECONDARY' %>
</div>
<br>
% param 'SecondaryMailServer' => $mai_datas->{secondarymailserver} unless param 'SecondaryMailServer';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputSecondaryMailServer" class="col-form-label"><%= l 'mai_LABEL_SECONDARY' %></label>
</div>
<div class="col-auto">
<input type="text" name="SecondaryMailServer" id="inputSecondaryMailServer" class="form-control" aria-describedby="SecondaryMailServer" value="<%= $mai_datas->{secondarymailserver} %>">
</div>
</div>
<br>
<div>
<%= l 'mai_DESC_FETCH_PERIOD' %>
</div>
% param 'FreqOffice' => $mai_datas->{freqoffice} unless param 'FreqOffice';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_FETCH_PERIOD' %>
</div>
<div class="col-auto">
<%= select_field 'FreqOffice' => $c->fetchmail_freq(), class => "form-select" %>
</div>
</div>
<br>
% param 'FreqOutside' => $mai_datas->{freqoutside} unless param 'FreqOutside';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_FETCH_PERIOD_NIGHTS' %>
</div>
<div class="col-auto">
<%= select_field 'FreqOutside' => $c->fetchmail_freq(), class => "form-select" %>
</div>
</div>
<br>
% param 'FreqWeekend' => $mai_datas->{freqweekend} unless param 'FreqWeekend';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_FETCH_PERIOD_WEEKENDS' %>
</div>
<div class="col-auto">
<%= select_field 'FreqWeekend' => $c->fetchmail_freq(), class => "form-select" %>
</div>
</div>
<br>
% param 'SecondaryMailAccount' => $mai_datas->{secondarymailaccount} unless param 'SecondaryMailAccount';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputSecondaryMailAccount" class="col-form-label"><%= l 'mai_LABEL_POP_ACCOUNT' %></label>
</div>
<div class="col-auto">
<input type="text" name="SecondaryMailAccount" id="inputSecondaryMailAccount" class="form-control" aria-describedby="SecondaryMailAccount" value="<%= $mai_datas->{secondarymailaccount} %>">
</div>
</div>
<br>
% param 'SecondaryMailPassword' => $mai_datas->{secondarymailpassword} unless param 'SecondaryMailPassword';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="password" class="col-form-label"><%= l 'mai_LABEL_POP_PASS' %></label>
</div>
<div class="col-auto">
<input type="password" name="SecondaryMailPassword" id="password" class="form-control" aria-describedby="SecondaryMailPassword" value="<%= $mai_datas->{secondarymailpassword} %>">
</div>
<div class="col-auto">
<span id="togglePassword" class="bi bi-eye"></span>
</div>
</div>
<br>
% param 'SpecifyHeader' => $mai_datas->{specifyheader} unless param 'SpecifyHeader';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_SORT_METHOD' %>
</div>
<div class="col-auto">
<%= select_field 'SpecifyHeader' => [[(l 'mai_DEFAULT') => 'off'], [(l 'mai_SPECIFY_BELOW') => 'on']], class => "form-select" %>
</div>
</div>
<br>
% param 'SecondaryMailEnvelope' => $mai_datas->{secondarymailenvelope} unless param 'SecondaryMailEnvelope';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputSecondaryMailEnvelope" class="col-form-label"><%= l 'mai_LABEL_SORT_HEADER' %></label>
</div>
<div class="col-auto">
<input type="text" name="SecondaryMailEnvelope" id="inputSecondaryEnvelope" class="form-control" aria-describedby="SecondaryMailEnvelope" value="<%= $mai_datas->{secondarymailenvelope} %>">
</div>
</div>
<br>
% my $btn = l('SAVE');
<%= hidden_field 'trt' => 'REC' %>
<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>
</div>
%end

View File

@@ -1,4 +1,4 @@
% layout 'AdminLTE', title => "Sme server 2 - emailsettings";
% layout 'AdminLTE', title => "Sme server 2 - E-Mail";
% content_for 'module' => begin
@@ -12,7 +12,7 @@
% if (config->{debug} == 1) {
<pre>
<%= dumper $c->current_route %>
<= dumper $mai_datas %>
<%= dumper $mai_data->{trt} %>
</pre>
% }
@@ -27,202 +27,31 @@
<br>
<form action="/smanager/emailsettings" method="POST">
%#Routing to partials according to trt parameter.
%#This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_POP_ACCESS_CONTROL' %>
</div>
<div class="col-auto">
<%= $c->get_current_pop3_access( TRUE ) %>
</div>
</div>
% if ($mai_data->{trt} eq "FRONT") {
<%= include 'partials/_mai_FRONT' %>
% }
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_IMAP_ACCESS_CONTROL' %>
</div>
<div class="col-auto">
<%= $c->get_current_imap_access( TRUE ) %>
</div>
</div>
% if ($mai_data->{trt} eq "ACC") {
<%= include 'partials/_mai_ACC' %>
% }
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_WEBMAIL' %>
</div>
<div class="col-auto">
<%= $c->get_current_webmail_status( TRUE ) %>
</div>
</div>
% if ($mai_data->{trt} eq "FIL") {
<%= include 'partials/_mai_FIL' %>
% }
<br>
% if ($mai_data->{trt} eq "REC") {
<%= include 'partials/_mai_REC' %>
% }
% my $btn = l('mai_DESC_STATE_ACCESS_BUTTON');
<%= hidden_field 'trt' => 'ACC' %>
<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>
<br><br>
<!--<hr class="" />-->
<form action="/smanager/emailsettings" method="POST">
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_VIRUS_SCAN' %>
</div>
<div class="col-auto">
<%= $c->get_virus_status(TRUE) %>
</div>
</div>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_SPAM_SCAN' %>
</div>
<div class="col-auto">
<%= $c->get_spam_status(TRUE) %>
</div>
</div>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT' %>
</div>
<div class="col-auto">
<%= $c->get_patterns_status(TRUE) %>
</div>
</div>
<br>
% my $btn = l('mai_DESC_STATE_FILTERING_BUTTON');
<%= hidden_field 'trt' => 'FIL' %>
<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>
<br><br>
<!--<hr class="" />-->
<form action="/smanager/emailsettings" method="POST">
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_MODE' %>
</div>
<div class="col-auto">
<%= $mai_datas->{fetchmailmethod} %>
</div>
</div>
% my $smtp_mesg;
% $smtp_mesg=l('SMTP port %u allow client to authenticate:');
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %>
</div>
<div class="col-auto">
<%= $c->get_current_smtp_auth( TRUE ) %>
</div>
</div>
% $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); %>
</div>
<div class="col-auto">
<%= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE ) %>
</div>
</div>
% $smtp_mesg=l 'Submission port %u status:';
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); %>
</div>
<div class="col-auto">
<%= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE ) %>
</div>
</div>
<br>
% my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON');
<%= hidden_field 'trt' => 'REC' %>
<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>
<br><br>
<!--<hr class="" />-->
<form action="/smanager/emailsettings" method="POST">
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_UNKNOWN' %>
</div>
<div class="col-auto">
<%= $c->get_emailunknownuser_status( TRUE ) %>
</div>
</div>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_DELEGATE' %>
</div>
<div class="col-auto">
<%= $c->get_value('DelegateMailServer') %>
</div>
</div>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l 'mai_LABEL_SMARTHOST' %>
</div>
<div class="col-auto">
<%= $c->get_value('SMTPSmartHost') %>
</div>
</div>
<br>
% if ($mai_data->{trt} eq "DEL") {
<%= include 'partials/_mai_DEL' %>
% }
% my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON');
<%= hidden_field 'trt' => 'DEL' %>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
<br>
</form>
</div>
%end

View File

@@ -19,21 +19,36 @@
%= content_for 'head_contrib'
%= content_for 'refresh'
<!-- Specific for AdminLTE -->
%= include 'common_js'
%= include 'common_css'
<!-- should move the JS in here to a proper file if required -->
%# if (config 'hasJquery') {
%#= include 'partials/_js_imports'
%# }
<!-- Custom overrides js/css? -->
<!-- This needs refining - do contribs add in their own stuff?? -->
<!-- This needs refining -->
% if (config 'hasJquery') {
%= include 'partials/_js_imports'
<!-- the sections below should add the correct JS/CSS per panel -->
%# if ($c->current_route eq 'nutups') {
%#= include 'partials/_nutups_overrides'
%# }
%# panel specific css file
% my $controller = stash('controller');
% if ($controller) {
% my $css_path = "css/$controller.css";
%# Use the url_for helper to generate the correct static file URL
% if (app->static->file($css_path)) {
<link rel="stylesheet" href="<%= url_for("/$css_path") %>">
% }
% }
% if ($c->current_route eq 'nutups') {
%= include 'partials/_nutups_overrides'
% }
</head>
@@ -208,6 +223,16 @@
<div id="adminlte-version"></div>
%# Specific panel js code
% $controller = stash('controller');
% if ($controller) {
% my $js_path = "js/$controller.js";
%# Use the url_for helper to generate the correct static file URL
% if (app->static->file($js_path)) {
<script src="<%= url_for("/$js_path") %>"></script>
% }
% }
</body>
</html>

View File

@@ -89,7 +89,7 @@
<!-- /.col -->
<div class="col-4">
<div class="d-grid gap-2">
<button type="submit" class="btn btn-primary">Login</button>
<button type="submit" class="btn btn-primary btn-sm">Login</button>
</div>
</div>
<!-- /.col -->

View File

@@ -26,7 +26,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-danger"><%= $btn %></button>
<button type="submit" class="btn btn-danger btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -7,7 +7,7 @@
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %> </button>
</div>
</div>
<%= hidden_field 'trt' => 'ADD' %>
@@ -47,7 +47,7 @@
% my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure
% my $actionModify = qq{
% <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
% $modify_text
% </button>
% </a>
@@ -60,7 +60,7 @@
% my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure
% $actionRemove = qq{
% <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
% $remove_text
% </button>
% </a>
@@ -112,7 +112,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-auto">
<button type="submit" class="btn btn-primary"><%= $btn2 %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn2 %></button>
</div>
</div>

View File

@@ -36,7 +36,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => $dom_datas->{trt} %>

View File

@@ -78,7 +78,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => $dom_datas->{trt} %>

View File

@@ -70,7 +70,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -59,7 +59,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-danger"><%= $btn %></button>
<button type="submit" class="btn btn-danger btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -6,7 +6,7 @@
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %> </button>
</div>
</div>
<%= hidden_field 'trt' => 'ADD' %>
@@ -39,7 +39,7 @@
% my $modify_text = l('MODIFY'); # Localized text
% my $actionModify = qq{
% <a href="groups2?CsrfDef=$csrf_token&trt=UPD&group=$group_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
% $modify_text
% </button>
% </a>
@@ -48,7 +48,7 @@
% my $remove_text = l('REMOVE'); # Localized text
% my $actionRemove = qq{
% <a href="groups2?CsrfDef=$csrf_token&trt=DEL&group=$group_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
% $remove_text
% </button>
% </a>

View File

@@ -79,7 +79,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -22,7 +22,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-danger"><%= $btn %></button>
<button type="submit" class="btn btn-danger btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -5,7 +5,7 @@
<form action="/smanager/hostentriesd" method="POST">
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => $hos_datas->{trt} %>
@@ -47,7 +47,7 @@
%my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure
%$actionModify = qq{
% <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
% $modify_text
% </button>
% </a>
@@ -57,7 +57,7 @@
%#my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure
%$actionRemove = qq{
% <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
% $remove_text
% </button>
% </a>

View File

@@ -53,7 +53,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -77,7 +77,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -21,7 +21,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -20,7 +20,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-danger"><%= $btn %></button>
<button type="submit" class="btn btn-danger btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -7,7 +7,7 @@
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %> </button>
</div>
</div>
<%= hidden_field 'trt' => 'ADD'; %>
@@ -60,7 +60,7 @@
%my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure
%$actionModify = qq{
% <a href="ibaysd?CsrfDef=$csrf_token&trt=UPD&ibay=$ibays_entry_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
% $modify_text
% </button>
% </a>
@@ -74,7 +74,7 @@
%if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
%$actionResetPw = qq{
% <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
% <button type='button' class="btn btn-danger" title="$password_text - currently unset" >
% <button type='button' class="btn btn-danger btn-sm" title="$password_text - currently unset" >
% $password_text
% </button>
% </a>
@@ -82,7 +82,7 @@
% } else {
%$actionResetPw = qq{
% <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
% <button type='button' class="btn btn-primary" title='$password_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$password_text' >
% $password_text
% </button>
% </a>
@@ -97,7 +97,7 @@
%my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure
%$actionRemove = qq{
% <a href="ibaysd?CsrfDef=$csrf_token&trt=DEL&ibay=$ibays_entry_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
% $remove_text
% </button>
% </a>

View File

@@ -49,7 +49,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -107,7 +107,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -53,7 +53,7 @@
$('#menuadm').toggle({ duration: 300 });
});
$('.section-title').click(function() {
var $section = $(this).parent().next('div');
if(!$section.length){

View File

@@ -56,7 +56,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
<a href='letsencryptd' class="btn btn-primary btn-sm btn-sm" role="button"><%= $back_text %></a>
</div>
</div>

View File

@@ -67,7 +67,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
<a href='letsencryptd' class="btn btn-primary btn-sm btn-sm" role="button"><%= $back_text %></a>
</div>
</div>

View File

@@ -144,7 +144,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-1">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -87,7 +87,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-1">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -76,7 +76,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -39,7 +39,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
@@ -78,7 +78,7 @@
%my $csrf_token = "TOKEN"; # CSRF token for security
%$actionRemove = qq{
% <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
% $remove_text
% </button>
% </a>

View File

@@ -38,7 +38,7 @@
<!-- /.col -->
<div class="col-4">
<div class="d-grid gap-2">
<button type="submit" class="btn btn-primary">Sign In</button>
<button type="submit" class="btn btn-primary btn-sm">Sign In</button>
</div>
</div>
<!-- /.col -->

View File

@@ -195,7 +195,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-1">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -114,7 +114,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-1">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
</form>

View File

@@ -90,7 +90,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-1">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
</form>

View File

@@ -40,7 +40,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
@@ -92,7 +92,7 @@
% my $csrf_token = "TOKEN"; # CSRF token for security
% my $actionRemove = qq{
% <a href="portforwardingd?CsrfDef=$csrf_token&trt=DEL&sport=$sport&proto=$proto">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
% $remove_text
% </button>
% </a>

View File

@@ -53,7 +53,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-1">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
</form>

View File

@@ -30,7 +30,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-1">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
</form>

View File

@@ -9,7 +9,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-1">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
</form>
@@ -54,7 +54,7 @@
% my $printer_name = $printer->key;
% my $actionRemove = qq{
% <a href="printers2?CsrfDef=$csrf_token&trt=DEL&&printer=$printer_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
% $remove_text
% </button>
% </a>

View File

@@ -37,7 +37,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -14,7 +14,7 @@
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-danger"><%= $btn %></button>
<button type="submit" class="btn btn-danger btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -6,7 +6,7 @@
<%= $c->render_to_string(inline => l('pse_DESCRIPTION')); %>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => 'ADD' %>
@@ -53,7 +53,7 @@
%my $pseudonyms_entry_name = $pseudonym->key; # pseudonyms_entry name extracted from the data structure
%$actionModify = qq{
% <a href="pseudonyms2?CsrfDef=$csrf_token&trt=UPD&pseudonym=$pseudonyms_entry_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
% $modify_text
% </button>
% </a>
@@ -66,7 +66,7 @@
%my $pseudonyms_entry_name = $pseudonym->key; # pseudonyms_entry name extracted from the data structure
%$actionRemove = qq{
% <a href="pseudonyms2?CsrfDef=$csrf_token&trt=DEL&pseudonym=$pseudonyms_entry_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
% $remove_text
% </button>
% </a>

View File

@@ -62,7 +62,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -71,7 +71,7 @@
% 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' >
% <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
% $modify_text
% </button>
% </a>

View File

@@ -85,7 +85,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -31,7 +31,7 @@
</div>
<div class="col-auto">
<button type="submit" class="btn btn-primary">Theme</button>
<button type="submit" class="btn btn-primary btn-sm">Theme</button>
</div>
</div>
</form>

View File

@@ -40,7 +40,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-danger"><%= $btn %></button>
<button type="submit" class="btn btn-danger btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -5,7 +5,7 @@
<form action="/smanager/useraccounts" method="POST">
<br>
<div>
<button type="submit" class="btn btn-primary"><%= $btn %> </button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %> </button>
</div>
</form>
@@ -63,14 +63,14 @@
% if ($useraccounts_user_name eq 'admin') {
%$actionModify = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$modify_text'>
% <button type='button' class="btn btn-primary btn-sm" title='$modify_text'>
% $modify_text
% </button>
%</a>
%};
%$actionResetPw = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWS&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$password_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$password_text' >
% $password_text
% </button>
%</a>
@@ -78,7 +78,7 @@
% } else {
%$actionModify = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$modify_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$modify_text' >
% $modify_text
% </button>
%</a>
@@ -93,14 +93,14 @@
<!-- Sets BOTH columns - possibly leave out Reset Password here?-->
%$actionLock = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
% <button type='button' class="btn btn-danger" title="$password_text - currently unset">
% <button type='button' class="btn btn-danger btn-sm" title="$password_text - currently unset">
% Unlock
% </button>
%</a>
%};
%$actionResetPw = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title="$password_text - currently unset">
% <button type='button' class="btn btn-primary btn-sm" title="$password_text - currently unset">
% $password_text
% </button>
%</a>
@@ -109,14 +109,14 @@
% } elsif ($useraccounts_user_name ne 'admin') {
%$actionLock = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$lock_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$lock_text' >
% $lock_text
% </button>
%</a>
%};
%$actionResetPw = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$password_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$password_text' >
% $password_text
% </button>
%</a>
@@ -126,7 +126,7 @@
% if ( $removable eq 'yes' ) {
%$actionRemove = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% <button type='button' class="btn btn-primary btn-sm" title='$remove_text' >
% $remove_text
% </button>
%</a>
@@ -136,7 +136,7 @@
<!-- 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 btn-sm" title='$roundcube_text' >
% $roundcube_text
% </button>
%</a>

View File

@@ -42,7 +42,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -75,7 +75,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -64,7 +64,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -279,7 +279,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -105,7 +105,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= l 'SAVE' %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= l 'SAVE' %></button>
</div>
</div>

View File

@@ -66,7 +66,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -2,10 +2,6 @@
% content_for 'module' => begin
<!-- should be moved -->
%= javascript '/js/qmailanalog.js'
<div class="card-body">
% if (config->{debug} == 1) {
@@ -60,7 +56,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -40,7 +40,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>
</form>

View File

@@ -277,7 +277,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -59,7 +59,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -106,7 +106,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -101,7 +101,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -25,7 +25,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -92,7 +92,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-1">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -44,7 +44,7 @@
<%= hidden_field 'trt' => 'UPDT' %>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-sm btn-primary"><%= $btnInUp %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btnInUp %></button>
</div>
</div>
</form>
@@ -57,7 +57,7 @@
<%= hidden_field 'trt' => 'INST' %>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-sm btn-primary"><%= $btnInAv %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btnInAv %></button>
</div>
</div>
</form>
@@ -70,7 +70,7 @@
<%= hidden_field 'trt' => 'REMO' %>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-sm btn-primary"><%= $btnInRm %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btnInRm %></button>
</div>
</div>
@@ -135,7 +135,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-sm btn-primary"><%= $btnConfig %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btnConfig %></button>
</div>
</div>

View File

@@ -149,7 +149,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-sm btn-primary"><%= $btnSave %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btnSave %></button>
</div>
</div>

View File

@@ -72,7 +72,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-sm btn-primary"><%= $btnSave %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btnSave %></button>
</div>
</div>

View File

@@ -74,7 +74,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-sm btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>

View File

@@ -45,7 +45,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<button type="submit" class="btn btn-primary btn-sm"><%= $btn %></button>
</div>
</div>