diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep index fa86833..62117c1 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep @@ -5,117 +5,141 @@
% if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $yum_datas -

+ 
+            <%= dumper $c->current_route %>
+            <%= dumper $yum_datas %>
+
% } - +

<%= $title%>

% if ( $notif ) { -
- - %= $notif - - %} +
+
+ <%= $notif %> +
+
+ % } % if ( $c->is_empty('updates') ) { -
-

- %=l 'yum_TITLE_UPTODATE' -

- %=l 'yum_DESC_UPTODATE' -
-
- %} +
+
+

<%=l 'yum_TITLE_UPTODATE' %>

+
+ <%=l 'yum_DESC_UPTODATE' %> +
+
+ % } % if ( $c->non_empty('updates') ) { -
-
-

- %=l 'yum_TITLE_UPDATES_AVAILABLE' -

- %=l 'yum_DESC_UPDATES_AVAILABLE' -
-
+
+
+

<%= l 'yum_TITLE_UPDATES_AVAILABLE' %>

+ <%= l 'yum_DESC_UPDATES_AVAILABLE' %> +
+
- %= form_for 'yum' => (method => 'POST') => begin - %= hidden_field 'trt' => 'UPDT' - %= submit_button $c->l('yum_BUTTON_INSTALL_UPDATES'), class => "" - % end - %} +
+ % my $btnInUp = $c->l('yum_BUTTON_INSTALL_UPDATES'); + <%= hidden_field 'trt' => 'UPDT' %> +
+
+ +
+
+
+ % } % if ( $c->non_empty('available') ) { - %= form_for 'yum' => (method => 'POST') => begin -
- %= hidden_field 'trt' => 'INST' - %= submit_button $c->l('yum_BUTTON_INSTALL_AVAILABLE'), class => "" - % end - %} +
+
+ % my $btnInAv = $c->l('yum_BUTTON_INSTALL_AVAILABLE'); + <%= hidden_field 'trt' => 'INST' %> +
+
+ +
+
+
+ % } % if ( $c->non_empty('installed') ) { - %= form_for 'yum' => (method => 'POST') => begin -
- %= hidden_field 'trt' => 'REMO' - %= submit_button $c->l('yum_BUTTON_REMOVE'), class => "" - % end - %} +
+
+ % my $btnInRm = $c->l('yum_BUTTON_REMOVE'); + <%= hidden_field 'trt' => 'REMO' %> +
+
+ +
+
+ % } + +
+ +
- %= form_for 'yum' => (method => 'POST') => begin +
-

- - %=l 'yum_LABEL_YUM_STATUS' - - - %= $c->get_status('status', 'localise') - -

+
+
+ <%= l 'yum_LABEL_YUM_STATUS' %> +
+
+ <%= $c->get_status('status', 'localise') %> +
+
-

- - %=l 'yum_LABEL_YUM_PACKAGEFUNCTIONS' - - - %= $c->get_status('PackageFunctions', 'localise') - -

+
+
+ <%= l 'yum_LABEL_YUM_PACKAGEFUNCTIONS' %> +
+
+ <%= $c->get_status('PackageFunctions', 'localise') %> +
+
-

- - %=l 'yum_LABEL_YUM_DELTARPMPROCESS' - - - %= $c->get_status('DeltaRpmProcess', 'localise') - -

+
+
+ <%= l 'yum_LABEL_YUM_DELTARPMPROCESS' %> +
+
+ <%= $c->get_status('DeltaRpmProcess', 'localise') %> +
+
-

- - %=l 'yum_LABEL_YUM_DOWNLOADONLY' - - - %= $c->get_status('DownloadOnly', 'localise') - -

+
+
+ <%= l 'yum_LABEL_YUM_DOWNLOADONLY' %> +
+
+ <%= $c->get_status('DownloadOnly', 'localise') %> +
+
-

- - %=l 'yum_LABEL_YUM_AUTOINSTALLUPDATES' - - - %= $c->get_status('AutoInstallUpdates', 'localise') - -

+
+
+ <%= l 'yum_LABEL_YUM_AUTOINSTALLUPDATES' %> +
+
+ <%= $c->get_status('AutoInstallUpdates', 'localise') %> +
+
- %= hidden_field 'trt' => 'CONF' -
- %= submit_button $c->l('yum_BUTTON_CONFIGURATION'), class => "" +
- % end + % my $btnConfig = $c->l('yum_BUTTON_CONFIGURATION'); + <%= hidden_field 'trt' => 'CONF' %> + +
+
+ +
+
+ +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep index 5023cc0..686a8fb 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep @@ -5,105 +5,157 @@
% if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $yum_datas -

