diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep index 920e712..c241aad 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep @@ -2,9 +2,9 @@
-

<%= l 'CREATE_GROUP' %>

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

<%= l 'CREATE_GROUP' %>

+
+ <%= l 'grp_GROUP_NAMING' %>

% my $btn = l('ADD'); @@ -29,7 +29,7 @@ <%= l 'grp_GROUP_DESC_EXPL' %> -

+

@@ -47,33 +47,33 @@
-
- <%= l 'GROUP_MEMBERS' %> -
+
+ <%= l 'GROUP_MEMBERS' %> +
-
-
- %= check_box 'groupMembers' => 'admin' -  Administrator (admin) -
+
+
+ %= check_box 'groupMembers' => 'admin' +  Administrator (admin) +
% my $users = $c->gen_users_list(); % foreach my $key ( sort keys %$users ) { - %= check_box 'groupMembers' => $key -   - %= $users->{$key} - %= " (" . $key . ")" + %= check_box 'groupMembers' => $key +   + %= $users->{$key} + %= " (" . $key . ")"
% }
-

+

-
+
- %= hidden_field 'trt' => $grp_datas->{trt} - + %= hidden_field 'trt' => $grp_datas->{trt} +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep index db6e8bc..4bed2a4 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep @@ -5,59 +5,59 @@


-

<%=l 'REMOVE_USER_GROUP' %>

+

<%=l 'REMOVE_USER_GROUP' %>


- - <%=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) %> - + + <%=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) %> +

-
+
% my $size = keys %$members; % if ( ! $size ){ %= l 'ACCOUNT_GROUP_NONE' % } else { - %= l 'grp_GROUP_HAS_MEMBERS' + %= l 'grp_GROUP_HAS_MEMBERS' -

+

-
    +
      % foreach my $key ( keys %$members) {
    • %=$key ( <%=$members->{$key} %> ) -
      • + % }
    % } -
+


-
+
% $size = keys %$ibays; % if ( $size ) { %=l 'grp_IBAYS_WILL_BE_CHANGED' -
-
    +
    +
      % foreach my $key (sort ( keys %$ibays )) { -
    • - %=$key - ( - %=$ibays->{$key} - ) -
      • +
    • + %=$key + ( + %=$ibays->{$key} + ) +
      • % } -
    +
% } -
- -
+
+ +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep index d9612de..e6f6410 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep @@ -11,31 +11,31 @@
- + % end
-

<%=l 'grp_CURRENT_LIST' %>

-

