From a624647c2a5dec79b5e4869144ec91f31861225c Mon Sep 17 00:00:00 2001 From: "Fritz D. Ansel" Date: Thu, 12 Aug 2021 06:48:09 +0200 Subject: [PATCH] ksmbd: fix the layout of textbox without this, only 50% of screen where used also show version only 1 time if Ksmbd/Kmod versions match Signed-off-by: Fritz D. Ansel --- .../luci-static/resources/view/ksmbd.js | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/applications/luci-app-ksmbd/htdocs/luci-static/resources/view/ksmbd.js b/applications/luci-app-ksmbd/htdocs/luci-static/resources/view/ksmbd.js index 4a9de896f9..47b4bc0ff5 100644 --- a/applications/luci-app-ksmbd/htdocs/luci-static/resources/view/ksmbd.js +++ b/applications/luci-app-ksmbd/htdocs/luci-static/resources/view/ksmbd.js @@ -14,22 +14,23 @@ return view.extend({ ]); }, render: function(stats) { - var m, s, o, v; - v = ''; + var m, s, o, v, v2; + v = '?'; + v2 = '?'; m = new form.Map('ksmbd', _('Network Shares')); - if (stats[2]) { + if (stats[2]) v = stats[2].trim(); - } - if (stats[3]) { - v = v + ' Kmod: ' + stats[3].trim(); - } - s = m.section(form.TypedSection, 'globals', 'Ksmbd: ' + v); + if (stats[3]) + v2 = stats[3].trim(); + if (v != v2) + v = v +'/'+ v2; + s = m.section(form.TypedSection, 'globals', 'Ksmbd/Kmod Version ' + v); s.anonymous = true; s.tab('general', _('General Settings')); - s.tab('template', _('Edit Template')); + s.tab('template', _('Edit Template'), _('Edit the template that is used for generating the ksmbd configuration.')); s.taboption('general', widgets.NetworkSelect, 'interface', _('Interface'), _('Listen only on the given interface or, if unspecified, on lan')); @@ -44,7 +45,7 @@ return view.extend({ _('Allow legacy smb(v1)/Lanman connections, needed for older devices without smb(v2.1/3) support.')); o = s.taboption('template', form.TextValue, '_tmpl', - _('Edit the template that is used for generating the ksmbd configuration.'), + null, _("This is the content of the file '/etc/ksmbd/smb.conf.template' from which your ksmbd configuration will be generated. \ Values enclosed by pipe symbols ('|') should not be changed. They get their values from the 'General Settings' tab.")); o.rows = 20; -- 2.30.2