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

Timestamp:

Jun 24, 2012, 9:26:25 PM (12 years ago)

Author:

grum

Message:

feature:2664- compatibility with Piwigo 2.4

File:

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

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

@@ -8 +8 @@
   {if isset($meta_ref) }
     {if isset($INFO_AUTHOR)}
-      <meta name="author" content="{$INFO_AUTHOR|@replace:'"':' '}">
+      <meta name="author" content="{$INFO_AUTHOR|@strip_tags:false|@replace:'"':' '}">
     {/if}
     {if isset($related_tags)}
@@ -25 +25 @@
     <title>{$PAGE_TITLE} | {$GALLERY_TITLE}</title>
   {/if}
-
+ <link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico">
 
   <link rel="start" title="{'Home'|@translate}" href="{$U_HOME}" >
@@ -43 +43 @@
   <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/gally-default/css/content.css">
 
-  {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"}
-
-
-  {php}
-    $themes=$this->get_template_vars('themes');
-    foreach($themes as $theme)
-    {
-      $dir=dirname($_SERVER['SCRIPT_FILENAME'])."/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"))
-      {
-        $this->assign("local_conf", $dirlocal."local.conf");
-      }
-      else
-      {
-        $this->assign("local_conf", "");
-      }
-    }
-  {/php}
-
-  {config_load file=$default_conf}
-  {if $local_conf!=""}
-    {config_load file=$local_conf}
-  {/if}
-
-  {php}
-      $this->assign("alternateBannerContent", html_entity_decode($this->get_config_vars('alternateBannerContent')));
-  {/php}
+  {combine_script id="jquery" path="themes/default/js/jquery.js"}
+  {combine_script id="jquery.ui" path="themes/default/js/ui/jquery.ui.core.js"}
+  {combine_script id="jquery.ui.tabs" path="themes/default/js/ui/jquery.ui.tabs.js"}
+  {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/jquery.ui.dialog.js"}
 
   {include file='config.js.tpl'}
 
   {if #manageTips#=='yes'}
-    {combine_script id="gpc.simpleTip" path="themes/gally-default/js/simpleTip.min.js" require="jquery"}
+    {combine_script id="gpc.simpleTip" path="themes/gally-default/js/simpleTip.js" require="jquery"}
     {combine_script id="gallyjs-ttm" path="themes/gally-default/js/gallyjs-ttm.js" require="jquery"}
   {/if}
@@ -109 +81 @@
 {/foreach}
 
+{if isset($U_PREFETCH)}<link rel="prefetch" href="{$U_PREFETCH}">{/if}
+{if isset($U_CANONICAL)}<link rel="canonical" href="{$U_CANONICAL}">{/if}
+
+{if not empty($page_refresh)    }<meta http-equiv="refresh" content="{$page_refresh.TIME};url={$page_refresh.U_REFRESH}">{/if}
+
 {if not empty($head_elements)}
   {foreach from=$head_elements item=elt}{$elt}
@@ -115 +92 @@
 
 {get_combined_scripts load='header'}
+{combine_script id="jquery" load="footer"}
+
 </head>
 
@@ -137 +116 @@
 <div id="theHeader" style="display:none;"></div>
 <div id="theHeaderAlt">
-  {$alternateBannerContent}
+  {$gally->getAlternateBannerContent()}
 </div>
 {else}