Compare commits

...

6 Commits

Author SHA1 Message Date
John Crisp
767cf3bc19 More review template fixes 2025-04-17 17:53:04 +02:00
John Crisp
dbdd5217d9 Update review template and fix typo 2025-04-17 17:27:15 +02:00
John Crisp
f516d2b759 Update review template and fix typo 2025-04-17 17:26:55 +02:00
John Crisp
4551efc1ed Remove template and update breadcrumbs 2025-04-16 20:06:58 +02:00
John Crisp
79b2e7f492 Fix remote Access remove network 2025-04-16 18:40:51 +02:00
John Crisp
93b8d4cb6f Fix form syntax issues and more cleaning 2025-04-16 18:09:49 +02:00
19 changed files with 225 additions and 244 deletions

View File

@@ -1,69 +0,0 @@
% layout 'AdminLTE' , title => "Sme server 2 - login";
% content_for 'module' => begin
<div id="" class="">
%if ( config 'debug' ) {
<p>
%= dumper $c->current_route
%if ( stash 'trt' ) {
%= dumper stash 'trt'
%}
</p>
%}
% if ( stash 'error' ) {
<br><div class="">
%= $c->render_to_string(inline => stash 'error')
</div>
%}
% my $btn = l('use_SIGNIN');
% if ( $trt eq 'RESET' ) {
<br><div class=""><h2>
%= $c->render_to_string(inline => l 'use_DESC_RESET')
</h2></div>
% $btn = l('use_RESET');
%}
<h1>
%=l 'use_TITLE'
</h1>
%= form_for '/login' => (method => 'POST') => begin
<p><span class="">
%=l 'USER_NAME'
</span><span class="">
%= text_field 'Username'
</span></p>
% if ( $trt ne 'RESET' ) {
<p><span class="">
%=l 'PASSWORD'
</span><span class="">
%= password_field 'Password', id => "", autocomplete => 'current-password', class=>""
% if (config 'hasJquery') {
%#<a href='#' id="" class=""> <img src="images/visible.png" height="16" alt="Visible"></a>
% }
</span></p>
%}
%= hidden_field 'From' => $c->tx->req->url
%= hidden_field 'Trt' => $trt
<br>
<div class="">
%= submit_button "$btn", class => ""
</div>
%if ( config 'pwdreset' ) {
<div class=""><a href='login2'>
%=l 'use_FORGOT'
</a></div>
%}
% end
</div>
%end

View File

@@ -8,7 +8,10 @@
<div class="col-sm-6">
<ol class="breadcrumb float-sm-start">
<li class="breadcrumb-item"><a href="initial">Home</a></li>
<li class="breadcrumb-item active" aria-current="page"><%= $c->current_route %></li>
<li class="breadcrumb-item active" aria-current="page">
<a href="<%= $c->stash('controller') %>"> <%= $c->stash('controller') %>
</a>
</li>
</ol>
</div>
</div>

View File

@@ -1,5 +1,5 @@
<div id="flag-container" class = "flag-style">
<div id="flag-container" class="flag-style">
<!-- class=flag-style" -->
<!-- The flag icon will be inserted here -->
</div>

View File

@@ -1,14 +1,14 @@
<div id="" class="">
<div>
<!--<HR class="">-->
<a href="https://mojolicious.org" target="_blank"><img src="images/sme-mojo-logo-white.png" style="position:relative;"></a>
<font class="">
% if ( $c->is_logged_in && $c->is_admin) {
SME Server <%= session 'releaseVersion' %>-<%= $c->app->VERSION %> Manager II
% my $mode;
% if (config->{mode} eq 'development'){ $mode = '-dev';} else { $mode = '';}
(Mojo:<%= Mojolicious->VERSION %><%= $mode %>)
% }
<br>Copyright 1999-2006 Mitel Corporation<br>
%= session 'copyRight'
<br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
<font>
% if ( $c->is_logged_in && $c->is_admin) {
SME Server <%= session 'releaseVersion' %>-<%= $c->app->VERSION %> Manager II
% my $mode;
% if (config->{mode} eq 'development'){ $mode = '-dev';} else { $mode = '';}
(Mojo:<%= Mojolicious->VERSION %><%= $mode %>)
% }
<br>Copyright 1999-2006 Mitel Corporation<br>
%= session 'copyRight'
<br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
</font>

