From 808b2a44c4bb0b37601b99bc592d1136e651e46b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 28 Feb 2012 15:23:02 -0500 Subject: [PATCH] Bug 7616 - Remove unused template markup for css_libs, css_module, js_libs, etc. Removing references to unused template variables and markup. Signed-off-by: Julian Maurice Signed-off-by: Paul Poulain --- C4/Auth.pm | 22 ----------- .../prog/en/includes/doc-head-close.inc | 37 ------------------- 2 files changed, 59 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index ccb2c15000..38bbd5ef15 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -147,17 +147,6 @@ sub get_template_and_user { my $insecure = C4::Context->preference('insecure'); if ($user or $insecure) { - # load the template variables for stylesheets and JavaScript - $template->param( css_libs => $in->{'css_libs'} ); - $template->param( css_module => $in->{'css_module'} ); - $template->param( css_page => $in->{'css_page'} ); - $template->param( css_widgets => $in->{'css_widgets'} ); - - $template->param( js_libs => $in->{'js_libs'} ); - $template->param( js_module => $in->{'js_module'} ); - $template->param( js_page => $in->{'js_page'} ); - $template->param( js_widgets => $in->{'js_widgets'} ); - # user info $template->param( loggedinusername => $user ); $template->param( sessionID => $sessionID ); @@ -281,17 +270,6 @@ sub get_template_and_user { } else { # if this is an anonymous session, setup to display public lists... - # load the template variables for stylesheets and JavaScript - $template->param( css_libs => $in->{'css_libs'} ); - $template->param( css_module => $in->{'css_module'} ); - $template->param( css_page => $in->{'css_page'} ); - $template->param( css_widgets => $in->{'css_widgets'} ); - - $template->param( js_libs => $in->{'js_libs'} ); - $template->param( js_module => $in->{'js_module'} ); - $template->param( js_page => $in->{'js_page'} ); - $template->param( js_widgets => $in->{'js_widgets'} ); - $template->param( sessionID => $sessionID ); my ($total, $pubshelves) = C4::Context->get_shelves_userenv(); # an anonymous user has no 'barshelves'... diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index 53f6843440..bc551acc83 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -7,49 +7,12 @@ [% ELSE %] [% END %] -[% IF ( css_libs ) %] - [% FOREACH css_lib IN css_libs %] - - [% END %] -[% END %] - -[% IF ( css_module ) %] - -[% END %] -[% IF ( css_page ) %] - -[% END %] - -[% IF ( css_widgets ) %] - [% FOREACH css_widget IN css_widgets %] - - [% END %] -[% END %] [% IF ( IntranetUserCSS ) %][% END %] - - -[% IF ( js_libs ) %] - [% FOREACH js_lib IN js_libs %] - - [% END %] -[% END %] -[% IF ( js_module ) %] - -[% END %] -[% IF ( js_page ) %] - -[% END %] - -[% IF ( js_widgets ) %] - [% FOREACH js_widget IN js_widgets %] - - [% END %] -[% END %] [% IF ( login ) %] [% END %] -- 2.39.5