From 6d364f6fa60718f49375ecba8f2a6e6faf630b78 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 30 Jul 2018 12:55:56 +0100
Subject: [PATCH] Show installing apps with different style on web admin
---
src/freedombone-utils-webadmin | 27 +++++++++++++++++++--------
webadmin/EN/apps_add_template.html | 5 +++++
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 48009aaa8..557b6302b 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -190,9 +190,11 @@ function web_admin_create_add_apps {
done
# check if the app is pending installation
+ app_pending_install=
if [ -f "$pending_installs" ]; then
if grep -q "install_${app_name}" "$pending_installs"; then
app_is_installed=1
+ app_pending_install=1
fi
fi
@@ -235,14 +237,23 @@ function web_admin_create_add_apps {
filename="/var/www/${local_hostname}/htdocs/admin/app_add_${app_name}.html"
- { echo ' <div class="column">';
- echo ' <div>';
- echo " <a href=\"app_add_${app_name}.html\">";
- echo " <img src=\"icons/${app_name}.png\" style=\"width:100%\">";
- echo " <center>${app_name}</center>";
- echo ' </a>';
- echo ' </div>';
- echo ' </div>'; } >> "$appslist_add_filename"
+ if [ ! $app_pending_install ]; then
+ { echo ' <div class="column">';
+ echo ' <div>';
+ echo " <a href=\"app_add_${app_name}.html\">";
+ echo " <img src=\"icons/${app_name}.png\" style=\"width:100%\">";
+ echo " <center>${app_name}</center>";
+ echo ' </a>';
+ echo ' </div>';
+ echo ' </div>'; } >> "$appslist_add_filename"
+ else
+ { echo ' <div class="column">';
+ echo ' <div>';
+ echo " <img src=\"icons/${app_name}.png\" style=\"width:100%\">";
+ echo " <center class=\"installing\">${app_name}</center>";
+ echo ' </div>';
+ echo ' </div>'; } >> "$appslist_add_filename"
+ fi
cp "$app_add_template_filename" "$filename"
diff --git a/webadmin/EN/apps_add_template.html b/webadmin/EN/apps_add_template.html
index 111e0c678..d80a0b554 100644
--- a/webadmin/EN/apps_add_template.html
+++ b/webadmin/EN/apps_add_template.html
@@ -56,6 +56,11 @@
vertical-align: middle;
}
+ .installing {
+ opacity: 0.5;
+ font-weight: bold;
+ }
+
@media screen and (max-width: 800px) {
.column {
-ms-flex: 50%;
--
GitLab