[Koha-patches] [PATCH] [SIGNED-OFF] Bug 7616 - Remove unused template markup for css_libs, css_module, js_libs, etc.

julian.maurice at biblibre.com julian.maurice at biblibre.com
Fri Mar 2 15:39:48 CET 2012


From: Owen Leonard <oleonard at myacpl.org>

Removing references to unused template variables and markup.

Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
---
 C4/Auth.pm                                         |   22 ------------
 .../prog/en/includes/doc-head-close.inc            |   37 --------------------
 2 files changed, 0 insertions(+), 59 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index ccb2c15..38bbd5e 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 53f6843..bc551ac 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 %]
     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" />
 [% END %]
-[% IF ( css_libs ) %]
-    [% FOREACH css_lib IN css_libs %]
-        <link rel="stylesheet" type="text/css" href="[% themelang %]/[% css_lib.lib %]" />
-    [% END %]
-[% END %]
-
-[% IF ( css_module ) %]
-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/modules/[% css_module %]" />
-[% END %]
-[% IF ( css_page ) %]
-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/pages/[% css_page %]" />
-[% END %]
-
-[% IF ( css_widgets ) %]
-    [% FOREACH css_widget IN css_widgets %]
-    <link rel="stylesheet" type="text/css" href="[% themelang %]/[% css_widget.widget %]" />
-    [% END %]
-[% END %]
 [% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %]
-
 <script type="text/javascript" src="[% themelang %]/lib/jquery/jquery.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/ui.tabs.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.hotkeys.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.cookie.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.highlight-3.js"></script>
-
-[% IF ( js_libs ) %]
-    [% FOREACH js_lib IN js_libs %]
-        <script type="text/javascript" src="[% themelang %]/[% js_lib.lib %]"></script>
-    [% END %]
-[% END %]
-[% IF ( js_module ) %]
-    <script type="text/javascript" src="[% themelang %]/js/modules/[% js_module %]"></script>
-[% END %]
-[% IF ( js_page ) %]
-    <script type="text/javascript" src="[% themelang %]/js/pages/[% js_page %]"></script>
-[% END %]
-
-[% IF ( js_widgets ) %]
-    [% FOREACH js_widget IN js_widgets %]
-        <script type="text/javascript" src="[% themelang %]/[% js_widget.widget %]"></script>
-    [% END %]
-[% END %]
 [% IF ( login ) %]
     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/login.css" />
 [% END %]
-- 
1.7.9.1



More information about the Koha-patches mailing list