Moved calendar path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2559 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
parent
8107c93933
commit
40393e50aa
|
@ -130,7 +130,7 @@ if ( empty($_REQUEST['sort_field']) )
|
||||||
$_REQUEST['sort_asc'] = (ZM_WEB_EVENT_SORT_ORDER == "asc");
|
$_REQUEST['sort_asc'] = (ZM_WEB_EVENT_SORT_ORDER == "asc");
|
||||||
}
|
}
|
||||||
|
|
||||||
$hasCal = file_exists( 'calendar/calendar.js' );
|
$hasCal = file_exists( 'tools/jscalendar/calendar.js' );
|
||||||
|
|
||||||
$focusWindow = true;
|
$focusWindow = true;
|
||||||
|
|
||||||
|
@ -252,7 +252,7 @@ for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ )
|
||||||
<td><input type="checkbox" name="autoArchive" value="1"<?php if ( !empty($dbFilter['AutoArchive']) ) { ?> checked="checked"<?php } ?>/></td>
|
<td><input type="checkbox" name="autoArchive" value="1"<?php if ( !empty($dbFilter['AutoArchive']) ) { ?> checked="checked"<?php } ?>/></td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
if ( ZM_OPT_MPEG != "no" )
|
if ( ZM_OPT_FFMPEG )
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -46,9 +46,9 @@ for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ )
|
||||||
if ( !empty($hasCal) )
|
if ( !empty($hasCal) )
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<style type="text/css">@import url(calendar/calendar-win2k-1.css);</style>
|
<style type="text/css">@import url(tools/jscalendar/calendar-win2k-1.css);</style>
|
||||||
<script type="text/javascript" src="calendar/calendar.js"></script>
|
<script type="text/javascript" src="tools/jscalendar/calendar.js"></script>
|
||||||
<script type="text/javascript" src="calendar/lang/calendar-en.js"></script>
|
<script type="text/javascript" src="tools/jscalendar/lang/calendar-en.js"></script>
|
||||||
<script type="text/javascript" src="calendar/calendar-setup.js"></script>
|
<script type="text/javascript" src="tools/jscalendar/calendar-setup.js"></script>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue