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 c241aad..ed91e40 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 @@ -10,70 +10,71 @@ % my $btn = l('ADD');
- -
-
- -
-
- -
-
- - Group - -
-
- -

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

- -
-
- +
+
+ +
+
+ +
+
+ + Group + +
-
- + +

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

+ +
+
+ +
+
+ +
+
+ + Group Alias + +
-
- - Group Alias - -
-
- -
- -
- <%= l 'GROUP_MEMBERS' %> -
- -
-
- %= 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 . ")" -
- % } -
-

- -
-
- +
+ <%= l 'GROUP_MEMBERS' %>
-
- - %= hidden_field 'trt' => $grp_datas->{trt} +
+
+ %= 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 . ")" +
+ % } +
+ +

+ +
+
+ +
+
+ + %= 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 4bed2a4..5bc586a 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 @@ -3,69 +3,69 @@ % my $btn = l('REMOVE');
-

- -

<%=l 'REMOVE_USER_GROUP' %>

- -
+

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

<%=l 'REMOVE_USER_GROUP' %>

-

- -
- - % my $size = keys %$members; - % if ( ! $size ){ - %= l 'ACCOUNT_GROUP_NONE' - % } else { - %= 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} - ) -
    • - % } -
- % } -
+ + <%=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) %> + +

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

+ +
    + % foreach my $key ( keys %$members) { +
  • + %=$key + ( <%=$members->{$key} %> ) +
    • + % } +
+ % } -
-
-
-
- - %= hidden_field 'trt' => $grp_datas->{trt} - %= hidden_field 'groupName' => $grp_datas->{group} - - + +

+ +
+ + % $size = keys %$ibays; + + % if ( $size ) { + %=l 'grp_IBAYS_WILL_BE_CHANGED' +
+
    + % foreach my $key (sort ( keys %$ibays )) { +
  • + %=$key + ( + %=$ibays->{$key} + ) +
    • + % } +
+ % } +
+ +
+
+ +
+
+ + %= hidden_field 'trt' => $grp_datas->{trt} + %= hidden_field 'groupName' => $grp_datas->{group} + +
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 e6f6410..b2f1667 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 @@ -2,17 +2,19 @@ % my $btn = l('GROUP_ADD'); - %= form_for '/groups' => (method => 'POST') => begin +
+ %#= form_for '/groups' => (method => 'POST') => begin - %= hidden_field 'trt' => 'ADD' - -
- -
- -
+ %= hidden_field 'trt' => 'ADD' - % end +
+ +
+ +
+
+ + %# end

<%=l 'grp_CURRENT_LIST' %>

@@ -23,19 +25,13 @@ % } else { - - - - + + + + - - + + % foreach my $group ( @$groups ) % { @@ -57,11 +53,11 @@ %my $csrf_token = "TOKEN"; # CSRF token for security %my $group_name = $group->key; # group name extracted from the data structure %my $actionRemove = qq{ - % - % - % + % + % + % %}; 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 bf5885f..aa29e11 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 @@ -4,87 +4,87 @@ -

+

+ +

<%= l 'MODIFY_USER_GROUP' %>

+ +

+ +
+
+ +
+
+ +
+
-

<%= l 'MODIFY_USER_GROUP' %>

+

-

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

+ + % param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc'; + +
+
+ +
+
+ +
+
+ + Group Alias + +
-
- + +

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

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

- - % param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc'; - -
-
- -
-
- -
-
- - Group Alias - -
-
- -

- -
- <%=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 . ")" +
- % } - -

- -
-
- -
-
- - - %= hidden_field 'trt' => $grp_datas->{trt} - %= hidden_field 'groupName' => $grp_datas->{group} - +
+ % 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 . ")" +
+ % } + +

+ +
+
+ +
+
+ + + %= hidden_field 'trt' => $grp_datas->{trt} + %= hidden_field 'groupName' => $grp_datas->{group} + +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_del.html.ep index 779c21d..33fd675 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_del.html.ep @@ -1,29 +1,29 @@
% my $btn = l('REMOVE'); - %= form_for '/hostentriesd' => (method => 'POST') => begin -

-

- %=l 'hos_REMOVE_TITLE' -

-

-

- %= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname}); -

- -

- %=l 'hos_ABOUT_TO_REMOVE' -

- -

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

+
+ %#= form_for '/hostentriesd' => (method => 'POST') => begin + +
+

<%= l 'hos_REMOVE_TITLE'%>

