adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 00:53:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 1502: based on Dotclear model, P@t has reorganized the way Piwigo

Browse Source 
manages template/theme in a simpler "theme only level" architecture. It
supports multiple level inheritance.

git-svn-id: http://piwigo.org/svn/trunk@5123 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2010-03-13 00:00:52 +00:00
parent c396f08708
commit 14778ce673
615 changed files with 652 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.inc.php
+9 -13
View File
@@ -611,12 +611,11 @@ function redirect_html( $url , $msg = '', $refresh_time = 0)
load_language('common.lang');
trigger_action('loading_lang');
load_language('local.lang', '', array('no_fallback'=>true) );
list($tmpl, $thm) = explode('/', get_default_template());
$template = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl, $thm);
$template = new Template(PHPWG_ROOT_PATH.'themes', get_default_theme());
}
else
{
$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme']);
$template = new Template(PHPWG_ROOT_PATH.'themes', $user['theme']);
}
if (empty($msg))
@@ -710,24 +709,21 @@ function url_is_remote($url)
}
/**
* returns available template/theme
* returns available themes
*/
function get_pwg_themes()
{
global $conf;
$themes = array();
$template_dir = PHPWG_ROOT_PATH.'template';
$template_dir = PHPWG_ROOT_PATH.'themes';
foreach (get_dirs($template_dir) as $template)
foreach (get_dirs($template_dir) as $theme)
{
if ( $template != 'default' )
{
foreach (get_dirs($template_dir.'/'.$template.'/theme') as $theme)
{
array_push($themes, $template.'/'.$theme);
}
}
if ( $theme != 'default' )
{
array_push($themes, $theme);
}
}
// plugins want remove some themes based on user status maybe?