From patchwork Tue Oct 13 16:07:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3559 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTt4150z3x1S for ; Tue, 13 Oct 2020 16:09:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSx6jt4z1S3; Tue, 13 Oct 2020 16:08:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSt3GvZz304y; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSs0fCcz2xBM for ; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSp6n8Wz1Gp; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2ZNOkv4TiV6JicfuzrSrfMv5tYk2UmtOkLYIegcxpP0=; b=vIxK421E5oIx+Lv9IBhbj28c2erMC/+ZnJZXsz4BcOSEbpMV2PaMDvGexKL9YctfsnaH2F TdG81kLsP+wTe0Bw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2ZNOkv4TiV6JicfuzrSrfMv5tYk2UmtOkLYIegcxpP0=; b=EEzcHElwGg6MwaNNY8WTLkQSzI0Bt01z8Zr1MginkZBM6C6E8XpkcWZ2fXV2oB69FP8kqb jdJhMhw6g3I8mdQYJ4F4qb9tARWs++yIVPAjELu4Sg6l5WscMZjplVCfY6+dOCMoxHXelf MIo8byKfH6oDCMY17YEt61E/0qi35M++mOXtqHamDOIOUQYlyUjub0TuKbyMMacLnTY+Qn Me7b7hN+cXFX+foSbHcWIlQSHZwy1qKaa+zBbgRFID9J7Rwn0HOL45tsbSSfdLS6+Pl9+w CF0L3eM02fWvcEF/tYcWWDh0dSJWX7baFFd/ASZrkCD6VpjWtQVbDjfiwHKjWg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 34/54] samba: Replace icons on top of page with buttons Date: Tue, 13 Oct 2020 16:07:52 +0000 Message-Id: <20201013160812.27754-34-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- doc/language_issues.de | 5 +++++ doc/language_issues.en | 5 ++--- doc/language_issues.es | 5 +++++ doc/language_issues.fr | 5 +++++ doc/language_issues.it | 5 +++++ doc/language_issues.nl | 5 +++++ doc/language_issues.pl | 5 +++++ doc/language_issues.ru | 5 +++++ doc/language_issues.tr | 5 +++++ doc/language_missings | 16 ++++++++++++++++ html/cgi-bin/samba.cgi | 36 ++++++++++++++++++++++++++++-------- langs/en/cgi-bin/en.pl | 2 ++ 12 files changed, 88 insertions(+), 11 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 32bdc1f5d..853e1ae9d 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -658,6 +658,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: socket options @@ -820,6 +823,8 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val zoneslave amount error WARNING: untranslated string: desired = Desired +WARNING: untranslated string: disable = Disable +WARNING: untranslated string: enable = Enable WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string diff --git a/doc/language_issues.en b/doc/language_issues.en index 9a8a0f7bc..6e61d0475 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -594,6 +594,7 @@ WARNING: untranslated string: dial = Connect WARNING: untranslated string: dial profile = Connect with profile WARNING: untranslated string: dialing mode = Dialing mode: WARNING: untranslated string: dialup red not ppp = Dialup profiles can only used if RED is set to PPP Dialup
Check the networking setup. +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disabled = disabled WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: disk access = Disk Access @@ -709,6 +710,7 @@ WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules WARNING: untranslated string: empty = This field may be left blank WARNING: untranslated string: empty profile = empty +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable ignore filter = Enable ignore filter WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: enabled = Enabled: @@ -1603,9 +1605,6 @@ WARNING: untranslated string: smart information = S.M.A.R.T. information WARNING: untranslated string: smartwarn1 = Device: WARNING: untranslated string: smartwarn2 = reports S.M.A.R.T. error WARNING: untranslated string: smb daemon = SMB Daemon -WARNING: untranslated string: smbrestart = Restart samba -WARNING: untranslated string: smbstart = Start samba -WARNING: untranslated string: smbstop = Stop samba WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported diff --git a/doc/language_issues.es b/doc/language_issues.es index a7414c5fd..7b24eec97 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -585,6 +585,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits @@ -869,6 +872,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dnat address = Firewall Interface @@ -930,6 +934,7 @@ WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: email usemail = Activate Mail Service WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: entropy = Entropy diff --git a/doc/language_issues.fr b/doc/language_issues.fr index b6ab22001..470634f62 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -693,6 +693,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: socket options @@ -860,6 +863,8 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val zoneslave amount error WARNING: untranslated string: desired = Desired +WARNING: untranslated string: disable = Disable +WARNING: untranslated string: enable = Enable WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: guardian block a host = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index 759c21777..6f8ec84b6 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -666,6 +666,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits @@ -896,6 +899,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dns = unknown string @@ -937,6 +941,7 @@ WARNING: untranslated string: email tls explicit = explicit (STARTTLS) WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: email usemail = Activate Mail Service WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: error = Error WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 29e714dcd..41badf829 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -659,6 +659,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits @@ -896,6 +899,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dns = unknown string @@ -942,6 +946,7 @@ WARNING: untranslated string: email tls explicit = explicit (STARTTLS) WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: email usemail = Activate Mail Service WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: error = Error WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! diff --git a/doc/language_issues.pl b/doc/language_issues.pl index a7414c5fd..7b24eec97 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -585,6 +585,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits @@ -869,6 +872,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dnat address = Firewall Interface @@ -930,6 +934,7 @@ WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: email usemail = Activate Mail Service WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: entropy = Entropy diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 380f46043..9c9a60dc9 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -588,6 +588,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits @@ -872,6 +875,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: disk access = Disk Access WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) @@ -934,6 +938,7 @@ WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: email usemail = Activate Mail Service WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: entropy = Entropy diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 62567ffc5..e5f558875 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -694,6 +694,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits @@ -874,6 +877,7 @@ WARNING: untranslated string: crypto warning = Cryptographic warning WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: desired = Desired +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dns = unknown string WARNING: untranslated string: dns check servers = Check DNS Servers @@ -896,6 +900,7 @@ WARNING: untranslated string: duration = Duration WARNING: untranslated string: email tls explicit = explicit (STARTTLS) WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: error = Error WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! diff --git a/doc/language_missings b/doc/language_missings index 6908166d9..d6b3db633 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -31,8 +31,10 @@ < dhcp server disabled on blue interface < dhcp server enabled on blue interface < dh name is invalid +< disable < dns could not add server < done +< enable < error the to date has to be later than the from date < g.dtm < g.lite @@ -222,6 +224,7 @@ < dh key warn1 < dh name is invalid < dh parameter +< disable < Disabled < disconnected < dl client arch insecure @@ -291,6 +294,7 @@ < email usemail < emerging pro rules < emerging rules +< enable < enable smt < encryption < entropy @@ -935,6 +939,8 @@ < bewan adsl pci st < bewan adsl usb < desired +< disable +< enable < g.dtm < g.lite < netbios nameserver daemon @@ -1034,6 +1040,7 @@ < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< disable < Disabled < disconnected < dl client arch insecure @@ -1080,6 +1087,7 @@ < email tls implicit < email usemail < emerging pro rules +< enable < enable smt < error < error the to date has to be later than the from date @@ -1405,6 +1413,7 @@ < dh key warn1 < dh name is invalid < dh parameter +< disable < Disabled < disconnected < dl client arch insecure @@ -1459,6 +1468,7 @@ < email tls implicit < email usemail < emerging pro rules +< enable < enable smt < error < error the to date has to be later than the from date @@ -1888,6 +1898,7 @@ < dh key warn1 < dh name is invalid < dh parameter +< disable < Disabled < disconnected < dl client arch insecure @@ -1957,6 +1968,7 @@ < email usemail < emerging pro rules < emerging rules +< enable < enable smt < encryption < entropy @@ -2748,6 +2760,7 @@ < dh key warn1 < dh name is invalid < dh parameter +< disable < Disabled < disconnected < disk access @@ -2819,6 +2832,7 @@ < email usemail < emerging pro rules < emerging rules +< enable < enable smt < encryption < entropy @@ -3467,6 +3481,7 @@ < dangerous < default IP address < desired +< disable < Disabled < disconnected < dns check servers @@ -3490,6 +3505,7 @@ < email tls explicit < email tls implicit < emerging pro rules +< enable < enable smt < error < error the to date has to be later than the from date diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 73f2c4d39..77aac5c0e 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -249,14 +249,34 @@ END print < -
- - - - -
-
-
+ +
+ + + + + + + +
+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+
+ +
+
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index b907eb325..f13f05fb4 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -821,6 +821,7 @@ 'dialup settings' => 'Dialup Settings', 'directory mask' => 'UNIX directory rights', 'directory writeable' => 'directory writeable', +'disable' => 'Disable', 'disabled' => 'disabled', 'disconnect' => 'OVPN Stop / Disconnect', 'disconnected' => 'Disconnected', @@ -989,6 +990,7 @@ 'emerging rules' => 'Emergingthreats.net Community Rules', 'empty' => 'This field may be left blank', 'empty profile' => 'empty', +'enable' => 'Enable', 'enable ignore filter' => 'Enable ignore filter', 'enable javascript' => 'Enable javascript', 'enable smt' => 'Enable Simultaneous Multi-Threading (SMT)',
$Lang::tr{'basic options'}