Skip to content
GitLab

18599: Favicon .ico fix, other fixes

Merged Katarzyna Kwiatkowska requested to merge 18599 into master
Compare
and
9 files
+ 56
− 43
ui/js/app.js
+ 43
− 30
@@ -16,6 +16,7 @@
var checkCount;
var retryLimit = 3;
var retryDelay = 1000;
var reregisterDelay = 7500;
var vdcToken = null;
// var deviceStateDescriptions = {};
var dsmuids = [];
@@ -42,8 +43,8 @@
callout = dS.utils.showStatusCallout;
$deviceTable = $('#Devices');
$deviceTableWorkingCopy = $('<table id="Devices" class="stack unstriped space-bottom">');
$deviceTableWorkingCopy.html($deviceTable.html());
$deviceTableWorkingCopy = $deviceTable.clone(); // $('<table id="Devices" class="stack unstriped space-bottom">');
// $deviceTableWorkingCopy.html($deviceTable.html());
$deviceTableHeader = $deviceTable.find('thead .sub-header');
$rediscoverButton = $('#button_rediscover_devices');
$searchingForDevicesPopup = $('#SearchingForDevices');
@@ -224,7 +225,7 @@
// }
// action = '<a href="' + action + '" class="button secondary recheck-remote-connect" target="_blank">' + i18n._('open device settings page') + '</a>';
var isWallButton = (device.name === wallButtonName);
var isWallButton = device.name.startsWith(wallButtonName);
var $tr = $('<tr' + (device.present ? '' : ' class="absent"') + '>');
$tr
.attr('data-dsuid', device.dSUID)
@@ -233,7 +234,7 @@
.html(' <td data-before="' + i18n._('Name') + '" class="name">' + (device.name ? device.name : '-') + '</td>' +
' <td data-before="' + i18n._('Model') + '">' + device.HWInfo + '</td>' +
// ' <td data-before="' + i18n._('Status') + '" class="status state_' + device.dSUID + '"><span class="rel in-progress">&nbsp;</span></td>' +
' <td data-before="' + i18n._('Status') + '" class="status state_' + device.dSUID + '">' +
' <td data-before="' + i18n._('Status') + '" class="status state_' + device.dSUID + ' flex">' +
' <em>' + i18n._(device.present ? 'connected' : 'disconnected') + '</em>' +
' </td>' +
(isWallButton ?
@@ -285,7 +286,7 @@
}
for (dsuid in devices) {
if (devices.hasOwnProperty(dsuid) && devices[dsuid].name === 'Wall Button') { // @TODO: is this proper criterion to filter out non-wall buttons?
if (devices.hasOwnProperty(dsuid) && devices[dsuid].name.startsWith('Wall Button')) { // @TODO: is this proper criterion to filter out non-wall buttons?
// queryForStateDescriptions(dsuid);
queryForWallButtonType(dsuid);
}
@@ -335,9 +336,9 @@
var $tr = $('<tr class="dark no-devices">');
$tr
.attr('data-dsmuid', dsm.dSUID)
.html(' <td data-before="' + i18n._('Name') + '" class="name">' + dsm.name + '</td>' +
.html(' <td data-before="' + i18n._('Name') + '" class="name"><span class="rel">' + dsm.name + '</span></td>' +
' <td data-before="' + i18n._('IP') + '" class="ip"><span class="rel in-progress">&nbsp;</span></td>' +
' <td></td>' +
' <td class="flex"></td>' +
' <td></td>' +
' <td class="actions text-center large-text-right">' +
' <button class="vdsm-edit button secondary" data-open="EditIp">' + i18n._('Set IP') + '</button>' +
@@ -551,20 +552,10 @@
.setDialogState(success ? 'success' : 'error')
.find('.button, [data-close]')
.setState('default');
// $form.setFormState('default');
if (success) {
setTimeout(function () {
$rediscoverButton.setState('in progress');
$searchingForDevicesPopup.open();
$deviceTableWorkingCopy.html($deviceTable.html());
buildTable();
// or call reregister?
}, 5000);
}
// else {
// $rediscoverButton.setState('enabled');
// }
$deviceTableWorkingCopy.html($deviceTable.html());
$deviceTable.setTableState('in progress');
setTimeout(buildTable, reregisterDelay * 2);
}
function removeInactivatedDevice (data, dsuid, $select) {
@@ -589,6 +580,9 @@
function whenNewDeviceCreated (data, dsuid, $select) {
checkCount--;
var i;
var len = dsmuids.length;
ajaxRequest('/json/property/query2', {
query: '/apartment/zones/zone0/devices/*(DisplayID)'
}, function (data) {
@@ -601,24 +595,47 @@
}
}
if (addingCompleted) {
removeInactivatedDevice(data, dsuid, $select);
for (i = 0; i < len; i++) {
ajaxRequest('/dsa/json/dsm/restartRegistration', { dsuid: dsmuids[i] }, true);
}
setTimeout(function () {
removeInactivatedDevice(data, dsuid, $select);
}, reregisterDelay);
} else if (checkCount > 0) {
setTimeout(function () {
whenNewDeviceCreated(data, dsuid, $select);
}, checkInterval);
} else {
// limit of re-checks reached; try to remove anyway
removeInactivatedDevice(data, dsuid, $select);
for (i = 0; i < len; i++) {
ajaxRequest('/dsa/json/dsm/restartRegistration', { dsuid: dsmuids[i] }, true);
}
setTimeout(function () {
removeInactivatedDevice(data, dsuid, $select);
}, reregisterDelay);
}
}
}, function () {
$editWallButtonTypeDialog.setDialogState('error');
// $rediscoverButton.setState('enabled');
// $form.setFormState('default');
$rediscoverButton.setState('default');
// $editWallButtonTypeDialog.find('.button, [data-close]').setState('default');
});
}
function queryToSaveWallButtonType (dsuid, type) {
$rediscoverButton.setState('disabled');
var $form = $editWallButtonTypeDialog.find('.reveal-content form');
function errorCallback () {
$editWallButtonTypeDialog.setDialogState('error');
// $form.setFormState('default');
$rediscoverButton.setState('default');
// $editWallButtonTypeDialog.find('.button, [data-close]').setState('default');
}
ajaxRequest('/json/property/vdcquery', {
query: 'setProperty(deviceId=' + dsuid + ')/(hmButtonType="' + type + '")'
}, function (data) {
@@ -633,14 +650,10 @@
// $form.setFormState('hidden');
// $deviceTable.find('.type_' + dsuid + ' .rel').html(type);
} else {
$editWallButtonTypeDialog.setDialogState('error');
$form.setFormState('default');
errorCallback();
}
}, function () {
$editWallButtonTypeDialog.setDialogState('error');
}, function () {
// $form.setFormState('default');
// $editWallButtonTypeDialog.find('.button, [data-close]').setState('default');
errorCallback();
});
}
@@ -671,7 +684,7 @@
ajaxRequest('/dsa/json/dsm/restartRegistration', { dsuid: dsmuids[i] }, true);
}
setTimeout(buildTable, 5000);
setTimeout(buildTable, reregisterDelay);
}
function checkRemoteConnect (initial) {
ui/js/dss-responsive-ui.js
+ 1
− 1

Changes are too large to be shown.

View file @ 00dd9c9a
ui/resources/css/dss-responsive-ui.css
+ 2
− 2

Changes are too large to be shown.

View file @ 00dd9c9a
ui/resources/images/favicons/favicon.ico deleted 100644 → 0
+ 0
− 0

1.12 KiB | W: 16 | H: 16

ui/resources/images/src/homematic-default-icon.psd
+ 0
− 0
No preview for this file type
ui/resources/index.html
+ 5
− 5
@@ -46,26 +46,26 @@
<tr class="sub-header text-left underlined hide">
<th id="table_header_name"></th>
<th id="table_header_model"></th>
<th id="table_header_status"></th>
<th id="table_header_button_type" class="flex"></th>
<th id="table_header_status" class="flex"></th>
<th id="table_header_button_type"></th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody></tbody>
<tfoot>
<tr class="table-status empty hide">
<td colspan="4" class="text-center rel">
<td colspan="5" class="text-center rel flex">
<span id="no_devices"></span>
</td>
</tr>
<tr class="table-status alert hide">
<td colspan="4" class="text-center rel">
<td colspan="5" class="text-center rel flex">
<i class="fa fa-times-circle"></i>
<span id="error_devices"></span>
</td>
</tr>
<tr class="table-status disconnected hide">
<td colspan="4" class="text-center rel">
<td colspan="5" class="text-center rel flex">
<i class="fa fa-times-circle"></i>
<span id="disconnected_devices"></span>
</td>
ui/default_icon.png
+ 0
− 0

4.82 KiB

3.04 KiB

  • 2-up
  • Swipe
  • Onion skin
ui/favicon.ico 0 → 100644
+ 0
− 0

14.73 KiB

ui/index.html
+ 5
− 5
@@ -107,26 +107,26 @@
<tr class="sub-header text-left underlined hide">
<th id="table_header_name"></th>
<th id="table_header_model"></th>
<th id="table_header_status"></th>
<th id="table_header_button_type" class="flex"></th>
<th id="table_header_status" class="flex"></th>
<th id="table_header_button_type"></th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody></tbody>
<tfoot>
<tr class="table-status empty hide">
<td colspan="4" class="text-center rel">
<td colspan="5" class="text-center rel flex">
<span id="no_devices"></span>
</td>
</tr>
<tr class="table-status alert hide">
<td colspan="4" class="text-center rel">
<td colspan="5" class="text-center rel flex">
<i class="fa fa-times-circle"></i>
<span id="error_devices"></span>
</td>
</tr>
<tr class="table-status disconnected hide">
<td colspan="4" class="text-center rel">
<td colspan="5" class="text-center rel flex">
<i class="fa fa-times-circle"></i>
<span id="disconnected_devices"></span>
</td>