View File

@@ -18,7 +18,7 @@
%=l 'PASSWORD_NEW', class => ""
</span>
<span class="">
%= password_field 'newPass', class => "" , class="">'sme-password'
%= password_field 'newPass', class => "" , class=> 'sme-password'
</span>
</p>
@@ -27,7 +27,7 @@
%=l 'PASSWORD_VERIFY_NEW', class => ""
</span>
<span class="">
%= password_field 'newPassVerify', class => "", class="">'sme-password'
%= password_field 'newPassVerify', class => "", class=> 'sme-password'
</span>
</p>
@@ -41,4 +41,4 @@
% end
</div>
</div>

View File

@@ -25,19 +25,19 @@
<a href='letsencryptd?trt=PARAMS' class="">
%= l('lets_CONFIG')
</a>
%#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class="">'link link2'
%#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2'
<a href='letsencryptd?trt=CHECKALLDOMAINS' class="">
%= l('lets_CHECK_ALL_DOMAINS')
</a>
%#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class="">'link link3'
%#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=> 'link link3'
<a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="">
%= l('lets_CHECK_ALL_ENABLED_DOMAINS')
</a>
%#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class="">'link link4'
%#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4'
</div>
@@ -105,7 +105,8 @@
<p>
<span class="">
%=l('lets_Not_Before')
</span><span class="">
</span>
<span class="">
% param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
%= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
<br>
@@ -148,4 +149,4 @@
%# Probably finally by a submit.
%end
</div>
</div>

View File

@@ -29,7 +29,8 @@
<p>
<span class="">
%=l('lets_SERVICE_STATUS')
</span><span class="">
</span>
<span class="">
%# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']];
% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']], $lets_data->{status});
%# param 'status' => $lets_data->{status} unless param 'status';
@@ -77,7 +78,8 @@
<p>
<span class="">
%=l('lets_API_STATUS')
</span><span class="">
</span>
<span class="">
% my @API_options = [['2' => '2']];
% param 'API' => $lets_data->{API} unless param 'API';
%= select_field 'API' => @API_options, class => ""

View File

@@ -26,7 +26,7 @@
<a href='nutupsd?trt=CONFIG' class="">
%= l('nut_Configure_NutUPS')
</a>
%#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class="">'link link1'
%#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class=> 'link link1'
</div>
@@ -53,4 +53,4 @@
%# Probably finally by a submit.
%end
</div>
</div>

View File

