aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rwxr-xr-xmod/events.php6
-rwxr-xr-xmod/settings.php7
2 files changed, 10 insertions, 3 deletions
diff --git a/mod/events.php b/mod/events.php
index e10f508dd..0906d16c2 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -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(),
diff --git a/mod/settings.php b/mod/settings.php
index b4cd2e608..57a4e6db0 100755
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -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']);