From 40e07fd39fa64b174cfe79312a96f9b82d72d4b4 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 14 Apr 2018 18:01:00 -0400
Subject: #602 #606  - iOS won't support multiport. Webkit bug see
 https://bugs.webkit.org/show_bug.cgi?id=35377

---
 www/templates/devoptions.html | 5 ++++-
 www/templates/montage.html    | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 5be3fd65..61076042 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -124,6 +124,7 @@
 
             <label ng-if="$root.platformOS!='desktop'">
                 <ion-toggle ng-model="loginData.enableStrictSSL" ng-checked="loginData.enableStrictSSL" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableStrictSSL' | translate}}
+
                    </span>
                 </ion-toggle>
             </label>
@@ -155,7 +156,9 @@
             </label>
 
             <label>
-                    <ion-toggle ng-model="loginData.disableSimulStreaming" ng-checked="loginData.disableSimulStreaming" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kDisableSimulStreaming' | translate}}
+                    <ion-toggle ng-model="loginData.disableSimulStreaming" ng-checked="loginData.disableSimulStreaming"
+                    ng-change="checkMultiPortToggle()" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kDisableSimulStreaming' | translate}}
+                    <p ng-if="$root.platformOS=='ios'">{{'kDisableSimulStreamingNote' | translate}}</p>
                       </span>
                     </ion-toggle>
                 </label>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 77580f5e..0742e3d3 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -33,9 +33,9 @@
             <br/>
             <div id="flyoutmenu" style="float:left">
                 <ul>
-                        <li>
+                       <!-- <li>
                                 <a href="" ng-click="killAllImages()"> <i class="ion-ionic"></i></a>
-                            </li>
+                            </li>-->
 
                     <li>
                         <a href="" ng-click="sliderChanged(1)"> <i class="ion-plus-circled"></i></a>
@@ -90,7 +90,7 @@
 
                   
 
-            <span ng-repeat="monitor in MontageMonitors | onlyEnabled |limitTo: monLimit">
+            <span ng-if="!singleMonitorModalOpen" ng-repeat="monitor in MontageMonitors | onlyEnabled |limitTo: monLimit">
                <div  class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}} ">
 
                   <!--  <figure>
-- 
cgit v1.2.3