[Rt-commit] r18117 - in rt/3.999/branches/merge_to_3.8.2: . lib/RT/Interface/Web sbin share/html share/html/Admin/CustomFields share/html/Admin/Queues share/html/Admin/Users share/html/Elements share/html/Elements/CollectionAsTable share/html/Elements/RT__Model__Group share/html/Elements/RT__Model__Queue share/html/Elements/RT__Model__Scrip share/html/Elements/RT__Model__Template share/html/Elements/RT__Model__Ticket share/html/Elements/RT__Model__User share/html/NoAuth/css/3.4-compat share/html/NoAuth/css/3.5-default share/html/REST/1.0/NoAuth share/html/Search share/html/Ticket share/html/Ticket/Elements share/html/Tools/Reports share/html/User

sunnavy at bestpractical.com sunnavy at bestpractical.com
Sun Feb 1 19:57:49 EST 2009


Author: sunnavy
Date: Sun Feb  1 19:57:48 2009
New Revision: 18117

Modified:
   rt/3.999/branches/merge_to_3.8.2/   (props changed)
   rt/3.999/branches/merge_to_3.8.2/lib/RT/Interface/Web/Handler.pm
   rt/3.999/branches/merge_to_3.8.2/sbin/rt-validator
   rt/3.999/branches/merge_to_3.8.2/share/html/Admin/CustomFields/Modify.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Admin/Queues/Modify.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Admin/Users/Modify.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Callback
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/CollectionAsTable/ParseFormat
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ColumnMap
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/EditCustomField
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/EditLinks
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Header
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ListActions
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Login
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/MakeClicky
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/PageLayout
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/QueueSummary
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Group/ColumnMap
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Queue/ColumnMap
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Scrip/ColumnMap
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Template/ColumnMap
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Ticket/ColumnMap
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__User/ColumnMap
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/SelectOwner
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ShowCustomFields
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ShowSearch
   rt/3.999/branches/merge_to_3.8.2/share/html/NoAuth/css/3.4-compat/main.css
   rt/3.999/branches/merge_to_3.8.2/share/html/NoAuth/css/3.5-default/main.css
   rt/3.999/branches/merge_to_3.8.2/share/html/REST/1.0/NoAuth/mail-gateway
   rt/3.999/branches/merge_to_3.8.2/share/html/Search/Bulk.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/BuildFormatString
   rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/PickCFs
   rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/ResultViews
   rt/3.999/branches/merge_to_3.8.2/share/html/Search/Results.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Search/Simple.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Create.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Display.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/EditBasics
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowBasics
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowHistory
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowRequestor
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowSummary
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransaction
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Forward.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/GnuPG.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/History.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Modify.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyAll.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyDates.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyLinks.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyPeople.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Reminders.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Update.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Tools/Reports/index.html
   rt/3.999/branches/merge_to_3.8.2/share/html/User/Prefs.html
   rt/3.999/branches/merge_to_3.8.2/share/html/index.html

Log:
 r19418 at sunnavys-mb:  sunnavy | 2009-02-02 08:57:09 +0800
 callbackname => callback_name, callbackpage => callback_page, callbackonce => callback_once


Modified: rt/3.999/branches/merge_to_3.8.2/lib/RT/Interface/Web/Handler.pm
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/lib/RT/Interface/Web/Handler.pm	(original)
+++ rt/3.999/branches/merge_to_3.8.2/lib/RT/Interface/Web/Handler.pm	Sun Feb  1 19:57:48 2009
@@ -131,22 +131,22 @@
 
 Method replaces deprecated component C<Element/Callback>.
 
-Takes hash with optional C<CallbackPage>, C<Callbackname>
-and C<CallbackOnce> arguments, other arguments are passed
+Takes hash with optional C<callback_page>, C<callback_name>
+and C<callback_once> arguments, other arguments are passed
 throught to callback components.
 
 =over 4
 
-=item CallbackPage
+=item callback_page
 
 Page path relative to the root, leading slash is mandatory.
 By default is equal to path of the caller component.
 
-=item Callbackname
+=item callback_name
 
 name of the callback. C<Default> is used unless specified.
 
-=item CallbackOnce
+=item callback_once
 
 By default is false, otherwise runs callbacks only once per
 process of the server. Such callbacks can be used to fill
@@ -155,7 +155,7 @@
 =back
 
 Searches for callback components in
-F<< /Callbacks/<any dir>/CallbackPage/Callbackname >>, for
+F<< /Callbacks/<any dir>/callback_page/callback_name >>, for
 example F</Callbacks/MyExtension/autohandler/Default> would
 be called as default callback for F</autohandler>.
 
@@ -167,15 +167,15 @@
     sub callback {
         my ( $self, %args ) = @_;
 
-        my $name = delete $args{'Callbackname'} || 'Default';
-        my $page = delete $args{'CallbackPage'} || $self->callers(0)->path;
+        my $name = delete $args{'callback_name'} || 'Default';
+        my $page = delete $args{'callback_page'} || $self->callers(0)->path;
         unless ($page) {
             Jifty->log->error("Couldn't get a page name for callbacks");
             return;
         }
 
         my $CacheKey = "$page--$name";
-        return 1 if delete $args{'CallbackOnce'} && $called{$CacheKey};
+        return 1 if delete $args{'callback_once'} && $called{$CacheKey};
         $called{$CacheKey} = 1;
 
         my $callbacks = $cache{$CacheKey};

Modified: rt/3.999/branches/merge_to_3.8.2/sbin/rt-validator
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/sbin/rt-validator	(original)
+++ rt/3.999/branches/merge_to_3.8.2/sbin/rt-validator	Sun Feb  1 19:57:48 2009
@@ -158,7 +158,7 @@
     Queues => [],
 
     Scrips => [],
-    ScripActions => [],
+    Scripactions => [],
     ScripConditions => [],
     Templates => [],
 

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Admin/CustomFields/Modify.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Admin/CustomFields/Modify.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Admin/CustomFields/Modify.html	Sun Feb  1 19:57:48 2009
@@ -216,7 +216,7 @@
     '(?#Year)^[12]\d{3}$',
 );
 
