fixed conflict

hollie · Dec 29, 2020 · 5867eb3 · 5867eb3
2 parents 2601dae + fc40346
commit 5867eb3
Show file tree

Hide file tree

Showing 24 changed files with 33 additions and 10 deletions.
diff --git a/web/ia7/graphics/fp_speaker_danger_128.png b/web/ia7/graphics/fp_speaker_danger_128.png
diff --git a/web/ia7/graphics/fp_speaker_danger_32.png b/web/ia7/graphics/fp_speaker_danger_32.png
diff --git a/web/ia7/graphics/fp_speaker_danger_48.png b/web/ia7/graphics/fp_speaker_danger_48.png
diff --git a/web/ia7/graphics/fp_speaker_danger_64.png b/web/ia7/graphics/fp_speaker_danger_64.png
diff --git a/web/ia7/graphics/fp_speaker_default_128.png b/web/ia7/graphics/fp_speaker_default_128.png
diff --git a/web/ia7/graphics/fp_speaker_default_32.png b/web/ia7/graphics/fp_speaker_default_32.png
diff --git a/web/ia7/graphics/fp_speaker_default_48.png b/web/ia7/graphics/fp_speaker_default_48.png
diff --git a/web/ia7/graphics/fp_speaker_default_64.png b/web/ia7/graphics/fp_speaker_default_64.png
diff --git a/web/ia7/graphics/fp_speaker_info_128.png b/web/ia7/graphics/fp_speaker_info_128.png
diff --git a/web/ia7/graphics/fp_speaker_info_32.png b/web/ia7/graphics/fp_speaker_info_32.png
diff --git a/web/ia7/graphics/fp_speaker_info_48.png b/web/ia7/graphics/fp_speaker_info_48.png
diff --git a/web/ia7/graphics/fp_speaker_info_64.png b/web/ia7/graphics/fp_speaker_info_64.png
diff --git a/web/ia7/graphics/fp_speaker_success_128.png b/web/ia7/graphics/fp_speaker_success_128.png
diff --git a/web/ia7/graphics/fp_speaker_success_32.png b/web/ia7/graphics/fp_speaker_success_32.png
diff --git a/web/ia7/graphics/fp_speaker_success_48.png b/web/ia7/graphics/fp_speaker_success_48.png
diff --git a/web/ia7/graphics/fp_speaker_success_64.png b/web/ia7/graphics/fp_speaker_success_64.png
diff --git a/web/ia7/graphics/fp_speaker_warning_128.png b/web/ia7/graphics/fp_speaker_warning_128.png
diff --git a/web/ia7/graphics/fp_speaker_warning_32.png b/web/ia7/graphics/fp_speaker_warning_32.png
diff --git a/web/ia7/graphics/fp_speaker_warning_48.png b/web/ia7/graphics/fp_speaker_warning_48.png
diff --git a/web/ia7/graphics/fp_speaker_warning_64.png b/web/ia7/graphics/fp_speaker_warning_64.png
diff --git a/web/ia7/house/modes.shtml b/web/ia7/house/modes.shtml
@@ -4,22 +4,22 @@
 
 	<div class="col-sm-4">
 	   <div style="vertical-align:middle">
-		<button entity='mode_mh' class='btn btn-default btn-lg btn-list btn-popover btn-block btn-state-cmd navbutton-padding'>Mr.House Modes<span class='pull-right'>loading...</span>
+		<button entity='mode_mh' class='btn btn-default btn-lg btn-list btn-popover btn-block btn-state-cmd navbutton-padding'>Mr.House Modes<span class='pull-right object-state'>loading...</span>
 		</button>
 	</div>
 	</div>
 
 
 	<div class="col-sm-4">
 		   <div style="vertical-align:middle">
-		<button entity='mode_security' class='btn btn-default btn-lg btn-list btn-popover btn-block btn-state-cmd navbutton-padding'>Security Mode<span class='pull-right'>loading...</span>
+		<button entity='mode_security' class='btn btn-default btn-lg btn-list btn-popover btn-block btn-state-cmd navbutton-padding'>Security Mode<span class='pull-right object-state'>loading...</span>
 		</button>
 		</div>
 	</div>
 
 	<div class="col-sm-4">
 		   <div style="vertical-align:middle">