+
+ + <%= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname}); %> + + <%= l 'hos_ABOUT_TO_REMOVE' %> +
+
+ +
+
+ + %= hidden_field 'trt' => $hos_datas->{trt} %= hidden_field 'Hostname' => $hos_datas->{hostname} - % end + %# end +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_list.html.ep index b7ead6a..5be25ad 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_list.html.ep @@ -2,85 +2,82 @@ % my $btn = l('hos_ADD_HOSTNAME'); - %= form_for '/hostentries' => (method => 'POST') => begin +
+ %#= form_for '/hostentries' => (method => 'POST') => begin -

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

+
+
+ +
+
%= hidden_field 'trt' => $hos_datas->{trt} - % end + %# end + % my %dom_hos = %{$dom_hosts}; % foreach my $domain ( sort ( keys %dom_hos ) ) { -


- %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain); -

+
+ + + <%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain); %> + + +
- %=l 'GROUP' - - %=l 'DESCRIPTION' - - %=l 'ACTION' -
<%= l 'GROUP' %><%= l 'DESCRIPTION' %><%= l 'ACTION' %>
<%= $c->render_to_string(inline => $actionModify) %>
- - - - - - - - - - - - - % foreach (@{$dom_hos{$domain}{'HOSTS'}}) { - - %= t td => (class => "") => $_->{'HostName'}; - %= t td => (class => "") => $_->{'HostType'}; - %= t td => (class => "") => $_->{'IP'}; - %= t td => (class => "") => $_->{'MACAddress'}; - %= t td => (class => "") => $_->{'Comment'}; - - - % } - + + + + + + + + + + + + + % foreach (@{$dom_hos{$domain}{'HOSTS'}}) { + + + + + + + + + + % } +
- %=l 'hos_HOSTNAME' - - %=l 'hos_HOSTTYPE' - - %=l 'IP_ADDRESS_OR_FQDN' - - %=l 'hos_ETHERNET_ADDRESS' - - %=l 'COMMENT' - - %=l 'ACTION' -
- %my ($actionModify, $actionRemove) = ' '; - %my $static = $_->{'static'} || "no"; - %if ($static ne 'yes') { - %my $modify_text = l('MODIFY'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure - %$actionModify = qq{ - % - % - % - %}; - %my $remove_text = l('REMOVE'); # Localized text - %$csrf_token = "TOKEN"; # CSRF token for security - %#my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure - %$actionRemove = qq{ - % - % - % - %}; - %} - <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %> -
<%= l 'hos_HOSTNAME' %><%= l 'hos_HOSTTYPE' %><%= l 'IP_ADDRESS_OR_FQDN' %><%= l 'hos_ETHERNET_ADDRESS' %><%= l 'COMMENT' %><%= l 'ACTION' %>
<%= $_->{'HostName'}; %><%= $_->{'HostType'}; %><%= $_->{'IP'}; %><%= $_->{'MACAddress'}; %><%= $_->{'Comment'}; %> + %my ($actionModify, $actionRemove) = ' '; + %my $static = $_->{'static'} || "no"; + %if ($static ne 'yes') { + %my $modify_text = l('MODIFY'); # Localized text + %my $csrf_token = "TOKEN"; # CSRF token for security + %my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure + %$actionModify = qq{ + % + % + % + %}; + %my $remove_text = l('REMOVE'); # Localized text + %$csrf_token = "TOKEN"; # CSRF token for security + %#my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure + %$actionRemove = qq{ + % + % + % + %}; + %} + <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %> +
% }
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_ulc.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_ulc.html.ep index aaade76..098cb66 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_ulc.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_ulc.html.ep @@ -1,62 +1,64 @@
- % my $btn = l('NEXT'); + % my $btn = l('NEXT'); - %= form_for '/hostentriesd' => (method => 'POST') => begin -

- % if ( $hos_datas->{trt} eq "ALC" ) { - %=l 'hos_CREATE_TYPE' - % } else { - %=l 'hos_MODIFY_TYPE' - % $btn = l('MODIFY'); - % } -

+
+ %#= form_for '/hostentriesd' => (method => 'POST') => begin -

- %=l 'hos_LOCAL_PAGE_DESCRIPTION' -

- -

- %=l 'hos_LOCAL_IP_DESCRIPTION' -

- -

- - %=l 'hos_LOCAL_IP', class => "" - - - % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip'; - %= text_field 'Internalip', class => "" - -

- -

- %=l 'hos_ETHERNET_ADDRESS_DESCRIPTION' -

- -

- - %=l 'hos_ETHERNET_ADDRESS', class => "" - - - % param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress'; - %= text_field 'Macaddress', class => "" - -

- -


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

- - %= hidden_field 'trt' => $hos_datas->{trt} - %= hidden_field 'Hostname' => $hos_datas->{hostname} +

+ % if ( $hos_datas->{trt} eq "ALC" ) { + %=l 'hos_CREATE_TYPE' + % } else { + %=l 'hos_MODIFY_TYPE' + % $btn = l('MODIFY'); + % } +

+ +
+ <%= l 'hos_LOCAL_PAGE_DESCRIPTION' %> +
+ +
+ <%= l 'hos_LOCAL_IP_DESCRIPTION' %> +
+
+ <%= l 'hos_LOCAL_IP' %> +
+ +
+ % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip'; + <%= text_field 'Internalip' %> +
+ +
+ <%= l 'hos_ETHERNET_ADDRESS_DESCRIPTION' %> +
+ +
+ <%= l 'hos_ETHERNET_ADDRESS' %> +
+ +
+ % param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress'; + <%= text_field 'Macaddress' %> +
+ +
+
+ +
+
+ + %= hidden_field 'trt' => $hos_datas->{trt} + %= hidden_field 'Hostname' => $hos_datas->{hostname} %= hidden_field 'Name' => $hos_datas->{name} %= hidden_field 'Domain' => $hos_datas->{domain} - %= hidden_field 'Comment'=> $hos_datas->{comment} - %= hidden_field 'Hosttype'=> $hos_datas->{hosttype} - %= hidden_field 'Externalip' => $hos_datas->{externalip} + %= hidden_field 'Comment'=> $hos_datas->{comment} + %= hidden_field 'Hosttype'=> $hos_datas->{hosttype} + %= hidden_field 'Externalip' => $hos_datas->{externalip} - %end + %#end +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_upd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_upd.html.ep index 25c4455..31a2a23 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_upd.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_upd.html.ep @@ -1,81 +1,79 @@
- % my $btn = l('NEXT'); + % my $btn = l('NEXT'); - %= form_for '/hostentriesd' => (method => 'POST') => begin -

- % if ( $hos_datas->{trt} eq "ADD" ) { - %=l 'hos_CREATE_TITLE' - % } else { - %=l 'hos_MODIFY_TITLE' - % $btn = l('MODIFY'); - % } -

+
+ %#= form_for '/hostentriesd' => (method => 'POST') => begin -

- %=l 'hos_HOSTNAME_DESCRIPTION' -

+

+ % if ( $hos_datas->{trt} eq "ADD" ) { + <%=l 'hos_CREATE_TITLE' %> + % } else { + <%=l 'hos_MODIFY_TITLE' %> + % $btn = l('MODIFY'); + % } +

+ +
<%= l 'hos_HOSTNAME_DESCRIPTION' %>
+
<%=l 'hos_HOSTNAME' %>
+ +
+ % if ( $hos_datas->{trt} eq "ADD" ) { + % param 'Name' => $hos_datas->{name} unless param 'Name'; + <%= text_field 'Name' %> + % } else { + %= hidden_field 'Name' => $hos_datas->{name} + <%= $hos_datas->{name} %> + % } +
+ +
+ <%= l 'DOMAIN' %> +
-

- - %=l 'hos_HOSTNAME', class => "" - - - % if ( $hos_datas->{trt} eq "ADD" ) { - % param 'Name' => $hos_datas->{name} unless param 'Name'; - %= text_field 'Name', class => "" - % } else { - %= hidden_field 'Name' => $hos_datas->{name} - %= $hos_datas->{name}, class => "" - % } - -

+
+ % if ( $hos_datas->{trt} eq "ADD" ) { + % param 'Domain' => $hos_datas->{domain} unless param 'Domain'; + <%= select_field 'Domain', $c->domains_list() %> + % } else { + %= hidden_field 'Domain' => $hos_datas->{domain} + <%= $hos_datas->{domain} %> + % } +
+ +
+ <%= $c->l('COMMENT', ''); %> +
-

- - %=l 'DOMAIN', class => "" - - - % if ( $hos_datas->{trt} eq "ADD" ) { - % param 'Domain' => $hos_datas->{domain} unless param 'Domain'; - %= select_field 'Domain', $c->domains_list(), class => "" - % } else { - %= hidden_field 'Domain' => $hos_datas->{domain} - %= $hos_datas->{domain}, class => "" - % } - -

+
+ % param 'Comment' => $hos_datas->{comment} unless param 'Comment'; + <%= text_field 'Comment' %> +
-

- - %= $c->l('COMMENT', ''); - - - % param 'Comment' => $hos_datas->{comment} unless param 'Comment'; - %= text_field 'Comment', class => "" - -

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

- - %=l 'LOCATION', class => "" - - - % param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype'; - %= select_field 'Hosttype', $c->hosttype_list(), class => "" - -

+
+ % param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype'; + %= select_field 'Hosttype', $c->hosttype_list(), class => "" +
-


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

+
- %= hidden_field 'trt' => $hos_datas->{trt} - %= hidden_field 'Hostname' => $hos_datas->{hostname} - %= hidden_field 'Internalip' => $hos_datas->{internalip} - %= hidden_field 'Externalip' => $hos_datas->{externalip} - %= hidden_field 'Macaddress' => $hos_datas->{macaddress} +
+
+ +
+
+ + %= hidden_field 'trt' => $hos_datas->{trt} + %= hidden_field 'Hostname' => $hos_datas->{hostname} + %= hidden_field 'Internalip' => $hos_datas->{internalip} + %= hidden_field 'Externalip' => $hos_datas->{externalip} + %= hidden_field 'Macaddress' => $hos_datas->{macaddress} - %end + %#end +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_urm.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_urm.html.ep index 0f7f737..8aca5f8 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_urm.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_hos_urm.html.ep @@ -3,36 +3,38 @@ % my $btn = l('MODIFY'); - %= form_for '/hostentriesd' => (method => 'POST') => begin - -

- %=l 'hos_REMOTE_PAGE_DESCRIPTION' -

- -

- - %=l 'IP_ADDRESS_OR_FQDN', class => "" - - - % param 'Externalip' => $hos_datas->{externalip} unless param 'Externalip'; - %= text_field 'Externalip', class => "" - -

- - -


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

- - %= hidden_field 'trt' => $hos_datas->{trt} - %= hidden_field 'Hostname' => $hos_datas->{hostname} +
+ %#= form_for '/hostentriesd' => (method => 'POST') => begin + +
+ <%= l 'hos_REMOTE_PAGE_DESCRIPTION' %> +
+ +
+ <%= l 'IP_ADDRESS_OR_FQDN' %> +
+ +
+ % param 'Externalip' => $hos_datas->{externalip} unless param 'Externalip'; + <%= text_field 'Externalip' %> +
+ +
+
+ +
+
+ + %= hidden_field 'trt' => $hos_datas->{trt} + %= hidden_field 'Hostname' => $hos_datas->{hostname} %= hidden_field 'Name' => $hos_datas->{name} %= hidden_field 'Domain' => $hos_datas->{domain} - %= hidden_field 'Comment'=> $hos_datas->{comment} - %= hidden_field 'Hosttype'=> $hos_datas->{hosttype} - %= hidden_field 'Internalip' => $hos_datas->{internalip} - %= hidden_field 'Macaddress' => $hos_datas->{macaddress} + %= hidden_field 'Comment'=> $hos_datas->{comment} + %= hidden_field 'Hosttype'=> $hos_datas->{hosttype} + %= hidden_field 'Internalip' => $hos_datas->{internalip} + %= hidden_field 'Macaddress' => $hos_datas->{macaddress} - %end + %#end +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep index 1c61352..27a1c56 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_del.html.ep @@ -2,51 +2,55 @@ % my $btn = l('REMOVE'); - %= form_for '/useraccountsd' => (method => 'POST') => begin -
-

<%= l 'usr_REMOVE_ACCOUNT_TITLE' %>

-
-
-
- Needs a text change in the Lex files -
- %= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} ); -
- -

