Layout: Javascript Includes gefixt

1. jquery-ui muss im Top vorhanden sein für glquicksearch.js
2. Javacript und CssMenu brauchen das frame_header css nicht einbinden
3. js includes normalisiert ohne "js/" Präfix

diff --git a/SL/Layout/CssMenu.pm b/SL/Layout/CssMenu.pm
index d9399083de7a93b10b3b2e61ba16b138d642e1d6..b67475f6612a1e8e39d61195aeb35314f04b0b59 100644 (file)
--- a/SL/Layout/CssMenu.pm
+++ b/SL/Layout/CssMenu.pm
@@ -4,7 +4,7 @@ use strict;
 use parent qw(SL::Layout::Base);
 
 sub use_stylesheet {
-  qw(icons16.css frame_header/header.css),
+  qw(icons16.css),
 }
 
 sub pre_content {

diff --git a/SL/Layout/Javascript.pm b/SL/Layout/Javascript.pm
index 366e0d7c9464322b1b11f7b0883cff77236e1a9f..e900012c0bbe5b476004af4d4195c090bfc8f385 100644 (file)
--- a/SL/Layout/Javascript.pm
+++ b/SL/Layout/Javascript.pm
@@ -59,7 +59,6 @@ sub stylesheets {
     dhtmlsuite/menu-item.css
     dhtmlsuite/menu-bar.css
     icons16.css
-    frame_header/header.css
     menu.css
   ));
   $_[0]->SUPER::stylesheets;

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index 4a02d652a81ff3c609c887e564e4b6b88c76eb93..72d3e75be426734226cf6cda95a6305f564a8392 100644 (file)
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -26,12 +26,12 @@ sub javascripts_inline {
 sub use_javascript {
   my $self = shift;
   qw(
-    js/jquery.js
-    js/common.js
-    js/namespace.js
-    js/kivi.js
+    jquery.js
+    common.js
+    namespace.js
+    kivi.js
   ),
-  'js/locale/'. $::myconfig{countrycode} .'.js',
+  'locale/'. $::myconfig{countrycode} .'.js',
   $self->SUPER::use_javascript(@_);
 }
 

diff --git a/SL/Layout/Top.pm b/SL/Layout/Top.pm
index 165134ddce2203b970642e17fbb84b4a420b0fb2..47ab065fbebd77a4829064d3e23ae6af6f33c120 100644 (file)
--- a/SL/Layout/Top.pm
+++ b/SL/Layout/Top.pm
@@ -18,8 +18,8 @@ sub stylesheets {
 }
 
 sub javascripts {
-  ('js/quicksearch_input.js') x!! $::auth->assert('customer_vendor_edit', 1),
-  ('js/glquicksearch.js')     x!! $::auth->assert('general_ledger', 1)
+  ('jquery-ui.js', 'quicksearch_input.js') x!! $::auth->assert('customer_vendor_edit', 1),
+  ('jquery-ui.js', 'glquicksearch.js')     x!! $::auth->assert('general_ledger', 1)
 }
 
 1;