From b8b470c3bfc948aa6dfb19241033a95723778635 Mon Sep 17 00:00:00 2001
From: Arjun Roychowdhury <pliablepixels@gmail.com>
Date: Mon, 2 Nov 2015 16:09:20 -0500
Subject: displaying event id in full screen, fixed rn-platform bug

---
 www/css/style.css                | 15 +++++++++++++++
 www/external/angular-carousel.js |  2 ++
 www/templates/events-modal.html  |  6 +++---
 www/templates/events.html        |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/www/css/style.css b/www/css/style.css
index c6be1c1f..fedf5879 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -225,6 +225,21 @@ http://www.cssportal.com/tryit/index.php?file=blog/css-notification-badge */
     width:70%;
 }
 
+.events-range-modal-text 
+{
+    position:absolute;
+    bottom:20px;
+    right:10px;
+    z-index:10;
+    opacity:0.7;
+    color:white;
+    background-color: black;
+    border-radius: 5px 5px 5px 5px;
+    padding-left:3px;
+    padding-right:3px;
+    
+}
+
 .events-alarm-line
 {
 
diff --git a/www/external/angular-carousel.js b/www/external/angular-carousel.js
index dc387cf5..04b91455 100644
--- a/www/external/angular-carousel.js
+++ b/www/external/angular-carousel.js
@@ -69,6 +69,7 @@ angular.module('angular-carousel')
 	// PP - added touchend to make it react to touch devices
            if (attrs.hasOwnProperty('rnPlatform') && attrs.rnPlatform == 'unknown')
 	   {
+		console.log ("ranPlatform is " + attrs.rnPlatform);
 		 console.log ("Desktop, de-registering any old click");
             	element.off('click', toggleAutoPlay); // PP - remove mouse click for desktop
            	 element.on('click', toggleAutoPlay); // PP for  desktop
@@ -76,6 +77,7 @@ angular.module('angular-carousel')
 	   }
 	  else
 	  {
+		console.log ("ranPlatform is " + attrs.rnPlatform);
 	    console.log ("Device, de-registering any old touch");
             element.off('touchend', toggleAutoPlay); // PP - remove touchend too
             element.on('touchend', toggleAutoPlay);
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 3d07fcd0..4344d9be 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -8,7 +8,7 @@
 
 
                     <div ng-if="defaultVideo=='' || loginData.enableh264==false">
-                        <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{calcMsTimer(eFramesNum, eventDur)/1000.0}}" rn-carousel-pause-on-hover  rn-platform="$root.platformOS">
+                        <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{calcMsTimer(eFramesNum, eventDur)/1000.0}}" rn-carousel-pause-on-hover  rn-platform="{{$root.platformOS}}">
 
                             <li ng-repeat="slide in slides">
 
@@ -39,7 +39,7 @@
                 <!-- 100vh -->
             </ion-scroll>
 
-
+          
 
         </ion-content>
 
@@ -62,7 +62,7 @@
     <a mfb-button icon="ion-close" label="exit event view" ng-click="closeModal()"> </a>
 
 </nav>
-
+<div class="events-range-modal-text">playing event: {{eventId}}</div>
 <div class="events-range-modal" ng-if="defaultVideo==''">
 
     <div style="width:90%">
diff --git a/www/templates/events.html b/www/templates/events.html
index ed045938..9daa7b6b 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -138,7 +138,7 @@
                                 <p>{{mycarousel.index+1}}/{{event.Event.Frames}} Type: {{FrameArray[mycarousel.index].Type}}</p>
 
                                 <div style="height:190px">
-                                    <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{calcMsTimer(event.Event.Frames, event.Event.Length)/1000.0}}" rn-carousel-pause-on-hover rn-platform="$root.platformOS">
+                                    <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{calcMsTimer(event.Event.Frames, event.Event.Length)/1000.0}}" rn-carousel-pause-on-hover rn-platform="{{$root.platformOS}}">
                                         <li ng-repeat="slide in slides">
                                             <!-- Linwood scaling -->
                                             <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{playbackURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/>
-- 
cgit v1.2.3