- % my $numGroups = @$groups; - % if ($numGroups == 0){ +

<%=l 'grp_CURRENT_LIST' %>

+

+ % my $numGroups = @$groups; + % if ($numGroups == 0){ %=l 'ACCOUNT_GROUP_NONE' - % } else { - - - - - - - - - + % } else { +
- %=l 'GROUP' - - %=l 'DESCRIPTION' - - %=l 'ACTION' -
+ + + + + + + + % foreach my $group ( @$groups ) % { @@ -43,34 +43,34 @@ - %my $modify_text = l('MODIFY'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $group_name = $group->key; # group name extracted from the data structure - %my $actionModify = qq{ + %my $modify_text = l('MODIFY'); # Localized text + %my $csrf_token = "TOKEN"; # CSRF token for security + %my $group_name = $group->key; # group name extracted from the data structure + %my $actionModify = qq{ % - % + % % - %}; - %my $remove_text = l('REMOVE'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $group_name = $group->key; # group name extracted from the data structure - %my $actionRemove = qq{ + %}; + %my $remove_text = l('REMOVE'); # Localized text + %my $csrf_token = "TOKEN"; # CSRF token for security + %my $group_name = $group->key; # group name extracted from the data structure + %my $actionRemove = qq{ % - % + % % - %}; + %}; - - - + + + % } - -
+ %=l 'GROUP' + + %=l 'DESCRIPTION' + + %=l 'ACTION' +
<%= $group->key %> <%= $group->prop('Description') %><%= $c->render_to_string(inline => $actionModify) %><%= $c->render_to_string(inline => $actionRemove) %>
<%= $c->render_to_string(inline => $actionModify) %><%= $c->render_to_string(inline => $actionRemove) %>
- <%} %> + + + <%} %> diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep index f2156cb..bf5885f 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep @@ -1,16 +1,16 @@ -
+
% my $btn = l('SAVE'); -

- -

<%= l 'MODIFY_USER_GROUP' %>

- -

- -
+

+ +

<%= l 'MODIFY_USER_GROUP' %>

+ +

+ +
@@ -19,13 +19,13 @@
-

+

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

+

- % param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc'; + % param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc';
@@ -41,50 +41,50 @@
-

+

- <%=l 'GROUP_MEMBERS' %> -
- -
- -
- % if ( $members->{'admin'} ) { - %= check_box 'groupMembers', value => 'admin', checked => undef - % } else { - %= check_box 'groupMembers' => 'admin' - % } -  Administrator (admin) + <%=l 'GROUP_MEMBERS' %>
-
+
+ +
+ % if ( $members->{'admin'} ) { + %= check_box 'groupMembers', value => 'admin', checked => undef + % } else { + %= check_box 'groupMembers' => 'admin' + % } +  Administrator (admin) +
+ +
% my $users = $c->gen_users_list(); % foreach my $key ( sort keys %$users ) { - % if ( $members->{ $key } ) { - - % } else { - %= check_box 'groupMembers' => $key -   - % } - %= $users->{$key} - %= " (" . $key . ")" + % if ( $members->{ $key } ) { + + % } else { + %= check_box 'groupMembers' => $key +   + % } + %= $users->{$key} + %= " (" . $key . ")"
% } -

+

-
+
- %= hidden_field 'trt' => $grp_datas->{trt} + %= hidden_field 'trt' => $grp_datas->{trt} %= hidden_field 'groupName' => $grp_datas->{group} - +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_js_imports.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_js_imports.html.ep index 10fad95..31f319a 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_js_imports.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_js_imports.html.ep @@ -15,13 +15,13 @@ const password = document.querySelector('#id_password'); if (( togglePassword ) && ( password )) { - togglePassword.addEventListener('click', function (e) { - // toggle the type attribute - const type = password.getAttribute('type') === 'password' ? 'text' : 'password'; - password.setAttribute('type', type); - // toggle the eye slash icon - // this.classList.toggle('eye-slash'); - }) + togglePassword.addEventListener('click', function (e) { + // toggle the type attribute + const type = password.getAttribute('type') === 'password' ? 'text' : 'password'; + password.setAttribute('type', type); + // toggle the eye slash icon + // this.classList.toggle('eye-slash'); + }) } }); @@ -36,34 +36,34 @@ %= javascript begin $(document).ready(function() { - $('#tognav').click(function() { - //alert('click1:'+window.localStorage.getItem('menunav')); - window.localStorage.setItem('menunav',!$('#menunav').is(':visible')); - //alert('click2:'+window.localStorage.getItem('menunav')); - $('#menunav').toggle({ duration: 300 }); - }); + $('#tognav').click(function() { + //alert('click1:'+window.localStorage.getItem('menunav')); + window.localStorage.setItem('menunav',!$('#menunav').is(':visible')); + //alert('click2:'+window.localStorage.getItem('menunav')); + $('#menunav').toggle({ duration: 300 }); + }); - $('#toguser').click(function() { - window.localStorage.setItem('menuuser',!$('#menuuser').is(':visible')); - $('#menuuser').toggle({ duration: 300 }); - }); + $('#toguser').click(function() { + window.localStorage.setItem('menuuser',!$('#menuuser').is(':visible')); + $('#menuuser').toggle({ duration: 300 }); + }); - $('#togadm').click(function() { - window.localStorage.setItem('menuadm',!$('#menuadm').is(':visible')); - $('#menuadm').toggle({ duration: 300 }); - }); + $('#togadm').click(function() { + window.localStorage.setItem('menuadm',!$('#menuadm').is(':visible')); + $('#menuadm').toggle({ duration: 300 }); + }); - - $('.section-title').click(function() { - var $section = $(this).parent().next('div'); - if(!$section.length){ - return false; - } - let localStorageTag = "admSection-"+this.innerHTML; - var jqObj = $($section); - window.localStorage.setItem(localStorageTag,!jqObj.is(':visible')); - $section.toggle({ duration: 600 }); - }) + + $('.section-title').click(function() { + var $section = $(this).parent().next('div'); + if(!$section.length){ + return false; + } + let localStorageTag = "admSection-"+this.innerHTML; + var jqObj = $($section); + window.localStorage.setItem(localStorageTag,!jqObj.is(':visible')); + $section.toggle({ duration: 600 }); + }) }); % end @@ -73,36 +73,36 @@ % content_for 'js_swapClass' => begin %= javascript begin - (function($) { - $.fn.swapClass = function(class1, class2) { - this.each(function() { - var $elem = $(this); - if ($elem.hasClass(class1)) { - $elem.removeClass(class1).addClass(class2); - } - else if ($elem.hasClass(class2)) { - $elem.removeClass(class2).addClass(class1); - } - }); - }; - })(jQuery); + (function($) { + $.fn.swapClass = function(class1, class2) { + this.each(function() { + var $elem = $(this); + if ($elem.hasClass(class1)) { + $elem.removeClass(class1).addClass(class2); + } + else if ($elem.hasClass(class2)) { + $elem.removeClass(class2).addClass(class1); + } + }); + }; + })(jQuery); $(document).ready(function() { - $('a.item-current').swapClass('item-current','item'); + $('a.item-current').swapClass('item-current','item'); - var pathname = $(location).attr('pathname'); + var pathname = $(location).attr('pathname'); - //alert('jQuery loaded. Path searched: ' + pathname); + //alert('jQuery loaded. Path searched: ' + pathname); - var menus = $('a.item'); - $.each(menus, function() { - if ( $(this).attr('href') == pathname ) { - $(this).swapClass('item', 'item-current'); - // alert('menu found! ' + $(this).attr('href') + ' ' + $(this).attr('class')); - } - }) + var menus = $('a.item'); + $.each(menus, function() { + if ( $(this).attr('href') == pathname ) { + $(this).swapClass('item', 'item-current'); + // alert('menu found! ' + $(this).attr('href') + ' ' + $(this).attr('class')); + } + }) - }); + }); % end % end diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLDOMAINS.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLDOMAINS.html.ep index 776a530..8628567 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLDOMAINS.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLDOMAINS.html.ep @@ -2,37 +2,37 @@ %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 %#
- + - % if (config->{debug} == 1) { - 
-			%= dumper $lets_data
-
- % } + % if (config->{debug} == 1) { + 
+            %= dumper $lets_data
+
+ % } - % my $btn = l('lets_APPLY'); - %= form_for "letsencryptu" => (method => 'POST') => begin - % param 'trt' => $lets_data->{trt} unless param 'trt'; - %= hidden_field 'trt' => $lets_data->{trt} - %# Inputs etc in here. + % my $btn = l('lets_APPLY'); + %= form_for "letsencryptu" => (method => 'POST') => begin + % param 'trt' => $lets_data->{trt} unless param 'trt'; + %= hidden_field 'trt' => $lets_data->{trt} + %# Inputs etc in here. -

<%=l('lets_Check_all_domains')%>

- -

<%=l('lets_Loop_through_checking_the_letsencrypt')%>

- - - %=l('lets_All_domains_check_result') - - - % param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck'; - %= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true' -
- - +

<%=l('lets_Check_all_domains')%>

+ +

<%=l('lets_Loop_through_checking_the_letsencrypt')%>

+ + + %=l('lets_All_domains_check_result') + + + % param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck'; + %= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true' +
+ + %my $back_text = l('lets_Back'); # Localized text %my $actionBack = qq{ % @@ -40,8 +40,8 @@ % %}; <%= $c->render_to_string(inline => $actionBack) %> - + - %# Probably finally by a submit. - %end + %# Probably finally by a submit. + %end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep index c629b14..477f864 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep @@ -2,38 +2,38 @@ %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 %#
- - - % if (config->{debug} == 1) { - 
-			%= dumper $lets_data
-
- % } - - % my $btn = l('lets_APPLY'); - %= form_for "letsencryptu" => (method => 'POST') => begin - % param 'trt' => $lets_data->{trt} unless param 'trt'; - %= hidden_field 'trt' => $lets_data->{trt} - %# Inputs etc in here. + + + % if (config->{debug} == 1) { + 
+            %= dumper $lets_data
+
+ % } + + % my $btn = l('lets_APPLY'); + %= form_for "letsencryptu" => (method => 'POST') => begin + % param 'trt' => $lets_data->{trt} unless param 'trt'; + %= hidden_field 'trt' => $lets_data->{trt} + %# Inputs etc in here. -

<%=l('lets_Check_all_enabled_domains')%>

- -

<%=l('lets_Loop_through_checking_the_letsencrypt')%>

- - - %=l('lets_Enabled_domains_check_result') - - - % param 'EnabledDomainsCheck' => $lets_data->{EnabledDomainsCheck} unless param 'EnabledDomainsCheck'; - %= text_area 'EnabledDomainsCheck', cols=>40, rows=>10, Readonly=>'true' - -
+

<%=l('lets_Check_all_enabled_domains')%>

+ +

<%=l('lets_Loop_through_checking_the_letsencrypt')%>

+ + + %=l('lets_Enabled_domains_check_result') + + + % param 'EnabledDomainsCheck' => $lets_data->{EnabledDomainsCheck} unless param 'EnabledDomainsCheck'; + %= text_area 'EnabledDomainsCheck', cols=>40, rows=>10, Readonly=>'true' + +
- + %my $back_text = l('lets_Back'); # Localized text %my $actionBack = qq{ % @@ -41,9 +41,9 @@ % %}; <%= $c->render_to_string(inline => $actionBack) %> - - - - %# Probably finally by a submit. - %end + + + + %# Probably finally by a submit. + %end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep index bdc86a7..2137f33 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_CHECKONEDOMAIN.html.ep @@ -2,48 +2,48 @@ %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 %#
- - - % if (config->{debug} == 1) { - 
-			%= dumper $lets_data
-
- % } - - % my $btn = l('lets_APPLY'); - %= form_for "letsencryptu" => (method => 'POST') => begin - % param 'trt' => $lets_data->{trt} unless param 'trt'; - %= hidden_field 'trt' => $lets_data->{trt} - %# Inputs etc in here. + + + % if (config->{debug} == 1) { + 
+            %= dumper $lets_data
+
+ % } + + % my $btn = l('lets_APPLY'); + %= form_for "letsencryptu" => (method => 'POST') => begin + % param 'trt' => $lets_data->{trt} unless param 'trt'; + %= hidden_field 'trt' => $lets_data->{trt} + %# Inputs etc in here. -

<%=l('lets_Check_just_one_domain')%>

- -

<%=l('lets_Loop_through_and_check_the')%>

- -

- %=l('lets_Domains_name') - - - % param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck'; - %= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true' -
- -

- - - %=l('lets_One_domain_check_result') - - - % param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck'; - %= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true' - -
- - +

<%=l('lets_Check_just_one_domain')%>

+ +

<%=l('lets_Loop_through_and_check_the')%>

+ +

+ %=l('lets_Domains_name') + + + % param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck'; + %= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true' +
+ +

+ + + %=l('lets_One_domain_check_result') + + + % param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck'; + %= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true' + +
+ + %my $back_text = l('lets_Back'); # Localized text %my $actionBack = qq{ % @@ -51,9 +51,9 @@ % %}; <%= $c->render_to_string(inline => $actionBack) %> - - - - %# Probably finally by a submit. - %end + + + + %# Probably finally by a submit. + %end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep index 2a097e8..b329370 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_LIST.html.ep @@ -2,151 +2,151 @@ %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 %#
- - - % if (config->{debug} == 1) { - 
-			%= dumper $lets_data
-
- % } - - % my $btn = l('lets_APPLY'); - %= form_for "letsencryptu" => (method => 'POST') => begin - % param 'trt' => $lets_data->{trt} unless param 'trt'; - %= hidden_field 'trt' => $lets_data->{trt} - %# Inputs etc in here. + + + % if (config->{debug} == 1) { + 
+            %= dumper $lets_data
+
+ % } + + % my $btn = l('lets_APPLY'); + %= form_for "letsencryptu" => (method => 'POST') => begin + % param 'trt' => $lets_data->{trt} unless param 'trt'; + %= hidden_field 'trt' => $lets_data->{trt} + %# Inputs etc in here. -
+
- - %= l('lets_CONFIG') - - %#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2' - - - - %= l('lets_CHECK_ALL_DOMAINS') - - %#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=> 'link link3' - - - - %= l('lets_CHECK_ALL_ENABLED_DOMAINS') - - %#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4' - - -
- - -

<%=l('lets_For_this_Server')%>

- -

- - %=l('lets_Internal_IP') - - - % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP'; - %= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true' -
- -

- -

- - %=l('lets_External_Interface_IP') - - - % param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP'; - %= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true' -
- -

- -

- - %=l('lets_Internet_IP') - - - % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP'; - %= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true' -
- -

- -

<%=l('lets_Current_certificate_details')%>

- -

- - %=l('lets_Issuer') - - - % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer'; - %= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true' -
- -

- -

- - %=l('lets_Expiry') - - - % param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry'; - %= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true' -
- -

- -

- - %=l('lets_Not_Before') - + + %= l('lets_CONFIG') + + %#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2' + + + + %= l('lets_CHECK_ALL_DOMAINS') + + %#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=> 'link link3' + + + + %= l('lets_CHECK_ALL_ENABLED_DOMAINS') + + %#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4' + + +

+ + +

<%=l('lets_For_this_Server')%>

+ +

+ + %=l('lets_Internal_IP') + + + % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP'; + %= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true' +
+ +

+ +

+ + %=l('lets_External_Interface_IP') + + + % param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP'; + %= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true' +
+ +

+ +

+ + %=l('lets_Internet_IP') + + + % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP'; + %= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true' +
+ +

+ +

<%=l('lets_Current_certificate_details')%>

+ +

+ + %=l('lets_Issuer') + + + % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer'; + %= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true' +
+ +

+ +

+ + %=l('lets_Expiry') + + + % param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry'; + %= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true' +
+ +

+ +

+ + %=l('lets_Not_Before') + - % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore'; - %= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true' -
- -

- -

<%=l('lets_List_of_Domains_and_Hosts')%>

- -
- - - - - - - - - - - - - - - % my $control_data = $c->stash('DomainList'); - % foreach my $row (@$control_data) { - - - - - - - - - - - %} - -
<%=l('lets_Domain_name_/_HOSTNAME')%><%=l('lets_Brief_description')%><%=l('lets_Content')%><%=l('lets_LABEL_NAMESERVERS')%><%=l('lets_LABEL_POINT')%><%=l('lets_LABEL_LECERT')%><%=l('lets_IS_IN_CERT')%><%=l('lets_CHECK')%>
<%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'})%><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'})%><%=$c->render_to_string(inline=>$row->{'Table1-Content'})%><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'})%><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'})%><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'})%><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'})%><%=$c->render_to_string(inline=>$row->{'Table1-CHECK'})%>
- - - %# Probably finally by a submit. - %end + % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore'; + %= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true' +
+ +

