From 40393e50aa1cee41042d3f56c7132bc64ed8a2d0 Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Wed, 16 Jul 2008 13:22:22 +0000
Subject: [PATCH] Moved calendar path

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2559 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/skins/classic/views/filter.php       | 4 ++--
 web/skins/classic/views/js/filter.js.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index c3d41ff09..cd5599c1d 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -130,7 +130,7 @@ if ( empty($_REQUEST['sort_field']) )
     $_REQUEST['sort_asc'] = (ZM_WEB_EVENT_SORT_ORDER == "asc");
 }
 
-$hasCal = file_exists( 'calendar/calendar.js' );
+$hasCal = file_exists( 'tools/jscalendar/calendar.js' );
 
 $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>
             </tr>
 <?php
-if ( ZM_OPT_MPEG != "no" )
+if ( ZM_OPT_FFMPEG )
 {
 ?>
             <tr>
diff --git a/web/skins/classic/views/js/filter.js.php b/web/skins/classic/views/js/filter.js.php
index 3cbed82f8..9b5ca7633 100644
--- a/web/skins/classic/views/js/filter.js.php
+++ b/web/skins/classic/views/js/filter.js.php
@@ -46,9 +46,9 @@ for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ )
 if ( !empty($hasCal) )
 {
 ?>
-<style type="text/css">@import url(calendar/calendar-win2k-1.css);</style>
-<script type="text/javascript" src="calendar/calendar.js"></script>
-<script type="text/javascript" src="calendar/lang/calendar-en.js"></script>
-<script type="text/javascript" src="calendar/calendar-setup.js"></script>
+<style type="text/css">@import url(tools/jscalendar/calendar-win2k-1.css);</style>
+<script type="text/javascript" src="tools/jscalendar/calendar.js"></script>
+<script type="text/javascript" src="tools/jscalendar/lang/calendar-en.js"></script>
+<script type="text/javascript" src="tools/jscalendar/calendar-setup.js"></script>
 <?php
 }