summaryrefslogtreecommitdiffstats
path: root/modules-available/baseconfig/templates/_page.html
diff options
context:
space:
mode:
authorSimon Rettberg2017-04-26 15:34:58 +0200
committerSimon Rettberg2017-04-26 15:34:58 +0200
commit2a368cb3e597e35b467a6aebbaf35d42747681f5 (patch)
treeb62b33d104200009dbd62a8272da76337e1b2054 /modules-available/baseconfig/templates/_page.html
parent[baseconfig_bwlp] Update translations (diff)
downloadslx-admin-2a368cb3e597e35b467a6aebbaf35d42747681f5.tar.gz
slx-admin-2a368cb3e597e35b467a6aebbaf35d42747681f5.tar.xz
slx-admin-2a368cb3e597e35b467a6aebbaf35d42747681f5.zip
[baseconfig] Display inherited value and source when editing module specific settings
This optionally requires a callback to find the inheritance source in the module in question. The locations module was updated accordingly. This implements #3120
Diffstat (limited to 'modules-available/baseconfig/templates/_page.html')
-rw-r--r--modules-available/baseconfig/templates/_page.html16
1 files changed, 10 insertions, 6 deletions
diff --git a/modules-available/baseconfig/templates/_page.html b/modules-available/baseconfig/templates/_page.html
index 7f380495..e0be35bc 100644
--- a/modules-available/baseconfig/templates/_page.html
+++ b/modules-available/baseconfig/templates/_page.html
@@ -25,18 +25,22 @@
<div class="row">
<div class="col-md-5 slx-cfg-toggle">
<div>{{setting}}</div>
- {{^override}}
<div class="slx-default">
+ {{#defaultvalue}}{{lang_defaultValue}}:{{/defaultvalue}}
{{defaultvalue}}
</div>
- <input class="bs-switch" name="override[{{setting}}]" id="CB_{{setting}}" type="checkbox" {{checked}}> <label for="CB_{{setting}}">{{lang_settingActive}}</label>
- {{/override}}
- {{#override}}
- <input class="bs-switch" name="override[{{setting}}]" id="CB_{{setting}}" type="checkbox" {{checked}}> <label for="CB_{{setting}}">{{lang_enableOverride}}</label>
- {{/override}}
+ <input class="bs-switch" name="override[{{setting}}]" id="CB_{{setting}}" type="checkbox" {{checked}}>
+ <label for="CB_{{setting}}">
+ {{#override}}{{lang_enableOverride}}{{/override}}
+ {{^override}}{{lang_settingActive}}{{/override}}
+ </label>
</div>
<div class="col-md-5">
{{{item}}}
+ <div class="slx-default">
+ {{#defaultsource}}{{lang_inheritSource}}:{{/defaultsource}}
+ {{defaultsource}}
+ </div>
</div>
<div class="col-md-2">
<a class="btn btn-default" data-toggle="modal" data-target="#help-{{setting}}"><span class="glyphicon glyphicon-question-sign"></span></a>