-$m->callback(Callbackname => 'validation_patterns', values => \@CFvalidations);
+$m->callback(callback_name => 'validation_patterns', values => \@CFvalidations);
 
 
 </%INIT>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Admin/Queues/Modify.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Admin/Queues/Modify.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Admin/Queues/Modify.html	Sun Feb  1 19:57:48 2009
@@ -187,7 +187,7 @@
         results      => \@linkresults,
         record_obj    => $queue_obj,
         args_ref      => \%ARGS, 
-        Callbackname => 'process_links'
+        callback_name => 'process_links'
     );
     push @results, @linkresults;
     push @results, process_object_custom_field_updates( args_ref => \%ARGS, object => $queue_obj );

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Admin/Users/Modify.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Admin/Users/Modify.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Admin/Users/Modify.html	Sun Feb  1 19:57:48 2009
@@ -134,7 +134,7 @@
 </table>
 % }
 </&>
-% $m->callback( %ARGS, Callbackname => 'left_column_bottom', user_object => $user_object );
+% $m->callback( %ARGS, callback_name => 'left_column_bottom', user_object => $user_object );
 </td>
 
 <td valign="top" class="boxcontainer">
@@ -222,7 +222,7 @@
 % }
 </table>
 </&>
-% $m->callback( %ARGS, Callbackname => 'right_column_bottom', user_object => $user_object );
+% $m->callback( %ARGS, callback_name => 'right_column_bottom', user_object => $user_object );
 </td></tr>
 <tr>
 <td colspan="2">

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Callback
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Callback	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Callback	Sun Feb  1 19:57:48 2009
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <%INIT>
 $ARGS{'callback_page'} = delete $ARGS{'page'} || $m->callers(1)->path;
-$ARGS{'callbackname'} = delete $ARGS{'_Callbackname'};
+$ARGS{'callback_name'} = delete $ARGS{'_callback_name'};
 Jifty->log->debug("$ARGS{'callback_page'} calls old style callback, use \$m->callback");
 return $m->callback( %ARGS );
 </%INIT>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/CollectionAsTable/ParseFormat
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/CollectionAsTable/ParseFormat	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/CollectionAsTable/ParseFormat	Sun Feb  1 19:57:48 2009
@@ -65,7 +65,7 @@
         title => '',
     };
 
-    $m->callback(callbackname => 'PreColumn', column => $colref, col => \$col);
+    $m->callback(callback_name => 'PreColumn', column => $colref, col => \$col);
 
     if ( $col =~ s!/STYLE:([^/]+)!!io ) {
         $colref->{'style'} = $1;
@@ -104,12 +104,12 @@
         $colref->{'attribute'} = $1;
     }
 
-    $m->callback(callbackname => 'PostColumn', column => $colref, col => \$col);
+    $m->callback(callback_name => 'PostColumn', column => $colref, col => \$col);
 
     push @Columns, $colref;
 }
 
-$m->callback(callbackname => 'PostProcess', columns => \@Columns, format => $format);
+$m->callback(callback_name => 'PostProcess', columns => \@Columns, format => $format);
 
 return(@Columns);
 </%init>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ColumnMap
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ColumnMap	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ColumnMap	Sun Feb  1 19:57:48 2009
@@ -141,7 +141,7 @@
 
 </%ONCE>
 <%INIT>
-$m->callback( COLUMN_MAP => $COLUMN_MAP, Callbackname => 'once', CallbackOnce => 1 );
+$m->callback( COLUMN_MAP => $COLUMN_MAP, callback_name => 'once', callback_once => 1 );
 $m->callback( COLUMN_MAP => $COLUMN_MAP );
 
 # first deal with class specific things

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/EditCustomField
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/EditCustomField	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/EditCustomField	Sun Feb  1 19:57:48 2009
@@ -77,7 +77,7 @@
 $m->out("\n".'<input type="hidden" class="hidden" name="'.$name_prefix.$custom_field->id.'-values-magic" value="1" />'."\n");
 
 my $EditComponent = "EditCustomField$Type";
-$m->callback( Callbackname => 'edit_componentname', name => \$EditComponent, custom_field => $custom_field, object => $object );
+$m->callback( callback_name => 'edit_componentname', name => \$EditComponent, custom_field => $custom_field, object => $object );
 $EditComponent = "EditCustomField$Type" unless $m->comp_exists($EditComponent);
 
 return $m->comp(

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/EditLinks
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/EditLinks	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/EditLinks	Sun Feb  1 19:57:48 2009
@@ -52,7 +52,7 @@
 <h3><&|/l&>New Links</&></h3>
 % if (ref($object) eq 'RT::Model::Ticket') {
 <i><&|/l&>Enter tickets or URIs to link tickets to. Separate multiple entries with spaces.</&>
-% $m->callback( Callbackname => 'extra_link_instructions' );
+% $m->callback( callback_name => 'extra_link_instructions' );
 </i><br />
 % } elsif (ref($object) eq 'RT::Model::Queue') {
 <i><&|/l&>Enter queues or URIs to link queues to. Separate multiple entries with spaces.</&>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Header
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Header	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Header	Sun Feb  1 19:57:48 2009
@@ -76,7 +76,7 @@
 % if ($m->comp_exists($stylesheet_plugin) ) {
 <& $stylesheet_plugin &>
 % }
-% $m->callback( %ARGS, Callbackname => 'head' );
+% $m->callback( %ARGS, callback_name => 'head' );
 
 </head>
 % Jifty->handler->stash->{'in_body'} = 1;

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ListActions
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ListActions	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ListActions	Sun Feb  1 19:57:48 2009
@@ -80,7 +80,7 @@
             %ARGS,
             row  => \$_,
             skip => \$skip,
-            Callbackname => 'modify_row',
+            callback_name => 'modify_row',
         );
         !$skip;
     }

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Login
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Login	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Login	Sun Feb  1 19:57:48 2009
@@ -66,7 +66,7 @@
                 ;
 </%INIT>
 
-% $m->callback( %ARGS, Callbackname => 'header' );
+% $m->callback( %ARGS, callback_name => 'header' );
 <& /Elements/Header, title => _('Login'), focus => 'user' &>
 
 
@@ -80,7 +80,7 @@
 </&>
 % }
 
