Changeset 10736 for extensions/gally/gally-default/template/header.tpl

Timestamp:

May 1, 2011, 10:07:10 PM (13 years ago)

Author:

grum

Message:

bug:2291 ; compatibility with piwigo 2.2

File:

• extensions/gally/gally-default/template/header.tpl (modified) (6 diffs)

extensions/gally/gally-default/template/header.tpl

@@ -43 +43 @@
   <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/gally-default/css/content.css">
 
-  {known_script id="jquery" src=$ROOT_URL|cat:"themes/default/js/jquery.packed.js"}
-  {known_script id="jquery.ui" src=$ROOT_URL|cat:"themes/default/js/ui/packed/ui.core.packed.js"}
-  {known_script id="jquery.ui.tabs" src=$ROOT_URL|cat:"themes/default/js/ui/packed/ui.tabs.packed.js"}
-  {known_script id="jquery.ui.dialog" src=$ROOT_URL|cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}
+  {combine_script id="jquery" path="themes/default/js/jquery.min.js"}
+  {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
+  {combine_script id="jquery.ui.tabs" path="themes/default/js/ui/minified/jquery.ui.tabs.min.js"}
+  {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
 
 
@@ -54 +54 @@
     {
       $dir=dirname($_SERVER['SCRIPT_FILENAME'])."/themes/".$theme['id']."/conf/";
-      $dirlocal=dirname($_SERVER['SCRIPT_FILENAME'])."/local/themes/".$theme['id']."/conf/";
+      $dirlocal=dirname($_SERVER['SCRIPT_FILENAME'])."/".PWG_LOCAL_DIR."themes/".$theme['id']."/conf/";
       $this->assign("default_conf", $dir."default.conf");
       if(file_exists($dirlocal."local.conf"))
@@ -79 +79 @@
 
   {if #manageTips#=='yes'}
-    {known_script id="gpc.simpleTip" src=$ROOT_URL|@cat:"themes/gally-default/js/simpleTip.packed.js" }
-    {known_script id="gallyjs-ttm" src=$ROOT_URL|cat:"themes/gally-default/js/gallyjs-ttm.packed.js"}
+    {combine_script id="gpc.simpleTip" path="themes/gally-default/js/simpleTip.min.js" require="jquery"}
+    {combine_script id="gallyjs-ttm" path="themes/gally-default/js/gallyjs-ttm.min.js" require="jquery"}
   {/if}
 
   {if $BODY_ID=='theCategoryPage'}
-  {known_script id="gallyjs-tcp" src=$ROOT_URL|cat:"themes/gally-default/js/gallyjs-tcp.packed.js"}
+  {combine_script id="gallyjs-tcp" path="themes/gally-default/js/gallyjs-tcp.min.js" require="jquery"}
   <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/gally-default/css/thumbnails.css">
   <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/gally-default/css/menubar.css">
@@ -90 +90 @@
 
   {if $BODY_ID=='thePicturePage'}
-  {known_script id="gallyjs-tpp" src=$ROOT_URL|cat:"themes/gally-default/js/gallyjs-tpp.packed.js"}
+  {combine_script id="gallyjs-tpp" path="themes/gally-default/js/gallyjs-tpp.js" require="jquery"}
   <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/gally-default/css/picture.css">
   {/if}
@@ -101 +101 @@
   {/if}
 
-  {foreach from=$themes item=theme}
-    <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.id}/css/theme.css">
-    {if isset($theme.local_head)}{include file=$theme.local_head}{/if}
-  {/foreach}
+{get_combined_css}
+{foreach from=$themes item=theme}
+  {if $theme.load_css}
+{combine_css path="themes/`$theme.id`/css/theme.css" order=-10}
+  {/if}
+  {if !empty($theme.local_head)}{include file=$theme.local_head load_css=$theme.load_css}{/if}
+{/foreach}
 
 {if not empty($head_elements)}
@@ -111 +114 @@
 {/if}
 
+{get_combined_scripts load='header'}
 </head>