diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep index 4d40a4f..efdb307 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep @@ -5,94 +5,127 @@
% if (config->{debug} == 1) { -

- (DBG)route: <%= $c->current_route %>
- (DBG)trt: <%= $bugr_datas->{trt} %>
-

+
+ (DBG)route: <%= $c->current_route %>
+ (DBG)trt: <%= $bugr_datas->{trt} %>
+
% } - +

<%= $title %>

- - - %=l ('bugr_DO_NOT_PANIC') - -

- %=l ('bugr_SME_EXPERIENCE') -

-

- %=l ('bugr_USE_TEMPLATE') -: https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs. -

-

- %=l ('bugr_PLEASE_REPORT_HERE') -: https://bugs.koozali.org. -

-

- %=l ('bugr_FOLLOWING_REPORT_MIGHT_HELP') -

-

- %=l ('bugr_REPORT_CONTENT') -
+
+

<%= l ('bugr_DO_NOT_PANIC') %>

+
+
+ <%= l ('bugr_SME_EXPERIENCE') %> +
+
+
+ <%= l ('bugr_USE_TEMPLATE') %> + : https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs +
+
+
+ <%= l ('bugr_PLEASE_REPORT_HERE') %> + : https://bugs.koozali.org +
+
+
+ <%= l ('bugr_FOLLOWING_REPORT_MIGHT_HELP') %> +
+
+
+ <%= l ('bugr_REPORT_CONTENT') %> +

- %=l ('bugr_PRIVACY') -

- - <% my $btn = l('bugr_CREATE_REPORT'); %> - - %= form_for 'bugreport' => (method => 'POST') => begin - %= submit_button "$btn", class => "" - % end - -

- %=l ('bugr_DONATING') - -

- %=l ('bugr_AWARE_SME') -

- - %=l ('bugr_YOUR_HELP') - -

- %=l ('bugr_CONSIDER_DONATING') -

-

- - %= link_to 'https://wiki.koozali.org/Donate' => begin - %= image '/images/btn_donateCC_LG.gif' - - %= hidden_field 'trt' => $bugr_datas->{trt} - - % end +

- %=l ('bugr_THANK_YOU') + +
+ <%= l ('bugr_PRIVACY') %> +
+ +
+ + % my $btn = l('bugr_CREATE_REPORT'); + + +
+
+
+ +
+
+ <%= hidden_field 'trt' => $bugr_datas->{trt} %> +
+ +
+ +
+ + <%= l ('bugr_DONATING') %> + +

+ <%= l ('bugr_AWARE_SME') %> +

+ + <%= l ('bugr_YOUR_HELP') %> + +

+ <%= l ('bugr_CONSIDER_DONATING') %> +

+
+ +
+ +
+ + + +
+ +
+ +
+ Donate + +
+ + +
+
+ <%= l ('bugr_THANK_YOU') %> +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep index 283a6af..95f3ce4 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep @@ -5,10 +5,10 @@
% if (config->{debug} == 1) { -

- (DBG)route: <%= $c->current_route %>
- (DBG)trt: <%= $bugr_datas->{trt} %>
-

+
+ (DBG)route: <%= $c->current_route %>
+ (DBG)trt: <%= $bugr_datas->{trt} %>
+
% }

<%= $title %>

@@ -17,17 +17,25 @@ <% my $btn = l('bugr_Download this report'); %> - %= form_for 'bugreportD' => (method => 'POST') => begin - %= submit_button "$btn", class => "" - %= hidden_field 'trt' => $bugr_datas->{trt} - % end - +
+
+
+ +
+
+ <%= hidden_field 'trt' => $bugr_datas->{trt} %> +
+ + + % my $out = "==================
"; % $out .= "Boot anaysis image (right click and save image to download)
"; % $out .= "==================
"; % $out .= "boot timing image"; - -
<%= $c->render_to_string(inline=>$out) %>
+ +
+ <%= $c->render_to_string(inline=>$out) %> +

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep index 3bd1ef1..1c084f2 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep @@ -21,7 +21,7 @@ %= include 'common_js' %= include 'common_css' - + @@ -57,7 +57,7 @@ @@ -112,23 +112,23 @@ - +
@@ -142,10 +142,10 @@
- + - +
@@ -153,16 +153,16 @@ %= include 'partials/_app_content_breadcrumb' - + - + - + - + - + @@ -171,17 +171,17 @@ %= include 'partials/_panel_card_top' %= include 'partials/_panel_card_header' % } - + %= content 'module' % if ($c->current_route ne 'login') { %= include 'partials/_panel_card_footer' %= include 'partials/_panel_card_bottom' - % } + % }
- + diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep index 006da19..e88bdbf 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep @@ -64,13 +64,13 @@ tell me if you find this! - <%=$c->l("ln_REMOVE_HOSTS_DESC") %> + <%= $c->l("ln_REMOVE_HOSTS_DESC") %>
<%= $c->l("ln_REMOVE_HOSTS_LABEL") %> - <%=check_box deletehost=>1, checked=>1 %> + <%= check_box deletehost=>1, checked=>1 %>

% } diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_rvw_content.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_rvw_content.html.ep index 6d814c8..8c64fdd 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_rvw_content.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_rvw_content.html.ep @@ -2,8 +2,8 @@ - - + + @@ -11,19 +11,19 @@ - + - + % if ( $rvw_datas->{publicip} ) { - + % } - + - + - +
<%= l 'rvw_NETWORKING_PARAMS' %> <%= l 'rvw_NETWORKING_PARAMS' %> 
<%= l 'rvw_SERVER_MODE' %> <%= $rvw_datas->{servermode} %>
<%= l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK' %> <%= $rvw_datas->{localip} %>
<%=l 'rvw_INTERNET_VISIBLE_ADDRESS' %> <%= $rvw_datas->{publicip} %>
<%= l 'rvw_GATEWAY'%> @@ -31,24 +31,24 @@ <%= $rvw_datas->{serveronly} %>
Local Networks (not translated?) <%= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );%>
<%= l 'rvw_DHCP_SERVER' %> <%= $rvw_datas->{dhcpserver} %>
- + - - + + @@ -56,34 +56,34 @@ - + - + - + - +
<%= l 'rvw_SERVER_NAMES' %> <%= l 'rvw_SERVER_NAMES' %> 
<%= l 'rvw_DNS_SERVER' %> <%= $rvw_datas->{dnsserver} %>
<%= l 'rvw_WEB_SERVER' %> <%= $rvw_datas->{webserver} %>
<%= l 'rvw_PROXY_SERVER' %> <%= $rvw_datas->{proxyserver} %>
<%= l 'rvw_FTP_SERVER' %> <%= $rvw_datas->{ftpserver} %>
<%= l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS' %> <%= $rvw_datas->{smtpserver} %>
- + - - + + @@ -91,7 +91,7 @@ - + @@ -100,22 +100,22 @@ - + - + - + - +
<%= l 'rvw_DOMAIN_INFORMATION' %> <%= l 'rvw_DOMAIN_INFORMATION' %> 
<%= l 'rvw_PRIMARY_DOMAIN' %> <%= $rvw_datas->{domainname} %>
<%= l 'rvw_VIRTUAL_DOMAINS' %> <%= $rvw_datas->{virtualdomains} %><%= l 'rvw_PRIMARY_WEB_SITE' %> <%= $rvw_datas->{primarywebsite} %>
<%= l 'rvw_SERVER_MANAGER' %> <%= $rvw_datas->{servermanager} %>
<%= l 'rvw_USER_PASSWORD_PANEL' %> <%= $rvw_datas->{usermanager} %>
<%= l 'rvw_EMAIL_ADDRESSES' %> <%= $rvw_datas->{emailaddresses} %>
\ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep index fcf8943..aea2b7a 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep @@ -1,4 +1,5 @@ % layout 'AdminLTE', title => "Sme server 2 - qmailanalog"; + % content_for 'module' => begin @@ -7,46 +8,64 @@
- %if (config->{debug} == 1) { -

- (DBG)route: <%= $c->current_route %>
-

- %} + % if (config->{debug} == 1) { +
+ (DBG)route: <%= $c->current_route %>
+
+ % } +

<%= $title %>


+ <%= $modul %> - <% my $btn = l('qma_GENERATE_REPORT'); %> - %= form_for 'qmailanalog' => (method => 'POST') => begin -

- - %=l 'qma_REPORT_TYPE' - - - - %= select_field 'report_type' => $c->reportType_list(), id => "" - -

+ <% my $btn = l('qma_GENERATE_REPORT'); %> + + +
+ +
+
+ +
+
+ + <%= select_field 'report_type' => $c->reportType_list(), class => "form-select", id => "analysis_type" %> +
+
+ +
-
- - %= label_for message_id => 'Message ID:' - - - %= text_field 'message_id', placeholder => 'Enter Postfix Message ID', id => "" - +
+
+ +
+
+ +
-
- - %= label_for email_address => 'Email Address:' - - - %= email_field 'email_address', placeholder => 'Enter email address', id => "" - +
+ +
+
+ +
+
+ +
- %= submit_button "$btn", class => "" - % end +
+ +
+
+ +
+
+ + +
+ %end \ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep index 3324ff7..62c576f 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep @@ -5,70 +5,108 @@
%if (config->{debug} == 1) { -

- (DBG)route: <%= $c->current_route %>
-

- %} +
+ (DBG)route: <%= $c->current_route %>
+
+ % } +