+ 
+            <%= dumper $c->current_route %>
+            <%= dumper $yum_datas %>
+
% } - + +

<%= $title%>

% if ( $notif ) { -
-
- %= $notif -
- %} +
+
+ <%= $notif %> +
+
+ % } - %= form_for 'yumd' => (method => 'POST') => begin -

- - %=l 'yum_LABEL_YUM_STATUS' - - - % param 'yum_check4updates' => $c->get_status('check4updates') unless param 'yum_check4updates'; - %= select_field 'yum_check4updates' => $c->get_check_freq_opt() - -

+
-
- %=l 'yum_DESC_YUM_PACKAGEFUNCTIONS' +
+
+ <%= l 'yum_LABEL_YUM_STATUS' %> +
+
+ % param 'yum_check4updates' => $c->get_status('check4updates') unless param 'yum_check4updates'; + <%= select_field 'yum_check4updates' => $c->get_check_freq_opt(), class => "form-select" %> +
+
-

- - %=l 'yum_LABEL_YUM_PACKAGEFUNCTIONS' - - - % param 'yum_PackageFunctions' => $c->get_status('PackageFunctions') unless param 'yum_PackageFunctions'; - %= select_field 'yum_PackageFunctions' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']] - -

+
-
- %=l 'yum_DESC_ENABLED_REPOSITORIES' + <%= l 'yum_DESC_YUM_PACKAGEFUNCTIONS' %> -

- - %=l 'yum_LABEL_ENABLED_REPOSITORIES' - - - % param 'SelectedRepositories' => $c->get_repository_current_options() unless param 'SelectedRepositories'; - %= select_field 'SelectedRepositories' => $c->get_repository_options2(), class => "", multiple => '1' - -

+

-
- %=l 'yum_DESC_YUM_DELTARPMPROCESS' +
+
+ <%= l 'yum_LABEL_YUM_PACKAGEFUNCTIONS' %> +
+
+ % param 'yum_PackageFunctions' => $c->get_status('PackageFunctions') unless param 'yum_PackageFunctions'; + <%= select_field 'yum_PackageFunctions' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']], class => "form-select" %> +
+
-

- - %=l 'yum_LABEL_YUM_DELTARPMPROCESS' - - - % param 'yum_DeltaRpmProcess' => $c->get_status('DeltaRpmProcess') unless param 'yum_DeltaRpmProcess'; - %= select_field 'yum_DeltaRpmProcess' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']] - -

+
-
- %=l 'yum_DESC_YUM_DOWNLOADONLY' + <%= l 'yum_DESC_ENABLED_REPOSITORIES' %> -

- - %=l 'yum_LABEL_YUM_DOWNLOADONLY' - - - % param 'yum_DownloadOnly' => $c->get_status('DownloadOnly') unless param 'yum_DownloadOnly'; - %= select_field 'yum_DownloadOnly' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']] - -

+

-
- %=l 'yum_DESC_YUM_AUTOINSTALLUPDATES' +
-

- - %=l 'yum_LABEL_YUM_AUTOINSTALLUPDATES' - - - % param 'yum_AutoInstallUpdates' => $c->get_status('AutoInstallUpdates') unless param 'yum_AutoInstallUpdates'; - %= select_field 'yum_AutoInstallUpdates' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']] - -

- %= hidden_field 'trt' => 'CONF' -
- - %= submit_button $c->l('SAVE'), class => "" - - % end +
+
+ <%= l 'yum_LABEL_ENABLED_REPOSITORIES' %> +
+
+ % param 'SelectedRepositories' => $c->get_repository_current_options() unless param 'SelectedRepositories'; + + <%= select_field 'SelectedRepositories' => $c->get_repository_options2(), multiple => '1', size => "16", class => "form-select" %> +
+
+ +
+ <%= dumper $c->get_repository_options2() %> +
+ <%= dumper $c->get_repository_current_options () %> +
+ <%= dumper $c->every_param('SelectedRepositories') %> +
+ + + %# my @repo (); + %# my %repositories = $c->get_repository_options2(); + <%#= dumper %repositories %> + + %# foreach my @repository (keys %$repositories) { + <%#= dumper @repository %> +
+ %# my $repoName = $_->{Name}; + %# my $repoStatus = $_ -> {Status}; + %# } + + + +
+ + <%= l 'yum_DESC_YUM_DELTARPMPROCESS' %> + +

+ +
+
+ <%= l 'yum_LABEL_YUM_DELTARPMPROCESS' %> +
+
+ % param 'yum_DeltaRpmProcess' => $c->get_status('DeltaRpmProcess') unless param 'yum_DeltaRpmProcess'; + <%= select_field 'yum_DeltaRpmProcess' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']], class => "form-select" %> +
+
+ +
+ + <%= l 'yum_DESC_YUM_DOWNLOADONLY' %> + +

