Add download button to montagereview

web/skins/classic/css/classic/views/montagereview.css

@@ -36,3 +36,7 @@
 input[type=range]::-ms-tooltip {
     display: none;
 }
+
+#downloadVideo {
+  margin-left: 5px;
+}

web/skins/classic/css/dark/views/montagereview.css

@@ -36,3 +36,7 @@
 input[type=range]::-ms-tooltip {
     display: none;
 }
+
+#downloadVideo {
+  margin-left: 5px;
+}

web/skins/classic/css/flat/views/montagereview.css

@@ -42,3 +42,7 @@ input[type=range]::-ms-tooltip {
     color: white;
   font-size: 40px;
 }
+
+#downloadVideo {
+  margin-left: 5px;
+}

web/skins/classic/views/js/montagereview.js

@@ -335,6 +335,7 @@ function redrawScreen() {
         $('zoomout').style.display="none";
         $('panleft').style.display="none";
         $('panright').style.display="none";
+        $('downloadVideo').style.display="none";
 
     } else  {
     // switch out of liveview mode
@@ -351,6 +352,7 @@ function redrawScreen() {
         $('panleft').style.display="inline-flex";
         $('panright').style.display="inline";
         $('panright').style.display="inline-flex";
+        $('downloadVideo').style.display="inline";
     }
 
     if ( fitMode == 1 ) {
@@ -553,6 +555,9 @@ function click_panright() {
   maxTimeSecs = minTimeSecs + rangeTimeSecs - 1;
   clicknav(minTimeSecs,maxTimeSecs,0);
 }
+function click_download() {
+  createPopup( '?view=download'+filterQuery, 'zmDownload', 'download' );
+}
 function click_all_events() {
   clicknav(0,0,0);
 }

web/skins/classic/views/js/montagereview.js.php

@@ -1,4 +1,6 @@
 
+var filterQuery = '<?php echo isset($filterQuery)?htmlspecialchars_decode($filterQuery):'' ?>';
+
 var server_utc_offset = <?php
 $TimeZone = new DateTimeZone( ini_get('date.timezone') );
 $now = new DateTime('now', $TimeZone);

web/skins/classic/views/montagereview.php

@@ -64,7 +64,7 @@ if (isset($_REQUEST['minTime']) || isset($_REQUEST['maxTime'])) {
       'Query' => array(
         'terms' => array(
           array('attr' => 'StartDateTime', 'op' => '>=', 'val' => $_REQUEST['minTime']),
-          array('attr' => 'StartDateTime', 'op' => '<=', 'val' => $_REQUEST['maxTime']),
+          array('attr' => 'StartDateTime', 'op' => '<=', 'val' => $_REQUEST['maxTime'], 'cnj' => 'and'),
         )
       ),
     );
@@ -224,6 +224,7 @@ xhtmlHeaders(__FILE__, translate('MontageReview') );
         <button type="button" id="live"      onclick="setLive(1-liveMode);"><?php echo translate('Live') ?></button>
         <button type="button" id="fit"       onclick="setFit(1-fitMode);"  ><?php echo translate('Fit') ?></button>
         <button type="button" id="panright"  onclick="click_panright();"         ><?php echo translate('Pan') ?> &gt;</button>
+        <button type="button" id="downloadVideo" onclick="click_download();"        ><?php echo translate('Download Video') ?></button>
       </div>
       <div id="timelinediv">
         <canvas id="timeline" onmousemove="mmove(event);" ontouchmove="tmove(event);" onmousedown="mdown(event);" onmouseup="mup(event);" onmouseout="mout(event);"></canvas>