diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp index ee7a5c829..ef943dd02 100644 --- a/src/zm_zone.cpp +++ b/src/zm_zone.cpp @@ -136,7 +136,7 @@ void Zone::RecordStats(const Event *event) { db_mutex.lock(); snprintf(sql, sizeof(sql), "INSERT INTO Stats SET MonitorId=%d, ZoneId=%d, EventId=%" PRIu64 ", FrameId=%d, PixelDiff=%d, AlarmPixels=%d, FilterPixels=%d, BlobPixels=%d, Blobs=%d, MinBlobSize=%d, MaxBlobSize=%d, MinX=%d, MinY=%d, MaxX=%d, MaxY=%d, Score=%d", - monitor->Id(), id, event->Id(), event->Frames()+1, pixel_diff, alarm_pixels, alarm_filter_pixels, alarm_blob_pixels, alarm_blobs, min_blob_size, max_blob_size, alarm_box.LoX(), alarm_box.LoY(), alarm_box.HiX(), alarm_box.HiY(), score + monitor->Id(), id, event->Id(), event->Frames(), pixel_diff, alarm_pixels, alarm_filter_pixels, alarm_blob_pixels, alarm_blobs, min_blob_size, max_blob_size, alarm_box.LoX(), alarm_box.LoY(), alarm_box.HiX(), alarm_box.HiY(), score ); if ( mysql_query(&dbconn, sql) ) { Error("Can't insert event stats: %s", mysql_error(&dbconn)); diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index b473d09ed..9014f1028 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -426,4 +426,8 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) { - + diff --git a/web/skins/classic/views/donate.php b/web/skins/classic/views/donate.php index 6cf873bd4..502377133 100644 --- a/web/skins/classic/views/donate.php +++ b/web/skins/classic/views/donate.php @@ -33,32 +33,38 @@ $options = array( 'already' => translate('DonateAlready'), ); -$focusWindow = true; - -xhtmlHeaders(__FILE__, translate('Donate')); ?> - -
- -
-
- - -

- -

-

- -

-
- - -
-
+ + + diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js index cce137c25..ab8fc8daa 100644 --- a/web/skins/classic/views/js/console.js +++ b/web/skins/classic/views/js/console.js @@ -140,7 +140,7 @@ function initPage() { createPopup('?view=version', 'zmVersion', 'version'); } if ( showDonatePopup ) { - createPopup('?view=donate', 'zmDonate', 'donate'); + $j('#donate').modal('show'); } // Makes table sortable diff --git a/web/skins/classic/views/js/frames.js b/web/skins/classic/views/js/frames.js index 0cdfb5545..0b5f45846 100644 --- a/web/skins/classic/views/js/frames.js +++ b/web/skins/classic/views/js/frames.js @@ -19,11 +19,7 @@ function initThumbAnimation() { function processClicks(event, field, value, row, $element) { if ( field == 'FramesScore' ) { - if ( value > 0 ) { window.location.assign('?view=stats&eid='+row.EventId+'&fid='+row.FramesId); - } else { - alert("No statistics available"); - } } else { window.location.assign('?view=frame&eid='+row.EventId+'&fid='+row.FramesId); }