Beanz/flatpress
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

themes and styles now sort()ed by ID

Browse Source
This commit is contained in:
real_nowhereman 2007-11-16 20:56:27 +00:00
parent f43109aacf
commit 7b01fb6758
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/panels/themes/admin.themes.style.php
View File

@ -25,8 +25,9 @@
global $fp_config; global $fp_config;
$o =& new admin_themes_obj_style_idx; $o =& new admin_themes_obj_style_idx;
$list = $o->getList(); $list = $o->getList();
sort($list);
$info = array(); $info = array();
$based = THEMES_DIR . THE_THEME; $based = THEMES_DIR . THE_THEME;
@ -96,4 +97,4 @@
} }
?> ?>

27
fp-includes/core/core.theme.php
View File

@ -52,17 +52,36 @@
theme_register_default_widgetsets(); theme_register_default_widgetsets();
} else { } else {
define('THEME_LEGACY_MODE', false); define('THEME_LEGACY_MODE', false);
if (isset($theme['default_style'])) {
if ($theme['version'] > 0.704) {
if (!isset($fp_config['general']['style'])) if (!isset($fp_config['general']['style']))
$fp_config['general']['style'] = $theme['default_style']; $fp_config['general']['style'] = $theme['default_style'];
include(THEMES_DIR . THE_THEME . "/{$fp_config['general']['style']}/style.conf.php"); include(THEMES_DIR . THE_THEME . "/{$fp_config['general']['style']}/style.conf.php");
$theme['style'] = $style; $theme['style'] = $style;
} else { } else {
theme_register_default_widgetsets();
$theme['style'] = array(
'style_def' => $theme['style_def']? $theme['style_def'] : 'style.css',
'style_admin' => $theme['style_admin']? $theme['style_admin'] : 'style.css',
);
} }
} }
// no widgets registered, load default set
if (!get_registered_widgets())
theme_register_default_widgetsets();
} }
return $theme; return $theme;
@ -151,7 +170,7 @@
echo BLOG_BASEURL . THEMES_DIR . THE_THEME; echo BLOG_BASEURL . THEMES_DIR . THE_THEME;
$css = class_exists('adminpanel')? $css = defined('MOD_ADMIN_PANEL')?
$theme['style']['style_admin'] : $theme['style']['style_def']; $theme['style']['style_admin'] : $theme['style']['style_def'];
$substyle = '/'. (isset($fp_config['general']['style'])? $fp_config['general']['style'].'/' : ''); $substyle = '/'. (isset($fp_config['general']['style'])? $fp_config['general']['style'].'/' : '');