[Rt-commit] r6586 - in rt/branches/3.7-EXPERIMENTAL: . html html/Admin html/Admin/Elements html/Admin/Global html/Admin/Global/CustomFields html/Admin/Groups html/Admin/Queues html/Elements html/Elements/RT__Ticket html/NoAuth html/Prefs html/Search html/Search/Elements html/Ticket html/Ticket/Elements html/Tools/Elements html/Tools/Reports/Elements html/User/Elements lib/RT/Interface/Web

ruz at bestpractical.com ruz at bestpractical.com
Tue Dec 5 11:03:01 EST 2006


Author: ruz
Date: Tue Dec  5 11:02:57 2006
New Revision: 6586

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/CustomFieldTabs
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/EditTemplates
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/GlobalCustomFieldTabs
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/GroupTabs
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/QueueTabs
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SystemTabs
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/Tabs
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/ToolTabs
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/UserTabs
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Global/CustomFields/index.html
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Global/index.html
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Groups/Modify.html
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/GroupRights.html
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/Modify.html
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/UserRights.html
   rt/branches/3.7-EXPERIMENTAL/html/Admin/index.html
   rt/branches/3.7-EXPERIMENTAL/html/Elements/Callback
   rt/branches/3.7-EXPERIMENTAL/html/Elements/EditCustomField
   rt/branches/3.7-EXPERIMENTAL/html/Elements/EditLinks
   rt/branches/3.7-EXPERIMENTAL/html/Elements/Error
   rt/branches/3.7-EXPERIMENTAL/html/Elements/Footer
   rt/branches/3.7-EXPERIMENTAL/html/Elements/Header
   rt/branches/3.7-EXPERIMENTAL/html/Elements/ListActions
   rt/branches/3.7-EXPERIMENTAL/html/Elements/Login
   rt/branches/3.7-EXPERIMENTAL/html/Elements/MakeClicky
   rt/branches/3.7-EXPERIMENTAL/html/Elements/MessageBox
   rt/branches/3.7-EXPERIMENTAL/html/Elements/PageLayout
   rt/branches/3.7-EXPERIMENTAL/html/Elements/QueueSummary
   rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Ticket/ColumnMap
   rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectCustomFieldValue
   rt/branches/3.7-EXPERIMENTAL/html/Elements/ShowLinks
   rt/branches/3.7-EXPERIMENTAL/html/Elements/Tabs
   rt/branches/3.7-EXPERIMENTAL/html/NoAuth/Logout.html
   rt/branches/3.7-EXPERIMENTAL/html/Prefs/SearchOptions.html
   rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/ConditionRow
   rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/PickBasics
   rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/PickCFs
   rt/branches/3.7-EXPERIMENTAL/html/Search/Results.html
   rt/branches/3.7-EXPERIMENTAL/html/Search/Simple.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Display.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/EditBasics
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowBasics
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowHistory
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowMessageHeaders
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowMessageStanza
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowRequestor
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowSummary
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowTransaction
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/Tabs
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Modify.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyAll.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyDates.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyLinks.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyPeople.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html
   rt/branches/3.7-EXPERIMENTAL/html/Tools/Elements/Tabs
   rt/branches/3.7-EXPERIMENTAL/html/Tools/Reports/Elements/Tabs
   rt/branches/3.7-EXPERIMENTAL/html/User/Elements/Tabs
   rt/branches/3.7-EXPERIMENTAL/html/User/Prefs.html
   rt/branches/3.7-EXPERIMENTAL/html/autohandler
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Web/Request.pm

Log:
 r4249 at cubic-pc:  cubic | 2006-12-05 19:13:00 +0300
  r4247 at cubic-pc:  cubic | 2006-12-04 23:41:15 +0300
  * /Elements/Callback -> $m->callback
 


Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/CustomFieldTabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/CustomFieldTabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/CustomFieldTabs	Tue Dec  5 11:02:57 2006
@@ -97,7 +97,7 @@
 }
 
   # Now let callbacks add their extra tabs