+ +

<%=l('lets_List_of_Domains_and_Hosts')%>

+ +
+ + + + + + + + + + + + + + + % my $control_data = $c->stash('DomainList'); + % foreach my $row (@$control_data) { + + + + + + + + + + + %} + +
<%=l('lets_Domain_name_/_HOSTNAME')%><%=l('lets_Brief_description')%><%=l('lets_Content')%><%=l('lets_LABEL_NAMESERVERS')%><%=l('lets_LABEL_POINT')%><%=l('lets_LABEL_LECERT')%><%=l('lets_IS_IN_CERT')%><%=l('lets_CHECK')%>
<%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'})%><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'})%><%=$c->render_to_string(inline=>$row->{'Table1-Content'})%><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'})%><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'})%><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'})%><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'})%><%=$c->render_to_string(inline=>$row->{'Table1-CHECK'})%>
+ + + %# Probably finally by a submit. + %end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep index 9c4455d..2f24ea1 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_lets_PARAMS.html.ep @@ -2,129 +2,129 @@ %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 %#
- - - % if (config->{debug} == 1) { - 
-			%= dumper $lets_data
-
- % } - - % my $btn = l('lets_APPLY'); - %= form_for "letsencryptu" => (method => 'POST') => begin - % param 'trt' => $lets_data->{trt} unless param 'trt'; - %= hidden_field 'trt' => $lets_data->{trt} - %# Inputs etc in here. + + + % if (config->{debug} == 1) { + 
+            %= dumper $lets_data
+
+ % } + + % my $btn = l('lets_APPLY'); + %= form_for "letsencryptu" => (method => 'POST') => begin + % param 'trt' => $lets_data->{trt} unless param 'trt'; + %= hidden_field 'trt' => $lets_data->{trt} + %# Inputs etc in here. -

<%=l('lets_Manage_letsencrypt-config_settings:')%>

- -

- %=l('lets_CONFIG_LETSENCRYPT') -

- -

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

<%=l('lets_Manage_letsencrypt-config_settings:')%>

+ +

+ %=l('lets_CONFIG_LETSENCRYPT') +

+ +

+ + %=l('lets_SERVICE_STATUS') + - %# 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'; - %= select_field 'status' => @status_options, class => "" -
- -

- -

- - %=l('lets_HOOKSCRIPT_STATUS') - - - % my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']]; - % param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript'; - %= select_field 'hookScript' => @hookScript_options, class => "" -
- -

- -

- - %=l('lets_HOSTOVERRIDE_STATUS') - - - % my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']]; - % param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride'; - %= select_field 'hostOverride' => @hostOverride_options, class => "" -
- -

- -

- - %=l('lets_ACCEPT_TERMS_STATUS') - - - % my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']]; - % param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS'; - %= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, 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'; + %= select_field 'status' => @status_options, class => "" +
+ +

+ +

+ + %=l('lets_HOOKSCRIPT_STATUS') + + + % my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']]; + % param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript'; + %= select_field 'hookScript' => @hookScript_options, class => "" +
+ +

+ +

+ + %=l('lets_HOSTOVERRIDE_STATUS') + + + % my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']]; + % param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride'; + %= select_field 'hostOverride' => @hostOverride_options, class => "" +
+ +

+ +

+ + %=l('lets_ACCEPT_TERMS_STATUS') + + + % my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']]; + % param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS'; + %= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => "" +
+ +

-

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

+ + %=l('lets_API_STATUS') + - % my @API_options = [['2' => '2']]; - % param 'API' => $lets_data->{API} unless param 'API'; - %= select_field 'API' => @API_options, class => "" -
- -

+ % my @API_options = [['2' => '2']]; + % param 'API' => $lets_data->{API} unless param 'API'; + %= select_field 'API' => @API_options, class => "" +
+ +

-

- - %=l('lets_KEYSIZE_STATUS') - - - % my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']]; - % param 'keysize' => $lets_data->{keysize} unless param 'keysize'; - %= select_field 'keysize' => @keysize_options, class => "" -
- -

+

+ + %=l('lets_KEYSIZE_STATUS') + + + % my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']]; + % param 'keysize' => $lets_data->{keysize} unless param 'keysize'; + %= select_field 'keysize' => @keysize_options, class => "" +
+ +

-