-% $m->callback( %ARGS, Callbackname => 'before_form' );
+% $m->callback( %ARGS, callback_name => 'before_form' );
 
 <div id="login-box">
 <&| /Widgets/TitleBox, title => _('Login'), titleright => $RT::VERSION, hideable => 0 &>
@@ -108,7 +108,7 @@
 % }
 </&>
 </div><!-- #login-box -->
-% $m->callback( %ARGS, Callbackname => 'after_form' );
+% $m->callback( %ARGS, callback_name => 'after_form' );
 </div><!-- #login-body -->
 <& /Elements/Footer, menu => 0 &>
 <%ARGS>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/MakeClicky
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/MakeClicky	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/MakeClicky	Sun Feb  1 19:57:48 2009
@@ -98,7 +98,7 @@
 # XXX Have to have Page argument, as Mason gets caller wrong in Callback?
 # This happens as we are in <%ONCE> block
 $m->callback(
-    CallbackPage => "/Elements/MakeClicky",
+    callback_page => "/Elements/MakeClicky",
     types        => \@types,
     actions      => \%actions,
     handle       => \$handle,

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/PageLayout
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/PageLayout	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/PageLayout	Sun Feb  1 19:57:48 2009
@@ -156,7 +156,7 @@
 </div>
 </div>
 <div id="body">
-% $m->callback( %ARGS, Callbackname => 'before_body' );
+% $m->callback( %ARGS, callback_name => 'before_body' );
 % $m->flush_buffer(); # we've got the page laid out, let's flush the buffer;
 
 <%INIT>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/QueueSummary
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/QueueSummary	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/QueueSummary	Sun Feb  1 19:57:48 2009
@@ -80,7 +80,7 @@
     $Queues->find_all_rows();
     @queues = grep $queue_filter->($_), @{$Queues->items_array_ref};
 
-    $m->callback( Callbackname => 'filter', Queues => \@queues );
+    $m->callback( callback_name => 'filter', Queues => \@queues );
 
     @queues = map { {
         id          => $_->id,

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Group/ColumnMap
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Group/ColumnMap	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Group/ColumnMap	Sun Feb  1 19:57:48 2009
@@ -88,6 +88,6 @@
 
 </%ONCE>
 <%INIT>
-$m->callback( COLUMN_MAP => $COLUMN_MAP, Callbackname => 'column_map', CallbackOnce => 1 );
+$m->callback( COLUMN_MAP => $COLUMN_MAP, callback_name => 'column_map', callback_once => 1 );
 return get_column_map_entry( Map => $COLUMN_MAP, name => $name, Attribute => $attr );
 </%INIT>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Queue/ColumnMap
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Queue/ColumnMap	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Queue/ColumnMap	Sun Feb  1 19:57:48 2009
@@ -109,7 +109,7 @@
 };
 </%ONCE>
 <%INIT>
-$m->callback( COLUMN_MAP => $COLUMN_MAP, Callbackname => 'column_map', CallbackOnce => 1 );
+$m->callback( COLUMN_MAP => $COLUMN_MAP, callback_name => 'column_map', callback_once => 1 );
 return get_column_map_entry( Map => $COLUMN_MAP, name => $name, Attribute => $attr );
 </%INIT>
 

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Scrip/ColumnMap
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Scrip/ColumnMap	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Scrip/ColumnMap	Sun Feb  1 19:57:48 2009
@@ -91,6 +91,6 @@
 }
 </%ONCE>
 <%INIT>
-$m->callback( COLUMN_MAP => $COLUMN_MAP, CallbackName => 'ColumnMap', CallbackOnce => 1 );
+$m->callback( COLUMN_MAP => $COLUMN_MAP, callback_name => 'ColumnMap', callback_once => 1 );
 return get_column_map_entry( Map => $COLUMN_MAP, name => $name, Attribute => $attr );
 </%INIT>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Template/ColumnMap
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Template/ColumnMap	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Template/ColumnMap	Sun Feb  1 19:57:48 2009
@@ -65,6 +65,6 @@
 
 </%ONCE>
 <%INIT>
-$m->callback( COLUMN_MAP => $COLUMN_MAP, Callbackname => 'column_map', CallbackOnce => 1 );
+$m->callback( COLUMN_MAP => $COLUMN_MAP, callback_name => 'column_map', callback_once => 1 );
 return get_column_map_entry( Map => $COLUMN_MAP, name => $name, Attribute => $attr );
 </%INIT>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Ticket/ColumnMap
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Ticket/ColumnMap	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__Ticket/ColumnMap	Sun Feb  1 19:57:48 2009
@@ -342,8 +342,8 @@
 }
 </%ONCE>
 <%init>
-$m->callback( COLUMN_MAP => $COLUMN_MAP, Callbackname => 'once', CallbackOnce => 1 );
+$m->callback( COLUMN_MAP => $COLUMN_MAP, callback_name => 'once', callback_once => 1 );
 # backward compatibility
-$m->callback( COLUMN_MAP => $COLUMN_MAP, Callbackname => 'column_map' );
+$m->callback( COLUMN_MAP => $COLUMN_MAP, callback_name => 'column_map' );
 return get_column_map_entry( Map => $COLUMN_MAP, name => $name, Attribute => $attr );
 </%init>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__User/ColumnMap
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__User/ColumnMap	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/RT__Model__User/ColumnMap	Sun Feb  1 19:57:48 2009
@@ -137,6 +137,6 @@
 
 </%ONCE>
 <%INIT>
-$m->callback( COLUMN_MAP => $COLUMN_MAP, Callbackname => 'column_map', CallbackOnce => 1 );
+$m->callback( COLUMN_MAP => $COLUMN_MAP, callback_name => 'column_map', callback_once => 1 );
 return get_column_map_entry( Map => $COLUMN_MAP, name => $name, Attribute => $attr );
 </%INIT>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/SelectOwner
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/SelectOwner	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/SelectOwner	Sun Feb  1 19:57:48 2009
@@ -85,7 +85,7 @@
 $m->callback(
     %ARGS,
     objects      => \@objects,
-    Callbackname => 'update_objectList'
+    callback_name => 'update_objectList'
 );
 
 my $isSU = Jifty->web->current_user
