[Bps-public-commit] rt-extension-mailgate branch, master, updated. 7d83c44ce22c25290dea2dd8ea5fb8911cfe66e8

[Chia-liang Kao]

The branch, master has been updated
       via  7d83c44ce22c25290dea2dd8ea5fb8911cfe66e8 (commit)
      from  9dd7282dac9616c61038879b0d7d3f3caaa2ea33 (commit)

Summary of changes:
 html/Admin/Queues/MailGate.html                    |    5 +----
 .../MailGate/Admin/Elements/QueueTabs/Default      |   14 --------------
 html/Callbacks/MailGate/Elements/Tabs/Privileged   |   11 +++++++++++
 3 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 html/Callbacks/MailGate/Admin/Elements/QueueTabs/Default
 create mode 100644 html/Callbacks/MailGate/Elements/Tabs/Privileged

- Log -----------------------------------------------------------------
commit 7d83c44ce22c25290dea2dd8ea5fb8911cfe66e8
Author: Chia-liang Kao <clkao at clkao.org>
Date:   Tue Nov 16 19:57:15 2010 +0800

    new menu

diff --git a/html/Admin/Queues/MailGate.html b/html/Admin/Queues/MailGate.html
index 987bdcf..003fba7 100644
--- a/html/Admin/Queues/MailGate.html
+++ b/html/Admin/Queues/MailGate.html
@@ -25,10 +25,7 @@ span.mail-behaviour {
 </style>
 
 <& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/QueueTabs, id => $QueueObj->id,
-    QueueObj => $QueueObj,
-    current_tab => 'Admin/Queues/MailGate.html?id='.$id,
-    Title => $title &>
+<& /Elements/Tabs &>
 
 <& /Elements/ListActions, actions => \@results &>
 
diff --git a/html/Callbacks/MailGate/Admin/Elements/QueueTabs/Default b/html/Callbacks/MailGate/Admin/Elements/QueueTabs/Default
deleted file mode 100644
index fc4c8a1..0000000
--- a/html/Callbacks/MailGate/Admin/Elements/QueueTabs/Default
+++ /dev/null
@@ -1,14 +0,0 @@
-<%init>
-if ($QueueObj) {
-
-    my $path = 'Admin/Queues/MailGate.html?id='. $QueueObj->Id;
-    $tabs->{'this'}{'subtabs'}{'z-mg'} = {
-		title => loc('Mail Gateway'),
-        path => $path
-	};
-}
-</%init>
-<%args>
-$QueueObj => undef
-$tabs => undef
-</%args>
diff --git a/html/Callbacks/MailGate/Elements/Tabs/Privileged b/html/Callbacks/MailGate/Elements/Tabs/Privileged
new file mode 100644
index 0000000..0bd12e3
--- /dev/null
+++ b/html/Callbacks/MailGate/Elements/Tabs/Privileged
@@ -0,0 +1,11 @@
+<%init>
+if ($QueueObj) {
+
+    Menu->child( 'config')->child( 'mailgate' => title => loc("Mail Gateway"),
+                                   path => 'Admin/Queues/MailGate.html?id='. $QueueObj->Id );
+}
+</%init>
+<%args>
+$QueueObj => undef
+$tabs => undef
+</%args>

-----------------------------------------------------------------------