- - %=l('lets_CONFIGUREMODE_STATUS') - - - % my @configure_options = [['ALL' => 'all'], ['Domains' => 'domains'], ['HOSTS' => 'hosts'], ['NONE' => 'none']]; - % param 'configure' => $lets_data->{configure} unless param 'configure'; - %= select_field 'configure' => @configure_options, class => "" -
- -

+

+ + %=l('lets_CONFIGUREMODE_STATUS') + + + % my @configure_options = [['ALL' => 'all'], ['Domains' => 'domains'], ['HOSTS' => 'hosts'], ['NONE' => 'none']]; + % param 'configure' => $lets_data->{configure} unless param 'configure'; + %= select_field 'configure' => @configure_options, class => "" +
+ +

-

- - %=l('lets_EMAIL') - - - % param 'email' => $lets_data->{email} unless param 'email'; - %=email_field 'email', class => "" - -

+

+ + %=l('lets_EMAIL') + + + % param 'email' => $lets_data->{email} unless param 'email'; + %=email_field 'email', class => "" + +

- - %= submit_button l('lets_Save'), class => "" - + + %= submit_button l('lets_Save'), class => "" + - %# Probably finally by a submit. - %end + %# Probably finally by a submit. + %end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep index d79b539..a91b164 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep @@ -1,76 +1,76 @@
- % my $retref= $c->stash("ret"); - % my %ret; - % unless (length($retref)) {%ret = (ret=>"");} - % else {%ret = %$retref;} - - % my @vars = split(",",$ret{vars}); - % my $var1 = @vars[0]; - % my $var2 = @vars[1]; - % my $var3 = @vars[2]; - % my $var4 = @vars[3]; - % my $var5 = @vars[4]; - % my $var6 = @vars[5]; + % my $retref= $c->stash("ret"); + % my %ret; + % unless (length($retref)) {%ret = (ret=>"");} + % else {%ret = %$retref;} + + % my @vars = split(",",$ret{vars}); + % my $var1 = @vars[0]; + % my $var2 = @vars[1]; + % my $var3 = @vars[2]; + % my $var4 = @vars[3]; + % my $var5 = @vars[4]; + % my $var6 = @vars[5]; - %if ($ret{'ret'} eq "") { - - %} elsif (index($ret{ret},"SUCCESS") != -1) { -
-

Operation Status Report

- %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); -
- %} else { -
-

Operation Status Report - Error

- %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); -
- %} -
+ %if ($ret{'ret'} eq "") { + + %} elsif (index($ret{ret},"SUCCESS") != -1) { +
+

Operation Status Report

+ %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); +
+ %} else { +
+

Operation Status Report - Error

+ %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); +
+ %} +
% my $btn = l('ADD'); % my $network_db = esmith::NetworksDB->open(); % if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $c->stash("ret") -

+

+ %= dumper $c->current_route + %= dumper $c->stash("ret") +

% } %= form_for '/localnetworksb' => (method => 'POST') => begin -

- %=l "ln_ADD_TITLE" -

-

- %= $c->render_to_string(inline => l('ln_ADD_DESC')); -

-
- - %=l "NETWORK" - - - %=text_field 'networkAddress' - -

- - %=l "ln_SUBNET_MASK" - - - %=text_field 'networkMask' - -

- - %=l "ROUTER" - - - %=text_field 'networkRouter' - -

-

-
- %= submit_button "$btn", class => "" -

- %end +

+ %=l "ln_ADD_TITLE" +

+

+ %= $c->render_to_string(inline => l('ln_ADD_DESC')); +

+
+ + %=l "NETWORK" + + + %=text_field 'networkAddress' + +

+ + %=l "ln_SUBNET_MASK" + + + %=text_field 'networkMask' + +

+ + %=l "ROUTER" + + + %=text_field 'networkRouter' + +

+

+
+ %= submit_button "$btn", class => "" +

+ %end
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 aa2573e..7eac1b8 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 @@ -6,60 +6,60 @@ % my $router = $ln_datas->{router}; % if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $c->stash("ret") +

+ %= dumper $c->current_route + %= dumper $c->stash("ret") %= dumper %$ln_datas %= dumper $deletehosts -

+

% } %= form_for '/localnetworkse' => (method => 'POST') => begin -

- %=l "ln_REMOVE_TITLE" -

-

- %=l "ln_REMOVE_DESC" -

-
- - %=l "NETWORK" - - - %=$localnetwork - -

- - %=l "ln_SUBNET_MASK" - - - %= $subnet - -

- - %=l "ROUTER" - - - %= $router - -

- % if($deletehosts) { -
- %=$c->l("ln_REMOVE_HOSTS_DESC") -
- - %= $c->l("ln_REMOVE_HOSTS_LABEL") - - - %=check_box deletehost=>1, checked=>1 - -

- %} - %= hidden_field localnetwork=>$localnetwork -

-
- %= submit_button "$btn", class => "" -

- %end +

+ %=l "ln_REMOVE_TITLE" +

+

+ %=l "ln_REMOVE_DESC" +

+
+ + %=l "NETWORK" + + + %=$localnetwork + +

+ + %=l "ln_SUBNET_MASK" + + + %= $subnet + +

+ + %=l "ROUTER" + + + %= $router + +

+ % if($deletehosts) { +
+ %=$c->l("ln_REMOVE_HOSTS_DESC") +
+ + %= $c->l("ln_REMOVE_HOSTS_LABEL") + + + %=check_box deletehost=>1, checked=>1 + +

+ %} + %= hidden_field localnetwork=>$localnetwork +

+
+ %= submit_button "$btn", class => "" +

+ %end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep index 91d007e..9231607 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep @@ -2,107 +2,107 @@ % my $btn = l('ln_LOCALNETWORK_ADD'); %= form_for '/localnetworksa' => (method => 'POST') => begin - % my $retref= $c->stash("ret"); - % my %ret; - % unless (length($retref)) {%ret = (ret=>"");} - % else {%ret = %$retref;} + % my $retref= $c->stash("ret"); + % my %ret; + % unless (length($retref)) {%ret = (ret=>"");} + % else {%ret = %$retref;} % if (config->{debug} == 1) { -

- %= dumper "Ret:".$ret{ret}; -

- %} +

+ %= dumper "Ret:".$ret{ret}; +

+ %} - % my @vars = split(",",$ret{vars}); - % my $var1 = @vars[0]; - % my $var2 = @vars[1]; - % my $var3 = @vars[2]; - % my $var4 = @vars[3]; - % my $var5 = @vars[4]; - % my $var6 = @vars[5]; - % my $var7 = @vars[6]; + % my @vars = split(",",$ret{vars}); + % my $var1 = @vars[0]; + % my $var2 = @vars[1]; + % my $var3 = @vars[2]; + % my $var4 = @vars[3]; + % my $var5 = @vars[4]; + % my $var6 = @vars[5]; + % my $var7 = @vars[6]; - %if ($ret{ret} eq "") { - %=l "ln_FIRSTPAGE_DESC" - %} elsif (index($ret{ret},"SUCCESS") != -1) { -
-

Operation Status Report

- %= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); -
- %} else { -
-

Operation Status Report - Error

- %= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); -
- %} + %if ($ret{ret} eq "") { + %=l "ln_FIRSTPAGE_DESC" + %} elsif (index($ret{ret},"SUCCESS") != -1) { +
+

Operation Status Report

+ %= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); +
+ %} else { +
+

Operation Status Report - Error

+ %= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); +
+ %} -

-
- %= submit_button "$btn", class => "" -

+

+
+ %= submit_button "$btn", class => "" +

