archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature 1502: replace the theme.name by theme.id for theme.css load

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@5190 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-03-19 13:30:21 +00:00
commit 6b296b293d
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/themes/default/template/header.tpl
View file

@ -15,7 +15,7 @@
{foreach from=$themes item=theme}
{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.name}/theme.css">
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.id}/theme.css">
{/foreach}
{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=1} {*jQuery is always available by default*}

2
include/template.class.php
View file

@ -97,7 +97,7 @@ class Template {
$this->set_theme($root, $themeconf['parent'], $path);
}
$tpl_var = array('name' => $themeconf['name']);
$tpl_var = array('id' => $theme);
if (!empty($themeconf['local_head']) )
{
$tpl_var['local_head'] = realpath($root.'/'.$theme.'/'.$themeconf['local_head'] );

2
themes/default/template/header.tpl
View file

@ -32,7 +32,7 @@
{foreach from=$themes item=theme}
{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.name}/theme.css">
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.id}/theme.css">
{/foreach}
{if isset($U_PREFETCH) }<link rel="prefetch" href="{$U_PREFETCH}">{/if}