diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep index 86ce54c..3ad7133 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep @@ -6,8 +6,8 @@ % if (config->{debug} == 1) {
- %= dumper $c->current_route - %= dumper $dom_datas + <%= dumper $c->current_route %> + <%= dumper $dom_datas %>
% } diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_del.html.ep index 438db31..c1c1282 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_del.html.ep @@ -1,29 +1,38 @@
- % my $btn = l('REMOVE'); - %= form_for '/domains2' => (method => 'POST') => begin -

-

- %=l 'dom_REMOVE_TITLE' -

-

+ % my $btn = l('REMOVE'); -

- %= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description}); -

- -

- %= l('dom_ABOUT_TO_REMOVE') -

+
-

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

+
- %= hidden_field 'trt' => $dom_datas->{trt} - %= hidden_field 'Domain' => $dom_datas->{domain} +
+

<%=l 'dom_REMOVE_TITLE' %>

+
- % end +
+ +
+ <%= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description}); %> +
+ +
+ +
+ <%= l('dom_ABOUT_TO_REMOVE') %> +
+ +
+ +
+
+ +
+
+ + <%= hidden_field 'trt' => $dom_datas->{trt} %> + <%= hidden_field 'Domain' => $dom_datas->{domain} %> + +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep index 449dee1..c1945cd 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep @@ -1,127 +1,123 @@
% my $btn = l('dom_ADD_DOMAIN'); + <%= l('dom_FORM_DESCRIPTION'); %> - - %= form_for '/domains' => (method => 'POST') => begin - - %= l('dom_FORM_DESCRIPTION'); - -

+


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

+
+
+ +
+
+ <%= hidden_field 'trt' => 'ADD' %> +
- %= hidden_field 'trt' => 'ADD' - - % end +
+ +
+

<%=l 'dom_CURRENT_DOMAINS' %>

+
+ +
-

- %=l 'dom_CURRENT_DOMAINS' -