@@ -117,7 +117,7 @@
 $m->callback(
     %ARGS,
     objects      => \@objects,
-    Callbackname => 'update_objectList'
+    callback_name => 'update_objectList'
 );
 
 </%INIT>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ShowCustomFields
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ShowCustomFields	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ShowCustomFields	Sun Feb  1 19:57:48 2009
@@ -71,7 +71,7 @@
 </table>
 <%INIT>
 my $CustomFields = $object->custom_fields;
-$m->callback( Callbackname => 'massage_custom_fields', CustomFields => $CustomFields );
+$m->callback( callback_name => 'massage_custom_fields', CustomFields => $CustomFields );
 
 my $print_value = sub  {
     my ($cf, $value) = @_;
@@ -83,7 +83,7 @@
 Jifty->log->debug("$comp");
 Jifty->log->debug($cf->id);
     $m->callback(
-        Callbackname => 'show_componentname',
+        callback_name => 'show_componentname',
         name         => \$comp,
         CustomField  => $cf,
         object       => $object,

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ShowSearch
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ShowSearch	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/ShowSearch	Sun Feb  1 19:57:48 2009
@@ -112,7 +112,7 @@
 $ProcessedSearchArg = { %$SearchArg, %override } if keys %override;
 $m->callback(
     %ARGS,
-    Callbackname  => 'modify_search',
+    callback_name  => 'modify_search',
     OriginalSearch => $SearchArg,
     Search         => $ProcessedSearchArg,
 );

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/NoAuth/css/3.4-compat/main.css
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/NoAuth/css/3.4-compat/main.css	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/NoAuth/css/3.4-compat/main.css	Sun Feb  1 19:57:48 2009
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-% $m->callback(callbackname => 'Begin');
+% $m->callback(callback_name => 'Begin');
 
 %# Import the 3.5 styles we want to build off of...
 @import "../3.5-default/logo.css";
@@ -56,7 +56,7 @@
 @import "../3.5-default/quickbar.css";
 @import "../3.5-default/ticket.css";
 
-% $m->callback(callbackname => 'Post3.5');
+% $m->callback(callback_name => 'Post3.5');
 
 %# ...and then import the 3.4 compat styles afterwards so they can cascade
 @import "nav.css";
@@ -71,5 +71,5 @@
 @import "quickbar.css";
 @import "misc.css";
 
-% $m->callback(callbackname => 'End');
+% $m->callback(callback_name => 'End');
 

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/NoAuth/css/3.5-default/main.css
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/NoAuth/css/3.5-default/main.css	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/NoAuth/css/3.5-default/main.css	Sun Feb  1 19:57:48 2009
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-% $m->callback(callbackname => 'Begin');
+% $m->callback(callback_name => 'Begin');
 
 @import "misc.css";
 @import "login.css";
@@ -63,5 +63,5 @@
 @import "ticket-search.css";
 @import "local.css";
 
-% $m->callback(callbackname => 'End');
+% $m->callback(callback_name => 'End');
 

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/REST/1.0/NoAuth/mail-gateway
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/REST/1.0/NoAuth/mail-gateway	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/REST/1.0/NoAuth/mail-gateway	Sun Feb  1 19:57:48 2009
@@ -56,7 +56,7 @@
 <%init>
 require Encode;
 Encode::_utf8_off($ARGS{message});
-$m->callback( %ARGS, Callbackname => 'pre' );
+$m->callback( %ARGS, callback_name => 'pre' );
 use RT::Interface::Email ();    # It's an exporter, but we don't care
 $r->content_type('text/plain; charset=utf-8');
 $m->error_format('text');

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Search/Bulk.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Search/Bulk.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Search/Bulk.html	Sun Feb  1 19:57:48 2009
@@ -74,7 +74,7 @@
     class => 'RT::Model::TicketCollection'
    &>
 
-% $m->callback(Callbackname => 'after_ticket_list', args_ref => \%ARGS);
+% $m->callback(callback_name => 'after_ticket_list', args_ref => \%ARGS);
 
 <hr />
 

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/BuildFormatString
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/BuildFormatString	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/BuildFormatString	Sun Feb  1 19:57:48 2009
@@ -89,7 +89,7 @@
     NEWLINE     Bookmark
 ); # loc_qw
 
-$m->callback( CallbackOnce => 1, Callbackname => 'set_fields_once', Fields => \@fields );
+$m->callback( callback_once => 1, callback_name => 'set_fields_once', Fields => \@fields );
 
 my $CustomFields = RT::Model::CustomFieldCollection->new( current_user => Jifty->web->current_user);
 foreach my $id (keys %cfqueues) {

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/PickCFs
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/PickCFs	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/PickCFs	Sun Feb  1 19:57:48 2009
@@ -68,7 +68,7 @@
 }
 $CustomFields->limit_to_global;
 $m->callback(
-    Callbackname => 'massage_custom_fields',
+    callback_name => 'massage_custom_fields',
     CustomFields => $CustomFields,
 );
 

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/ResultViews
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/ResultViews	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/ResultViews	Sun Feb  1 19:57:48 2009
@@ -62,7 +62,7 @@
 <li><a href="<%RT->config->get('WebURL')%>/NoAuth/iCal/<% $ical_path %>"><% _('iCal') %></a></li>
 <li><a href="<%RT->config->get('WebPath')%>/Tools/Offline.html<%$short_query_string%>"><&|/l&>Editable text</&></a></li>
 % # Now let callbacks add their extra tools
-% $m->callback( %ARGS, callbackname => 'AfterTools' );
+% $m->callback( %ARGS, callback_name => 'AfterTools' );
 
 </ul>
 <form method="get" action="<%RT->config->get('WebPath')%>/Search/Chart.html">

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Search/Results.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Search/Results.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Search/Results.html	Sun Feb  1 19:57:48 2009
@@ -91,7 +91,7 @@
     short_querystring => $short_querystring,
 &>
 
-% $m->callback( query_string => $query_string, Callbackname => 'search_actions' );
+% $m->callback( query_string => $query_string, callback_name => 'search_actions' );
 </div>
 </&>
 <%INIT>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Search/Simple.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Search/Simple.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Search/Simple.html	Sun Feb  1 19:57:48 2009
@@ -51,7 +51,7 @@
     title => $title
 &>
 
-% $m->callback( %ARGS, Callbackname => 'pre_form' );
+% $m->callback( %ARGS, callback_name => 'pre_form' );
 
 <div id="SimpleSearchForm">
 <form action="Simple.html" method="get">
@@ -69,7 +69,7 @@
 
 </form>
 
-% $m->callback( %ARGS, Callbackname => 'post_form' );
+% $m->callback( %ARGS, callback_name => 'post_form' );
 
 </div>
 
@@ -84,7 +84,7 @@
         RT::Interface::Web::redirect(RT->config->get('WebURL')."Ticket/Display.html?id=".$1);
     }
 
