From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 25 Oct 2012 14:38:51 +0000 (+0200)
Subject: Javascript und None Layouts verbessert
X-Git-Tag: release-3.0.0beta1~93
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1245145122f88aff6cdc86eb55b4d092a21db4f3;p=kivitendo-erp.git

Javascript und None Layouts verbessert

Enthält Vorschläge von Ronny Kumke und
behebt #2025
---

diff --git a/SL/Layout/Javascript.pm b/SL/Layout/Javascript.pm
index 6e6d6553d..a9a17481d 100644
--- a/SL/Layout/Javascript.pm
+++ b/SL/Layout/Javascript.pm
@@ -26,6 +26,7 @@ sub stylesheets {
   $_[0]->add_stylesheets(qw(
     dhtmlsuite/menu-item.css
     dhtmlsuite/menu-bar.css
+    menu.css
   ));
   $_[0]->SUPER::stylesheets;
 }
diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index 0e65e8acd..ac7d5fcbe 100644
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -9,11 +9,20 @@ sub javascripts_inline {
 }
 
 sub use_javascript {
-  'js/common.js'
+  my $self = shift;
+  qw(
+    js/jquery.js
+    js/common.js
+  ),
+  $self->SUPER::use_javascript(@_);
 }
 
 sub use_stylesheet {
-  'main.css'
+  my $self = shift;
+  qw(
+    main.css
+  ),
+  $self->SUPER::use_stylesheet(@_);
 }
 
 sub _setup_formats {