-  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+  $m->callback( %ARGS, tabs => $tabs );
 
 foreach my $tab (sort keys %{$tabs->{'this'}->{'subtabs'}}) {
     if ($tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab) {

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/EditTemplates
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/EditTemplates	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/EditTemplates	Tue Dec  5 11:02:57 2006
@@ -96,7 +96,7 @@
 }                                           
 
 # Now let callbacks add their extra limits
-$m->comp('/Elements/Callback', Templates => $Templates, %ARGS);
+$m->callback( %ARGS, Templates => $Templates );
 
 # {{{ deal with deleting existing templates
 foreach my $key (keys %ARGS) {

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/GlobalCustomFieldTabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/GlobalCustomFieldTabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/GlobalCustomFieldTabs	Tue Dec  5 11:02:57 2006
@@ -73,7 +73,7 @@
  
 };
   # Now let callbacks add their extra tabs
-  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+  $m->callback( %ARGS, tabs => $tabs );
 
   foreach my $tab (sort keys %{$tabs}) {
     if ($tabs->{$tab}->{'path'} eq $current_tab) {

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/GroupTabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/GroupTabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/GroupTabs	Tue Dec  5 11:02:57 2006
@@ -79,7 +79,7 @@
 		 separator => 1, };
 
 # Now let callbacks add their extra tabs
-$m->comp( '/Elements/Callback', tabs => $tabs, %ARGS );
+$m->callback( %ARGS, tabs => $tabs );
 foreach my $tab ( sort keys %{$tabs->{'this'}->{'subtabs'}} ) {  
     if ( $tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab ) {
         $tabs->{'this'}->{'subtabs'}->{$tab}->{"subtabs"}        = $subtabs; 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/QueueTabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/QueueTabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/QueueTabs	Tue Dec  5 11:02:57 2006
@@ -98,7 +98,7 @@
 }
 
   # Now let callbacks add their extra tabs
-  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+  $m->callback( %ARGS, tabs => $tabs );
 foreach my $tab ( sort keys %{$tabs->{'this'}->{'subtabs'}} ) {  
     if ( $tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab ) {
         $tabs->{'this'}->{'subtabs'}->{$tab}->{"subtabs"}        = $subtabs; 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SystemTabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SystemTabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SystemTabs	Tue Dec  5 11:02:57 2006
@@ -72,7 +72,7 @@
 };
 
   # Now let callbacks add their extra tabs
-  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+  $m->callback( %ARGS, tabs => $tabs );
 
   foreach my $tab (sort keys %{$tabs}) {
     if ($tabs->{$tab}->{'path'} eq $current_tab) {

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/Tabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/Tabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/Tabs	Tue Dec  5 11:02:57 2006
@@ -71,7 +71,7 @@
 	     };
 
   # Now let callbacks add their extra tabs
-  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+  $m->callback( %ARGS, tabs => $tabs );
 
   if( defined $current_tab ) {
     foreach my $tab (keys %{$tabs}) {

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/ToolTabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/ToolTabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/ToolTabs	Tue Dec  5 11:02:57 2006
@@ -61,7 +61,7 @@
     };
 
     # Now let callbacks add their extra tabs
-    $m->comp('/Elements/Callback', %ARGS, tabs => $tabs);
+    $m->callback( %ARGS, tabs => $tabs );
 
     foreach my $tab ( values %{$tabs} ) {
         next unless $tab->{'path'} eq $current_tab;

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/UserTabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/UserTabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/UserTabs	Tue Dec  5 11:02:57 2006
@@ -82,7 +82,7 @@
 }
 
   # Now let callbacks add their extra tabs
-  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+  $m->callback( %ARGS, tabs => $tabs );
                                                                                 
 #foreach my $tab ( sort keys %{$tabs} ) {                                        
 #    if ( $tabs->{$tab}->{'path'} eq $current_subtab ) {                         

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Global/CustomFields/index.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Global/CustomFields/index.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Global/CustomFields/index.html	Tue Dec  5 11:02:57 2006
@@ -43,7 +43,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<& /Elements/Callback, tabs => $tabs, %ARGS &>
+% $m->callback( %ARGS, tabs => $tabs );
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/GlobalCustomFieldTabs, Title => $title &>
 
@@ -87,5 +87,5 @@
 };
 
 
-$m->comp('/Elements/Callback', tabs => $tabs);
+$m->callback( tabs => $tabs );
 </%INIT>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Global/index.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Global/index.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Global/index.html	Tue Dec  5 11:02:57 2006
@@ -43,7 +43,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<& /Elements/Callback, tabs => $tabs, %ARGS &>
+% $m->callback( %ARGS, tabs => $tabs );
 <& /Admin/Elements/Header, Title => loc('Admin/Global configuration') &>
 <& /Admin/Elements/SystemTabs, 
     Title => loc('Admin/Global configuration') &>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Groups/Modify.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Groups/Modify.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Groups/Modify.html	Tue Dec  5 11:02:57 2006
@@ -83,7 +83,7 @@
 <input type="hidden" class="hidden" name="SetEnabled" value="1" />
 <input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked%> /> <&|/l&>Enabled (Unchecking this box disables this group)</&><br />
 </tr>
-<& /Elements/Callback, GroupObj => $Group, results => \@results, %ARGS &>
+% $m->callback( %ARGS, GroupObj => $Group, results => \@results );
 </table>
 <& /Elements/Submit, Label => loc('Save Changes'), Reset => 1 &>
 </form>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/GroupRights.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/GroupRights.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/GroupRights.html	Tue Dec  5 11:02:57 2006
@@ -56,7 +56,7 @@
       
 <h1><&|/l&>System groups</&></h1>
 <table>
-<& /Elements/Callback, QueueObj => $QueueObj, results => \@results, %ARGS &>
+% $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results );
 % $Groups = RT::Groups->new($session{'CurrentUser'});
 % $Groups->LimitToSystemInternalGroups();
 %	while (my $Group = $Groups->Next()) {

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/Modify.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/Modify.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/Modify.html	Tue Dec  5 11:02:57 2006
@@ -103,7 +103,7 @@
 </td>
 <td colspan="4"><input type="hidden" class="hidden" name="SetEnabled" value="1" />
 <input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked%> /> <&|/l&>Enabled (Unchecking this box disables this queue)</&><br />
-<& /Elements/Callback, QueueObj => $QueueObj, results => \@results, %ARGS &>
+% $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results );
 </td>
 </tr>
 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/UserRights.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/UserRights.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/UserRights.html	Tue Dec  5 11:02:57 2006
@@ -55,7 +55,7 @@
       
       
 <table>
-<& /Elements/Callback, QueueObj => $QueueObj, results => \@results, %ARGS &>
+% $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results );
 %	while (my $Member = $Users->Next()) {
 % my $UserObj = $Member->MemberObj->Object();
 % my $group = RT::Group->new($session{'CurrentUser'});

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/index.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/index.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/index.html	Tue Dec  5 11:02:57 2006
@@ -91,7 +91,7 @@
     },
 };
 
-  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+  $m->callback( %ARGS, tabs => $tabs );
 
 
 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/Callback
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/Callback	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/Callback	Tue Dec  5 11:02:57 2006
@@ -46,6 +46,6 @@
 <%INIT>
 $ARGS{'CallbackPage'} = delete $ARGS{'Page'} || $m->callers(1)->path;
 $ARGS{'CallbackName'} = delete $ARGS{'_CallbackName'};
-$RT::Logger->debug("$ARGS{'CallbackPage'} calls old style callback, use \$m->rt_callback");
-return $m->rt_callback( %ARGS );
+$RT::Logger->debug("$ARGS{'CallbackPage'} calls old style callback, use \$m->callback");
+return $m->callback( %ARGS );
 </%INIT>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/EditCustomField
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/EditCustomField	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/EditCustomField	Tue Dec  5 11:02:57 2006
@@ -75,7 +75,7 @@
 $m->out("\n".'<input type="hidden" class="hidden" name="'.$NamePrefix.$CustomField->Id.'-Values-Magic" value="1" />'."\n");
 
 my $EditComponent = "EditCustomField$Type";
-$m->rt_callback( CallbackName => 'EditComponentName', Name => \$EditComponent, CustomField => $CustomField, Object => $Object );
+$m->callback( CallbackName => 'EditComponentName', Name => \$EditComponent, CustomField => $CustomField, Object => $Object );
 $EditComponent = "EditCustomField$Type" unless $m->comp_exists($EditComponent);
 
 return $m->comp(

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/EditLinks
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/EditLinks	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/EditLinks	Tue Dec  5 11:02:57 2006
@@ -117,7 +117,7 @@
 <h3><&|/l&>New Links</&></h3>
 % if (ref($Object) eq 'RT::Ticket') {
 <i><&|/l&>Enter tickets or URIs to link tickets to. Separate multiple entries with spaces.</&>
-% $m->rt_callback( CallbackName => 'ExtraLinkInstructions' );
+% $m->callback( CallbackName => 'ExtraLinkInstructions' );
 </i><br />
 % } elsif (ref($Object) eq 'RT::Queue') {
 <i><&|/l&>Enter queues or URIs to link queues to. Separate multiple entries with spaces.</&>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/Error
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/Error	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/Error	Tue Dec  5 11:02:57 2006
@@ -43,7 +43,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-% $m->rt_callback( %ARGS, error => $error );
+% $m->callback( %ARGS, error => $error );
 <& /Elements/Header, Code => $Code, Why => $Why, Title => $Title &>
 <& /Elements/Tabs, Title => $Title &>
 <div class="error">

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/Footer
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/Footer	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/Footer	Tue Dec  5 11:02:57 2006
@@ -46,7 +46,7 @@
 
 %# End of div#body from /Elements/PageLayout
 </div>
-% $m->rt_callback( %ARGS );
+% $m->callback( %ARGS );
 <div id="footer">
   <p id="time">
     <span><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></span>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/Header
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/Header	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/Header	Tue Dec  5 11:02:57 2006
@@ -76,7 +76,7 @@
 % }
 --></script>
 
-% $m->rt_callback( %ARGS, CallbackName => 'Head' );
+% $m->callback( %ARGS, CallbackName => 'Head' );
 
 </head>
   <body<% $id && qq[ id="comp-$id"] |n %>>
@@ -95,7 +95,7 @@
 % } else {
     <&|/l&>Not logged in.</&>
 % }
-% $m->rt_callback( %ARGS );
+% $m->callback( %ARGS );
 % unless (!$session{'CurrentUser'}->Name
 %         or (RT->Config->Get('WebExternalAuth') and !RT->Config->Get('WebFallbackToInternalAuth'))) {
     | <a  href="<%RT->Config->Get('WebPath')%>/NoAuth/Logout.html<%$URL ? "?URL=".$URL : ''%>"><&|/l&>Logout</&></a>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/ListActions
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/ListActions	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/ListActions	Tue Dec  5 11:02:57 2006
@@ -56,7 +56,7 @@
     grep $_,
     grep {
         my $skip;
-        $m->rt_callback(
+        $m->callback(
             %ARGS,
             row  => \$_,
             skip => \$skip,

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/Login
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/Login	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/Login	Tue Dec  5 11:02:57 2006
@@ -64,7 +64,7 @@
                 ;
 </%INIT>
 
-% $m->rt_callback( %ARGS, CallbackName => 'Header' );
+% $m->callback( %ARGS, CallbackName => 'Header' );
 <& /Elements/Header, Title => loc('Login'), Focus => 'user' &>
 
 
@@ -79,7 +79,7 @@
 </&>
 % }
 
-% $m->rt_callback( %ARGS, CallbackName => 'BeforeForm' );
+% $m->callback( %ARGS, CallbackName => 'BeforeForm' );
 
 <div id="login-box">
 <&| /Widgets/TitleBox, title => loc('Login'), titleright => $RT::VERSION, hideable => 0 &>
@@ -102,7 +102,7 @@
 </div>
 
 %# Give callbacks a chance to add more control elements
-% $m->rt_callback( %ARGS );
+% $m->callback( %ARGS );
 
 % # From mason 1.0.1 forward, this doesn't work. in fact, it breaks things.
 % # But on Mason 1.15 it's fixed again, so we still use it.
@@ -127,7 +127,7 @@
 % }
 </&>
 </div><!-- #login-box -->
-% $m->rt_callback( %ARGS, CallbackName => 'AfterForm' );
+% $m->callback( %ARGS, CallbackName => 'AfterForm' );
 <& /Elements/Footer, Menu => 0 &>
 <%ARGS>
 $user => ""

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/MakeClicky
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/MakeClicky	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/MakeClicky	Tue Dec  5 11:02:57 2006
@@ -50,7 +50,7 @@
 # Hook to add more Clicky types
 # XXX Have to have Page argument, as Mason gets caller wrong in Callback?
 # This happens as we are in <%ONCE> block
-$m->rt_callback(
+$m->callback(
     CallbackPage => "/Elements/MakeClicky",
     types        => \@types,
     actions      => \%actions,

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/MessageBox
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/MessageBox	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/MessageBox	Tue Dec  5 11:02:57 2006
@@ -44,7 +44,7 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <textarea class="messagebox" cols="<% $Width %>" rows="<% $Height %>" wrap="<% $Wrap %>" name="<% $Name %>">\
-% $m->rt_callback( %ARGS );
+% $m->callback( %ARGS );
 <% $Default || '' %><% $message %><% $signature %></textarea>
 <%INIT>
 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/PageLayout
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/PageLayout	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/PageLayout	Tue Dec  5 11:02:57 2006
@@ -155,7 +155,7 @@
 </div>
 
 <div id="body">
-% $m->rt_callback( %ARGS, CallbackName => 'BeforeBody' );
+% $m->callback( %ARGS, CallbackName => 'BeforeBody' );
 % $m->flush_buffer(); # we've got the page laid out, let's flush the buffer;
 
 <%INIT>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/QueueSummary
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/QueueSummary	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/QueueSummary	Tue Dec  5 11:02:57 2006
@@ -75,7 +75,7 @@
     $Queues->UnLimit();
     @queues = grep $queue_filter->($_), @{$Queues->ItemsArrayRef};
 
-    $m->rt_callback( CallbackName => 'Filter', Queues => \@queues );
+    $m->callback( CallbackName => 'Filter', Queues => \@queues );
 
     @queues = map { {
         id          => $_->Id,

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Ticket/ColumnMap
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Ticket/ColumnMap	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Ticket/ColumnMap	Tue Dec  5 11:02:57 2006
@@ -313,6 +313,6 @@
 };
 </%ONCE>
 <%init>
-$m->rt_callback( COLUMN_MAP => $COLUMN_MAP, CallbackName => 'ColumnMap', CallbackOnce => 1 );
+$m->callback( COLUMN_MAP => $COLUMN_MAP, CallbackName => 'ColumnMap', CallbackOnce => 1 );
 return ColumnMap($Name, $Attr);
 </%init>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectCustomFieldValue
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectCustomFieldValue	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectCustomFieldValue	Tue Dec  5 11:02:57 2006
@@ -43,7 +43,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-% $m->rt_callback( Name => $Name, CustomField => $CustomField );
+% $m->callback( Name => $Name, CustomField => $CustomField );
 % if ($CustomField->Type =~ /Select/i) {
 % my $values = $CustomField->Values;
 <select name="<%$Name%>">

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/ShowLinks
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/ShowLinks	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/ShowLinks	Tue Dec  5 11:02:57 2006
@@ -101,7 +101,7 @@
   </tr>
 
 % # Allow people to add more rows to the table                                                                                                                           
-% $m->rt_callback( %ARGS );
+% $m->callback( %ARGS );
 
 </table>
 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/Tabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/Tabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/Tabs	Tue Dec  5 11:02:57 2006
@@ -101,7 +101,7 @@
 }
                     
 # Now let callbacks add their extra tabs
-$m->rt_callback(
+$m->callback(
     topactions => $topactions, 
     toptabs    => $toptabs,
     %ARGS

Modified: rt/branches/3.7-EXPERIMENTAL/html/NoAuth/Logout.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/NoAuth/Logout.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/NoAuth/Logout.html	Tue Dec  5 11:02:57 2006
@@ -58,13 +58,13 @@
 % $m->abort();
 
 <%INIT>
-$m->comp('/Elements/Callback', _CallbackName => 'BeforeSessionDelete', %ARGS);
+$m->callback( %ARGS, CallbackName => 'BeforeSessionDelete' );
 
 if (defined %session) {
     tied(%session)->delete;
 }
 
-$m->comp('/Elements/Callback', _CallbackName => 'AfterSessionDelete', %ARGS);
+$m->callback( %ARGS, CallbackName => 'AfterSessionDelete' );
 </%INIT>
 
 <%ARGS>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Prefs/SearchOptions.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Prefs/SearchOptions.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Prefs/SearchOptions.html	Tue Dec  5 11:02:57 2006
@@ -1,4 +1,3 @@
-%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  

Modified: rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/ConditionRow
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/ConditionRow	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/ConditionRow	Tue Dec  5 11:02:57 2006
@@ -6,7 +6,7 @@
 <%INIT>
 return unless $Condition && $Condition->{'Name'};
 
-$m->comp('/Elements/Callback', Condition => \$Condition);
+$m->callback( Condition => \$Condition );
 return unless $Condition;
 
 my $handle_block;

Modified: rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/PickBasics
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/PickBasics	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/PickBasics	Tue Dec  5 11:02:57 2006
@@ -204,6 +204,6 @@
     },
 );
 
-$m->comp('/Elements/Callback', Conditions => \@lines);
+$m->callback( Conditions => \@lines );
 
 </%INIT>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/PickCFs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/PickCFs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/PickCFs	Tue Dec  5 11:02:57 2006
@@ -87,7 +87,7 @@
     push @lines, \%line;
 }
 
-$m->comp('/Elements/Callback', Conditions => \@lines, Queues => \%cfqueues );
+$m->callback( Conditions => \@lines, Queues => \%cfqueues );
 
 </%INIT>
 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Search/Results.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Search/Results.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Search/Results.html	Tue Dec  5 11:02:57 2006
@@ -85,7 +85,7 @@
     RSSFeedURL => $RSSFeedURL,
     ShortQueryString => $ShortQueryString,
 &>
-<& /Elements/Callback, _CallbackName => 'SearchActions', QueryString => $QueryString&>
+% $m->callback( QueryString => $QueryString, CallbackName => 'SearchActions' );
 </div>
 <%INIT>
 # Read from user preferences

Modified: rt/branches/3.7-EXPERIMENTAL/html/Search/Simple.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Search/Simple.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Search/Simple.html	Tue Dec  5 11:02:57 2006
@@ -72,7 +72,7 @@
 if ($q) {
     my $tickets = new RT::Tickets( $session{'CurrentUser'} );
     
-    $m->comp('/Elements/Callback', %ARGS, _CallbackName => 'ModifyQuery', query => \$q);
+    $m->callback( %ARGS, query => \$q, CallbackName => 'ModifyQuery' );
     
     my $search  = RT::Search::Googleish->new(Argument   => $q,
                                              TicketsObj => $tickets);

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html	Tue Dec  5 11:02:57 2006
@@ -53,7 +53,7 @@
 <& /Elements/ListActions, actions => \@results &>
 <form action="<% RT->Config->Get('WebPath') %>/Ticket/Create.html" method="post" enctype="multipart/form-data" name="TicketCreate">
 <input type="hidden" class="hidden" name="id" value="new" />
-% $m->rt_callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
+% $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
 
 <div id="Ticket-Create-basics">
 <a name="basics"></a>
@@ -242,7 +242,7 @@
 my $QueueObj = new RT::Queue($session{'CurrentUser'});
 $QueueObj->Load($Queue) || Abort(loc("Queue could not be loaded."));
 
-$m->comp('/Elements/Callback', QueueObj => $QueueObj, ARGSRef => \%ARGS );
+$m->callback( QueueObj => $QueueObj, ARGSRef => \%ARGS );
 
 my $CFs = $QueueObj->TicketCustomFields();
 my $TxnCFs = $QueueObj->TicketTransactionCustomFields();

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Display.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Display.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Display.html	Tue Dec  5 11:02:57 2006
@@ -51,14 +51,14 @@
     Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &>
 
 <& /Elements/ListActions, actions => \@Actions &>
-<& /Elements/Callback, _CallbackName => 'BeforeShowSummary', Ticket => $TicketObj, %ARGS &>
+% $m->callback( %ARGS, Ticket => $TicketObj, CallbackName => 'BeforeShowSummary' );
 <&| /Widgets/TitleBox, title => loc('Ticket metadata') &>
 <& /Ticket/Elements/ShowSummary,  Ticket => $TicketObj, Attachments => $attachments &>
 </&>
 
 <br />
 
-% $m->rt_callback( Ticket => $TicketObj, %ARGS, CallbackName => 'BeforeShowHistory' );
+% $m->callback( Ticket => $TicketObj, %ARGS, CallbackName => 'BeforeShowHistory' );
 
 <& /Ticket/Elements/ShowHistory , 
       Ticket => $TicketObj, 
@@ -69,7 +69,7 @@
       AttachmentContent => $attachment_content
 &> 
 
-<& /Elements/Callback, _CallbackName => 'AfterShowHistory', Ticket => $TicketObj, %ARGS &>
+% $m->callback( %ARGS, Ticket => $TicketObj, CallbackName => 'AfterShowHistory' );
 
 <%ARGS>
 $id => undef
@@ -80,7 +80,7 @@
 
 <%INIT>
 
-$m->rt_callback( TicketObj => $TicketObj, ARGSRef => \%ARGS, CallbackName => 'Initial' );
+$m->callback( TicketObj => $TicketObj, ARGSRef => \%ARGS, CallbackName => 'Initial' );
 
 my (@Actions, $Tickets);  
 
@@ -149,7 +149,7 @@
     delete $session{"Actions"};
 }
 
-$m->rt_callback(
+$m->callback(
     CallbackName => 'BeforeDisplay',
     TicketObj    => \$TicketObj,
     Tickets      => \$Tickets,

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/EditBasics
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/EditBasics	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/EditBasics	Tue Dec  5 11:02:57 2006
@@ -102,7 +102,7 @@
 
 
 
-% $m->rt_callback( CallbackName => 'EndOfList', TicketObj => $TicketObj, %ARGS );
+% $m->callback( CallbackName => 'EndOfList', TicketObj => $TicketObj, %ARGS );
 </table>
 
 <%INIT>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowBasics
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowBasics	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowBasics	Tue Dec  5 11:02:57 2006
@@ -76,7 +76,7 @@
     <td class="label queue"><&|/l&>Queue</&>:</td>
     <td class="value queue"><%$Ticket->QueueObj->Name%></td>
   </tr>
-% $m->rt_callback( %ARGS, CallbackName => 'EndOfList', TicketObj => $Ticket );
+% $m->callback( %ARGS, CallbackName => 'EndOfList', TicketObj => $Ticket );
 </table>
 <%ARGS>
 $Ticket => undef

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowHistory
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowHistory	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowHistory	Tue Dec  5 11:02:57 2006
@@ -84,7 +84,7 @@
 
 while ( my $Transaction = $Transactions->Next ) {
     my $skip = 0;
-    $m->rt_callback(
+    $m->callback(
         %ARGS,
         Transaction   => $Transaction,
         skip          => \$skip,

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowMessageHeaders
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowMessageHeaders	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowMessageHeaders	Tue Dec  5 11:02:57 2006
@@ -61,7 +61,7 @@
 
 my %display_headers = map { lc($_) => 1 } @DisplayHeaders;
 
-$m->rt_callback(
+$m->callback(
     message         => $Message,
     headers         => \@headers,
     display_headers => \%display_headers,

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowMessageStanza
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowMessageStanza	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowMessageStanza	Tue Dec  5 11:02:57 2006
@@ -72,7 +72,7 @@
     my $ref = shift;
     return unless defined $$ref && length $$ref;
 
-    $m->rt_callback( content => $ref, %ARGS );
+    $m->callback( content => $ref, %ARGS );
     $m->comp('/Elements/MakeClicky', content => $ref, ticket => $ticket, %ARGS);
     $$ref =~ s{$}{<br />}mg if defined $$ref;
     $m->out( $$ref );

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowRequestor
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowRequestor	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowRequestor	Tue Dec  5 11:02:57 2006
@@ -63,7 +63,7 @@
 &>
 
 %# Additional information about this user.  Empty by default.
-% $m->rt_callback( requestor => $requestor, %ARGS, CallbackName => 'AboutThisUser' );
+% $m->callback( requestor => $requestor, %ARGS, CallbackName => 'AboutThisUser' );
 
 <&|/l&>Comments about this user</&>:<br />
 <b><% ($requestor->Comments || loc("No comment entered about this user")) %></b><br />

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowSummary
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowSummary	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowSummary	Tue Dec  5 11:02:57 2006
@@ -69,7 +69,7 @@
         <br />
 	  <& /Ticket/Elements/ShowRequestor, Ticket => $Ticket &>
 
-      <& /Elements/Callback, %ARGS, _CallbackName => 'LeftColumn' &>
+% $m->callback( %ARGS, CallbackName => 'LeftColumn' );
 	</td>
 	<td valign="top" width="50%" class="boxcontainer">
 	  <&|/Widgets/TitleBox, title => loc("Reminders"),
@@ -91,7 +91,7 @@
 		class => 'ticket-info-links' &>
 	        <& /Elements/ShowLinks, Ticket => $Ticket &>
           </&>
-    <& /Elements/Callback, %ARGS, _CallbackName => 'RightColumn' &>
+% $m->callback( %ARGS, CallbackName => 'RightColumn' );
 
 	</td>
       </tr>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowTransaction	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowTransaction	Tue Dec  5 11:02:57 2006
@@ -52,7 +52,7 @@
     </td>
     <td class="date"><% $transdate|n %></td>
 % my $desc = $Transaction->BriefDescription;
-% $m->rt_callback( text => \$desc, Transaction => $Transaction, %ARGS, CallbackName => 'ModifyDisplay' );
+% $m->callback( text => \$desc, Transaction => $Transaction, %ARGS, CallbackName => 'ModifyDisplay' );
     <td class="description">
       <%$Transaction->CreatorObj->Name%> - <%$TicketString%> <%$desc%>
     </td>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/Tabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/Tabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/Tabs	Tue Dec  5 11:02:57 2006
@@ -43,7 +43,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-% $m->rt_callback( Ticket => $Ticket, actions=> $actions, tabs => $tabs, %ARGS );
+% $m->callback( Ticket => $Ticket, actions=> $actions, tabs => $tabs, %ARGS );
 <& /Elements/Tabs, 
     tabs => $tabs, 
     actions => $actions, 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Modify.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Modify.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Modify.html	Tue Dec  5 11:02:57 2006
@@ -50,7 +50,7 @@
 
 <& /Elements/ListActions, actions => \@results &>
 <form method="post" action="Modify.html" enctype="multipart/form-data">
-% $m->rt_callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
+% $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
 <input type="hidden" class="hidden" name="id" value="<% $TicketObj->Id %>" />
 
 <&| /Widgets/TitleBox, title => loc('Modify ticket #[_1]',$TicketObj->Id) &>
@@ -66,7 +66,7 @@
 my $CustomFields = $TicketObj->QueueObj->TicketCustomFields();
 
 # Now let callbacks have a chance at editing %ARGS
-$m->rt_callback( TicketObj => $TicketObj, CustomFields => $CustomFields, ARGSRef => \%ARGS );
+$m->callback( TicketObj => $TicketObj, CustomFields => $CustomFields, ARGSRef => \%ARGS );
 
 my @results = ProcessTicketBasics(TicketObj => $TicketObj, ARGSRef => \%ARGS);
 my @cf_results = ProcessObjectCustomFieldUpdates(Object => $TicketObj, ARGSRef => \%ARGS);

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyAll.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyAll.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyAll.html	Tue Dec  5 11:02:57 2006
@@ -52,7 +52,7 @@
 <& /Elements/ListActions, actions => \@results &>
 
 <form method="post" action="ModifyAll.html" enctype="multipart/form-data">
-% $m->rt_callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
+% $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
 <input type="hidden" class="hidden" name="id" value="<%$Ticket->Id%>" />
 
 <&| /Widgets/TitleBox, title => loc('Modify ticket # [_1]', $Ticket->Id) &>
@@ -145,7 +145,7 @@
                      $Ticket->CurrentUserHasRight('ModifyTicket') );
 
 
-$m->comp('/Elements/Callback', TicketObj => $Ticket, ARGSRef => \%ARGS);
+$m->callback( TicketObj => $Ticket, ARGSRef => \%ARGS );
 my (@wresults, @results,  @dresults, @lresults, @cf_results);
 
 unless ($OnlySearchForPeople) {

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyDates.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyDates.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyDates.html	Tue Dec  5 11:02:57 2006
@@ -52,7 +52,7 @@
 <& /Elements/ListActions, actions => \@results &>
 
 <form method="post" action="ModifyDates.html">
-% $m->rt_callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
+% $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
 <input type="hidden" class="hidden" name="id" value="<%$TicketObj->Id%>" />
 <&| /Widgets/TitleBox,title => loc('Modify dates for ticket # [_1]', $TicketObj->Id) &>
 <& Elements/EditDates, TicketObj => $TicketObj &>
@@ -64,7 +64,7 @@
 <%INIT>
 
 my $TicketObj = LoadTicket($id);
-$m->comp('/Elements/Callback', TicketObj => $TicketObj, ARGSRef => \%ARGS);
+$m->callback( TicketObj => $TicketObj, ARGSRef => \%ARGS );
 my @results = ProcessTicketDates( TicketObj => $TicketObj, ARGSRef => \%ARGS);
 
 </%INIT>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyLinks.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyLinks.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyLinks.html	Tue Dec  5 11:02:57 2006
@@ -53,7 +53,7 @@
 
 <form action="ModifyLinks.html" method="post">
 <input type="hidden" class="hidden" name="id" value="<%$Ticket->id%>" />
-% $m->rt_callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
+% $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
 <&| /Widgets/TitleBox, title => loc('Edit Links') &>
 <& /Elements/EditLinks, Object => $Ticket, Merge => 1 &>
 </&>
@@ -66,7 +66,7 @@
 <%INIT>
   
 my $Ticket = LoadTicket($id);
-$m->comp('/Elements/Callback', TicketObj => $Ticket, ARGSRef => \%ARGS);
+$m->callback( TicketObj => $Ticket, ARGSRef => \%ARGS );
 my @results = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
     
 </%INIT>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyPeople.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyPeople.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyPeople.html	Tue Dec  5 11:02:57 2006
@@ -53,7 +53,7 @@
 
 <form method="post" action="ModifyPeople.html">
 <input type="hidden" class="hidden" name="id" value="<%$Ticket->Id%>" />
-% $m->rt_callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
+% $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
 <&| /Widgets/TitleBox, title => loc('Modify people related to ticket #[_1]', $Ticket->Id),   width => "100%", color=> "#333399" &>
 <& Elements/EditPeople, Ticket => $Ticket, UserField => $UserField, UserString => $UserString, UserOp => $UserOp, GroupString => $GroupString, GroupOp => $GroupOp, GroupField => $GroupField &>
 </&>
@@ -65,7 +65,7 @@
 my (@results, @wresults);
 
 my $Ticket = LoadTicket($id);
-$m->comp('/Elements/Callback', TicketObj => $Ticket, ARGSRef => \%ARGS);
+$m->callback( TicketObj => $Ticket, ARGSRef => \%ARGS );
 
 # if we're trying to search for watchers and nothing else
 unless ($OnlySearchForPeople or $OnlySearchForGroup) {

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html	Tue Dec  5 11:02:57 2006
@@ -50,7 +50,7 @@
 
 <form action="Update.html" name="TicketUpdate"
     method="post" enctype="multipart/form-data">
-% $m->rt_callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
+% $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
 <input type="hidden" class="hidden" name="QuoteTransaction" value="<% $ARGS{QuoteTransaction} %>" />
 <input type="hidden" class="hidden" name="DefaultStatus" value="<% $DefaultStatus %>" />
 <input type="hidden" class="hidden" name="Action" value="<% $ARGS{Action} %>" />
@@ -65,7 +65,7 @@
 <& /Elements/SelectTimeUnits, Name => 'UpdateTimeWorked'&>
 </td></tr>
 % my $skip;
-% $m->rt_callback( CallbackName => 'BeforeUpdateType', skip => \$skip, %ARGS );
+% $m->callback( CallbackName => 'BeforeUpdateType', skip => \$skip, %ARGS );
 % if (!$skip) {
 <input type="hidden" class="hidden" name="id" value="<%$TicketObj->Id%>" /><br />
 % }
@@ -116,7 +116,7 @@
 <tr><td align="right"><&|/l&>Attach</&>:</td><td><input name="Attach" type="file" /><input type="submit" class="button" name="AddMoreAttach" value="<&|/l&>Add More Files</&>" /><input type="hidden" class="hidden" name="UpdateAttach" value="1" />
 </td></tr>
 <tr><td align="right" valign="top"><&|/l&>Message</&>:</td><td>
-% $m->rt_callback( CallbackName => 'BeforeMessageBox', %ARGS );
+% $m->callback( CallbackName => 'BeforeMessageBox', %ARGS );
 % if (exists $ARGS{UpdateContent}) {
 % # preserve QuoteTransaction so we can use it to set up sane references/in/reply to
 % my $temp = $ARGS{'QuoteTransaction'};

Modified: rt/branches/3.7-EXPERIMENTAL/html/Tools/Elements/Tabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Tools/Elements/Tabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Tools/Elements/Tabs	Tue Dec  5 11:02:57 2006
@@ -65,7 +65,7 @@
     },
 };
 
-$m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+$m->callback( %ARGS, tabs => $tabs );
 
 foreach my $tab ( sort keys %{$tabs} ) {
     if ( $tabs->{$tab}->{'path'} eq $current_tab ) {

Modified: rt/branches/3.7-EXPERIMENTAL/html/Tools/Reports/Elements/Tabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Tools/Reports/Elements/Tabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Tools/Reports/Elements/Tabs	Tue Dec  5 11:02:57 2006
@@ -68,7 +68,7 @@
 
 
 
-$m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+$m->callback( %ARGS, tabs => $tabs );
 
 foreach my $tab ( sort keys %{$tabs} ) {
     if ( $tabs->{$tab}->{'path'} eq $current_tab ) {

Modified: rt/branches/3.7-EXPERIMENTAL/html/User/Elements/Tabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/User/Elements/Tabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/User/Elements/Tabs	Tue Dec  5 11:02:57 2006
@@ -71,7 +71,7 @@
 	     };
 
   # Now let callbacks add their extra tabs
-  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+  $m->callback( %ARGS, tabs => $tabs );
 
   foreach my $tab (sort keys %{$tabs}) {
     if ($tabs->{$tab}->{'path'} eq $current_tab) {

Modified: rt/branches/3.7-EXPERIMENTAL/html/User/Prefs.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/User/Prefs.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/User/Prefs.html	Tue Dec  5 11:02:57 2006
@@ -98,7 +98,7 @@
   </tr>
 </table>
 </&>
-<& /Elements/Callback, _CallbackName => 'FormLeftColumn', UserObj => $UserObj, %ARGS &>
+% $m->callback( %ARGS, UserObj => $UserObj, CallbackName => 'FormLeftColumn' );
 </td>
 <td valign="top" class="boxcontainer">
 % unless (RT->Config->Get('WebExternalAuth') and !RT->Config->Get('WebFallbackToInternalAuth')) {
@@ -155,7 +155,7 @@
   </tr>
 </table>
 </&>
-<& /Elements/Callback, _CallbackName => 'FormRightColumn', UserObj => $UserObj, %ARGS &>
+% $m->callback( %ARGS, UserObj => $UserObj, CallbackName => 'FormRightColumn' );
 </td>
 </tr>
 <tr>

Modified: rt/branches/3.7-EXPERIMENTAL/html/autohandler
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/autohandler	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/autohandler	Tue Dec  5 11:02:57 2006
@@ -223,7 +223,7 @@
     unless $session{'CurrentUser'} && $session{'CurrentUser'}->Id;
 
 # Process per-page authentication callbacks
-$m->comp( '/Elements/Callback', %ARGS, _CallbackName => 'Auth' );
+$m->callback( %ARGS, CallbackName => 'Auth' );
 
 delete $session{'CurrentUser'}
     unless $session{'CurrentUser'} && $session{'CurrentUser'}->Id;
@@ -254,7 +254,7 @@
 
 # we've got credentials, let's serve the file up.
 # Process per-page global callbacks
-$m->comp('/Elements/Callback', %ARGS);
+$m->callback( %ARGS );
 
 # If the user isn't privileged, they can only see SelfService
 unless ( $session{'CurrentUser'}->Privileged ) {

Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Web/Request.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Web/Request.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Web/Request.pm	Tue Dec  5 11:02:57 2006
@@ -22,7 +22,7 @@
     return $self;
 }
 
-=head2 rt_callback
+=head2 callback
 
 Method replaces deprecated component C<Element/Callback>.
 
@@ -59,7 +59,7 @@
 {
 my %cache = ();
 my %called = ();
-sub rt_callback {
+sub callback {
     my ($self, %args) = @_;
 
     my $page = delete $args{'CallbackPage'} || $self->callers(0)->path;


More information about the Rt-commit mailing list