From 187aeb5abe4da0db57f565f775f3fdcc18c6c5aa Mon Sep 17 00:00:00 2001 From: Daniel Tiefnig Date: Mon, 22 Nov 2010 14:59:06 +0000 Subject: [PATCH] removed peering server domain fixed CSS layout fixed sourcecode indentation --- lib/admin/Controller/peering.pm | 4 - root/css/admin.css | 3 + root/tt/peering_detail.tt | 54 +++++------- root/tt/peering_rewrite.tt | 144 ++++++++++++++++---------------- 4 files changed, 97 insertions(+), 108 deletions(-) diff --git a/lib/admin/Controller/peering.pm b/lib/admin/Controller/peering.pm index 0554e5e..ea7ad56 100644 --- a/lib/admin/Controller/peering.pm +++ b/lib/admin/Controller/peering.pm @@ -364,7 +364,6 @@ sub create_peer : Local { my $grpid = $c->request->params->{grpid}; my $name = $c->request->params->{name}; - my $domain = $c->request->params->{domain}; my $ip = $c->request->params->{ip}; my $port = $c->request->params->{port}; my $weight = $c->request->params->{weight}; @@ -380,7 +379,6 @@ sub create_peer : Local { { group_id => $grpid, data => { name => $name, - domain => $domain, ip => $ip, port => $port, weight => $weight, @@ -464,7 +462,6 @@ sub edit_peer : Local { my $grpid = $c->request->params->{grpid}; my $peerid = $c->request->params->{peerid}; my $name = $c->request->params->{name}; - my $domain = $c->request->params->{domain}; my $ip = $c->request->params->{ip}; my $port = $c->request->params->{port}; my $weight = $c->request->params->{weight}; @@ -477,7 +474,6 @@ sub edit_peer : Local { { id => $peerid, data => { name => $name, - domain => $domain, ip => $ip, port => $port, weight => $weight, diff --git a/root/css/admin.css b/root/css/admin.css index a3441c9..67c1f20 100644 --- a/root/css/admin.css +++ b/root/css/admin.css @@ -416,6 +416,9 @@ ul#topsubmenu { #contentplace .registered_contacts, #contentplace .billing_fees, #contentplace .billing_peaktimes, +#contentplace .peering_rules, +#contentplace .peering_servers, +#contentplace .peering_rw_rules, #contentplace .numberblocks { width: 100%; diff --git a/root/tt/peering_detail.tt b/root/tt/peering_detail.tt index 557d58d..bfba904 100644 --- a/root/tt/peering_detail.tt +++ b/root/tt/peering_detail.tt @@ -3,15 +3,15 @@ [% grp.group.name %] - back + back -

Peering Rules

+

Peering Rules

[% IF messages.erulmsg %]
[% messages.erulmsg %]
[% END %] [% IF messages.erulerr %]
[% messages.erulerr %]
[% END %] - +
@@ -66,13 +66,13 @@ [% END %] - [% END %] + [% END %] [% id = id + 1 %] [% END %] [% UNLESS Catalyst.session.admin.read_only %] - + - - [% END %] + + [% END %]
Callee Prefix Caller Pattern
@@ -88,31 +88,30 @@ name="description" value="" /> -
- - -
+
+ + +
-
+
-

Peering Servers

+

Peering Servers

[% IF messages.servmsg %]
[% messages.servmsg %]
[% END %] [% IF messages.serverr %]
[% messages.serverr %]
[% END %] - +
- @@ -130,10 +129,6 @@ - [% ELSE %] - @@ -176,23 +170,19 @@ [% END %] - [% END %] + [% END %] [% id = id + 1 %] [% END %] [% UNLESS Catalyst.session.admin.read_only %] - + - - + [% END %]
NameFrom-Domain IP Address Port Weight - - @@ -156,7 +151,6 @@ cancel[% peer.name %][% peer.domain %] [% peer.ip %] [% peer.port %] [% peer.weight %]
- - @@ -206,14 +196,14 @@ name="weight" value="1" /> -
- - -
+
+ + +
-
+
diff --git a/root/tt/peering_rewrite.tt b/root/tt/peering_rewrite.tt index 89b3fe7..0c7296d 100644 --- a/root/tt/peering_rewrite.tt +++ b/root/tt/peering_rewrite.tt @@ -3,55 +3,55 @@ [% peer.peer_host.name %] - back + back - [% IF all_peers.size > 0 %] + [% IF all_peers.size > 0 %] [% UNLESS Catalyst.session.admin.read_only %] -

Import Rewrite Rules from another host

+

Import Rewrite Rules from another host

[% IF messages.cpmsg %]
[% messages.cpmsg %]
[% END %] [% IF messages.cperr %]
[% messages.cperr %]
[% END %] - - +
+ - - + - -
- Copy rules from peering host - - and - - existing rewrite rules. - + + Copy rules from peering host + + and + + existing rewrite rules. +
- +
- 		- -
-
- [% END %] - [% END %] + + + + + + + [% END %] + [% END %] -

Inbound Rewrite Rules for Caller

+

Inbound Rewrite Rules for Caller

[% IF messages.icallermsg %]
[% messages.icallermsg %]
[% END %] [% IF messages.icallererr %]
[% messages.icallererr %]
[% END %] - +
@@ -116,12 +116,12 @@ [% END %] - [% END %] + [% END %] [% id = id + 1 %] [% END %] - + [% UNLESS Catalyst.session.admin.read_only %] @@ -145,14 +145,14 @@ name="description" value="" /> - + [% END %] @@ -160,13 +160,13 @@
Match Pattern Replacement Pattern
-
- - -
+
+ + +
-
+
-

Inbound Rewrite Rules for Callee

+

Inbound Rewrite Rules for Callee

[% IF messages.icalleemsg %]
[% messages.icalleemsg %]
[% END %] [% IF messages.icalleeerr %]
[% messages.icalleeerr %]
[% END %] - +
@@ -231,13 +231,13 @@ [% END %] - [% END %] + [% END %] [% id = id + 1 %] [% END %] [% UNLESS Catalyst.session.admin.read_only %] - + @@ -260,27 +260,27 @@ name="description" value="" /> - - [% END %] + + [% END %]
Match Pattern Replacement Pattern
-
- - -
+
+ + +
-
+
-

Outbound Rewrite Rules for Caller

+

Outbound Rewrite Rules for Caller

[% IF messages.ocallermsg %]
[% messages.ocallermsg %]
[% END %] [% IF messages.ocallererr %]
[% messages.ocallererr %]
[% END %] - +
@@ -345,13 +345,13 @@ [% END %] - [% END %] + [% END %] [% id = id + 1 %] [% END %] [% UNLESS Catalyst.session.admin.read_only %] - + @@ -374,27 +374,27 @@ name="description" value="" /> - - [% END %] + + [% END %]
Match Pattern Replacement Pattern
-
- - -
+
+ + +
-
+
-

Outbound Rewrite Rules for Callee

+

Outbound Rewrite Rules for Callee

[% IF messages.ocalleemsg %]
[% messages.ocalleemsg %]
[% END %] [% IF messages.ocalleeerr %]
[% messages.ocalleeerr %]
[% END %] - +
@@ -459,13 +459,13 @@ [% END %] - [% END %] + [% END %] [% id = id + 1 %] [% END %] [% UNLESS Catalyst.session.admin.read_only %] - + @@ -488,15 +488,15 @@ name="description" value="" /> - - [% END %] + + [% END %]
Match Pattern Replacement Pattern
-
- - -
+
+ + +
-
+