+ +
+
+ <%= l 'yum_LABEL_YUM_DOWNLOADONLY' %> +
+
+ % param 'yum_DownloadOnly' => $c->get_status('DownloadOnly') unless param 'yum_DownloadOnly'; + <%= select_field 'yum_DownloadOnly' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']], class => "form-select" %> +
+
+ +
+ + <%= l 'yum_DESC_YUM_AUTOINSTALLUPDATES' %> + +

+ +
+
+ <%= l 'yum_LABEL_YUM_AUTOINSTALLUPDATES' %> +
+
+ % param 'yum_AutoInstallUpdates' => $c->get_status('AutoInstallUpdates') unless param 'yum_AutoInstallUpdates'; + <%= select_field 'yum_AutoInstallUpdates' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']], class => "form-select" %> +
+
+ +
+ + % my $btnSave = $c->l('SAVE'); + <%= hidden_field 'trt' => 'CONF' %> + +
+
+ +
+
+ +
+ +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep index 2dea9d0..f70fd2c 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep @@ -5,61 +5,79 @@
% if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $yum_datas -

+ 
+            <%= dumper $c->current_route %>
+            <%= dumper $yum_datas %>
+
% } - +

<%= $title%>

% if ( $notif ) { -
-
- %= $notif -
- %} -
+
+
+ <%= $notif %> +
+
+ % } - %= form_for 'yumd' => (method => 'POST') => begin +
- %=l 'yum_HEADER_AVAILABLE_SOFTWARE' -

- % if ($c->non_empty('available','group')) { - %=l 'yum_DESC_AVAILABLE_GROUPS' -

- - %=l 'yum_LABEL_AVAILABLE_GROUPS' - - - % param 'SelectedGroups' => $c->get_names2('updates','group') unless param 'SelectedGroups'; - %= select_field 'SelectedGroups' => $c->get_options2('available', 'group'), class => "", multiple => "1" - -

- %} -
- % if ($c->non_empty('available','packages')) { - %=l 'yum_DESC_AVAILABLE_PACKAGES' -

- - %=l 'yum_LABEL_AVAILABLE_PACKAGES' - - - % param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages'; - %= select_field 'SelectedPackages' => $c->get_options2('available', 'package'), class => "", multiple => "1" - -

- %} + <%= l 'yum_HEADER_AVAILABLE_SOFTWARE' %> - +

- %= hidden_field 'trt' => 'INST' -

- - %= submit_button $c->l('yum_INSTALL_SOFTWARE'), class => "" - + % if ($c->non_empty('available','group')) { + + <%=l 'yum_DESC_AVAILABLE_GROUPS' %> + +

+ +
+
+ <%= l 'yum_LABEL_AVAILABLE_GROUPS' %> +
+
+ % param 'SelectedGroups' => $c->get_names2('updates','group') unless param 'SelectedGroups'; + <%= select_field 'SelectedGroups' => $c->get_options2('available', 'group'), class => "form-select", size => "10", multiple => "1" %> +
+
+ % } + +

+ + % if ($c->non_empty('available','packages')) { + + <%= l 'yum_DESC_AVAILABLE_PACKAGES' %> + +

+ +
+
+ <%=l 'yum_LABEL_AVAILABLE_PACKAGES' %> +
+
+ % param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages'; + %= select_field 'SelectedPackages' => $c->get_options2('available', 'package'), class => "form-select", size => "10", multiple => "1" +
+
+ + % } + + +
+ <%= hidden_field 'trt' => 'INST' %> + % my $btnSave = $c->l('yum_INSTALL_SOFTWARE'); + + +
+
+ +
+
+ +
- % end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep index 84afe34..c3362a6 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep @@ -9,35 +9,39 @@
% if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $yum_datas -

+ 
+            <%= dumper $c->current_route %>
+            <%= dumper $yum_datas %>
+
% } - +

<%= $title%>

% if ( $notif ) { +
+
+ <%= $notif %> +
+
+ % } + +
+
-
- %= $notif -
- %} +

Please Wait - Yum Running (<%= $c->get_yum_status_page() %>)

- %= form_for 'yum' => (method => 'POST') => begin - -

Please Wait - Yum Running (<%= $c->get_yum_status_page() %>)