% end -
+
% my $numlocalnetworks = @$localnetworks; - % if ($numlocalnetworks == 0){ + % if ($numlocalnetworks == 0){ %=l 'ln_LOCAL_NETWORK_NONE' - % } else { + % } else {
- - - - - +
- %=l 'NETWORK' - - %=l 'ln_SUBNET_MASK' -
+ + + + - + - + - - - - - % foreach my $localnetwork (@$localnetworks ) - % { - % my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') ); - % my $removable = $localnetwork->prop('Removable') || "yes"; - % my $system = $localnetwork->prop('SystemLocalNetwork') || "no"; - % if ( $system eq "yes" ) { $removable = "no"; } - - %= t td => (class => "") => $localnetwork->key - %= t td => (class => "") => $localnetwork->prop('Mask') - %= t td => (class => "") => $num_hosts - %= t td => (class => "") => $localnetwork->prop('Router') - %my $actionRemove = ' '; - %if ($removable eq "yes") { - %my $remove_text = l('REMOVE'); # Localized text - %my $local_network_entry = $localnetwork->key; - %my $csrf_token = "TOKEN"; # CSRF token for security - %$actionRemove = qq{ + + + + + % foreach my $localnetwork (@$localnetworks ) + % { + % my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') ); + % my $removable = $localnetwork->prop('Removable') || "yes"; + % my $system = $localnetwork->prop('SystemLocalNetwork') || "no"; + % if ( $system eq "yes" ) { $removable = "no"; } + + %= t td => (class => "") => $localnetwork->key + %= t td => (class => "") => $localnetwork->prop('Mask') + %= t td => (class => "") => $num_hosts + %= t td => (class => "") => $localnetwork->prop('Router') + %my $actionRemove = ' '; + %if ($removable eq "yes") { + %my $remove_text = l('REMOVE'); # Localized text + %my $local_network_entry = $localnetwork->key; + %my $csrf_token = "TOKEN"; # CSRF token for security + %$actionRemove = qq{ % - % + % % - %}; - % } - - - % } - -
+ %=l 'NETWORK' + + %=l 'ln_SUBNET_MASK' + - %=l 'ln_NUMBER_OF_HOSTS' - + %=l 'ln_NUMBER_OF_HOSTS' + - %=l 'ROUTER' - + %=l 'ROUTER' + - %=l 'ACTION' -
+ %=l 'ACTION' +
<%= $c->render_to_string(inline => $actionRemove) %>
- %= hidden_field 'trt' => $ln_datas->{trt} - %} + %}; + % } + <%= $c->render_to_string(inline => $actionRemove) %> + + % } + + + %= hidden_field 'trt' => $ln_datas->{trt} + %}
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep index f4663d3..2d88b1c 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_CONFIG.html.ep @@ -2,162 +2,162 @@ %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 %#
- - % if (config->{debug} == 1) { - 
-			%= dumper $nut_data
-
- % } + + % if (config->{debug} == 1) { + 
+            %= dumper $nut_data
+
+ % } - % my $btn = l('nut_APPLY'); - %= form_for "nutupsu" => (method => 'POST') => begin - % param 'trt' => $nut_data->{trt} unless param 'trt'; - %= hidden_field 'trt' => $nut_data->{trt} - %# Inputs etc in here. + % my $btn = l('nut_APPLY'); + %= form_for "nutupsu" => (method => 'POST') => begin + % param 'trt' => $nut_data->{trt} unless param 'trt'; + %= hidden_field 'trt' => $nut_data->{trt} + %# Inputs etc in here. -

<%=l('nut_Manage_Nutups-config_settings:')%>

- -

- - %=l('nut_Nut_status') - - - %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']]; - %# param 'status' => $nut_data->{status} unless param 'status'; +

<%=l('nut_Manage_Nutups-config_settings:')%>

+ +

+ + %=l('nut_Nut_status') + + + %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']]; + %# param 'status' => $nut_data->{status} unless param 'status'; - % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status}); - %= select_field 'status' => @status_options, class => "", id => "" -
- -

- -

- - %=l('nut_Nut_mode') - - - % my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']]; - % param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode'; - %= select_field 'Nutmode' => @Nutmode_options, class => "", id => "" -
- -

- -
-

<%=l('nut_if_Net_Server')%>

- -

- - %=l('nut_MasterUPS_UPSNAME@IP') - - - % param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name'; - %= text_field 'MasterUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'ups@localhost' -
- -

+ % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status}); + %= select_field 'status' => @status_options, class => "", id => "" +
+ +

+ +

+ + %=l('nut_Nut_mode') + + + % my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']]; + % param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode'; + %= select_field 'Nutmode' => @Nutmode_options, class => "", id => "" +
+ +

+ +
+

<%=l('nut_if_Net_Server')%>

+ +

+ + %=l('nut_MasterUPS_UPSNAME@IP') + + + % param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name'; + %= text_field 'MasterUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'ups@localhost' +
+ +

-

- - %=l('nut_MasterUPS_Password') - - - % param 'MasterUPS_Password' => $nut_data->{MasterUPS_Password} unless param 'MasterUPS_Password'; - %=password_field 'MasterUPS_Password', class => "" - -

+

+ + %=l('nut_MasterUPS_Password') + + + % param 'MasterUPS_Password' => $nut_data->{MasterUPS_Password} unless param 'MasterUPS_Password'; + %=password_field 'MasterUPS_Password', class => "" + +

-

- - %=l('nut_UPS_Model') - - - % my @UPS_Model_options = $c->get_model_options(); - % param 'UPS_Model' => $nut_data->{UPS_Model} unless param 'UPS_Model'; - %= select_field 'UPS_Model' => \@UPS_Model_options, class => "", id => "" -
-

+

+ + %=l('nut_UPS_Model') + + + % my @UPS_Model_options = $c->get_model_options(); + % param 'UPS_Model' => $nut_data->{UPS_Model} unless param 'UPS_Model'; + %= select_field 'UPS_Model' => \@UPS_Model_options, class => "", id => "" +
+

-

- %=l('nut_UPS_Device') - - % param 'UPS_Device' => $nut_data->{UPS_Device} unless param 'UPS_Device'; - %= text_field 'UPS_Device', size => '50', class => "" , pattern=>'.*' , placeholder=>'auto (for usb)' -

-
- -
-

<%=l('nut_if_Net_Client')%>

-

- - %=l('nut_SlaveUPS_UPSNAME@IP') - - - % param 'SlaveUPS_Name' => $nut_data->{SlaveUPS_Name} unless param 'SlaveUPS_Name'; - %= text_field 'SlaveUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'upsname@IP' -
- -

- -

- - %=l('nut_SlaveUPS_Password') - - - % param 'SlaveUPS_Password' => $nut_data->{SlaveUPS_Password} unless param 'SlaveUPS_Password'; - %=password_field 'SlaveUPS_Password', class => "" - -

-
- -
-`

<%=l('nut_if_genericups')%>

-

- - %=l('nut_UPS_Generic_Type') - - - % param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type'; - %= text_field 'UPS_gen_Type', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Type' -
- -

- -

- - %=l('nut_UPS_Generic_Manufacturer') - - - % param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr'; - %= text_field 'UPS_gen_Mfr', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Mfr' -
- -

- -

- - %=l('nut_UPS_Generic_Model') - - - % param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model'; - %= text_field 'UPS_gen_Model', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Model' -
- -

-`
- - - %= submit_button l('nut_Save'), class => "" - - +

+ %=l('nut_UPS_Device') + + % param 'UPS_Device' => $nut_data->{UPS_Device} unless param 'UPS_Device'; + %= text_field 'UPS_Device', size => '50', class => "" , pattern=>'.*' , placeholder=>'auto (for usb)' +

+
+ +
+

<%=l('nut_if_Net_Client')%>

+

+ + %=l('nut_SlaveUPS_UPSNAME@IP') + + + % param 'SlaveUPS_Name' => $nut_data->{SlaveUPS_Name} unless param 'SlaveUPS_Name'; + %= text_field 'SlaveUPS_Name', size => '50', class => "" , pattern=>'.*' , placeholder=>'upsname@IP' +
+ +

+ +

+ + %=l('nut_SlaveUPS_Password') + + + % param 'SlaveUPS_Password' => $nut_data->{SlaveUPS_Password} unless param 'SlaveUPS_Password'; + %=password_field 'SlaveUPS_Password', class => "" + +

