enable ajax calendar with $a->config['experimentals']['new_calendar']=1

This commit is contained in:
Fabio Comuni 2012-02-15 12:47:50 +01:00
commit 73bee08ac2
4 changed files with 35 additions and 4 deletions

View file

@ -284,7 +284,11 @@ function events_content(&$a) {
if (x($_GET,'id')){
$tpl = get_markup_template("event.tpl");
} else {
$tpl = get_markup_template("events.tpl");
if (get_config('experimentals','new_calendar')==1){
$tpl = get_markup_template("events-js.tpl");
} else {
$tpl = get_markup_template("events.tpl");
}
}
$o = replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),

View file

@ -734,8 +734,11 @@ function settings_content(&$a) {
if($files) {
foreach($files as $file) {
$f = basename($file);
$theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
$themes[$f]=$theme_name;
$is_experimental = file_exists($file . '/experimental');
if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){
$theme_name = (($is_experimental) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
$themes[$f]=$theme_name;
}
}
}
$theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']);