From 305a2194e3160bbe1743446473ad44745fc4f9ee Mon Sep 17 00:00:00 2001 From: James Date: Wed, 19 Sep 2018 11:17:30 +1000 Subject: [PATCH] Clean up UI for initial install --- README.md | 1 + src/assets.rs | 1 + static/index.html | 9 +++++++-- static/js/views.js | 21 +++++++++++++++------ static/logo.png | Bin 0 -> 6313 bytes 5 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 static/logo.png diff --git a/README.md b/README.md index 5fe45d4..9035d40 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ apt install -y build-essential libwebkit2gtk-4.0-dev libssl-dev In order to build yourself an installer, as a bare minimum, you need to: - Add your favicon to `static/favicon.ico` +- Add your logo to `static/logo.png` - Modify the bootstrap configuration file as needed (`config.PLATFORM.toml`). - Have the main configuration file somewhere useful, reachable over HTTP. - Run: diff --git a/src/assets.rs b/src/assets.rs index e0edba4..6350ba0 100644 --- a/src/assets.rs +++ b/src/assets.rs @@ -34,6 +34,7 @@ pub fn file_from_string(file_path: &str) -> Option<(String, &'static [u8])> { file_path, "/index.html", "/favicon.ico", + "/logo.png", "/css/bulma.min.css", "/css/main.css", "/fonts/roboto-v18-latin-regular.eot", diff --git a/static/index.html b/static/index.html index 9141a4e..bb02f25 100644 --- a/static/index.html +++ b/static/index.html @@ -19,12 +19,17 @@
-

+ +

Welcome to the {{ attrs.name }} installer!

-

+

We will have you up and running in just a few moments.

+ +

+ Welcome to the {{ attrs.name }} maintenance tool. +

diff --git a/static/js/views.js b/static/js/views.js index 7141ac2..4323fd0 100644 --- a/static/js/views.js +++ b/static/js/views.js @@ -116,8 +116,8 @@ const SelectPackages = {
-
Install Location
-
+
Install Location
+
@@ -129,14 +129,23 @@ const SelectPackages = {
- Install - Modify + Back
`, + data: function() { + return { + advanced: false + } + }, methods: { select_file: function() { window.external.invoke(JSON.stringify({ diff --git a/static/logo.png b/static/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..7c6918d8d1ba8017f957bf062cafad926c370737 GIT binary patch literal 6313 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 literal 0 HcmV?d00001