-    $m->callback( %ARGS, query => \$q, Callbackname => 'modify_query' );
+    $m->callback( %ARGS, query => \$q, callback_name => 'modify_query' );
 
     if ($q =~ /^#?(\d+)$/) {
         RT::Interface::Web::redirect(RT->config->get('WebURL')."Ticket/Display.html?id=".$1);
@@ -95,7 +95,7 @@
         TicketsObj => $tickets,
     );
 
-    $m->callback( %ARGS, Callbackname => 'search_args', args => \%args);
+    $m->callback( %ARGS, callback_name => 'search_args', args => \%args);
 
     my $search = RT::Search::Googleish->new(%args);
 

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Create.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Create.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Create.html	Sun Feb  1 19:57:48 2009
@@ -55,7 +55,7 @@
 <& /Elements/ListActions, actions => \@results &>
 <form action="<% RT->config->get('WebPath') %>/Ticket/Create.html" method="post" enctype="multipart/form-data" name="ticket_create">
 <input type="hidden" class="hidden" name="id" value="new" />
-% $m->callback( Callbackname => 'form_start', args_ref => \%ARGS );
+% $m->callback( callback_name => 'form_start', args_ref => \%ARGS );
 % if ($gnupg_widget) {
 <& /Elements/GnuPG/SignEncryptWidget:ShowIssues, self => $gnupg_widget &>
 % }
@@ -159,7 +159,7 @@
 <tr>
 <td colspan="6">
 <&|/l&>describe the issue below</&>:<br />
-% $m->callback( %ARGS, queue_obj => $queue_obj, callbackname => 'BeforeMessageBox' );
+% $m->callback( %ARGS, queue_obj => $queue_obj, callback_name => 'BeforeMessageBox' );
 % if (exists $ARGS{content}) {
 <& /Elements/MessageBox, default => $ARGS{content}, include_signature => 0 &>
 % } else {
@@ -248,7 +248,7 @@
 
 </&>
 <%INIT>
-$m->callback( callbackname => "Init", args_ref => \%ARGS );
+$m->callback( callback_name => "Init", args_ref => \%ARGS );
 my $queue = $ARGS{queue};
 
 my $cloneticket_obj;
@@ -386,7 +386,7 @@
 }
 
 my $skip_create = 0;
-$m->callback( callbackname => 'BeforeCreate', args_ref => \%ARGS, skip_create => \$skip_create, 
+$m->callback( callback_name => 'BeforeCreate', args_ref => \%ARGS, skip_create => \$skip_create, 
               checks_failure => $checks_failure, results => \@results );
 
 if ((!exists $ARGS{'add_more_attach'}) and (defined($ARGS{'id'}) and $ARGS{'id'} eq 'new')) { # new ticket?

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Display.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Display.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Display.html	Sun Feb  1 19:57:48 2009
@@ -53,12 +53,12 @@
     current_tab => 'Ticket/Display.html?id='.$ticket_obj->id,
     title => _("#%1: %2", $ticket_obj->id, $ticket_obj->subject) &>
 
-% $m->callback(Callbackname => 'before_action_list', %ARGS, Actions => \@Actions, args_ref => \%ARGS, ticket => $ticket_obj);
+% $m->callback(callback_name => 'before_action_list', %ARGS, actions => \@Actions, args_ref => \%ARGS, ticket => $ticket_obj);
 
 <& /Elements/ListActions, actions => \@Actions &>
 <& Elements/ShowUpdateStatus, ticket => $ticket_obj &>
 
-% $m->callback( %ARGS, ticket => $ticket_obj, Callbackname => 'before_show_summary' );
+% $m->callback( %ARGS, ticket => $ticket_obj, callback_name => 'before_show_summary' );
 <div class="summary">
 <&| /Widgets/TitleBox, title => _('Ticket metadata') &>
 <& /Ticket/Elements/ShowSummary,  ticket => $ticket_obj, attachments => $attachments &>
@@ -66,7 +66,7 @@
 </div>
 <br />
 
-% $m->callback( ticket => $ticket_obj, %ARGS, Callbackname => 'before_show_history' );
+% $m->callback( ticket => $ticket_obj, %ARGS, callback_name => 'before_show_history' );
 
 <& /Ticket/Elements/ShowHistory , 
       ticket => $ticket_obj, 
@@ -80,7 +80,7 @@
 % $m->callback( %ARGS,
 %     ticket       => $ticket_obj,
 %     current_tab  => 'Ticket/Display.html?id=' . $ticket_obj->id,
-%     Callbackname => 'after_show_history',
+%     callback_name => 'after_show_history',
 % );
 
 % $m->comp('/Elements/Footer');
@@ -93,7 +93,7 @@
 
 <%INIT>
 
-$m->callback( ticket_obj => $ticket_obj, args_ref => \%ARGS, Callbackname => 'initial' );
+$m->callback( ticket_obj => $ticket_obj, args_ref => \%ARGS, callback_name => 'initial' );
 
 my (@Actions, $Tickets);  
 
@@ -137,7 +137,7 @@
 } else { 
     $ticket_obj ||= load_ticket($ARGS{'id'});
 
-    $m->callback( Callbackname => 'before_process_arguments',
+    $m->callback( callback_name => 'before_process_arguments',
         ticket_obj => $ticket_obj, tickets => $Tickets,
         ActionsRef => \@Actions, args_ref => \%ARGS );
     if ( defined $ARGS{'action'} ) {
@@ -148,10 +148,10 @@
         }
     }
 
-    $m->callback(Callbackname => 'process_arguments', 
+    $m->callback(callback_name => 'process_arguments', 
             ticket => $ticket_obj, 
             args_ref => \%ARGS, 
-            Actions => \@Actions);
+            actions => \@Actions);
     
     $ARGS{update_attachments} = $session{'Attachments'};
     push @Actions,
@@ -184,10 +184,10 @@
 }
 
 $m->callback(
-    Callbackname => 'before_display',
+    callback_name => 'before_display',
     ticket_obj => \$ticket_obj,
     tickets => \$Tickets,
-    Actions => \@Actions,
+    actions => \@Actions,
     args_ref => \%ARGS,
 );
 

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/EditBasics
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/EditBasics	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/EditBasics	Sun Feb  1 19:57:48 2009
@@ -107,7 +107,7 @@
 
 
 
-% $m->callback( Callbackname => 'end_of_list', ticket_obj => $ticket_obj, %ARGS );
+% $m->callback( callback_name => 'end_of_list', ticket_obj => $ticket_obj, %ARGS );
 </table>
 
 <%INIT>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowBasics
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowBasics	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowBasics	Sun Feb  1 19:57:48 2009
@@ -80,7 +80,7 @@
     <td class="label queue"><&|/l&>Queue</&>:</td>
     <td class="value queue"><& ShowQueue, queue_obj => $ticket->queue &></td>
   </tr>
-% $m->callback( %ARGS, Callbackname => 'end_of_list', ticket_obj => $ticket );
+% $m->callback( %ARGS, callback_name => 'end_of_list', ticket_obj => $ticket );
 </table>
 <%ARGS>
 $ticket => undef

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowHistory
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowHistory	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowHistory	Sun Feb  1 19:57:48 2009
@@ -91,7 +91,7 @@
         %ARGS,
         transaction   => $Transaction,
         skip          => \$skip,
-        Callbackname  => 'skip_transaction',
+        callback_name  => 'skip_transaction',
     );
     next if $skip;
 

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowRequestor
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowRequestor	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowRequestor	Sun Feb  1 19:57:48 2009
@@ -66,7 +66,7 @@
 &>
 
 %# Additional information about this user.  Empty by default.