<%= $title %>

+
+ <%= $notif %> - <% my $btn = l('NEXT'); %> - %= form_for 'viewlogfiles' => (method => 'POST') => begin -

- %=l 'log_FIRSTPAGE_DESC' -
- - %=l 'log_LOG_FILE_SELECT_DESC' - - - % param 'Filename' => 'messages'; - - %= select_field 'Filename' => $c->findlogFiles(), class => "" - -

+ <% my $btn = l('NEXT'); %> -

- %=l 'log_FILTER_PATTERN_DESC' -
- - %=l 'log_FILTER_PATTERN_LABEL' - - - %= text_field 'Matchpattern', class => "" - -

-

- %=l 'log_MATCH_PATTERN_DESC' -
- - %=l 'log_MATCH_PATTERN_LABEL' - - - %= text_field 'Highlightpattern', class => "" - -

+
-

- %=l 'log_OP_DESC' -
- - %=l 'log_OP_LABEL' - - - %if ($log_datas->{'default_op'} eq 'download') { - % param 'Operation' => 'download'; - %} - %= select_field 'Operation' => [[(l 'log_VIEW') => 'view'],[(l 'DOWNLOAD') => 'download']], class => "" - -

+
+ <%=l 'log_FIRSTPAGE_DESC' %> +
-

- %=l 'log_END_DESC' -

+
+ +
+
+ +
+
+ % param 'Filename' => 'messages'; + + %= select_field 'Filename' => $c->findlogFiles(), class => "form-select", id => "LogFileSelect" +
+
+ +
+ +
+ <%= l 'log_FILTER_PATTERN_DESC' %> +
+ +
+ +
+
+ +
+
+ +
+
+ + +
+ +
+ <%= l 'log_MATCH_PATTERN_DESC' %> +
+ +
+ +
+
+ +
+
+ +
+
+ +
+ +
+ <%= l 'log_OP_DESC' %> +
+ +
+ +
+
+ +
+
+ %if ($log_datas->{'default_op'} eq 'download') { + % param 'Operation' => 'download'; + % } + %= select_field 'Operation' => [[(l 'log_VIEW') => 'view'],[(l 'DOWNLOAD') => 'download']], class => "form-select", id => "LogOperation" +
+
+ +
+ +
+ <%= l 'log_END_DESC' %> +
+ +
+
+ +
+
+ +
- %= submit_button "$btn", class => "" - % end
+ %end diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep index fa0139e..91f3eec 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep @@ -5,28 +5,37 @@
% if (config->{debug} == 1) { -

- (DBG)route: <%= $c->current_route %>
- (DBG)trt: <%= $log_datas->{trt} %>
-

+
+ (DBG)route: <%= $c->current_route %>
+ (DBG)trt: <%= $log_datas->{trt} %>
+
% }

<%= $title %>

-
<%= $modul %>
+
+ + <%= $modul %> + +
-

<% my $btn = l('log_REFRESH'); %> - %= form_for 'viewlogfilesr' => (method => 'POST') => begin - %= submit_button "$btn", class => "" - %= hidden_field 'trt' => $log_datas->{trt} - %= hidden_field 'Filename' => $log_datas->{filename} - %= hidden_field 'Matchpattern' => $log_datas->{matchpattern} - %= hidden_field 'Highlightpattern' => $log_datas->{highlightpattern} - %= hidden_field 'Operation' => $log_datas->{operation} - % end -

+
+ +
+
+ +
+
+ + %= hidden_field 'trt' => $log_datas->{trt} + %= hidden_field 'Filename' => $log_datas->{filename} + %= hidden_field 'Matchpattern' => $log_datas->{matchpattern} + %= hidden_field 'Highlightpattern' => $log_datas->{highlightpattern} + %= hidden_field 'Operation' => $log_datas->{operation} +
+
%end diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index a48fc08..0f4b163 100644 --- a/smeserver-manager-AdminLTE.spec +++ b/smeserver-manager-AdminLTE.spec @@ -1,6 +1,6 @@ %define name smeserver-manager-AdminLTE %define version 11.0.0 -%define release 24 +%define release 25 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Name: %{name} Version: %{version} @@ -26,6 +26,9 @@ AdminLTE is an html framework for admin consoles wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip %changelog +* Tue May 20 2025 John Crisp 11.0.0-25.sme +- Log files - Bug reports - Config reports + * Mon May 19 2025 John Crisp 11.0.0-24.sme - Local Networks and a few odd tidies