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 6e6d6553d9b1049941b432c81c669fe8afa569fe..a9a17481d73d909350f9bc7f1046eb4b8db5b7ec 100644 (file)
--- 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
   $_[0]->add_stylesheets(qw(
     dhtmlsuite/menu-item.css
     dhtmlsuite/menu-bar.css

+    menu.css

   ));
   $_[0]->SUPER::stylesheets;
 }
   ));
   $_[0]->SUPER::stylesheets;
 }

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index 0e65e8acda1481b43b606b26ec63481ad6f19b16..ac7d5fcbe6109d8e68bc9afe3a6e157c4bd13ec6 100644 (file)
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -9,11 +9,20 @@ sub javascripts_inline {
 }
 
 sub use_javascript {
 }
 
 sub use_javascript {

-  'js/common.js'
+  my $self = shift;
+  qw(
+    js/jquery.js
+    js/common.js
+  ),
+  $self->SUPER::use_javascript(@_);

 }
 
 sub use_stylesheet {
 }
 
 sub use_stylesheet {

-  'main.css'
+  my $self = shift;
+  qw(
+    main.css
+  ),
+  $self->SUPER::use_stylesheet(@_);

 }
 
 sub _setup_formats {
 }
 
 sub _setup_formats {