@@ -0,0 +1,121 @@
<div>
<table class="table table-bordered">
<thead>
<tr>
<th><%= l 'rvw_NETWORKING_PARAMS' %></th>
<th>&nbsp</th>
</tr>
</thead>
<tbody>
<tr>
<td><%= l 'rvw_SERVER_MODE' %></td>
<td><%= $rvw_datas->{servermode} %></td>
</tr>
<tr>
<td><%= l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK' %></td>
<td><%= $rvw_datas->{localip} %></td>
</tr>
% if ( $rvw_datas->{publicip} ) {
<tr>
<td><%=l 'rvw_INTERNET_VISIBLE_ADDRESS' %></td>
<td><%= $rvw_datas->{publicip} %></td>
</tr>
% }
<tr>
<td><%= l 'rvw_GATEWAY'%></td>
<td>
<%= $rvw_datas->{gateway} %>
<%= $rvw_datas->{serveronly} %>
</td>
</tr>
<tr>
<td>Local Networks (not translated?)</td>
<td><%= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );%> </td>
<tr>
<tr>
<td><%= l 'rvw_DHCP_SERVER' %></td>
<td><%= $rvw_datas->{dhcpserver} %></td>
</tr>
</tbody>
</table>
<table class="table table-bordered">
<thead>
<tr>
<th><%= l 'rvw_SERVER_NAMES' %></th>
<th>&nbsp</th>
</tr>
</thead>
<tbody>
<tr>
<td><%= l 'rvw_DNS_SERVER' %></td>
<td><%= $rvw_datas->{dnsserver} %></td>
</tr>
<tr>
<td><%= l 'rvw_WEB_SERVER' %></td>
<td><%= $rvw_datas->{webserver} %></tr>
</tr>
<tr>
<td><%= l 'rvw_PROXY_SERVER' %></td>
<td><%= $rvw_datas->{proxyserver} %></tr>
</tr>
<tr>
<td><%= l 'rvw_FTP_SERVER' %></td>
<td><%= $rvw_datas->{ftpserver} %></tr>
</tr>
<tr>
<td><%= l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS' %></td>
<td><%= $rvw_datas->{smtpserver} %></tr>
</tr>
</tbody>
</table>
<table class="table table-bordered">
<thead>
<tr>
<th><%= l 'rvw_DOMAIN_INFORMATION' %></th>
<th>&nbsp</th>
</tr>
</thead>
<tbody>
<tr>
<td><%= l 'rvw_PRIMARY_DOMAIN' %></td>
<td><%= $rvw_datas->{domainname} %></td>
</tr>
<tr>
<td><%= l 'rvw_VIRTUAL_DOMAINS' %></td>
<td><%= $rvw_datas->{virtualdomains} %></td>
</tr>
<tr>
<td><%= l 'rvw_PRIMARY_WEB_SITE' %></td>
<td><%= $rvw_datas->{primarywebsite} %></td>
</tr>
<tr>
<td><%= l 'rvw_SERVER_MANAGER' %></td>
<td><%= $rvw_datas->{servermanager} %></td>
</tr>
<tr>
<td><%= l 'rvw_USER_PASSWORD_PANEL' %></td>
<td><%= $rvw_datas->{usermanager} %></td>
</tr>
<tr>
<td><%= l 'rvw_EMAIL_ADDRESSES' %></td>
<td><%= $rvw_datas->{emailaddresses} %></td>
</tr>
</tbody>
</table>
</div>

View File

@@ -18,7 +18,7 @@
<span class="">
%=l 'PASSWORD_NEW', class => ""
</span><span class="">
%= password_field 'newPass', class => "", class="">'sme-password'
%= password_field 'newPass', class => "", class=> 'sme-password'
</span>
</p>
@@ -27,7 +27,7 @@
%=l 'PASSWORD_VERIFY_NEW', class => ""
</span>
<span class="">
%= password_field 'newPassVerify', class => "", class="">'sme-password'
%= password_field 'newPassVerify', class => "", class=> 'sme-password'
</span>
</p>
@@ -42,4 +42,4 @@
% end
</div>
</div>

View File

@@ -12,7 +12,7 @@
%=l 'usr_CURRENT_SYSTEM_PASSWORD', class => ""
</span>
<span class="">
%= password_field 'CurPass', class => "", class="">'sme-password'
%= password_field 'CurPass', class => "", class=> 'sme-password'
</span>
</p>
@@ -21,7 +21,7 @@
%=l 'usr_NEW_SYSTEM_PASSWORD', class => ""
</span>
<span class="">
%= password_field 'Pass', class => "", class="">'sme-password'
%= password_field 'Pass', class => "", class=> 'sme-password'
</span>
</p>
@@ -30,7 +30,7 @@
%=l 'usr_NEW_SYSTEM_PASSWORD_VERIFY', class => ""
</span>
<span class="">
%= password_field 'PassVerify', class => "", class="">'sme-password'
%= password_field 'PassVerify', class => "", class=> 'sme-password'
</span>
</p>

View File