<%= $c->render_to_string(inline => $c->format_yum_log()) %> %= hidden_field 'trt' => 'LOGF' +
- + - % end +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yumremove.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yumremove.html.ep index 5fc6f97..8450aa3 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/yumremove.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumremove.html.ep @@ -1,62 +1,84 @@ -% layout 'AdminLTE', title => "Sme server 2 - yum_update"; +% layout 'AdminLTE', title => "Sme server 2 - yum_remove"; % content_for 'module' => begin
% if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $yum_datas -

+ 
+            <%= dumper $c->current_route %>
+            <%= dumper $yum_datas %>
+
% }

<%= $title%>

-
% if ( $notif ) { -
- %= $notif -
- %} +
+
+ <%= $notif %> +
+
+ % } - %= form_for 'yumd' => (method => 'POST') => begin +
- %=l 'yum_HEADER_INSTALLED_SOFTWARE' + <%= l 'yum_HEADER_INSTALLED_SOFTWARE' %> -
- % if ($c->non_empty('installed','group')) { - %=l 'yum_DESC_INSTALLED_GROUPS' -

- - %=l 'yum_LABEL_INSTALLED_GROUPS' - - - %= select_field 'SelectedGroups' => $c->get_options2('installed', 'group'), class => "", multiple => "1" -

- %} -
- % if ($c->non_empty('installed','packages')) { - %=l 'yum_DESC_INSTALLED_PACKAGES' -

- - %=l 'yum_LABEL_INSTALLED_PACKAGES' - - - %= select_field 'SelectedPackages' => $c->get_options2('installed', 'package'), class => "", multiple => "1" - -

- %} +
- + % if ($c->non_empty('installed','group')) { - %= hidden_field 'trt' => 'REMO' -
- - %= submit_button $c->l('REMOVE'), class => "" - + <%=l 'yum_DESC_INSTALLED_GROUPS' %> - % end +

+ +
+
+ <%= l 'yum_LABEL_INSTALLED_GROUPS' %> +
+
+ %# param 'SelectedGroups' => $c->get_names2('updates','group') unless param 'SelectedGroups'; + <%= select_field 'SelectedGroups' => $c->get_options2('installed', 'group'), class => "form-select", size => "10", multiple => "1" %> +
+
+ % } + +

+ + % if ($c->non_empty('installed','packages')) { + + <%= l 'yum_DESC_INSTALLED_PACKAGES' %> + +

+ +
+
+ <%=l 'yum_LABEL_INSTALLED_PACKAGES' %> +
+
+ %# param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages'; + %= select_field 'SelectedPackages' => $c->get_options2('installed', 'package'), class => "form-select", size => "10", multiple => "1" +
+
+ + % } + + + + + +
+ <%= hidden_field 'trt' => 'REMO' %> + % my $btn = $c->l('REMOVE'); + +
+
+ +
+
+ +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep index ebc3b7f..8de6c6a 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep @@ -5,43 +5,52 @@
% if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $yum_datas -

+ 
+            <%= dumper $c->current_route %>
+            <%= dumper $yum_datas %>
+
% }

<%= $title%>

% if ( $notif ) { -
- %= $notif -
- %} +
+
+ <%= $notif %> +
+ % } - %= form_for 'yumd' => (method => 'POST') => begin +
- %=l 'yum_DESC_AVAILABLE_UPDATES' +
+ <%=l 'yum_DESC_AVAILABLE_UPDATES' %> +
-

- - %=l 'yum_LABEL_AVAILABLE_UPDATES' - - - % param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages'; - %= select_field 'SelectedPackages' => $c->get_options2('updates', 'package'), class => "", multiple => "1" - -

+
+ <%=l 'yum_LABEL_AVAILABLE_UPDATES' %> +
- +
+ % param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages'; + <%= select_field 'SelectedPackages' => $c->get_options2('updates', 'package'), class => "form-select", multiple => "1" %> +
- %= hidden_field 'trt' => 'UPDT' -
- - %= submit_button $c->l('yum_INSTALL_UPDATES'), class => "" - + + + <%= hidden_field 'trt' => 'UPDT' %> + +
+ + % $btn = $c->l('yum_INSTALL_UPDATES'); + +
+
+ +
+
+ +
- % end
diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index 9426c0e..053c52f 100644 --- a/smeserver-manager-AdminLTE.spec +++ b/smeserver-manager-AdminLTE.spec @@ -1,6 +1,7 @@ %define name smeserver-manager-AdminLTE %define version 11.0.0 -%define release 41 +%define release 42 + Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Name: %{name} Version: %{version} @@ -28,6 +29,9 @@ AdminLTE is an html framework for admin consoles wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip %changelog +* Thu Jun 26 2025 John Crisp 11.0.0-42.sme +- Finish Software updater + * Thu Jun 19 2025 John Crisp 11.0.0-41.sme - Work on NutUPS - Work on DateTime