]> wagnertech.de Git - kivitendo-erp.git/commitdiff
projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b1064ee)
container für focus handling
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 19 Sep 2012 13:52:38 +0000 (15:52 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 17 Oct 2012 14:00:46 +0000 (16:00 +0200)
SL/Controller/Layout/Base.pm patch | blob | history
SL/Controller/Layout/None.pm patch | blob | history
SL/Form.pm patch | blob | history
templates/webpages/generic/focus_setup.html [new file with mode: 0644] patch | blob

diff --git a/SL/Controller/Layout/Base.pm b/SL/Controller/Layout/Base.pm
index dbd5d8835eb449ec217bc1a4cb7e8ddf3df4047c..ed25f1b7828a75533d581c71ea4f9e29b68a2447 100644 (file)
--- a/SL/Controller/Layout/Base.pm
+++ b/SL/Controller/Layout/Base.pm
@@ -5,6 +5,7 @@ use parent qw(SL::Controller::Base);
 
 use Rose::Object::MakeMethods::Generic (
   'scalar --get_set_init' => qw(menu),
 
 use Rose::Object::MakeMethods::Generic (
   'scalar --get_set_init' => qw(menu),
+  'scalar'                => qw(focus),
   'array'                 => [
     'add_stylesheets_inline' => { interface => 'add', hash_key => 'stylesheets_inline' },
     'add_javascripts_inline' => { interface => 'add', hash_key => 'javascripts_inline' },
   'array'                 => [
     'add_stylesheets_inline' => { interface => 'add', hash_key => 'stylesheets_inline' },
     'add_javascripts_inline' => { interface => 'add', hash_key => 'javascripts_inline' },
diff --git a/SL/Controller/Layout/None.pm b/SL/Controller/Layout/None.pm
index 2d9e2e85eaa6b3700ab984a2248fe23d17a4c682..204b8ee361180ed8f64d64f513f8e473a0e2cbfa 100644 (file)
--- a/SL/Controller/Layout/None.pm
+++ b/SL/Controller/Layout/None.pm
@@ -4,7 +4,24 @@ use strict;
 use parent qw(SL::Controller::Layout::Base);
 
 sub javascripts_inline {
 use parent qw(SL::Controller::Layout::Base);
 
 sub javascripts_inline {
+  _setup_formats(),
+  _setup_focus(),
+}
+
+
+sub _setup_formats {
   $::form->parse_html_template('generic/javascript_setup')
 }
 
   $::form->parse_html_template('generic/javascript_setup')
 }
 
+sub _setup_focus {
+  if ($::request->{layout}->focus || $::form->{fokus}) {
+    return $::form->parse_html_template('generic/focus_setup', {
+      focus => $::request->{layout}->focus,
+      fokus => $::form->{fokus},
+    })
+  } else {
+    return ();
+  }
+}
+
 1;
 1;
diff --git a/SL/Form.pm b/SL/Form.pm
index 186e661511cb108499bd6480707799251fd88870..514c282d2a8b4bbfa93bc62f9d1057238343724f 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -488,7 +488,6 @@ sub header {
   push @header, map { qq|<script type="text/javascript" src="$_"></script>| }                    $layout->javascripts;
   push @header, $self->{javascript} if $self->{javascript};
   push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
   push @header, map { qq|<script type="text/javascript" src="$_"></script>| }                    $layout->javascripts;
   push @header, $self->{javascript} if $self->{javascript};
   push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
-  push @header, "<script type='text/javascript'>function fokus(){ document.$self->{fokus}.focus(); }</script>" if $self->{fokus};
 
   my  %doctypes = (
     strict       => qq|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">|,
 
   my  %doctypes = (
     strict       => qq|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">|,
diff --git a/templates/webpages/generic/focus_setup.html b/templates/webpages/generic/focus_setup.html
new file mode 100644 (file)
index 0000000..22bb2a2
--- /dev/null
+++ b/templates/webpages/generic/focus_setup.html
@@ -0,0 +1 @@
+function fokus(){ [% IF focus %]$('[% focus %]').focus()[% ELSE %][% fokus %].focus()[% END %] }
Unnamed repository; edit this file 'description' to name the repository.