Merge branch 'master' into dev

diff --combined SL/Layout/None.pm
index cb3bdb9,c3708bf..0a2f6ca
--- 1/SL/Layout/None.pm
--- 2/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@@ -6,8 -6,21 +6,21 @@@ use parent qw(SL::Layout::Base)
  use List::MoreUtils qw(apply);
  
  sub javascripts_inline {
-   _setup_formats(),
-   _setup_focus(),
+   my ($self)  = @_;
+ 
+   my $datefmt = apply {
+     s/d+/dd/gi;
+     s/m+/mm/gi;
+     s/y+/yy/gi;
+   } $::myconfig{dateformat};
+ 
+   return $self->render(
+     'layout/javascript_setup',
+     { type => 'js', output => 0, },
+     datefmt      => $datefmt,
+     focus        => $::request->layout->focus,
+     ajax_spinner => 1,
+   );
  }
  
  sub use_javascript {
@@@ -15,7 -28,6 +28,7 @@@
    qw(
      js/jquery.js
      js/common.js
 +    js/namespace.js
    ),
    $self->SUPER::use_javascript(@_);
  }
@@@ -29,24 -41,4 +42,4 @@@ sub use_stylesheet 
    $self->SUPER::use_stylesheet(@_);
  }
  
- sub _setup_formats {
-   my $datefmt = apply {
-     s/d+/dd/gi;
-     s/m+/mm/gi;
-     s/y+/yy/gi;
-   } $::myconfig{dateformat};
- 
-   $::form->parse_html_template('layout/javascript_setup', { datefmt => $datefmt });
- }
- 
- sub _setup_focus {
-   if ($::request->{layout}->focus) {
-     return $::form->parse_html_template('layout/focus_setup', {
-       focus => $::request->{layout}->focus,
-     })
-   } else {
-     return ();
-   }
- }
- 
  1;