+
+ +
+`

<%=l('nut_if_genericups')%>

+

+ + %=l('nut_UPS_Generic_Type') + + + % param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type'; + %= text_field 'UPS_gen_Type', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Type' +
+ +

+ +

+ + %=l('nut_UPS_Generic_Manufacturer') + + + % param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr'; + %= text_field 'UPS_gen_Mfr', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Mfr' +
+ +

+ +

+ + %=l('nut_UPS_Generic_Model') + + + % param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model'; + %= text_field 'UPS_gen_Model', size => '50', class => "" , pattern=>'.*' , placeholder=>'UPS_gen_Model' +
+ +

+`
+ + + %= submit_button l('nut_Save'), class => "" + + - - - %# Probably finally by a submit. - %end + + + %# Probably finally by a submit. + %end
\ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep index a6ce652..05eb971 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_STATUS.html.ep @@ -2,55 +2,55 @@ %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 %#
- - % if (config->{debug} == 1) { - 
-			%= dumper $nut_data
-
- % } - - % my $btn = l('nut_APPLY'); - %= form_for "nutupsu" => (method => 'POST') => begin - % param 'trt' => $nut_data->{trt} unless param 'trt'; - %= hidden_field 'trt' => $nut_data->{trt} - %# Inputs etc in here. + + % if (config->{debug} == 1) { + 
+            %= dumper $nut_data
+
+ % } + + % my $btn = l('nut_APPLY'); + %= form_for "nutupsu" => (method => 'POST') => begin + % param 'trt' => $nut_data->{trt} unless param 'trt'; + %= hidden_field 'trt' => $nut_data->{trt} + %# Inputs etc in here. -
- - - - %= l('nut_Configure_NutUPS') - - %#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class=> 'link link1' - - -
- - -

<%=l('nut_Status_of_the_controlled_UPS')%>

- -

- %=l('nut_Descriptive_paragraph') -

+
+ + + + %= l('nut_Configure_NutUPS') + + %#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class=> 'link link1' + + +
+ + +

<%=l('nut_Status_of_the_controlled_UPS')%>

+ +

+ %=l('nut_Descriptive_paragraph') +

- - %= include 'partials/_nut_UPS_STATUS' - - %# Probably finally by a submit. - %end + + %= include 'partials/_nut_UPS_STATUS' + + %# Probably finally by a submit. + %end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_UPS_STATUS.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_UPS_STATUS.html.ep index 756e8d0..30ff1d5 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_UPS_STATUS.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_nut_UPS_STATUS.html.ep @@ -1,45 +1,45 @@

UPS Status

%= stylesheet '/css/nut_ups-status-page.css'
-
-

Device Information

- - - - - -
Manufacturer:<%= $nut_data->{'ups_data'}->{'device.mfr'} %>
Model:<%= $nut_data->{'ups_data'}->{'device.model'} %>
Serial:<%= $nut_data->{'ups_data'}->{'device.serial'} %>
Type:<%= $nut_data->{'ups_data'}->{'device.type'} %>
-
- -
-

Battery Status

- - - - - -
Charge:<%= $nut_data->{'ups_data'}->{'battery.charge'} %>%
Runtime:<%= sprintf("%.2f", $nut_data->{'ups_data'}->{'battery.runtime'} / 60) %> minutes
Voltage:<%= $nut_data->{'ups_data'}->{'battery.voltage'} %>V
Type:<%= $nut_data->{'ups_data'}->{'battery.type'} %>
-
- -
-

Input Power

- - - - - - -
Voltage:<%= $nut_data->{'ups_data'}->{'input.voltage'} %>V
Nominal Voltage:<%= $nut_data->{'ups_data'}->{'input.voltage.nominal'} %>V
Sensitivity:<%= $nut_data->{'ups_data'}->{'input.sensitivity'} %>
Transfer High:<%= $nut_data->{'ups_data'}->{'input.transfer.high'} %>V
Transfer Low:<%= $nut_data->{'ups_data'}->{'input.transfer.low'} %>V
-
- -
-

UPS Status

- - - - - - -
Status:<%= $nut_data->{'ups_data'}->{'ups.status'} %>
Load:<%= $nut_data->{'ups_data'}->{'ups.load'} %>%
Beeper:<%= $nut_data->{'ups_data'}->{'ups.beeper.status'} %>
Firmware:<%= $nut_data->{'ups_data'}->{'ups.firmware'} %>
Test Result:<%= $nut_data->{'ups_data'}->{'ups.test.result'} %>
-
+
+

Device Information

+ + + + + +
Manufacturer:<%= $nut_data->{'ups_data'}->{'device.mfr'} %>
Model:<%= $nut_data->{'ups_data'}->{'device.model'} %>
Serial:<%= $nut_data->{'ups_data'}->{'device.serial'} %>
Type:<%= $nut_data->{'ups_data'}->{'device.type'} %>
+
+ +
+

Battery Status

+ + + + + +
Charge:<%= $nut_data->{'ups_data'}->{'battery.charge'} %>%
Runtime:<%= sprintf("%.2f", $nut_data->{'ups_data'}->{'battery.runtime'} / 60) %> minutes
Voltage:<%= $nut_data->{'ups_data'}->{'battery.voltage'} %>V
Type:<%= $nut_data->{'ups_data'}->{'battery.type'} %>
+
+ +
+

Input Power

+ + + + + + +
Voltage:<%= $nut_data->{'ups_data'}->{'input.voltage'} %>V
Nominal Voltage:<%= $nut_data->{'ups_data'}->{'input.voltage.nominal'} %>V
Sensitivity:<%= $nut_data->{'ups_data'}->{'input.sensitivity'} %>
Transfer High:<%= $nut_data->{'ups_data'}->{'input.transfer.high'} %>V
Transfer Low:<%= $nut_data->{'ups_data'}->{'input.transfer.low'} %>V
+
+ +
+

UPS Status

+ + + + + + +
Status:<%= $nut_data->{'ups_data'}->{'ups.status'} %>
Load:<%= $nut_data->{'ups_data'}->{'ups.load'} %>%
Beeper:<%= $nut_data->{'ups_data'}->{'ups.beeper.status'} %>
Firmware:<%= $nut_data->{'ups_data'}->{'ups.firmware'} %>
Test Result:<%= $nut_data->{'ups_data'}->{'ups.test.result'} %>
+
\ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep index eac15b4..e86c920 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep @@ -1,95 +1,95 @@
- % my $retref= $c->stash("ret"); - % my %ret; - % unless (length($retref)) {%ret = (ret=>"");} - % else {%ret = %$retref;} - - % my @vars = split(",",$ret{vars}); - % my $var1 = @vars[0]; - % my $var2 = @vars[1]; - % my $var3 = @vars[2]; - % my $var4 = @vars[3]; - % my $var5 = @vars[4]; - % my $var6 = @vars[5]; + % my $retref= $c->stash("ret"); + % my %ret; + % unless (length($retref)) {%ret = (ret=>"");} + % else {%ret = %$retref;} + + % my @vars = split(",",$ret{vars}); + % my $var1 = @vars[0]; + % my $var2 = @vars[1]; + % my $var3 = @vars[2]; + % my $var4 = @vars[3]; + % my $var5 = @vars[4]; + % my $var6 = @vars[5]; -
- %if ($ret{'ret'} eq "") { - - %} elsif (index($ret{ret},"SUCCESS") != -1) { -
- - %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); -
- %} else { -
- - %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); -
- %} -
+
+ %if ($ret{'ret'} eq "") { + + %} elsif (index($ret{ret},"SUCCESS") != -1) { +
+ + %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); +
+ %} else { +
+ + %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); +
+ %} +
% my $btn = l('ADD'); % if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $c->stash("ret") -

+

+ %= dumper $c->current_route + %= dumper $c->stash("ret") +

