finishing up changes to cascades

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 786de4f..875b781 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1,3 +1,5 @@
+@import url( /intranet-tmpl/prog/en/lib/yui/reset-fonts-grids.css) all;
+
 body {
        text-align : left;
 }
@@ -226,4 +228,4 @@ p.tag {
 /* the style of subfield paragraph */
 p.subfield {
     
-}
\ No newline at end of file
+}

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 d7b0001..55ce029 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -1,7 +1,46 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/reset-fonts-grids.css" />
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/staff.css" />
+
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/staff-global.css" />
+
+<!-- TMPL_IF NAME="css_libs" -->
+<!-- TMPL_LOOP NAME="css_libs" -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/lib/<!-- TMPL_VAR NAME="lib" -->" />
+<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="css_module" -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/lib/<!-- TMPL_VAR NAME="css_module" -->" />
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="css_page" -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/lib/<!-- TMPL_VAR NAME="css_page" -->" />
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="css_widgets" -->
+<!-- TMPL_LOOP NAME="css_widgets" -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/lib/<!-- TMPL_VAR NAME="widget" -->" />
+<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="js_libs" -->
+<!-- TMPL_LOOP NAME="js_libs" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/<!-- TMPL_VAR NAME="lib" -->"></script>
+<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="js_module" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/<!-- TMPL_VAR NAME="js_module" -->"></script>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="js_page" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/<!-- TMPL_VAR NAME="js_page" -->"></script>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="js_widgets" -->
+<!-- TMPL_LOOP NAME="js_widgets" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/<!-- TMPL_VAR NAME="widget" -->"></script>
+<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
+
 <!-- TMPL_IF NAME="popup" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/intranet2popup.css" /><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="login" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/login.css" /><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="wizard" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/wizard.css" />