Layout: Anpassung von den meisten Layouts an die neue javascript/stylesheet Struktur

diff --git a/SL/Layout/ActionBar.pm b/SL/Layout/ActionBar.pm
index cdd845be4f8c95016628547dbbbdfc0fb8a045ad..5345e9e14e72e75f7a9dacdd8f119df80426cfb7 100644 (file)
--- a/SL/Layout/ActionBar.pm
+++ b/SL/Layout/ActionBar.pm
@@ -39,7 +39,7 @@ sub javascripts_inline {
   join '', map { $_->script } @{ $_[0]->actions };
 }
 
-sub javascripts {
+sub static_javascripts {
   'kivi.ActionBar.js'
 }
 

diff --git a/SL/Layout/CssMenu.pm b/SL/Layout/CssMenu.pm
index b67475f6612a1e8e39d61195aeb35314f04b0b59..6897a478c324b32d1e2affc8311b0ecc237cfd1c 100644 (file)
--- a/SL/Layout/CssMenu.pm
+++ b/SL/Layout/CssMenu.pm
@@ -3,7 +3,7 @@ package SL::Layout::CssMenu;
 use strict;
 use parent qw(SL::Layout::Base);
 
-sub use_stylesheet {
+sub static_stylesheets {
   qw(icons16.css),
 }
 

diff --git a/SL/Layout/MenuLeft.pm b/SL/Layout/MenuLeft.pm
index d365210c9332cd61a03cbca2b6dae2daa93aafe8..ad7937e28ced754a77c990dd1de4bde958f8ae34 100644 (file)
--- a/SL/Layout/MenuLeft.pm
+++ b/SL/Layout/MenuLeft.pm
@@ -7,7 +7,7 @@ use List::MoreUtils qw(apply);
 use SL::JSON qw(to_json);
 use URI;
 
-sub stylesheets {
+sub static_stylesheets {
   qw(icons16.css icons24.css menu.css)
 }
 
@@ -15,7 +15,7 @@ sub javascripts_inline {
   "\$(function(){kivi.LeftMenu.init(@{[ to_json([ section_menu($_[0]->menu) ]) ]})});"
 }
 
-sub javascripts {
+sub static_javascripts {
   qw(
     js/jquery.cookie.js
     js/kivi.LeftMenu.js

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index 0569ff1e12006cea74fde9c3756d6180ff9210b0..1504f97112277205c055d31327745825187ef7fe 100644 (file)
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -23,8 +23,7 @@ sub javascripts_inline {
   );
 }
 
-sub use_javascript {
-  my $self = shift;
+sub static_javascripts {
   qw(
     jquery.js
     common.js
@@ -33,16 +32,13 @@ sub use_javascript {
     kivi.js
   ),
   'locale/'. $::myconfig{countrycode} .'.js',
-  $self->SUPER::use_javascript(@_);
 }
 
-sub use_stylesheet {
-  my $self = shift;
+sub static_stylesheets {
   qw(
     main.css
     menu.css
   ),
-  $self->SUPER::use_stylesheet(@_);
 }
 
 1;

diff --git a/SL/Layout/Top.pm b/SL/Layout/Top.pm
index 05c0046e1d5b9a4c6fbcc08dbf5e1ceddfe3b078..471d6128dc01303baa7869a890a32336a954f180 100644 (file)
--- a/SL/Layout/Top.pm
+++ b/SL/Layout/Top.pm
@@ -22,11 +22,11 @@ sub pre_content {
   );
 }
 
-sub stylesheets {
+sub static_stylesheets {
  'frame_header/header.css';
 }
 
-sub javascripts {
+sub static_javascripts {
   'jquery-ui.js',
   'kivi.QuickSearch.js',
 }