- - - - - - - - - - - - - - -
- %=l 'ACCOUNT' - - %=l 'USER_NAME' -
<%= $usr_datas->{user} %><%= $usr_datas->{name} %>
- -
- %= $c->render_to_string(inline => $c->l('usr_REMOVE_DESC2')) - -
-
- +
+ %#= form_for '/useraccountsd' => (method => 'POST') => begin + +
+

<%= l 'usr_REMOVE_ACCOUNT_TITLE' %>

+
+
+
+ Needs a text change in the Lex files +
+ %= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
-
- - %= hidden_field 'trt' => $usr_datas->{trt} - %= hidden_field 'user' => $usr_datas->{user} - %= hidden_field 'name' => $usr_datas->{name} - % end +

+ + + + + + + + + + + + + + +
+ %=l 'ACCOUNT' + + %=l 'USER_NAME' +
<%= $usr_datas->{user} %><%= $usr_datas->{name} %>
+ +
+ %= $c->render_to_string(inline => $c->l('usr_REMOVE_DESC2')) + +
+
+ +
+
+ + %= hidden_field 'trt' => $usr_datas->{trt} + %= hidden_field 'user' => $usr_datas->{user} + %= hidden_field 'name' => $usr_datas->{name} + + %# end + +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep index 21a91de..a2f47b1 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep @@ -1,17 +1,17 @@
- % my $btn = l('usr_ADD_USER'); - %= form_for '/useraccounts' => (method => 'POST') => begin +
+ %#= form_for '/useraccounts' => (method => 'POST') => begin
- - % end +
+ %# end
%= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC')) diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep index a5570f2..a0b238d 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_lock.html.ep @@ -1,8 +1,11 @@
% my $btn = l('usr_LOCK'); + +
- %= form_for '/useraccountsd' => (method => 'POST') => begin + %#= form_for '/useraccountsd' => (method => 'POST') => begin +