-		<button entity='mode_occupied' class='btn btn-default btn-lg btn-list btn-popover btn-block btn-state-cmd navbutton-padding'>Occupied Mode<span class='pull-right'>loading...</span>
+		<button entity='mode_occupied' class='btn btn-default btn-lg btn-list btn-popover btn-block btn-state-cmd navbutton-padding'>Occupied Mode<span class='pull-right object-state'>loading...</span>
 		</button>
 		</div>
 	</div>
@@ -29,7 +29,7 @@
   <div id='row1' class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2'>
  	<div class="col-sm-4">
 		   <div style="vertical-align:middle">
-		<button entity='mode_sleeping' class='btn btn-default btn-lg btn-list btn-popover btn-block btn-state-cmd navbutton-padding'>Sleeping Mode<span class='pull-right'>loading...</span>
+		<button entity='mode_sleeping' class='btn btn-default btn-lg btn-list btn-popover btn-block btn-state-cmd navbutton-padding'>Sleeping Mode<span class='pull-right object-state'>loading...</span>
 		</button>
 		</div>
 	</div>

diff --git a/web/ia7/house/sample.shtml b/web/ia7/house/sample.shtml
@@ -15,15 +15,15 @@
 
 	<div class="col-sm-4">
 	   <div style="vertical-align:middle">
-		<button entity='gen_door' class='btn btn-default btn-lg btn-list btn-popover btn-block btn-state-cmd navbutton-padding'>Garage Door<span class='pull-right'>loading...</span>
+		<button entity='gen_door' class='btn btn-default btn-lg btn-list btn-popover btn-block btn-state-cmd navbutton-padding'>Garage Door<span class='pull-right object-state'>loading...</span>
 		</button>
 	</div>
 	</div>
 
 
 	<div class="col-sm-4">
 		   <div style="vertical-align:middle">
-		<button entity='test_light' class='btn btn-default btn-lg btn-list btn-popover btn-block btn-state-cmd navbutton-padding'>Garage Light<span class='pull-right'>loading...</span>
+		<button entity='test_light' class='btn btn-default btn-lg btn-list btn-popover btn-block btn-state-cmd navbutton-padding'>Garage Light<span class='pull-right object-state'>loading...</span>
 		</button>
 		</div>
 	</div>

diff --git a/web/ia7/include/jquery.longclick-1.0.min.js b/web/ia7/include/jquery.longclick-1.0.min.js
@@ -1 +1,26 @@
-(function(a){var b={NS:"jquery.longclick-",delay:700};a.fn.mayTriggerLongClicks=function(c){var d=a.extend(b,c);var f;var e;return a(this).on("mousedown touchstart",function(){e=false;f=setTimeout(function(g){e=true;a(g).trigger("longClick")},d.delay,this)}).on("mouseup touchend",function(){clearTimeout(f)}).on("click",function(g){if(e){g.stopImmediatePropagation()}})}})(jQuery);
+(function(a) {
+    var b = {
+        NS: "jquery.longclick-",
+        delay: 700
+    };
+    a.fn.mayTriggerLongClicks = function(c) {
+        var d = a.extend(b, c);
+        var f;
+        var e;
+        return a(this).on("mousedown touchstart", function() {
+            e = false;
+            f = setTimeout(function(g) {
+                e = true;
+                a(g).trigger("longClick")
+            }, d.delay, this)
+        }).on("mouseup touchend", function() {
+            clearTimeout(f)
+        }).on("touchmove", function() {
+            clearTimeout(f)
+        }).on("click", function(g) {
+            if (e) {
+                g.stopImmediatePropagation()
+            }
+        })
+    }
+})(jQuery);
diff --git a/web/ia7/include/tables.css b/web/ia7/include/tables.css
@@ -1,7 +1,5 @@
 .table-curved {
     border-collapse: separate;
-}
-.table-curved {
     border: solid #ccc 1px;
     border-radius: 6px;
     border-left:0px;
@@ -149,4 +147,4 @@
 			width: 320px; }
 		}
 
-	}
+	}