-% $m->callback( requestor => $requestor, %ARGS, Callbackname => 'about_this_user' );
+% $m->callback( requestor => $requestor, %ARGS, callback_name => 'about_this_user' );
 
 <&|/l&>comments about this user</&>:<br />
 <b><% ($requestor->comments || _("No comment entered about this user")) %></b><br />

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowSummary
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowSummary	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowSummary	Sun Feb  1 19:57:48 2009
@@ -70,7 +70,7 @@
       <& /Ticket/Elements/ShowAttachments, ticket => $ticket, attachments => $attachments &>
 	  <& /Ticket/Elements/ShowRequestor, ticket => $ticket &>
 
-% $m->callback( %ARGS, Callbackname => 'left_column' );
+% $m->callback( %ARGS, callback_name => 'left_column' );
 	</td>
 	<td valign="top" class="boxcontainer">
 % if ( RT->config->get('EnableReminders') ) {
@@ -103,7 +103,7 @@
  		class => 'ticket-info-links', @extra &>
 	        <& /Elements/ShowLinks, ticket => $ticket &>
           </&>
-% $m->callback( %ARGS, Callbackname => 'right_column' );
+% $m->callback( %ARGS, callback_name => 'right_column' );
 
 	</td>
       </tr>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransaction	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransaction	Sun Feb  1 19:57:48 2009
@@ -46,9 +46,9 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <div class="ticket-transaction <% $type_class %> <% $row_num % 2 ? 'odd' : 'even' %>">
-% $m->callback( titlebar_cmd => \$titlebar_commands, Transaction => $transaction, %ARGS, Callbackname => 'modify_display' );
+% $m->callback( titlebar_cmd => \$titlebar_commands, Transaction => $transaction, %ARGS, callback_name => 'modify_display' );
 <div class="ticket-transaction">
-% $m->callback( titlebar_cmd => \$titlebar_commands, Transaction => $transaction, %ARGS, Callbackname => 'modify_command' );
+% $m->callback( titlebar_cmd => \$titlebar_commands, Transaction => $transaction, %ARGS, callback_name => 'modify_command' );
   <div class="metadata">
     <span class="type">
       <a name="txn-<% $transaction->id %>" href="<% $display_path %>#txn-<% $transaction->id %>">#</a>
@@ -56,7 +56,7 @@
     </span>
     <span class="date"><% $transdate|n %></span>
 % my $desc = $transaction->brief_description;
-% $m->callback( text => \$desc, Transaction => $transaction, %ARGS, Callbackname => 'modify_display' );
+% $m->callback( text => \$desc, Transaction => $transaction, %ARGS, callback_name => 'modify_display' );
     <span class="description">
       <% $transaction->creator_obj->name %> - <% $TicketString %> <% $desc %>
     </span>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Forward.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Forward.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Forward.html	Sun Feb  1 19:57:48 2009
@@ -51,11 +51,11 @@
     title  => $Title,
 &>
 
-% $m->callback(Callbackname => 'before_action_list', Actions => \@results, args_ref => \%ARGS, ticket => $ticket_obj);
+% $m->callback(callback_name => 'before_action_list', actions => \@results, args_ref => \%ARGS, ticket => $ticket_obj);
 <& /Elements/ListActions, actions => \@results &>
 
 <form action="Forward.html" name="forward_message" method="post">
-% $m->callback( Callbackname => 'form_start', args_ref => \%ARGS );
+% $m->callback( callback_name => 'form_start', args_ref => \%ARGS );
 <input type="hidden" class="hidden" name="id" value="<% $id %>" /><br />
 <input type="hidden" class="hidden" name="quote_transaction" value="<% $ARGS{'quote_transaction'} %>" />
 

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/GnuPG.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/GnuPG.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/GnuPG.html	Sun Feb  1 19:57:48 2009
@@ -53,7 +53,7 @@
     title => $title,
 &>
 
-% $m->callback( Callbackname => 'before_action_list', %ARGS, Actions => \@results, args_ref => \%ARGS );
+% $m->callback( callback_name => 'before_action_list', %ARGS, actions => \@results, args_ref => \%ARGS );
 <& /Elements/ListActions, actions => \@results &>
 <form method="post" action="<% RT->config->get('WebPath') . $m->request_comp->path %>?id=<% $id %>">
 <a href="<% RT->config->get('WebURL') %>Ticket/Display.html?id=<% $txn->ticket %>#txn-<% $id %>">

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/History.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/History.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/History.html	Sun Feb  1 19:57:48 2009
@@ -50,7 +50,7 @@
     ticket => $Ticket, current_tab => 'Ticket/History.html?id='.$Ticket->id, 
     title => _("Ticket History # %1 %2", $Ticket->id, $Ticket->subject) &>
 
-% $m->callback( %ARGS, ticket => $Ticket, Callbackname => 'before_action_list' );
+% $m->callback( %ARGS, ticket => $Ticket, callback_name => 'before_action_list' );
 
 
 <br />
@@ -63,7 +63,7 @@
     attachment_content => $attachment_content
     &> 
 
-% $m->callback( %ARGS, Callbackname => 'after_show_history', ticket => $Ticket, current_tab => 'Ticket/History.html?id=' . $Ticket->id );
+% $m->callback( %ARGS, callback_name => 'after_show_history', ticket => $Ticket, current_tab => 'Ticket/History.html?id=' . $Ticket->id );
 
 </&>
 <%ARGS>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Modify.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Modify.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Modify.html	Sun Feb  1 19:57:48 2009
@@ -50,11 +50,11 @@
     ticket => $ticket_obj, current_subtab => "Ticket/Modify.html?id=".$ticket_obj->id, 
     title => _('Modify ticket #%1', $ticket_obj->id) &>
 
-% $m->callback(Callbackname => 'before_action_list', Actions => \@results, args_ref => \%ARGS, ticket => $ticket_obj);
+% $m->callback(callback_name => 'before_action_list', actions => \@results, args_ref => \%ARGS, ticket => $ticket_obj);
 
 <& /Elements/ListActions, actions => \@results &>
 <% Jifty->web->form->start( submit_to => '?id=' . $ticket_obj->id ) %>
-% $m->callback( Callbackname => 'form_start', args_ref => \%ARGS );
+% $m->callback( callback_name => 'form_start', args_ref => \%ARGS );
 <input type="hidden" class="hidden" name="id" value="<% $ticket_obj->id %>" />
 
 <&| /Widgets/TitleBox, title => _('Modify ticket #%1',$ticket_obj->id), class=>'ticket-info-basics' &>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyAll.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyAll.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyAll.html	Sun Feb  1 19:57:48 2009
@@ -51,7 +51,7 @@
     current_tab => "Ticket/ModifyAll.html?id=".$Ticket->id, 
     title => _("Ticket #%1 Jumbo update: %2", $Ticket->id, $Ticket->subject) &>
 
-% $m->callback(Callbackname => 'before_action_list', Actions => \@results, args_ref => \%ARGS, ticket => $Ticket);
+% $m->callback(callback_name => 'before_action_list', actions => \@results, args_ref => \%ARGS, ticket => $Ticket);
 <& /Elements/ListActions, actions => \@results &>
 
 <% Jifty->web->form->start( submit_to => '?id=' . $Ticket->id ) %>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyDates.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyDates.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyDates.html	Sun Feb  1 19:57:48 2009
@@ -50,7 +50,7 @@
     ticket => $ticket_obj, 
     current_tab => "Ticket/ModifyDates.html?id=".$ticket_obj->id, 
     title => _('Modify dates for #%1', $ticket_obj->id) &> 
-% $m->callback(Callbackname => 'before_action_list', args_ref => \%ARGS, ticket => $ticket_obj);
+% $m->callback(callback_name => 'before_action_list', args_ref => \%ARGS, ticket => $ticket_obj);
 
 <& /Elements/ListActions &>
 

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyLinks.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyLinks.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyLinks.html	Sun Feb  1 19:57:48 2009
@@ -51,12 +51,12 @@
     current_tab => "Ticket/ModifyLinks.html?id=".$Ticket->id, 
     title => _("Link ticket #%1", $Ticket->id) &>
 
-% $m->callback(Callbackname => 'before_action_list', Actions => \@results, args_ref => \%ARGS, ticket => $Ticket);
+% $m->callback(callback_name => 'before_action_list', actions => \@results, args_ref => \%ARGS, ticket => $Ticket);
 <& /Elements/ListActions, actions => \@results &>
 
 <% Jifty->web->form->start( submit_to => '?id=' . $Ticket->id ) %>
 <input type="hidden" class="hidden" name="id" value="<%$Ticket->id%>" />
-% $m->callback( Callbackname => 'form_start', args_ref => \%ARGS );
+% $m->callback( callback_name => 'form_start', args_ref => \%ARGS );
 % my (@extra);
 % push @extra, titleright_raw => '<a href="'. RT->config->get('WebPath') . '/Ticket/Graphs/index.html?id='.$Ticket->id.'">'._('Graph').'</a>' unless RT->config->get('DisableGraphViz');
 <&| /Widgets/TitleBox, title => _('Edit Links'), class=>'ticket-info-links', @extra &>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyPeople.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyPeople.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/ModifyPeople.html	Sun Feb  1 19:57:48 2009
@@ -51,12 +51,12 @@
     current_tab => "Ticket/ModifyPeople.html?id=".$Ticket->id, 
     title => _('Modify people related to ticket #%1', $Ticket->id) &>
 
-% $m->callback(Callbackname => 'before_action_list', Actions => \@results, args_ref => \%ARGS, ticket => $Ticket);
+% $m->callback(callback_name => 'before_action_list', actions => \@results, args_ref => \%ARGS, ticket => $Ticket);
 <& /Elements/ListActions, actions => \@results &>
 
 <form method="post" action="ModifyPeople.html">
 <input type="hidden" class="hidden" name="id" value="<%$Ticket->id%>" />
-% $m->callback( Callbackname => 'form_start', args_ref => \%ARGS );
+% $m->callback( callback_name => 'form_start', args_ref => \%ARGS );
 <&| /Widgets/TitleBox, title => _('Modify people related to ticket #%1', $Ticket->id),   width => "100%", color=> "#333399", class=>'ticket-info-people' &>
 <& Elements/EditPeople, ticket => $Ticket, user_field => $user_field, user_string => $user_string, user_op => $user_op, group_string => $group_string, group_op => $group_op, group_field => $group_field &>
 </&>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Reminders.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Reminders.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Reminders.html	Sun Feb  1 19:57:48 2009
@@ -51,7 +51,7 @@
     current_tab => "Ticket/Reminders.html?id=".$Ticket->id, 
     title => _("Reminders for ticket #%1", $Ticket->id) &>
     
-% $m->callback(Callbackname => 'before_action_list', args_ref => \%ARGS, ticket => $Ticket);
+% $m->callback(callback_name => 'before_action_list', args_ref => \%ARGS, ticket => $Ticket);
     
 <form action="<%RT->config->get('WebPath')%>/Ticket/Reminders.html" method="post">
 <&|/Widgets/TitleBox, title => _("Reminders"),

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Update.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Update.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Update.html	Sun Feb  1 19:57:48 2009
@@ -50,12 +50,12 @@
     ticket => $ticket_obj, 
     title=> $title &>
     
-% $m->callback(Callbackname => 'before_action_list', args_ref => \%ARGS, ticket => $ticket_obj);
+% $m->callback(callback_name => 'before_action_list', args_ref => \%ARGS, ticket => $ticket_obj);
 <& /Elements/ListActions, actions => \@results &>
 
 <form action="Update.html" name="ticket_update"
     method="post" enctype="multipart/form-data">
-% $m->callback( Callbackname => 'form_start', args_ref => \%ARGS, ticket => $ticket_obj );
+% $m->callback( callback_name => 'form_start', args_ref => \%ARGS, ticket => $ticket_obj );
 <input type="hidden" class="hidden" name="quote_transaction" value="<% $ARGS{quote_transaction}||'' %>" />
 <input type="hidden" class="hidden" name="default_status" value="<% $default_status ||''%>" />
 <input type="hidden" class="hidden" name="action" value="<% $ARGS{action}||'' %>" />
@@ -79,7 +79,7 @@
 <& /Elements/SelectTimeUnits, name => 'update_time_worked'&>
 </td></tr>
 % my $skip;
-% $m->callback( %ARGS, Callbackname => 'before_update_type', skip => \$skip );
+% $m->callback( %ARGS, callback_name => 'before_update_type', skip => \$skip );
 % if (!$skip) {
 <input type="hidden" class="hidden" name="id" value="<%$ticket_obj->id%>" /><br />
 % }
@@ -133,7 +133,7 @@
 % }
 
 <tr><td class="label" valign="top"><&|/l&>Message</&>:</td><td>
