From e5521d6f8d529562cb25836c7aa14c518167ba37 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 30 Jul 2018 10:42:52 +0100
Subject: [PATCH] Preparing for international deployments of web admin
---
src/freedombone-utils-webadmin | 15 ++++++++++-----
webadmin/{ => EN}/app_add_template.html | 2 +-
webadmin/{ => EN}/app_installing.html | 2 +-
webadmin/{ => EN}/app_remove.html | 2 +-
webadmin/{ => EN}/app_remove_scheduled.html | 2 +-
webadmin/{ => EN}/app_scheduled.html | 2 +-
webadmin/{ => EN}/app_template.html | 0
webadmin/{ => EN}/apps_add_template.html | 2 +-
webadmin/{ => EN}/apps_template.html | 2 +-
webadmin/{ => EN}/backup.html | 10 +++++-----
webadmin/{ => EN}/index.html | 10 +++++-----
webadmin/{ => EN}/installapp.php | 0
webadmin/{ => EN}/removeapp.php | 0
webadmin/{ => EN}/userprofile.html | 4 ++--
webadmin/{ => EN}/users_template.html | 10 +++++-----
webadmin/{ => images}/admin_apps.png | Bin
webadmin/{ => images}/admin_backup.png | Bin
webadmin/{ => images}/admin_backup_keys.png | Bin
webadmin/{ => images}/admin_create_backup.png | Bin
webadmin/{ => images}/admin_help.png | Bin
webadmin/{ => images}/admin_restore.png | Bin
webadmin/{ => images}/admin_restore_keys.png | Bin
webadmin/{ => images}/admin_users.png | Bin
webadmin/{ => images}/logo.png | Bin
webadmin/{ => images}/qrcodeicon.png | Bin
25 files changed, 34 insertions(+), 29 deletions(-)
rename webadmin/{ => EN}/app_add_template.html (98%)
rename webadmin/{ => EN}/app_installing.html (97%)
rename webadmin/{ => EN}/app_remove.html (97%)
rename webadmin/{ => EN}/app_remove_scheduled.html (97%)
rename webadmin/{ => EN}/app_scheduled.html (97%)
rename webadmin/{ => EN}/app_template.html (100%)
rename webadmin/{ => EN}/apps_add_template.html (97%)
rename webadmin/{ => EN}/apps_template.html (98%)
rename webadmin/{ => EN}/backup.html (87%)
rename webadmin/{ => EN}/index.html (85%)
rename webadmin/{ => EN}/installapp.php (100%)
rename webadmin/{ => EN}/removeapp.php (100%)
rename webadmin/{ => EN}/userprofile.html (91%)
rename webadmin/{ => EN}/users_template.html (85%)
rename webadmin/{ => images}/admin_apps.png (100%)
rename webadmin/{ => images}/admin_backup.png (100%)
rename webadmin/{ => images}/admin_backup_keys.png (100%)
rename webadmin/{ => images}/admin_create_backup.png (100%)
rename webadmin/{ => images}/admin_help.png (100%)
rename webadmin/{ => images}/admin_restore.png (100%)
rename webadmin/{ => images}/admin_restore_keys.png (100%)
rename webadmin/{ => images}/admin_users.png (100%)
rename webadmin/{ => images}/logo.png (100%)
rename webadmin/{ => images}/qrcodeicon.png (100%)
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 9d60342dd..84f22a376 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -50,6 +50,7 @@ function web_admin_configure_installer_daemon {
echo '[Install]';
echo 'WantedBy=multi-user.target';
echo 'Alias=pleroma.service'; } > /etc/systemd/system/webadmin.service
+
systemctl enable webadmin
systemctl daemon-reload
systemctl start webadmin
@@ -107,12 +108,12 @@ function web_admin_create_users {
fi
fi
fi
- pubkey_qrcode="/var/www/${local_hostname}/htdocs/admin/userprofile_${USERNAME}.png"
+ pubkey_qrcode="/var/www/${local_hostname}/htdocs/admin/images/userprofile_${USERNAME}.png"
su -c "gpg --armor --export \"$GPG_ID\"" - "$USERNAME" | qrencode -t PNG -o "$pubkey_qrcode"
{ echo ' <div class="chip">';
echo " <a href=\"userprofile_${USERNAME}.html\">";
- echo ' <img src="admin_users.png" alt="Person" width="96" height="96">';
+ echo ' <img src="images/admin_users.png" alt="Person" width="96" height="96">';
echo " $USERNAME";
echo ' </a>';
echo ' </div>'; } >> "$users_file"
@@ -135,7 +136,7 @@ function web_admin_create_users {
{ echo ' <div class="chip">';
echo " <a href=\"newuser.html\">";
- echo ' <img src="admin_users.png" alt="Person" width="96" height="96">';
+ echo ' <img src="images/admin_users.png" alt="Person" width="96" height="96">';
echo ' +';
echo ' </a>';
echo ' </div>';
@@ -418,6 +419,8 @@ function install_web_admin {
# This is intended as an admin web user interface
# similar to Plinth or the yunohost
+ language_subdir='EN'
+
local_hostname=$(grep 'host-name' /etc/avahi/avahi-daemon.conf | awk -F '=' '{print $2}').local
if [ ! -d "/var/www/${local_hostname}/htdocs/admin" ]; then
@@ -426,11 +429,13 @@ function install_web_admin {
if [ -d "/usr/share/${PROJECT_NAME}/webadmin" ]; then
cp -r "/usr/share/${PROJECT_NAME}/webadmin"/* "/var/www/${local_hostname}/htdocs/admin"
+ cp "/usr/share/${PROJECT_NAME}/webadmin/${language_subdir}"/*.html "/var/www/${local_hostname}/htdocs/admin"
+ cp "/usr/share/${PROJECT_NAME}/webadmin/${language_subdir}"/*.php "/var/www/${local_hostname}/htdocs/admin"
else
- echo "install_web_admin 5" > /tmp/debugweb
+ placeholderstr=$"This is a placeholder for the web admin panel on ${local_hostname}"
{ echo '<html>';
echo ' <body>';
- echo " This is a placeholder for the web admin panel on ${local_hostname}";
+ echo " ${placeholderstr}";
echo ' </body>';
echo '</html>'; } > "/var/www/${local_hostname}/htdocs/admin/index.html"
fi
diff --git a/webadmin/app_add_template.html b/webadmin/EN/app_add_template.html
similarity index 98%
rename from webadmin/app_add_template.html
rename to webadmin/EN/app_add_template.html
index f352cd5a2..ca06d56a7 100644
--- a/webadmin/app_add_template.html
+++ b/webadmin/EN/app_add_template.html
@@ -91,7 +91,7 @@
</head>
<body>
<div class="card">
- <a href="apps_add.html"><img id="headerpic" class="img-responsive" src="logo.png"></a>
+ <a href="apps_add.html"><img id="headerpic" class="img-responsive" src="images/logo.png"></a>
<h1>APPNAME</h1>
<img id="iconpic" class="img-responsive" src="icons/APPNAME.png">
<p class="appdesc">APPDESCRIPTION</p>
diff --git a/webadmin/app_installing.html b/webadmin/EN/app_installing.html
similarity index 97%
rename from webadmin/app_installing.html
rename to webadmin/EN/app_installing.html
index 59d601f65..7bb2e4f42 100644
--- a/webadmin/app_installing.html
+++ b/webadmin/EN/app_installing.html
@@ -59,7 +59,7 @@
</head>
<body>
<div class="header">
- <a href="apps_add.html"><img id="headerpic" class="img-responsive" src="logo.png"></a>
+ <a href="apps_add.html"><img id="headerpic" class="img-responsive" src="images/logo.png"></a>
<h2>Beginning app install</h2>
diff --git a/webadmin/app_remove.html b/webadmin/EN/app_remove.html
similarity index 97%
rename from webadmin/app_remove.html
rename to webadmin/EN/app_remove.html
index 33fa3f91c..d0637a8dd 100644
--- a/webadmin/app_remove.html
+++ b/webadmin/EN/app_remove.html
@@ -59,7 +59,7 @@
</head>
<body>
<div class="header">
- <a href="apps.html"><img id="headerpic" class="img-responsive" src="logo.png"></a>
+ <a href="apps.html"><img id="headerpic" class="img-responsive" src="images/logo.png"></a>
<h2>Beginning removal of app</h2>
diff --git a/webadmin/app_remove_scheduled.html b/webadmin/EN/app_remove_scheduled.html
similarity index 97%
rename from webadmin/app_remove_scheduled.html
rename to webadmin/EN/app_remove_scheduled.html
index 6d431f45b..016ed0513 100644
--- a/webadmin/app_remove_scheduled.html
+++ b/webadmin/EN/app_remove_scheduled.html
@@ -59,7 +59,7 @@
</head>
<body>
<div class="header">
- <a href="apps.html"><img id="headerpic" class="img-responsive" src="logo.png"></a>
+ <a href="apps.html"><img id="headerpic" class="img-responsive" src="images/logo.png"></a>
<h2>App is being removed</h2>
diff --git a/webadmin/app_scheduled.html b/webadmin/EN/app_scheduled.html
similarity index 97%
rename from webadmin/app_scheduled.html
rename to webadmin/EN/app_scheduled.html
index 4eb45b2b0..f08408627 100644
--- a/webadmin/app_scheduled.html
+++ b/webadmin/EN/app_scheduled.html
@@ -59,7 +59,7 @@
</head>
<body>
<div class="header">
- <a href="apps_add.html"><img id="headerpic" class="img-responsive" src="logo.png"></a>
+ <a href="apps_add.html"><img id="headerpic" class="img-responsive" src="images/logo.png"></a>
<h2>App is scheduled to be installed</h2>
diff --git a/webadmin/app_template.html b/webadmin/EN/app_template.html
similarity index 100%
rename from webadmin/app_template.html
rename to webadmin/EN/app_template.html
diff --git a/webadmin/apps_add_template.html b/webadmin/EN/apps_add_template.html
similarity index 97%
rename from webadmin/apps_add_template.html
rename to webadmin/EN/apps_add_template.html
index 99831ff59..a0ad5c93d 100644
--- a/webadmin/apps_add_template.html
+++ b/webadmin/EN/apps_add_template.html
@@ -73,7 +73,7 @@
<body>
<div class="header">
- <a href="apps.html"><img id="headerpic" class="img-responsive" src="logo.png"></a>
+ <a href="apps.html"><img id="headerpic" class="img-responsive" src="images/logo.png"></a>
</div>
</body>
diff --git a/webadmin/apps_template.html b/webadmin/EN/apps_template.html
similarity index 98%
rename from webadmin/apps_template.html
rename to webadmin/EN/apps_template.html
index 85e9b7550..80a09a3b2 100644
--- a/webadmin/apps_template.html
+++ b/webadmin/EN/apps_template.html
@@ -88,7 +88,7 @@
<body>
<div class="header">
- <a href="index.html"><img id="headerpic" class="img-responsive" src="logo.png"></a>
+ <a href="index.html"><img id="headerpic" class="img-responsive" src="images/logo.png"></a>
</div>
<br>
diff --git a/webadmin/backup.html b/webadmin/EN/backup.html
similarity index 87%
rename from webadmin/backup.html
rename to webadmin/EN/backup.html
index 68d332668..00ebddfe0 100644
--- a/webadmin/backup.html
+++ b/webadmin/EN/backup.html
@@ -75,7 +75,7 @@
<body>
<div class="header">
- <a href="index.html"><img id="headerpic" class="img-responsive" src="logo.png"></a>
+ <a href="index.html"><img id="headerpic" class="img-responsive" src="images/logo.png"></a>
<br>Backup and Restore
</div>
@@ -83,7 +83,7 @@
<div class="column">
<div>
<a href="./backupsystem.html">
- <img src="admin_create_backup.png" style="width:100%">
+ <img src="images/admin_create_backup.png" style="width:100%">
<center>Backup System</center>
</a>
</div>
@@ -91,7 +91,7 @@
<div class="column">
<div>
<a href="./restoresystem.html">
- <img src="admin_restore.png" style="width:100%">
+ <img src="images/admin_restore.png" style="width:100%">
<center>Restore System</center>
</a>
</div>
@@ -99,7 +99,7 @@
<div class="column">
<div>
<a href="./format.html">
- <img src="admin_backup.png" style="width:100%">
+ <img src="images/admin_backup.png" style="width:100%">
<center>Format a Drive</center>
</a>
</div>
@@ -107,7 +107,7 @@
<div class="column">
<div>
<a href="./help_backup.html">
- <img src="admin_help.png" style="width:100%">
+ <img src="images/admin_help.png" style="width:100%">
<center>Help</center>
</a>
</div>
diff --git a/webadmin/index.html b/webadmin/EN/index.html
similarity index 85%
rename from webadmin/index.html
rename to webadmin/EN/index.html
index abc4cb6d9..ecaade4ae 100644
--- a/webadmin/index.html
+++ b/webadmin/EN/index.html
@@ -73,14 +73,14 @@
<body>
<div class="header">
- <img id="headerpic" class="img-responsive" src="logo.png">
+ <img id="headerpic" class="img-responsive" src="images/logo.png">
</div>
<div class="row">
<div class="column">
<div>
<a href="./apps.html">
- <img src="admin_apps.png" style="width:100%">
+ <img src="images/admin_apps.png" style="width:100%">
<center>Apps</center>
</a>
</div>
@@ -88,7 +88,7 @@
<div class="column">
<div>
<a href="./backup.html">
- <img src="admin_backup.png" style="width:100%">
+ <img src="images/admin_backup.png" style="width:100%">
<center>Backup / Restore</center>
</a>
</div>
@@ -96,7 +96,7 @@
<div class="column">
<div>
<a href="./users.html">
- <img src="admin_users.png" style="width:100%">
+ <img src="images/admin_users.png" style="width:100%">
<center>Users</center>
</a>
</div>
@@ -104,7 +104,7 @@
<div class="column">
<div>
<a href="./help.html">
- <img src="admin_help.png" style="width:100%">
+ <img src="images/admin_help.png" style="width:100%">
<center>Help</center>
</a>
</div>
diff --git a/webadmin/installapp.php b/webadmin/EN/installapp.php
similarity index 100%
rename from webadmin/installapp.php
rename to webadmin/EN/installapp.php
diff --git a/webadmin/removeapp.php b/webadmin/EN/removeapp.php
similarity index 100%
rename from webadmin/removeapp.php
rename to webadmin/EN/removeapp.php
diff --git a/webadmin/userprofile.html b/webadmin/EN/userprofile.html
similarity index 91%
rename from webadmin/userprofile.html
rename to webadmin/EN/userprofile.html
index 17a70535f..33dbba8d0 100644
--- a/webadmin/userprofile.html
+++ b/webadmin/EN/userprofile.html
@@ -70,7 +70,7 @@
<body>
<div class="header">
- <a href="users.html"><img id="headerpic" class="img-responsive" src="logo.png"/></a>
+ <a href="users.html"><img id="headerpic" class="img-responsive" src="images/logo.png"/></a>
</div>
<div class="card">
@@ -78,7 +78,7 @@
<p class="title">USERTYPE</p>
<p class="email">Email/XMPP: USEREMAIL</p>
<p class="gpg">GPG: USERGPG</p>
- <a href="userprofile_USERNAME.png"><img id="qrcodepic" class="img-responsive" src="qrcodeicon.png"/></a>
+ <a href="images/userprofile_USERNAME.png"><img id="qrcodepic" class="img-responsive" src="images/qrcodeicon.png"/></a>
<p><button>Change Password</button></p>
<!-- remove user button -->
<p><button>Remove</button></p>
diff --git a/webadmin/users_template.html b/webadmin/EN/users_template.html
similarity index 85%
rename from webadmin/users_template.html
rename to webadmin/EN/users_template.html
index 3ff2e4029..fb7804dd2 100644
--- a/webadmin/users_template.html
+++ b/webadmin/EN/users_template.html
@@ -71,7 +71,7 @@
<body>
<div class="header">
- <a href="index.html"><img id="headerpic" class="img-responsive" src="logo.png"></a>
+ <a href="index.html"><img id="headerpic" class="img-responsive" src="images/logo.png"></a>
<br>Users
</div>
@@ -80,25 +80,25 @@
<div class="column">
<div class="chip">
<a href="userprofile.html">
- <img src="admin_users.png" alt="Person" width="96" height="96">
+ <img src="images/admin_users.png" alt="Person" width="96" height="96">
User A
</a>
</div>
<div class="chip">
<a href="userprofile.html">
- <img src="admin_users.png" alt="Person" width="96" height="96">
+ <img src="images/admin_users.png" alt="Person" width="96" height="96">
User B
</a>
</div>
<div class="chip">
<a href="userprofile.html">
- <img src="admin_users.png" alt="Person" width="96" height="96">
+ <img src="images/admin_users.png" alt="Person" width="96" height="96">
User C
</a>
</div>
<div class="chip">
<a href="newuser.html">
- <img src="admin_users.png" alt="Person" width="96" height="96">
+ <img src="images/admin_users.png" alt="Person" width="96" height="96">
+
</a>
</div>
diff --git a/webadmin/admin_apps.png b/webadmin/images/admin_apps.png
similarity index 100%
rename from webadmin/admin_apps.png
rename to webadmin/images/admin_apps.png
diff --git a/webadmin/admin_backup.png b/webadmin/images/admin_backup.png
similarity index 100%
rename from webadmin/admin_backup.png
rename to webadmin/images/admin_backup.png
diff --git a/webadmin/admin_backup_keys.png b/webadmin/images/admin_backup_keys.png
similarity index 100%
rename from webadmin/admin_backup_keys.png
rename to webadmin/images/admin_backup_keys.png
diff --git a/webadmin/admin_create_backup.png b/webadmin/images/admin_create_backup.png
similarity index 100%
rename from webadmin/admin_create_backup.png
rename to webadmin/images/admin_create_backup.png
diff --git a/webadmin/admin_help.png b/webadmin/images/admin_help.png
similarity index 100%
rename from webadmin/admin_help.png
rename to webadmin/images/admin_help.png
diff --git a/webadmin/admin_restore.png b/webadmin/images/admin_restore.png
similarity index 100%
rename from webadmin/admin_restore.png
rename to webadmin/images/admin_restore.png
diff --git a/webadmin/admin_restore_keys.png b/webadmin/images/admin_restore_keys.png
similarity index 100%
rename from webadmin/admin_restore_keys.png
rename to webadmin/images/admin_restore_keys.png
diff --git a/webadmin/admin_users.png b/webadmin/images/admin_users.png
similarity index 100%
rename from webadmin/admin_users.png
rename to webadmin/images/admin_users.png
diff --git a/webadmin/logo.png b/webadmin/images/logo.png
similarity index 100%
rename from webadmin/logo.png
rename to webadmin/images/logo.png
diff --git a/webadmin/qrcodeicon.png b/webadmin/images/qrcodeicon.png
similarity index 100%
rename from webadmin/qrcodeicon.png
rename to webadmin/images/qrcodeicon.png
--
GitLab