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
parent fe3e8ee854
commit 73bee08ac2
4 changed files with 35 additions and 4 deletions

View file

@ -283,9 +283,13 @@ function events_content(&$a) {
// links: array('href', 'text', 'extra css classes', 'title') // links: array('href', 'text', 'extra css classes', 'title')
if (x($_GET,'id')){ if (x($_GET,'id')){
$tpl = get_markup_template("event.tpl"); $tpl = get_markup_template("event.tpl");
} else {
if (get_config('experimentals','new_calendar')==1){
$tpl = get_markup_template("events-js.tpl");
} else { } else {
$tpl = get_markup_template("events.tpl"); $tpl = get_markup_template("events.tpl");
} }
}
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$tabs' => $tabs, '$tabs' => $tabs,

View file

@ -734,10 +734,13 @@ function settings_content(&$a) {
if($files) { if($files) {
foreach($files as $file) { foreach($files as $file) {
$f = basename($file); $f = basename($file);
$theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f); $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; $themes[$f]=$theme_name;
} }
} }
}
$theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']); $theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']);

6
view/events-js.tpl Normal file
View file

@ -0,0 +1,6 @@
$tabs
<h2>$title</h2>
<div id="new-event-link"><a href="$new_event.0" >$new_event.1</a></div>
<div id="events-calendar"></div>

View file

@ -3,4 +3,22 @@ $tabs
<div id="new-event-link"><a href="$new_event.0" >$new_event.1</a></div> <div id="new-event-link"><a href="$new_event.0" >$new_event.1</a></div>
<div id="events-calendar"></div> <div id="event-calendar-wrapper">
<a href="$previus.0" class="prevcal $previus.2"><div id="event-calendar-prev" class="icon s22 prev" title="$previus.1"></div></a>
$calendar
<a href="$next.0" class="nextcal $next.2"><div id="event-calendar-prev" class="icon s22 next" title="$next.1"></div></a>
</div>
<div class="event-calendar-end"></div>
{{ for $events as $event }}
<div class="event">
{{ if $event.is_first }}<hr /><a name="link-$event.j" ><div class="event-list-date">$event.d</div></a>{{ endif }}
{{ if $event.item.author-name }}<a href="$event.item.author-link" ><img src="$event.item.author-avatar" height="32" width="32" />$event.item.author-name</a>{{ endif }}
$event.html
{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{ endif }}
{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }}
</div>
<div class="clear"></div>
{{ endfor }}