From 7b5bcd45f81e0819df44757324bcd55238533b37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
<dani-garcia@users.noreply.github.com>
Date: Mon, 18 Feb 2019 19:25:33 +0100
Subject: [PATCH] Show read-only options in the config panel and the env
variable names in the tooltips
---
src/config.rs | 2 +-
src/static/templates/admin/page.hbs | 49 ++++++++++++++++++++++++++++-
2 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/src/config.rs b/src/config.rs
index 12ae4c0f..a0facd0d 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -213,7 +213,7 @@ make_config! {
settings {
/// Domain URL |> This needs to be set to the URL used to access the server, including 'http[s]://' and port, if it's different than the default. Some server functions don't work correctly without this value
domain: String, true, def, "http://localhost".to_string();
- /// PRIVATE |> Domain set
+ /// Domain Set |> Indicates if the domain is set by the admin. Otherwise the default will be used.
domain_set: bool, false, def, false;
/// Enable web vault
web_vault_enabled: bool, false, def, true;
diff --git a/src/static/templates/admin/page.hbs b/src/static/templates/admin/page.hbs
index 63916873..fb28181f 100644
--- a/src/static/templates/admin/page.hbs
+++ b/src/static/templates/admin/page.hbs
@@ -66,7 +66,7 @@
<div id="g_{{group}}" class="card-body collapse" data-parent="#config-form">
{{#each elements}}
{{#if editable}}
- <div class="form-group row" title="{{doc.description}}">
+ <div class="form-group row" title="[{{name}}] {{doc.description}}">
{{#case type "text" "number" "password"}}
<label for="input_{{name}}" class="col-sm-3 col-form-label">{{doc.name}}</label>
<div class="col-sm-8 input-group">
@@ -100,6 +100,53 @@
</div>
{{/if}}
{{/each}}
+
+ <div class="card bg-light mb-3">
+ <div class="card-header"><button type="button" class="btn btn-link collapsed" data-toggle="collapse"
+ data-target="#g_readonly">Read-Only Config</button></div>
+ <div id="g_readonly" class="card-body collapse" data-parent="#config-form">
+ <p>
+ NOTE: These options can't be modified in the editor because they would require the server
+ to be restarted. To modify them, you need to set the correct environment variables when
+ launching the server. You can check the variable names in the tooltips of each option.
+ </p>
+
+ {{#each config}}
+ {{#each elements}}
+ {{#unless editable}}
+ <div class="form-group row" title="[{{name}}] {{doc.description}}">
+ {{#case type "text" "number" "password"}}
+ <label for="input_{{name}}" class="col-sm-3 col-form-label">{{doc.name}}</label>
+ <div class="col-sm-8 input-group">
+ <input readonly class="form-control" id="input_{{name}}" type="{{type}}"
+ value="{{value}}" {{#if default}} placeholder="Default: {{default}}" {{/if}}>
+
+ {{#case type "password"}}
+ <div class="input-group-append">
+ <button class="btn btn-outline-secondary" type="button"
+ onclick="toggleVis('#input_{{name}}');">Show/hide</button>
+ </div>
+ {{/case}}
+ </div>
+ {{/case}}
+ {{#case type "checkbox"}}
+ <div class="col-sm-3">{{doc.name}}</div>
+ <div class="col-sm-8">
+ <div class="form-check">
+ <input disabled class="form-check-input" type="checkbox" id="input_{{name}}"
+ {{#if value}} checked {{/if}}>
+
+ <label class="form-check-label" for="input_{{name}}"> Default: {{default}} </label>
+ </div>
+ </div>
+ {{/case}}
+ </div>
+ {{/unless}}
+ {{/each}}
+ {{/each}}
+ </div>
+ </div>
+
<button type="submit" class="btn btn-primary">Save</button>
<button type="button" class="btn btn-danger float-right" onclick="deleteConf();">Reset defaults</button>
</form>
--
GitLab