% } %= form_for '/portforwardingb' => (method => 'POST') => begin -

- %=l "pf_CREATE_RULE" -

-

- %=l "pf_SUMMARY_ADD_DESC" -


- - %=l "pf_LABEL_PROTOCOL" - - - %=select_field 'proto'=>["TCP","UDP"] -

- - %=l "pf_LABEL_SOURCE_PORT" - - - %=text_field 'sport' - -

- - %=l "pf_LABEL_DESTINATION_PORT" - - - %=text_field 'dport' - -

- - %=l "pf_LABEL_DESTINATION_HOST" - - - %=text_field 'dhost' - -

- - %=l "pf_ALLOW_HOSTS" - - - %=text_field 'allow' - -

- - %=l "pf_RULE_COMMENT" - - - %=text_field 'cmmnt' - -

-

-
- %= submit_button "$btn", class => "" -

+

+ %=l "pf_CREATE_RULE" +

+

+ %=l "pf_SUMMARY_ADD_DESC" +


+ + %=l "pf_LABEL_PROTOCOL" + + + %=select_field 'proto'=>["TCP","UDP"] +

+ + %=l "pf_LABEL_SOURCE_PORT" + + + %=text_field 'sport' + +

+ + %=l "pf_LABEL_DESTINATION_PORT" + + + %=text_field 'dport' + +

+ + %=l "pf_LABEL_DESTINATION_HOST" + + + %=text_field 'dhost' + +

+ + %=l "pf_ALLOW_HOSTS" + + + %=text_field 'allow' + +

+ + %=l "pf_RULE_COMMENT" + + + %=text_field 'cmmnt' + +

+

+
+ %= submit_button "$btn", class => "" +

- %end + %end
\ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep index b2c5c92..bf63e0f 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep @@ -9,65 +9,65 @@ % my $allow = $pf_datas->{allow}; % if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $c->stash("ret") +

+ %= dumper $c->current_route + %= dumper $c->stash("ret") %= dumper %$pf_datas -

+

% } %= form_for '/portforwardinge' => (method => 'POST') => begin
- %= l "pf_SUMMARY_REMOVE_DESC" -


- - %=l "pf_LABEL_PROTOCOL" - - - %=$proto -

- - %=l "pf_LABEL_SOURCE_PORT" - - - %=$sport - -

- - %=l "pf_LABEL_DESTINATION_HOST" - - - %=$dport - -

- - %=l "pf_LABEL_DESTINATION_PORT" - - - %=$dhost - -

- - %=l "pf_RULE_COMMENT" - - - %=$cmmnt - -

- - %=l "pf_ALLOW_HOSTS" - - - %=$allow - -

- %#} - %= hidden_field sport=>$sport - %= hidden_field proto=>$proto -
- %= submit_button "$btn", class => "" -

+ %= l "pf_SUMMARY_REMOVE_DESC" +


+ + %=l "pf_LABEL_PROTOCOL" + + + %=$proto +

+ + %=l "pf_LABEL_SOURCE_PORT" + + + %=$sport + +

+ + %=l "pf_LABEL_DESTINATION_HOST" + + + %=$dport + +

+ + %=l "pf_LABEL_DESTINATION_PORT" + + + %=$dhost + +

+ + %=l "pf_RULE_COMMENT" + + + %=$cmmnt + +

+ + %=l "pf_ALLOW_HOSTS" + + + %=$allow + +

+ %#} + %= hidden_field sport=>$sport + %= hidden_field proto=>$proto +
+ %= submit_button "$btn", class => "" +

- %end + %end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep index 8766f8d..58a9566 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep @@ -2,119 +2,119 @@ % my $btn = l('pf_CREATE_RULE'); %= form_for '/portforwardinga' => (method => 'POST') => begin - % my $retref= $c->stash("ret"); - % my %ret; - % unless (length($retref)) {%ret = (ret=>"");} - % else {%ret = %$retref;} + % my $retref= $c->stash("ret"); + % my %ret; + % unless (length($retref)) {%ret = (ret=>"");} + % else {%ret = %$retref;} % my $numtcpforwards = @$tcpforwards; - % my $numudpforwards = @$udpforwards; + % my $numudpforwards = @$udpforwards; - % my @vars = split(",",$ret{vars}); - % my $var1 = @vars[0]; - % my $var2 = @vars[1]; - % my $var3 = @vars[2]; - % my $var4 = @vars[3]; - % my $var5 = @vars[4]; - % my $var6 = @vars[5]; + % my @vars = split(",",$ret{vars}); + % my $var1 = @vars[0]; + % my $var2 = @vars[1]; + % my $var3 = @vars[2]; + % my $var4 = @vars[3]; + % my $var5 = @vars[4]; + % my $var6 = @vars[5]; - %if ($ret{ret} eq "") { - %= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); - %} elsif (index($ret{ret},"SUCCESS") != -1) { -
-
- - %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); -
- %} else { -
-
- - %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); -
- %} + %if ($ret{ret} eq "") { + %= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); + %} elsif (index($ret{ret},"SUCCESS") != -1) { +
+
+ + %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); +
+ %} else { +
+
+ + %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); +
+ %} -

-
- %= submit_button "$btn", class => "" -

+

+
+ %= submit_button "$btn", class => "" +