- - - - - - - - - - + + + + + + + + + - % foreach my $domain ( @$domains ) { - - %= t td => (class => "") => $domain->{Domain} - %= t td => (class => "") => $domain->{'Description'} - %= t td => (class => "") => $domain->{'Content'} - %= t td => (class => "") => l('dom_' . $domain->{'Nameservers'}) + - %# my $actionModify = "" . "" . ""; - %my $modify_text = l('MODIFY'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure - %my $actionModify = qq{ - % - % - % - %}; - %my $removable = ($domain->{Removable} || 'yes'); - %my $actionRemove = ' '; - %if ($removable eq 'yes') { - %my $remove_text = l('REMOVE'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure - %$actionRemove = qq{ - % - % - % + % foreach my $domain ( @$domains ) { + + + + + + + %# my $actionModify = "" . "" . ""; + % my $modify_text = l('MODIFY'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure + % my $actionModify = qq{ + % + % + % %}; - %# $actionRemove = "" . "" . ""; - %}; - - - % } + % my $removable = ($domain->{Removable} || 'yes'); + % my $actionRemove = ' '; + % if ($removable eq 'yes') { + % my $remove_text = l('REMOVE'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure + % $actionRemove = qq{ + % + % + % + %}; + %# $actionRemove = "" . "" . ""; + %}; + + + + % } - +
- %=l 'DOMAIN_NAME' - - %=l 'DESCRIPTION_BRIEF' - - %=l 'dom_CONTENT' - - %=l 'dom_LABEL_NAMESERVERS' - - %=l 'ACTION' -
<%=l 'DOMAIN_NAME' %><%=l 'DESCRIPTION_BRIEF' %><%=l 'dom_CONTENT' %><%=l 'dom_LABEL_NAMESERVERS'%><%=l 'ACTION' %>
<%= $domain->{Domain} %><%= $domain->{'Description'} %><%= $domain->{'Content'} %><%= l('dom_' . $domain->{'Nameservers'}) %> - <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %> -
<%= $c->render_to_string(inline => $actionRemove) %><%= $c->render_to_string(inline => $actionModify) %>
- %= hidden_field 'trt' => 'ADD' + <%= hidden_field 'trt' => 'ADD' %> - %= form_for '/domains' => (method => 'POST') => begin +

% my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS'); -

- %= l 'dom_DESC_CORPORATE_DNS_CURRENT' -

+

<%= l 'dom_DESC_CORPORATE_DNS_CURRENT' %>

-

- - %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' - - - %= $dom_datas->{forwarder} - -

- - % if ($dom_datas->{forwarder2}) { -

- - %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' - - - %= $dom_datas->{forwarder2} - -

+ % if ($dom_datas->{forwarder}) { +
+
+ <%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' %> +
+
+ <%= $dom_datas->{forwarder} %> +
+
% } -

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

- %= hidden_field 'trt' => 'UP2' - % end + % if ($dom_datas->{forwarder2}) { +
+
+ <%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' %> +
+
+ <%= $dom_datas->{forwarder2} %> +
+
+ % } +
+
+
+ +
+
+ + <%= hidden_field 'trt' => 'UP2' %> + +
\ No newline at end of file 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 a18617f..389afed 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 @@ -59,12 +59,12 @@
- +
- %= hidden_field 'trt' => $grp_datas->{trt} - %= hidden_field 'groupName' => $grp_datas->{group} + <%= 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 4dc35b8..77c3b7a 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 @@ -7,6 +7,7 @@
+
<%= hidden_field 'trt' => 'ADD' %> 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 3f169de..8bc1803 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 @@ -22,7 +22,7 @@
- +
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 32de2b4..34cddf2 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 @@ -20,7 +20,7 @@ - + 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 a576907..9b0a313 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 @@ -5,50 +5,58 @@ -

% if ( $hos_datas->{trt} eq "ALC" ) { -

<%=l 'hos_CREATE_TYPE' %>

- % } else { -

<%=l 'hos_MODIFY_TYPE' %>

+

<%= 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' %> +
+ +
+
+ <%= l 'hos_LOCAL_IP' %> +
+
+ % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip'; + <%= text_field 'Internalip' %> +
- -
- % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip'; - <%= text_field 'Internalip' %> -
- + +
+
<%= l 'hos_ETHERNET_ADDRESS_DESCRIPTION' %>
- -
- <%= l 'hos_ETHERNET_ADDRESS' %> + +
+ +
+
+ <%= l 'hos_ETHERNET_ADDRESS' %> +
+
+ % param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress'; + <%= text_field 'Macaddress' %> +
- -
- % 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} %> @@ -56,7 +64,8 @@ <%= hidden_field 'Comment'=> $hos_datas->{comment} %> <%= hidden_field 'Hosttype'=> $hos_datas->{hosttype} %> <%= hidden_field 'Externalip' => $hos_datas->{externalip} %> - + +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep index 3ee3dd0..c248b52 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_del.html.ep @@ -18,17 +18,14 @@
-
- +
- %= hidden_field 'trt' => $iba_datas->{trt} - %= hidden_field 'ibay' => $iba_datas->{ibay} + <%= hidden_field 'trt' => $iba_datas->{trt} %> + <%= hidden_field 'ibay' => $iba_datas->{ibay} %> -

-
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep index b08f892..3aa2d86 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep @@ -5,8 +5,10 @@
-
- +
+
+ +
<%= hidden_field 'trt' => 'ADD'; %> diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_del.html.ep index 974b3bc..a15a022 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_del.html.ep @@ -14,11 +14,11 @@

- +
- %= hidden_field 'trt' => $pse_datas->{trt} - %= hidden_field 'Pseudonym' => $pse_datas->{pseudonym} + <%= hidden_field 'trt' => $pse_datas->{trt} %> + <%= hidden_field 'Pseudonym' => $pse_datas->{pseudonym} %>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep index a474b77..1583946 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep @@ -2,19 +2,18 @@ % my $btn = l('pse_CLICK_TO_CREATE'); - %= $c->render_to_string(inline => l('pse_DESCRIPTION')); + - %= form_for '/pseudonyms' => (method => 'POST') => begin - - %= hidden_field 'trt' => 'ADD' - -
+
+ <%= $c->render_to_string(inline => l('pse_DESCRIPTION')); %> +
+ <%= hidden_field 'trt' => 'ADD' %> + - % end

<%= l 'pse_CURRENT_PSEUDONYMS' %>


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 27a1c56..fdc0b64 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 @@ -3,8 +3,7 @@ % my $btn = l('REMOVE');
- %#= form_for '/useraccountsd' => (method => 'POST') => begin - +

<%= l 'usr_REMOVE_ACCOUNT_TITLE' %>

@@ -14,9 +13,9 @@
%= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
- +

- +
<%= l 'hos_HOSTNAME' %> <%= l 'hos_HOSTTYPE' %> <%= l 'IP_ADDRESS_OR_FQDN' %>
@@ -35,22 +34,21 @@
- +
%= $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 + + <%= hidden_field 'trt' => $usr_datas->{trt} %> + <%= hidden_field 'user' => $usr_datas->{user} %> + <%= hidden_field 'name' => $usr_datas->{name} %> + - +