-% $m->callback( %ARGS, Callbackname => 'before_message_box' );
+% $m->callback( %ARGS, callback_name => 'before_message_box' );
 % if (exists $ARGS{update_content}) {
 % # preserve QuoteTransaction so we can use it to set up sane references/in/reply to
 % my $temp = $ARGS{'quote_transaction'};
@@ -168,7 +168,7 @@
 
 my @results;
 
-$m->callback( ticket => $ticket_obj, args_ref => \%ARGS, results => \@results, callbackname => 'Initial' );
+$m->callback( ticket => $ticket_obj, args_ref => \%ARGS, results => \@results, callback_name => 'Initial' );
 
 unless($default_status){
     $default_status=($ARGS{'status'} ||$ticket_obj->status());
@@ -248,7 +248,7 @@
 }
 
 if ( !$checks_failure && exists $ARGS{submit_ticket} ) {
-    $m->callback( ticket => $ticket_obj, args_ref => \%ARGS, Callbackname => 'before_display' );
+    $m->callback( ticket => $ticket_obj, args_ref => \%ARGS, callback_name => 'before_display' );
     return $m->comp('Display.html', ticket_obj => $ticket_obj, %ARGS);
 }
 

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Tools/Reports/index.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Tools/Reports/index.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Tools/Reports/index.html	Sun Feb  1 19:57:48 2009
@@ -72,6 +72,6 @@
     },
 };
 
