Skip to content
GitLab

17444: Only local vdc-hue taken into account; other bugs fixed; refactored ajax …

Merged Katarzyna Kwiatkowska requested to merge 17444 into master
Compare
and
2 files
+ 583
− 467
ui/scripts/scripts.js
+ 566
− 449

Files with large changes are collapsed by default.

ui/index.html
+ 17
− 18
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title id="page_title"></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="ressource/style.css"
media="all">
<link href="ressource/favicon.ico" rel="shortcut icon" />
<script type="text/javascript" src="scripts/scripts.js"></script>
<meta http-equiv="x-ua-compatible" content="IE=edge" />
<link href="favicon.ico" rel="shortcut icon" />
<meta charset="utf-8">
<title id="page_title"></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="ressource/style.css" media="all">
<link href="ressource/favicon.ico" rel="shortcut icon" />
<meta http-equiv="x-ua-compatible" content="IE=edge" />
<link href="favicon.ico" rel="shortcut icon" />
</head>
<body onload="onload();">
<body>
<div id="baseContent"
style="position: absolute; width: 100%; height: 100%;">
<div class="header">
@@ -33,7 +31,7 @@
<tr>
<td id="hue_bridge_status"></td>
<td id="hue_bridge_status_value"></td>
<td><a class="button" id="button_connect_bridge" onclick="huevdc_connect_bridge()"></a></td>
<td><a class="button" id="button_connect_bridge"></a></td>
</tr>
<tr>
<td id="hue_bridge_ip"></td>
@@ -42,7 +40,7 @@
<tr>
<td id="hue_bridge_devices"></td>
<td id="hue_bridge_ndevices"></td>
<td><a class="button" id="button_rediscover_devices" onclick="reregister()"></a></td>
<td><a class="button" id="button_rediscover_devices"></a></td>
</tr>
</table>
</div>
@@ -50,7 +48,7 @@
<div class="footer" style="margin-top:30px;"></div>
</div>
<div id="overlayDisabler" class="disabler"></div>
<table id="vdcNotFoundMessage" class="messagebox">
<table id="vdc_not_found_message" class="messagebox">
<tr style="height:250px;">
<td colspan="3">&nbsp;</td>
</tr>
@@ -58,12 +56,12 @@
<td style="width:50%;">&nbsp;</td>
<td style="min-width:500px;"><div id="vdc_not_found" class="displaybox"></div></td>
<td style="width:50%;">&nbsp;</td>
</tr>
</tr>
<tr style="height:50%;">
<td colspan="3">&nbsp;</td>
</tr>
</table>
<table id="connectBridgeMessage" class="messagebox">
<table id="connect_bridge_message" class="messagebox">
<tr style="height:250px;">
<td colspan="3">&nbsp;</td>
</tr>
@@ -72,7 +70,7 @@
<td style="min-width:500px;">
<div class="displaybox">
<div id="connect_bridge"></div>
<a class="button" onclick="huevdc_connect_bridge_abort()" id="huevdc_connect_bridge_abort"></a>
<a class="button" id="huevdc_connect_bridge_abort"></a>
</div>
</td>
<td style="width:50%;">&nbsp;</td>
@@ -88,7 +86,7 @@
<tr>
<td style="width:50%;">&nbsp;</td>
<td style="min-width:500px;">
<a href="#" onclick="hideMessage('hueAddonStillInstalled');return false;" style="font-size:30px;font-weight:bold;float:right;padding:10px 20px;text-decoration:none;color:#000;">x</a>
<a id="hide_message_button" href="#" style="font-size:30px;font-weight:bold;float:right;padding:10px 20px;text-decoration:none;color:#000;">x</a>
<div id="hue_addon_still_installed" class="displaybox"></div>
</td>
<td style="width:50%;">&nbsp;</td>
@@ -97,6 +95,7 @@
<td colspan="3">&nbsp;</td>
</tr>
</table>
<script type="text/javascript" src="scripts/scripts.js"></script>
</body>
</html>