From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 17 Aug 2015 15:10:36 +0000 (+0200)
Subject: Layout: Javascript Includes gefixt
X-Git-Tag: release-3.3.0~13
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=46c987b8b139347af65a470ed377ed6cccca545c;p=kivitendo-erp.git

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 d9399083d..b67475f66 100644
--- 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 366e0d7c9..e900012c0 100644
--- 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 4a02d652a..72d3e75be 100644
--- 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 165134ddc..47ab065fb 100644
--- 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;