-$m->callback( Callbackname => 'list_reports', %ARGS, tabs => $tabs );
+$m->callback( callback_name => 'list_reports', %ARGS, tabs => $tabs );
 
 </%init>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/User/Prefs.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/User/Prefs.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/User/Prefs.html	Sun Feb  1 19:57:48 2009
@@ -104,7 +104,7 @@
   </tr>
 </table>
 </&>
-% $m->callback( %ARGS, user_object => $user_object, Callbackname => 'form_left_column' );
+% $m->callback( %ARGS, user_object => $user_object, callback_name => 'form_left_column' );
 </td>
 <td valign="top" class="boxcontainer">
 % unless (RT->config->get('WebExternalAuth') and !RT->config->get('WebFallbackToInternalAuth')) {
@@ -161,7 +161,7 @@
   </tr>
 </table>
 </&>
-% $m->callback( %ARGS, user_object => $user_object, Callbackname => 'form_right_column' );
+% $m->callback( %ARGS, user_object => $user_object, callback_name => 'form_right_column' );
 </td>
 </tr>
 
@@ -187,7 +187,7 @@
 
 </table>
 
-% $m->callback( %ARGS, user_object => $user_object, Callbackname => 'form_end' );
+% $m->callback( %ARGS, user_object => $user_object, callback_name => 'form_end' );
 
 <& /Elements/Submit, label => _('Save Preferences') &>
 </form>
@@ -221,7 +221,7 @@
 		   );
 
     $m->callback(
-        Callbackname => 'update_logic',
+        callback_name => 'update_logic',
         fields       => \@fields,
         results      => \@results,
         user_object      => $user_object,

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/index.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/index.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/index.html	Sun Feb  1 19:57:48 2009
@@ -87,7 +87,7 @@
 <%init>
 
 my @results;
-$m->callback( args_ref => \%ARGS, results => \@results, callbackname => 'Initial' );
+$m->callback( args_ref => \%ARGS, results => \@results, callback_name => 'Initial' );
 
 if ( $ARGS{'quick_create'} ) {
     my $queue_obj = new RT::Model::Queue( current_user => Jifty->web->current_user );


More information about the Rt-commit mailing list