<%= l 'usr_LOCK_ACCOUNT_TITLE' %>

@@ -48,6 +51,7 @@ %= hidden_field 'user' => $usr_datas->{user} %= hidden_field 'name' => $usr_datas->{name} - % end +
+ %# end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep index 9331de8..4fa6e09 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwd.html.ep @@ -2,7 +2,8 @@ % my $btn = l('SAVE'); - %= form_for '/useraccountsd' => (method => 'POST') => begin +
+ %#= form_for '/useraccountsd' => (method => 'POST') => begin

<%= l 'RESET_PASSWORD_TITLE' %>

@@ -81,6 +82,7 @@ %= hidden_field 'user' => $usr_datas->{user} %= hidden_field 'name' => $usr_datas->{name} - % end + + %# end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep index 24fac81..84ec2b7 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_pwds.html.ep @@ -1,77 +1,78 @@
% my $btn = l('SAVE'); - - %= form_for '/useraccountsd' => (method => 'POST') => begin - -
-

<%= l 'PASSWORD_RESET' %>

-
+
+ %#= form_for '/useraccountsd' => (method => 'POST') => begin -
- -
- <%= l 'usr_SYSTEM_PASSWORD_DESCRIPTION' %> -
- -
- -
- <%=l 'usr_CURRENT_SYSTEM_PASSWORD' %> -
- -
- -
-
- +
+

