2 files changed, 20 insertions, 20 deletions
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 2b3667a1..230bca4f 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -1,7 +1,10 @@
 <ion-view title="Montage" cache-view="false" hide-nav-bar="{{minimal}}">
     <ion-nav-buttons side="left">
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
+         <button class="button button-icon button-clear ion-eye" ng-click="hideUnhide();">&nbsp;
+        </button>
         <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
+        
     </ion-nav-buttons>
 
 
@@ -14,6 +17,8 @@
         <button class="button button-icon button-clear ion-loop" ng-click="resetSizes();">&nbsp;
         </button>
         
+       
+        
         
       
         <button class="button button-icon button-clear ion-android-contract" ng-click="switchMinimal()">
@@ -41,16 +46,16 @@
             <div class="grid-sizer grid-item-10"></div>
             <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" 
                   ng-if="monitor.Monitor.Function!='None' &&  monitor.Monitor.Enabled !='0' ">
-            <div class="grid-item grid-item-{{monitor.Monitor.gridScale}} {{dragBorder}}" data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}}" >
-                <figure>
+            <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 class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'">
                     <div ng-if="!isModalActive" >
                         <div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">
                             <div ng-if = "!minimal">
                                 <div>
                                 <img   class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{LoginData.streamingurl}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey):toggleSelectItem($index);" image-spinner-loader="lines" on-swipe-up="swipeUp()" on-swipe-down="swipeDown()"  />
-                                <!--
-                                <div style="position:absolute;top:40%; left:50%;opacity:0.5;"><button  ng-class="monitor.Monitor.listDisplay=='show'?'button button-positive button-small icon  ion-ios-eye':'button button-assertive button-small icon  ion-eye-disabled'" ng-click="toggleHide(monitor)" ng-if="isDragabillyOn"></button></div>-->
-                                </div>
+                                
+                                <!--<div style="position:absolute;top:40%; left:50%;opacity:0.5;"><button  ng-class="monitor.Monitor.listDisplay=='show'?'button button-positive button-small icon  ion-ios-eye':'button button-assertive button-small icon  ion-eye-disabled'" ng-click="toggleHide(monitor)" ng-if="isDragabillyOn"></button></div>
+                                </div>-->
                                 
                                 
                             </div> 
diff --git a/www/templates/reorder-modal.html b/www/templates/reorder-modal.html
index 589cca5a..4e3ce82d 100644
--- a/www/templates/reorder-modal.html
+++ b/www/templates/reorder-modal.html
@@ -2,18 +2,11 @@
     <ion-modal-view cache-view="false" style="width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;" >
         
     <ion-header-bar class="bar-stable">
-      <div class="buttons">
-        <button class="button button-icon icon ion-ios-minus-outline"
-          ng-click="deleteList();"></button>
-          <button class="button button-icon icon ion-ios-drag" ng-click="reorderList();">
-            
-        </button>
-      </div>
+    
         
       <h1 class="title"></h1>
       <div class="buttons">
         
-          <button class="button button-icon icon ion-refresh" ng-click="reloadReorder()"></button>
           
           <button class="button button-icon icon ion-checkmark" ng-click="saveReorder()"></button>
           
@@ -24,13 +17,15 @@
         
         
         <ion-content >
-            <ion-list show-delete="data.showDelete" show-reorder="data.showReorder">
-                <ion-item  ng-repeat="item in MontageMonitors">
-                    {{item.Monitor.Name}}<ion-delete-button ng-class="{'ion-eye':item.Monitor.listDisplay=='show','ion-eye-disabled':item.Monitor.listDisplay!='show'}" ng-click="deleteItem($index)"></ion-delete-button>
-                    
-                    <ion-reorder-button class="ion-navicon" on-reorder="reorderItem(item,$fromIndex, $toIndex)"></ion-reorder-button>
-                </ion-item>
-            </ion-list>
+            <div class="list">
+                <span  ng-repeat="item in copyMontage">
+                    <a class="item item-icon-left" ng-click="toggleDelete($index)" href="">
+                        <i ng-class="{'icon ion-eye':item.Monitor.listDisplay=='show','icon ion-eye-disabled':item.Monitor.listDisplay!='show'}"> </i>
+                        {{item.Monitor.Name}}
+                    </a>
+                        
+                </span>
+            </div>
             
  
         </ion-content>