@@ -29,7 +29,8 @@
<p>
<span class="">
%=l 'usr_FIRSTNAME'
</span><span class="">
</span>
<span class="">
% param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
%= text_field 'FirstName', class => ""
</span>
@@ -64,7 +65,8 @@
<p>
<span class="">
%=l 'usr_STREET_ADDRESS'
</span><span class="">
</span>
<span class="">
% param 'Street' => $usr_datas->{street} unless param 'Street';
%= text_field 'Street', class => ""
</span>
@@ -139,17 +141,19 @@
%=l 'usr_GROUP_MEMBERSHIPS'
</span>
<span class="">
<table class="tabel table-bordered">
<table class="table table-bordered">
<thead>
<tr><th class="">
<tr>
<th class="">
%=l 'usr_MEMBER'
</th><th class="">
%=l 'GROUP'
</th><th class="">
%=l 'DESCRIPTION'
</th>
</tr>
</thead><tbody>
</tr>
</thead>
<tbody>
% foreach my $g ( @groups) {
% my $user = $usr_datas->{user};

View File

@@ -19,7 +19,8 @@
<br><br>
<span class="">
%=l 'prx_HTTP_PROXY_STATUS_LABEL'
</span><span class="">
</span>
<span class="">
% param 'http_proxy_status' => $prx_datas->{http_proxy_status} unless param 'http_proxy_status';
%= select_field 'http_proxy_status' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => "", id => ""
</span>

View File

@@ -1,7 +1,7 @@
% layout 'AdminLTE', title => "Sme server 2 - qmailanalog";
% content_for 'module' => begin
%= javascript '/js/qmailanalog.js'
<div id="" class="">
<div>
%if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
@@ -15,7 +15,8 @@
<p>
<span class="">
%=l 'qma_REPORT_TYPE'
</span><span class="">
</span>
<span class="">
<!-- (to be sorted) -->
%= select_field 'report_type' => $c->reportType_list(), id => ""
</span>
@@ -25,7 +26,8 @@
<div id="">
<span class="">
%= label_for message_id => 'Message ID:'
</span><span class="">
</span>
<span class="">
%= text_field 'message_id', placeholder => 'Enter Postfix Message ID', id => ""
</span>
</div>
@@ -33,7 +35,8 @@
<div id="">
<span class="">
%= label_for email_address => 'Email Address:'
</span><span class="">
</span>
<span class="">
%= email_field 'email_address', placeholder => 'Enter email address', id => ""
</span>
</div>

View File

@@ -91,7 +91,9 @@
%= t td => (class => "") => $net
%= t td => (class => "") => $mask
%= t td => (class => "") => $numhosts
<td class=""><input type='checkbox' name='Remote_nets' value='<%= $net.'/'.$mask %>'> </td>
<td class="">
<input type='checkbox' name='Remove_nets' value='<%= $net.'/'.$mask %>'>
</td>
</tr>
% }
@@ -111,7 +113,8 @@
<br><br>
<span class="">
%=l 'NETWORK'
</span><span class="">
</span>
<span class="">
%= text_field 'ValidFromNetwork', class => ""
</span>
<br>
@@ -225,4 +228,4 @@
</div>
% end
% end

View File

