aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/event_form.tpl4
-rw-r--r--view/tpl/wiki.tpl12
2 files changed, 10 insertions, 6 deletions
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index 2c1fc762c..8a06567c1 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -10,6 +10,10 @@
{{include file="field_input.tpl" field=$summary}}
+ {{if $tz_choose}}
+ {{include file="field_select_grouped.tpl" field=$timezone}}
+ {{/if}}
+
{{$s_dsel}}
{{$f_dsel}}
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 1b0b06132..8ad010168 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -368,7 +368,7 @@
$.post("embedphotos/album", {name: album},
function(data) {
if (data['status']) {
- $('#embedPhotoModalLabel').html('{{$modalchooseimages}}');
+ $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
$('#embedPhotoModalBodyAlbumDialog').html('\
<div><ul class="nav">\n\
<li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
@@ -402,7 +402,7 @@
$('#editor').val(currentContent + ddata['photolink']);
{{/if}}
} else {
- window.console.log('{{$modalerrorlink}}' + ':' + ddata['errormsg']);
+ window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
}
return false;
},
@@ -413,7 +413,7 @@
$('#embedPhotoModal').modal('hide');
});
} else {
- window.console.log('{{$modalerroralbum}} ' + JSON.stringify(album) + ':' + data['errormsg']);
+ window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
}
return false;
},
@@ -425,19 +425,19 @@
function(data) {
if (data['status']) {
var albums = data['albumlist']; //JSON.parse(data['albumlist']);
- $('#embedPhotoModalLabel').html('{{$modalchoosealbum}}');
+ $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
$('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>');
for(var i=0; i<albums.length; i++) {
var albumName = albums[i].text;
var albumLink = '<li>';
- albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + albumName + '\');return false;">' + albumName + '</a>';
+ albumLink += '<a href="#" onclick="choosePhotoFromAlbum("' + albumName + '");return false;">' + albumName + '</a>';
albumLink += '</li>';
$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
}
$('#embedPhotoModalBodyAlbumDialog').addClass('hide');
$('#embedPhotoModalBodyAlbumListDialog').removeClass('hide');
} else {
- window.console.log('{{$modalerrorlist}}' + ':' + data['errormsg']);
+ window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
}
return false;
},