From 8089187b3ef55497f0365ca3bd82353b23dd27d8 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Fri, 23 Oct 2020 14:39:04 +0100 Subject: [PATCH] use bs5 alpha2, config description changes alpha2's new close buttons are used, also fixed html_templates settings being automatically filled in with an incorrect value. --- README.md | 4 ++-- config.go | 4 +++- config/config-base.json | 16 ++++++++-------- data/templates/admin.html | 28 ++++++++++++++++++++-------- package-lock.json | 6 +++--- package.json | 2 +- scss/base.scss | 4 ++++ scss/bs5/bs5-jf.scss | 4 ++++ 8 files changed, 45 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index b00a45a..d52f9b6 100644 --- a/README.md +++ b/README.md @@ -55,9 +55,9 @@ docker create \ ``` #### Build from source -A Dockerfile is provided that creates an image built from source, but it's only suitable for those who will run jfa-go in docker. +If you're using docker, a Dockerfile is provided that builds from source. -Full build instructions can be found [here](https://github.com/hrfee/jfa-go/wiki/Build). +Otherwise, full build instructions can be found [here](https://github.com/hrfee/jfa-go/wiki/Build). #### Usage Simply run `jfa-go` to start the application. A setup wizard will start on `localhost:8056` (or your own specified address). Upon completion, refresh the page. diff --git a/config.go b/config.go index ea127c5..93f3acd 100644 --- a/config.go +++ b/config.go @@ -47,7 +47,9 @@ func (app *appContext) loadConfig() error { // if key.MustString("") == "" && key.Name() != "custom_css" { // key.SetValue(filepath.Join(app.data_path, (key.Name() + ".json"))) // } - key.SetValue(key.MustString(filepath.Join(app.data_path, (key.Name() + ".json")))) + if key.Name() != "html_templates" { + key.SetValue(key.MustString(filepath.Join(app.data_path, (key.Name() + ".json")))) + } } for _, key := range []string{"user_configuration", "user_displayprefs", "user_profiles", "ombi_template"} { // if app.config.Section("files").Key(key).MustString("") == "" { diff --git a/config/config-base.json b/config/config-base.json index 534d148..a143a0e 100644 --- a/config/config-base.json +++ b/config/config-base.json @@ -159,7 +159,7 @@ "requires_restart": true, "type": "bool", "value": false, - "description": "Use Bootstrap 5 (currently in alpha). This also removes the need for jQuery, so the page should load faster." + "description": "Use the Bootstrap 5 Alpha. Looks better and removes the need for jQuery, so the page should load faster." } }, "password_validation": { @@ -501,7 +501,7 @@ "ombi": { "meta": { "name": "Ombi Integration", - "description": "Connect to Ombi to automatically create a new user's account. You'll need to create an Ombi user template." + "description": "Connect to Ombi to automatically create both Ombi and Jellyfin accounts for new users. You'll need to create a user template for this to work. Once enabled, refresh to see an option in settings for this." }, "enabled": { "name": "Enabled", @@ -590,28 +590,28 @@ "description": "Location of stored Ombi user template." }, "user_template": { - "name": "User Template", + "name": "User Template (Deprecated)", "required": false, "requires_restart": true, "type": "text", "value": "", - "description": "Deprecated. Location of stored user policy template (json)." + "description": "Deprecated in favor of User Profiles. Location of stored user policy template (json)." }, "user_configuration": { - "name": "userConfiguration", + "name": "userConfiguration (Deprecated in favor of User Profiles.", "required": false, "requires_restart": true, "type": "text", "value": "", - "description": "Deprecated. Location of stored user configuration template (used for setting homescreen layout) (json)" + "description": "Deprecated in favor of User Profiles. Location of stored user configuration template (used for setting homescreen layout) (json)" }, "user_displayprefs": { - "name": "displayPreferences", + "name": "displayPreferences (Deprecated in favor of User Profiles.", "required": false, "requires_restart": true, "type": "text", "value": "", - "description": "Deprecated. Location of stored displayPreferences template (also used for homescreen layout) (json)" + "description": "Deprecated in favor of User Profiles. Location of stored displayPreferences template (also used for homescreen layout) (json)" }, "user_profiles": { "name": "User Profiles", diff --git a/data/templates/admin.html b/data/templates/admin.html index 6633b1a..e1a9b8e 100644 --- a/data/templates/admin.html +++ b/data/templates/admin.html @@ -93,8 +93,10 @@
-
@@ -112,8 +114,10 @@
-
@@ -156,8 +160,10 @@
-
@@ -206,15 +212,17 @@
About
-
jfa-go banner

jfa-go

-

Version {{ .version }}

-

Commit {{ .commit }}

+

Version {{ .version }}

+

Commit {{ .commit }}

Available under the MIT License.

@@ -225,8 +233,10 @@
-
@@ -251,8 +261,10 @@
Create a user
-
diff --git a/package-lock.json b/package-lock.json index f39312e..7516e82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -205,9 +205,9 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "bootstrap": { - "version": "5.0.0-alpha1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-alpha1.tgz", - "integrity": "sha512-iwKneP2pLXl8lN0YpnOuOARiNPTzmh/4cw+Un86u4OqrMLuQpyMC7nO07hvivvcg0B/ektJPjuPnS1s+YmRK9A==" + "version": "5.0.0-alpha2", + "resolved": "https://registry.npm.taobao.org/bootstrap/download/bootstrap-5.0.0-alpha2.tgz", + "integrity": "sha1-43zlg271fGkdfiNp9zgbhy0hX4M=" }, "bootstrap4": { "version": "npm:bootstrap@4.5.0", diff --git a/package.json b/package.json index 1f8fa12..6ad2990 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dependencies": { "@types/jquery": "^3.5.3", "autoprefixer": "^9.8.5", - "bootstrap": "^5.0.0-alpha1", + "bootstrap": "^5.0.0-alpha2", "bootstrap4": "npm:bootstrap@^4.5.0", "clean-css-cli": "^4.3.0", "esbuild": "^0.7.8", diff --git a/scss/base.scss b/scss/base.scss index b2fcf69..23edce9 100644 --- a/scss/base.scss +++ b/scss/base.scss @@ -120,3 +120,7 @@ body.modal-open { .unfocused { display: none; } + +.text-monospace { + font-family: monospace; +} diff --git a/scss/bs5/bs5-jf.scss b/scss/bs5/bs5-jf.scss index fe3a5ef..ebcafde 100644 --- a/scss/bs5/bs5-jf.scss +++ b/scss/bs5/bs5-jf.scss @@ -142,4 +142,8 @@ $list-group-action-active-bg: $jf-blue-focus; background-color: $jf-blue-hover; } +.btn-close { + filter: invert(80%); +} + @import "../base.scss";