@@ -1,137 +1,32 @@
% layout 'AdminLTE', title => 'Sme server 2 - Review';
% content_for 'module' => begin
<div id="" class="">
<h1> <%= $title %> </h1>
<%= $modul %><br><br>
%= form_for 'review' => begin
<b>
%=l 'rvw_NETWORKING_PARAMS'
</b><br>
%#= include 'partials/_panel_card_top'
%#= include 'partials/_panel_card_header'
<div>
<h1> <%= $title %> </h1>
<!-- Header text -->
%= $modul
<p><span class="">
%=l 'rvw_SERVER_MODE'
</span>
%= $rvw_datas->{servermode}
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $rvw_datas
</p>
<p><span class="">
%=l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK'
</span>
%= $rvw_datas->{localip}
</p>
% if ( $rvw_datas->{publicip} ) {
<p><span class="">
%=l 'rvw_INTERNET_VISIBLE_ADDRESS'
</span>
%= $rvw_datas->{publicip}
</p>
% }
<p><span class="">
%=l 'rvw_GATEWAY'
</span>
%= $rvw_datas->{gateway}
%= $rvw_datas->{serveronly}
</p>
<p><table width='100%'><tr><td class=""><!--span class="">
%=l 'rvw_ADDITIONAL_LOCAL_NETWORKS'
<!--/span--></td><td>
%= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );
</td></tr></table>
</p>
<p><table width='100%'><tr><td class="">
<!--<p><span class="">-->
%=l 'rvw_DHCP_SERVER'
<!--</span>-->
</td><td>
%= $rvw_datas->{dhcpserver}
<!--</p>-->
</td></tr></table></p>
<br><br>
<br><br><b>
%=l 'rvw_SERVER_NAMES'
</b><br>
<p><span class="">
%=l 'rvw_DNS_SERVER'
</span>
%= $rvw_datas->{dnsserver}
</p>
<p><span class="">
%=l 'rvw_WEB_SERVER'
</span>
%= $rvw_datas->{webserver}
</p>
<p><span class="">
%=l 'rvw_PROXY_SERVER'
</span>
%= $rvw_datas->{proxyserver}
</p>
<p><span class="">
%=l 'rvw_FTP_SERVER'
</span>
%= $rvw_datas->{ftpserver}
</p>
<p><span class="">
%=l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS'
</span>
%= $rvw_datas->{smtpserver}
</p>
<br><br><b>
%=l 'rvw_DOMAIN_INFORMATION'
</b><br>
<p><span class="">
%=l 'rvw_PRIMARY_DOMAIN'
</span>
%= $rvw_datas->{domainname}
</p>
<!---<p><span class="">-->
<p><table width='100%'><tr><td class="">
%=l 'rvw_VIRTUAL_DOMAINS'
</td><td>
<!--</span>-->
%= $rvw_datas->{virtualdomains}
</td></tr></table></p>
<!--</p>-->
<p><span class="">
%=l 'rvw_PRIMARY_WEB_SITE'
</span>
%= $rvw_datas->{primarywebsite}
</p>
<p><span class="">
%=l 'rvw_SERVER_MANAGER'
</span>
%= $rvw_datas->{servermanager}
</p>
<p><span class="">
%=l 'rvw_USER_PASSWORD_PANEL'
</span>
%= $rvw_datas->{usermanager}
</p>
<p><table width='100%'><tr><td class="">
%=l 'rvw_EMAIL_ADDRESSES'
</td><td>
%= $rvw_datas->{emailaddresses}
</td></tr></table></p>
% end
%= include 'partials/_rvw_content'
</div>
%#= include 'partials/_panel_card_footer'
%#= include 'partials/_panel_card_bottom'
% end

View File

@@ -53,7 +53,7 @@
%= l 'pwd_PASSWORD_OLD'
</span>
<span class="">
%= password_field 'Oldpass', class => "", class="">'sme-password'
%= password_field 'Oldpass', class => "", class=> 'sme-password'
</span>
<br><br>
</p>
@@ -64,7 +64,7 @@
%=l 'pwd_PASSWORD_NEW'
</span>
<span class="">
%= password_field 'Pass', class => "", class="">'sme-password'
%= password_field 'Pass', class => "", class=> 'sme-password'
</span>
<br><br>
</p>
@@ -74,7 +74,7 @@
%=l 'pwd_PASSWORD_VERIFY_NEW'
</span>
<span class="">
%= password_field 'Passverify', class => "", class="">'sme-password'
%= password_field 'Passverify', class => "", class=> 'sme-password'
</span>
<br><br>
</p>

View File

@@ -22,13 +22,15 @@
%=l 'yum_DESC_AVAILABLE_UPDATES'
<p><span class="">
<p>
<span class="">
%=l 'yum_LABEL_AVAILABLE_UPDATES'
</span>
<span class="">
% param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages';
%= select_field 'SelectedPackages' => $c->get_options2('updates', 'package'), class => "", multiple => "1"
</span></p>
</span>
</p>
<!-- $c->print_skip_header() -->

View File

@@ -1,6 +1,6 @@
%define name smeserver-manager-AdminLTE
%define version 11.0.0
%define release 3
%define release 7
Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
Name: %{name}
Version: %{version}
@@ -26,6 +26,21 @@ AdminLTE is an html framework for admin consoles
wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
%changelog
* Thu Apr 17 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-7.sme
- Clean up review template (but footer in the wrong place)
- Fix typo tabel
* Wed Apr 16 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-6.sme
- Remove old template
- Update breadcrumbs
* Wed Apr 16 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-5.sme
- Fix Remote Access remove network
* Wed Apr 16 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-4.sme
- More template cleaning
- Fix Password syntax errors
* Tue Apr 15 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-3.sme
- Finish template tidy