Skip to content

Commit fe4869c

Browse files
jokob-skjokob-sk
committed
FE: skeleton uplift, mqtt
1 parent 07b731f commit fe4869c

6 files changed

Lines changed: 34 additions & 14 deletions

File tree

‎front/css/app.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2716,8 +2716,8 @@ table.dataTable tbody > tr.selected
27162716
/* ----- Settings --------------------------------------------------------- */
27172717
.skel-overview-panel { margin-bottom: 10px; }
27182718
.skel-overview-heading { gap: 12px; }
2719-
.skel-overview-body { padding: 12px; display: flex; gap: 12px; flex-wrap: wrap; }
2720-
.skel-overview-card { min-width: 100px; height: 76px; border-radius: 4px; }
2719+
.skel-overview-body { padding: 12px; }
2720+
.skel-overview-card { min-width: 100%; height: 76px; border-radius: 4px; padding: 5px;}
27212721
.skel-section { margin-bottom: 8px; }
27222722
.skel-overview-header { gap: 14px; }
27232723
.skel-section-header { gap: 14px; }

‎front/php/templates/skel_settings.php‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,34 @@
77
<span class="skel-icon-block skel-shimmer"></span>
88
<span class="skel-line skel-shimmer" style="width:180px"></span>
99
</div>
10-
<div class="skel-overview-body">
11-
<div class="skel-overview-card skel-shimmer col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px"></div>
12-
<div class="skel-overview-card skel-shimmer col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px"></div>
13-
<div class="skel-overview-card skel-shimmer col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px"></div>
10+
<div class="skel-overview-body col-xs-12">
11+
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px">
12+
<div class="skel-overview-card skel-shimmer"></div>
13+
</div>
14+
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px">
15+
<div class="skel-overview-card skel-shimmer"></div>
16+
</div>
17+
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px">
18+
<div class="skel-overview-card skel-shimmer"></div>
19+
</div>
1420
</div>
1521
<div class="skel-overview-heading">
1622
<span class="skel-icon-block skel-shimmer"></span>
1723
<span class="skel-line skel-shimmer" style="width:180px"></span>
1824
</div>
19-
<div class="skel-overview-body">
20-
<div class="skel-overview-card skel-shimmer col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px"></div>
21-
<div class="skel-overview-card skel-shimmer col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px"></div>
22-
<div class="skel-overview-card skel-shimmer col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px"></div>
25+
<div class="skel-overview-body col-xs-12">
26+
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px">
27+
<div class="skel-overview-card skel-shimmer"></div>
28+
</div>
29+
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px">
30+
<div class="skel-overview-card skel-shimmer"></div>
31+
</div>
32+
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px">
33+
<div class="skel-overview-card skel-shimmer"></div>
34+
</div>
35+
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 padding-5px">
36+
<div class="skel-overview-card skel-shimmer"></div>
37+
</div>
2338
</div>
2439
</div>
2540

‎front/php/templates/skel_tab_maint_logging.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,9 @@
66
<span class="skel-shimmer" style="height:32px; flex:1; border-radius:4px;"></span>
77
</div>
88
<!-- Log content area -->
9-
<span class="skel-shimmer" style="display:block; width:100%; height:280px; border-radius:4px;"></span>
9+
<span class="skel-shimmer" style="display:block; width:100%; height:280px; border-radius:4px;padding:10px"></span>
10+
<span class="skel-line skel-shimmer" style="width:120px;padding:10px;margin:10px"></span>
11+
<span class="skel-shimmer" style="display:block; width:100%; height:280px; border-radius:4px;padding:10px"></span>
12+
<span class="skel-line skel-shimmer" style="width:120px;padding:10px;margin:10px"></span>
13+
<span class="skel-shimmer" style="display:block; width:100%; height:280px; border-radius:4px;padding:10px"></span>
1014
</div>

‎front/plugins/_publisher_mqtt/mqtt.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@ def initialize_message(self):
173173
"device": {
174174
"identifiers": [f"{self.deviceId}_sensor"],
175175
"manufacturer": "NetAlertX",
176-
"name": self.deviceName
176+
"name": self.deviceName,
177+
"connections": connections_snippet
177178
},
178179
"icon": f'mdi:{self.icon}'
179180
})

‎front/plugins/_publisher_telegram/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@
426426
"description": [
427427
{
428428
"language_code": "en_us",
429-
"string": "Telegram bot token. You cat get at from <a target=\"_blank\" href=\"https://t.me/BotFather\">BotFather</a>"
429+
"string": "Telegram bot token. You cat get one from <a target=\"_blank\" href=\"https://t.me/BotFather\">BotFather</a>"
430430
}
431431
]
432432
},

‎front/settings.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ function hideSettingsSkeleton() {
545545
var $skel = $('#settings-skeleton');
546546
if (!$skel.length) return;
547547
$('#settingsPage').removeClass('settings-loading');
548-
$skel.fadeOut(250, function() { $(this).remove(); });
548+
$skel.fadeOut(10, function() { $(this).remove(); });
549549
}
550550

551551
// display the name of the first person

0 commit comments

Comments
 (0)