<%= l 'PASSWORD_RESET' %>

-
- -
- -
- <%= l 'usr_NEW_SYSTEM_PASSWORD' %> -
+ +
-
- -
-
- +
+ <%= l 'usr_SYSTEM_PASSWORD_DESCRIPTION' %>
-
- - -
- - -
- <%= l 'usr_NEW_SYSTEM_PASSWORD_VERIFY' %> -
- -
-
-
- -
-
- -
- -
- -
-
- -
-
- - %= hidden_field 'trt' => $usr_datas->{trt} - %= hidden_field 'user' => $usr_datas->{user} - %= hidden_field 'name' => $usr_datas->{name} +
- % end +
+ <%=l 'usr_CURRENT_SYSTEM_PASSWORD' %> +
+ +
+ +
+
+ +
+
+ +
+ +
+ <%= l 'usr_NEW_SYSTEM_PASSWORD' %> +
+ +
+ +
+
+ +
+
+ + +
+ + +
+ <%= l 'usr_NEW_SYSTEM_PASSWORD_VERIFY' %> +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ + %= hidden_field 'trt' => $usr_datas->{trt} + %= hidden_field 'user' => $usr_datas->{user} + %= hidden_field 'name' => $usr_datas->{name} + + %# end +
\ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep index 17dbefb..1077608 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep @@ -149,8 +149,6 @@

- - % param 'Phone' => $usr_datas->{phone} unless param 'Phone';
@@ -167,8 +165,7 @@

- - + % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
@@ -293,6 +290,7 @@ % } + %#end
\ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep index 25d1e94..a8e1779 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep @@ -7,9 +7,8 @@

- %#= form_for '/useraccountsd' => (method => 'POST') => begin - - + %#= form_for '/useraccountsd' => (method => 'POST') => begin +
@@ -110,7 +109,7 @@ %= hidden_field 'trt' => $usr_datas->{trt} %= hidden_field 'user' => $usr_datas->{user} - % end + %# end
diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index fe5ba50..c5c67fe 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 18 +%define release 19 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-19.sme +- Fix more stuff with usr templates +- Update jhost templates + * Thu May 01 2025 John Crisp 11.0.0-18.sme - Trying to make _user_list more logical. Needs 'UNLOCK' translation - Big cleanup of dupplicate % my= but needs more work