% end - % if ($empty){ + % if ($empty){
- %=l 'pf_NO_FORWARDS' - % } else { + %=l 'pf_NO_FORWARDS' + % } else {
- %=l 'pf_SHOW_FORWARDS' -

- - - - - - - - - - - - - - % my %forwards = (); - % $forwards{TCP} = $tcpforwards; - % $forwards{UDP} = $udpforwards; + %=l 'pf_SHOW_FORWARDS' +

+
- %=l 'pf_LABEL_PROTOCOL' - - %=l 'pf_LABEL_SOURCE_PORT' - - %=l 'pf_LABEL_DESTINATION_HOST' - - %=l 'pf_LABEL_DESTINATION_PORT' - - %=l 'pf_ALLOW_HOSTS' - - %=l 'pf_RULE_COMMENT' - - %=l 'ACTION' -
+ + + + + + + + + + + + + % my %forwards = (); + % $forwards{TCP} = $tcpforwards; + % $forwards{UDP} = $udpforwards; % foreach my $proto (sort keys %forwards) { % if (@{ $forwards{$proto} }) { % foreach my $entry (@{ $forwards{$proto} }) { - + % my $sport = $entry->key; % my $dhost = $entry->prop('DestHost'); % my $dport = $entry->prop('DestPort') || ''; % my $cmmnt = $entry->prop('Comment') || ''; % my $allow = $entry->prop('AllowHosts') || ''; - %= t td => (class => "") => $proto - %= t td => (class => "") => $sport - %= t td => (class => "") => $dhost - %= t td => (class => "") => $dport - %= t td => (class => "") => $allow - %= t td => (class => "") => $cmmnt - - + %}; + <%= $c->render_to_string(inline => $actionRemove) %> + + % } % } %} - %} - -
+ %=l 'pf_LABEL_PROTOCOL' + + %=l 'pf_LABEL_SOURCE_PORT' + + %=l 'pf_LABEL_DESTINATION_HOST' + + %=l 'pf_LABEL_DESTINATION_PORT' + + %=l 'pf_ALLOW_HOSTS' + + %=l 'pf_RULE_COMMENT' + + %=l 'ACTION' +
- %my $remove_text = l('REMOVE'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $actionRemove = qq{ + %= t td => (class => "") => $proto + %= t td => (class => "") => $sport + %= t td => (class => "") => $dhost + %= t td => (class => "") => $dport + %= t td => (class => "") => $allow + %= t td => (class => "") => $cmmnt + + %my $remove_text = l('REMOVE'); # Localized text + %my $csrf_token = "TOKEN"; # CSRF token for security + %my $actionRemove = qq{ % - % + % % - %}; - <%= $c->render_to_string(inline => $actionRemove) %> -
- %= hidden_field 'trt' => $pf_datas->{trt} + %} + + + %= hidden_field 'trt' => $pf_datas->{trt}
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_add.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_add.html.ep index 6e94535..923b43a 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_add.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_add.html.ep @@ -1,51 +1,51 @@
- % my $btn = l('ADD'); + % my $btn = l('ADD'); %= form_for '/printers2' => (method => 'POST') => begin -

-

- %=l 'prt_CREATE_NEW_PRINTER' -

-
- %=l 'prt_CREATE_NEW_DESC' -

-
+

+

+ %=l 'prt_CREATE_NEW_PRINTER' +

+
+ %=l 'prt_CREATE_NEW_DESC' +

+
-

- - %=l 'prt_PRINTER_NAME', class => "" - - - %= text_field 'Name', class => "" - -

+

+ + %=l 'prt_PRINTER_NAME', class => "" + + + %= text_field 'Name', class => "" + +

-

- - %=l 'DESCRIPTION_BRIEF', class => "" - - - %= text_field 'Description', class => "" - -

+

+ + %=l 'DESCRIPTION_BRIEF', class => "" + + + %= text_field 'Description', class => "" + +

-

- - %=l 'LOCATION', class => "" - - - %= select_field 'Location' => $c->printerLocation_list(), class => "" - -

+

+ + %=l 'LOCATION', class => "" + + + %= select_field 'Location' => $c->printerLocation_list(), class => "" + +

-

-

- %= submit_button "$btn", class => "" -

+

+

+ %= submit_button "$btn", class => "" +

- %= hidden_field 'trt' => $prt_datas->{trt} - + %= hidden_field 'trt' => $prt_datas->{trt} + % end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_del.html.ep index 95f0842..58206dc 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_del.html.ep @@ -1,26 +1,26 @@
- % my $btn = l('REMOVE'); + % my $btn = l('REMOVE'); %= form_for '/printers2' => (method => 'POST') => begin -

-

- %=l 'prt_REMOVE_PRINTER' -

-

+

+

+ %=l 'prt_REMOVE_PRINTER' +

+

- <%=l 'prt_ABOUT_TO_REMOVE'%> <%=$prt_datas->{printer}%> - (<%=$prt_datas->{description}%>) -
+ <%=l 'prt_ABOUT_TO_REMOVE'%> <%=$prt_datas->{printer}%> + (<%=$prt_datas->{description}%>) +
- %=l 'prt_SPOOL_FILE_WARNING' -
+ %=l 'prt_SPOOL_FILE_WARNING' +
- %=l 'prt_ARE_YOU_SURE' -

+ %=l 'prt_ARE_YOU_SURE' +

-

-
- %= submit_button "$btn", class => "" -

+

+
+ %= submit_button "$btn", class => "" +

%= hidden_field 'trt' => $prt_datas->{trt} %= hidden_field 'printer' => $prt_datas->{printer} diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_list.html.ep index 438d4eb..ac7db49 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_list.html.ep @@ -6,45 +6,45 @@ %= hidden_field 'trt' => 'ADD' -

-
- %= submit_button "$btn", class => "" -

+

+
+ %= submit_button "$btn", class => "" +

% end -

-

- %=l 'prt_CURRENT_LIST' -

-

- % my $numPrinters = @$printerDrivers; - % if ($numPrinters == 0){ +

+

+ %=l 'prt_CURRENT_LIST' +

+

+ % my $numPrinters = @$printerDrivers; + % if ($numPrinters == 0){ %=l 'prt_NO_PRINTERS' - % } else { - - - - - - - - - - - - + % } else { +
- %=l 'NAME' - - %=l 'DESCRIPTION' - - %=l 'LOCATION' - - %=l 'prt_REMOTE_ADDRESS' - - %=l 'prt_REMOTE_NAME' - - %=l 'ACTION' -
+ + + + + + + + + + + % foreach my $printer (@$printerDrivers) % { % my $address = ($printer->prop('Location') eq 'remote') @@ -58,25 +58,25 @@ %= t td => (class => "") => $printer->prop('Location') %= t td => (class => "") => $address %= t td => (class => "") => $remoteName - - + %}; + <%= $c->render_to_string(inline => $actionRemove) %> + + % } - -
+ %=l 'NAME' + + %=l 'DESCRIPTION' + + %=l 'LOCATION' + + %=l 'prt_REMOTE_ADDRESS' + + %=l 'prt_REMOTE_NAME' + + %=l 'ACTION' +
- %my $remove_text = l('REMOVE'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $printer_name = $printer->key; - %my $actionRemove = qq{ + + %my $remove_text = l('REMOVE'); # Localized text + %my $csrf_token = "TOKEN"; # CSRF token for security + %my $printer_name = $printer->key; + %my $actionRemove = qq{ % - % + % % - %}; - <%= $c->render_to_string(inline => $actionRemove) %> -
- <%} %> -

+ + + <%} %> +

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_net.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_net.html.ep index d738f4b..2055c78 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_net.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_prt_net.html.ep @@ -1,45 +1,45 @@
- % my $btn = l('ADD'); + % my $btn = l('ADD'); %= form_for '/printers2' => (method => 'POST') => begin -

-

- %=l 'prt_CREATE_NETWORK_PRINTER' -

- -

- %=l 'prt_CREATE_NETWORK_DESC' -

- -

- - %=l 'prt_HOSTNAME_OR_IP', class => "" - - - %= text_field 'Address', class => "" - -

+

+

+ %=l 'prt_CREATE_NETWORK_PRINTER' +

+ +

+ %=l 'prt_CREATE_NETWORK_DESC' +

+ +

+ + %=l 'prt_HOSTNAME_OR_IP', class => "" + + + %= text_field 'Address', class => "" + +

-

- - %=l 'prt_REMOTE_NAME_DESC', class => "" - - - %= text_field 'RemoteName' => 'raw', class => "" - -

+

+ + %=l 'prt_REMOTE_NAME_DESC', class => "" + + + %= text_field 'RemoteName' => 'raw', class => "" + +

-

-

- %= submit_button "$btn", class => "" -

+

+

+ %= submit_button "$btn", class => "" +

- %= hidden_field 'trt' => $prt_datas->{trt} - %= hidden_field 'Name' => $prt_datas->{name} - %= hidden_field 'Description' => $prt_datas->{description} - %= hidden_field 'Location' => $prt_datas->{location} - + %= hidden_field 'trt' => $prt_datas->{trt} + %= hidden_field 'Name' => $prt_datas->{name} + %= hidden_field 'Description' => $prt_datas->{description} + %= hidden_field 'Location' => $prt_datas->{location} + % end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_rma_pptp.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_rma_pptp.html.ep index 7ddb8da..466f819 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_rma_pptp.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_rma_pptp.html.ep @@ -1,15 +1,15 @@ -

- %=l 'rma_TITLE_PPTP' -


- %=l 'rma_DESC_PPTP' -
- - %=l 'rma_LABEL_PPTP' - - - % param 'PptpSessions' => $c->get_pptp_sessions unless param 'PptpSessions'; - %= text_field 'PptpSessions' => $c->get_pptp_sessions(), class => "" - -

+

+ %=l 'rma_TITLE_PPTP' +


+ %=l 'rma_DESC_PPTP' +
+ + %=l 'rma_LABEL_PPTP' + + + % param 'PptpSessions' => $c->get_pptp_sessions unless param 'PptpSessions'; + %= text_field 'PptpSessions' => $c->get_pptp_sessions(), class => "" + +

- \ No newline at end of file + \ No newline at end of file diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index 14c0359..8d8d3b8 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 16 +%define release 17 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Name: %{name} Version: %{version} @@ -26,6 +26,10 @@ AdminLTE is an html framework for admin consoles wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip %changelog +* Thu May 01 2025 John Crisp 11.0.0-17.sme +- Convert tabs to spaces for consistency +- Fix group update container + * Thu May 01 2025 John Crisp 11.0.0-16.sme - Fix user add error - Update group templates