Merge branch 'develop' into issue-1574
This commit is contained in:
commit
b29b01fad4
30 changed files with 3577 additions and 1425 deletions
|
@ -13,10 +13,10 @@
|
|||
<input type="hidden" name="preview" id="event-edit-preview" value="0" />
|
||||
|
||||
<div id="event-start-text">{{$s_text}}</div>
|
||||
{{$s_dsel}} {{$s_tsel}}
|
||||
{{$s_dsel}}
|
||||
|
||||
<div id="event-finish-text">{{$f_text}}</div>
|
||||
{{$f_dsel}} {{$f_tsel}}
|
||||
{{$f_dsel}}
|
||||
|
||||
<div id="event-datetime-break"></div>
|
||||
|
||||
|
|
|
@ -14,11 +14,11 @@
|
|||
}
|
||||
|
||||
function doEventPreview() {
|
||||
$('#event-edit-preview').val(1);
|
||||
$.post('events',$('#event-edit-form').serialize(), function(data) {
|
||||
$.colorbox({ html: data });
|
||||
});
|
||||
$('#event-edit-preview').val(0);
|
||||
$('#event-edit-preview').val(1);
|
||||
$.post('events',$('#event-edit-form').serialize(), function(data) {
|
||||
$.colorbox({ html: data });
|
||||
});
|
||||
$('#event-edit-preview').val(0);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
<link rel="stylesheet" href="{{$baseurl}}/view/global.css" type="text/css" media="all" />
|
||||
<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
|
||||
<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
|
||||
<link rel="stylesheet" href="{{$baseurl}}/library/datetimepicker/jquery.datetimepicker.css" type="text/css" media="screen" />
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
|
||||
|
||||
|
@ -34,6 +35,7 @@
|
|||
<script type="text/javascript" src="{{$baseurl}}/js/fk.autocomplete.js" ></script>
|
||||
<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>
|
||||
<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
|
||||
<script type="text/javascript" src="{{$baseurl}}/library/datetimepicker/jquery.datetimepicker.js"></script>
|
||||
<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
|
||||
<script type="text/javascript" src="{{$baseurl}}/js/acl.js" ></script>
|
||||
<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
|
||||
|
|
|
@ -1,9 +1,47 @@
|
|||
<script>
|
||||
|
||||
function showHideDates() {
|
||||
if( $('#posted-date-dropdown').is(':visible')) {
|
||||
$('#posted-date-dropdown').hide();
|
||||
$('#posted-date-collapse').html(window.showMore);
|
||||
|
||||
}
|
||||
else {
|
||||
$('#posted-date-dropdown').show();
|
||||
$('#posted-date-collapse').html(window.showFewer);
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
<div id="datebrowse-sidebar" class="widget">
|
||||
<h3>{{$title}}</h3>
|
||||
<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
|
||||
<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="{{$size}}">
|
||||
{{foreach $dates as $d}}
|
||||
<option value="{{$url}}/{{$d.1}}/{{$d.2}}" >{{$d.0}}</option>
|
||||
{{/foreach}}
|
||||
</select>
|
||||
<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
|
||||
<ul id="posted-date-selector" class="datebrowse-ul">
|
||||
{{foreach $dates as $y => $arr}}
|
||||
{{if $y == $cutoff_year}}
|
||||
</ul>
|
||||
<div id="posted-date-dropdown" style="display: none;">
|
||||
<ul id="posted-date-selector-drop" class="datebrowse-ul">
|
||||
{{/if}}
|
||||
<li id="posted-date-selector-year-{{$y}}" class="tool">
|
||||
<a class="datebrowse-link" href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a>
|
||||
</li>
|
||||
<div id="posted-date-selector-{{$y}}" style="display: none;">
|
||||
<ul class="posted-date-selector-months datebrowse-ul">
|
||||
{{foreach $arr as $d}}
|
||||
<li class="tool">
|
||||
<a class="datebrowse-link" href="#" onclick="dateSubmit('{{$url}}/{{$d.1}}/{{$d.2}}'); return false;">{{$d.0}}</a></li>
|
||||
</li>
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
</div>
|
||||
{{/foreach}}
|
||||
{{if $cutoff}}
|
||||
</div>
|
||||
<ul class="datebrowse-ul">
|
||||
<li onclick="showHideDates(); return false;" id="posted-date-collapse" class="fakelink tool">{{$showmore}}</li>
|
||||
</ul>
|
||||
{{/if}}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue