From 0e18fc669a5b248547cae801b6a3bcd7f0e80770 Mon Sep 17 00:00:00 2001 From: Dmitry Naumov-Socolov Date: Thu, 27 Oct 2016 07:17:03 -0400 Subject: [PATCH] WEB. Improved Lets Encrypt interface --- web/css/styles.min.css | 10 ++++++++++ web/inc/i18n/ar.php | 3 +++ web/inc/i18n/bs.php | 3 +++ web/inc/i18n/cn.php | 3 +++ web/inc/i18n/cz.php | 3 +++ web/inc/i18n/da.php | 3 +++ web/inc/i18n/de.php | 3 +++ web/inc/i18n/el.php | 3 +++ web/inc/i18n/en.php | 2 ++ web/inc/i18n/es.php | 3 +++ web/inc/i18n/fa.php | 3 +++ web/inc/i18n/fi.php | 3 +++ web/inc/i18n/fr.php | 3 +++ web/inc/i18n/hu.php | 3 +++ web/inc/i18n/id.php | 3 +++ web/inc/i18n/it.php | 3 +++ web/inc/i18n/ja.php | 3 +++ web/inc/i18n/ka.php | 3 +++ web/inc/i18n/nl.php | 3 +++ web/inc/i18n/no.php | 3 +++ web/inc/i18n/pl.php | 3 +++ web/inc/i18n/pt-BR.php | 3 +++ web/inc/i18n/pt.php | 3 +++ web/inc/i18n/ro.php | 3 +++ web/inc/i18n/ru.php | 3 +++ web/inc/i18n/se.php | 3 +++ web/inc/i18n/tr.php | 3 +++ web/inc/i18n/tw.php | 3 +++ web/inc/i18n/ua.php | 3 +++ web/inc/i18n/vi.php | 3 +++ web/js/pages/add_web.js | 6 ++---- web/js/pages/edit_web.js | 13 ++++++------- web/templates/admin/add_web.html | 5 +++++ web/templates/admin/edit_mail_acc.html | 2 +- web/templates/admin/edit_web.html | 5 +++++ web/templates/user/list_web.html | 8 +++++++- 36 files changed, 122 insertions(+), 13 deletions(-) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index b3419387f..3723c9ec8 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -2623,6 +2623,15 @@ a.vst-text:active b{ margin: 2px 6px 0 3px; padding: 5px; } +.lets-encrypt-note { + color: #89a40a !important; + font-style: italic; + font-weight: normal !important; + height: 30px; + padding-top: 10px; + vertical-align: top; +} + .additional-control { margin-left: 17px; color: #2C9491; @@ -2695,6 +2704,7 @@ td.hint { font-style: italic; font-weight: normal; } +.ftp-path-prefix { padding-top: 7px; } .ui-button, .button { diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php index ebc6bc59b..bf657f06a 100644 --- a/web/inc/i18n/ar.php +++ b/web/inc/i18n/ar.php @@ -190,6 +190,9 @@ $LANG['ar'] = array( 'template' => 'نموذج', 'SSL Support' => 'دعم SSL', 'SSL Home Directory' => 'المجلد الرئيسي لـ SSL', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'دغم بروكسي', 'Proxy Extensions' => 'توسعات بروكسي', 'Web Statistics' => 'إحصائيات الوب', diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php index ff4e8185b..bbeaf2f9f 100644 --- a/web/inc/i18n/bs.php +++ b/web/inc/i18n/bs.php @@ -190,6 +190,9 @@ $LANG['bs'] = array( 'template' => 'šablon', 'SSL Support' => 'SSL podrška', 'SSL Home Directory' => 'SSL direktorij', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', + 'Lets Encrypt' => 'Lets Encrypt', 'Proxy Support' => 'Proxy podrška', 'Proxy Extensions' => 'Proxy ekstenzije', 'Web Statistics' => 'Web statistika', diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index aedcf6773..fd34501c8 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -191,6 +191,9 @@ $LANG['cn'] = array( 'template' => '模板', 'SSL Support' => 'SSL支持', 'SSL Home Directory' => 'SSL主目录', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => '代理支持', 'Proxy Extensions' => '代理扩展名', 'Web Statistics' => '网站统计', diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php index 5c90c07d7..a09668823 100644 --- a/web/inc/i18n/cz.php +++ b/web/inc/i18n/cz.php @@ -191,6 +191,9 @@ $LANG['cz'] = array( 'template' => 'šablona', 'SSL Support' => 'SSL podpora', 'SSL Home Directory' => 'SSL home adresář', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy podpora', 'Proxy Extensions' => 'Proxy rozšíření', 'Web Statistics' => 'Webové statistiky', diff --git a/web/inc/i18n/da.php b/web/inc/i18n/da.php index 4def825a4..a06ebbcf4 100644 --- a/web/inc/i18n/da.php +++ b/web/inc/i18n/da.php @@ -192,6 +192,9 @@ $LANG['da'] = array( 'template' => 'skabelon', 'SSL Support' => 'SSL Support', 'SSL Home Directory' => 'SSL Home', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy Support', 'Proxy Extensions' => 'Proxy Tilføjelser', 'Web Statistics' => 'Web Statistik', diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php index 850005351..ce73830c9 100644 --- a/web/inc/i18n/de.php +++ b/web/inc/i18n/de.php @@ -190,6 +190,9 @@ $LANG['de'] = array( 'template' => 'Template', 'SSL Support' => 'SSL Unterstützung', 'SSL Home Directory' => 'SSL Homeverzeichnis', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy Unterstützung', 'Proxy Extensions' => 'Proxy Erweiterungen', 'Web Statistics' => 'Web Statistiken', diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php index cda090a1c..a1506fd2e 100644 --- a/web/inc/i18n/el.php +++ b/web/inc/i18n/el.php @@ -191,6 +191,9 @@ $LANG['el'] = array( 'template' => 'template', 'SSL Support' => 'Υποστήριξη SSL', 'SSL Home Directory' => 'Αρχικός Κατάλογος SSL', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Υποστήριξη Proxy', 'Proxy Extensions' => 'Πρόσθετα Proxy', 'Web Statistics' => 'Στατιστικά Web', diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index 871fa1644..8f0dd0e7b 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -190,6 +190,8 @@ $LANG['en'] = array( 'template' => 'template', 'SSL Support' => 'SSL Support', 'SSL Home Directory' => 'SSL Home', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', 'Proxy Support' => 'Proxy Support', 'Proxy Extensions' => 'Proxy Extensions', 'Web Statistics' => 'Web Statistics', diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index 422de3e05..4e2937ded 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -191,6 +191,9 @@ $LANG['es'] = array( 'template' => 'plantilla', 'SSL Support' => 'Soporte SSL', 'SSL Home Directory' => 'SSL Del Directorio Local', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Soporte Proxy', 'Proxy Extensions' => 'Extensiones Proxy', 'Web Statistics' => 'Estadísticas Web', diff --git a/web/inc/i18n/fa.php b/web/inc/i18n/fa.php index b3eb2e845..8cac9fb47 100644 --- a/web/inc/i18n/fa.php +++ b/web/inc/i18n/fa.php @@ -193,6 +193,9 @@ $LANG['fa'] = [ 'template' => 'قالب', 'SSL Support' => 'پشتیبانی SSL', 'SSL Home Directory' => 'خانه SSL', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'پشتیبانی Proxy', 'Proxy Extensions' => 'فرمت های Proxy', 'Web Statistics' => 'آمار هاي وب', diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php index 0d36ae295..4d20b84c9 100644 --- a/web/inc/i18n/fi.php +++ b/web/inc/i18n/fi.php @@ -192,6 +192,9 @@ $LANG['fi'] = array( 'template' => 'pohjat', 'SSL Support' => 'SSL-tuki', 'SSL Home Directory' => 'SSL-kotihakemisto', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy-tuki', 'Proxy Extensions' => 'Proxy-laajennukset', 'Web Statistics' => 'Web-tilastot', diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php index 6527528b6..dcf4cc077 100644 --- a/web/inc/i18n/fr.php +++ b/web/inc/i18n/fr.php @@ -190,6 +190,9 @@ $LANG['fr'] = array( 'template' => 'template', 'SSL Support' => 'Support SSL', 'SSL Home Directory' => 'Racine SSL', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Support Proxy', 'Proxy Extensions' => 'Extensions Proxy', 'Web Statistics' => 'Statistiques Web', diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php index 90b0c3354..2a109313d 100644 --- a/web/inc/i18n/hu.php +++ b/web/inc/i18n/hu.php @@ -194,6 +194,9 @@ $LANG['hu'] = array( 'template' => 'sablon', 'SSL Support' => 'SSL támogatás', 'SSL Home Directory' => 'SSL kezdőlap', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy támogatás', 'Proxy Extensions' => 'Proxy kiterjesztések', 'Web Statistics' => 'Web statisztikák', diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php index e7cb5fcb9..3ab9a663b 100644 --- a/web/inc/i18n/id.php +++ b/web/inc/i18n/id.php @@ -193,6 +193,9 @@ $LANG['id'] = array( 'template' => 'kerangka', 'SSL Support' => 'Dukungan SSL', 'SSL Home Directory' => 'Direktori SSL Home', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Dukungan Proxy', 'Proxy Extensions' => 'Ekstensi Proxy', 'Web Statistics' => 'Statistik Web', diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php index 146a694e1..1388f1cee 100644 --- a/web/inc/i18n/it.php +++ b/web/inc/i18n/it.php @@ -191,6 +191,9 @@ $LANG['it'] = array( 'template' => 'template', 'SSL Support' => 'Supporto SSL', 'SSL Home Directory' => 'SSL Home', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Supporto Proxy', 'Proxy Extensions' => 'Estensioni Proxy', 'Web Statistics' => 'Statistiche Web', diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php index 4425637ad..0b6f8a3cc 100644 --- a/web/inc/i18n/ja.php +++ b/web/inc/i18n/ja.php @@ -190,6 +190,9 @@ $LANG['ja'] = array( 'template' => 'テンプレート', 'SSL Support' => 'SSLのサポート', 'SSL Home Directory' => 'SSLホームディレクトリ', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'プロキシのサポート', 'Proxy Extensions' => 'プロキシ対象拡張子', 'Web Statistics' => 'ウェブアクセス統計', diff --git a/web/inc/i18n/ka.php b/web/inc/i18n/ka.php index 18e6ede35..68b5263f5 100644 --- a/web/inc/i18n/ka.php +++ b/web/inc/i18n/ka.php @@ -190,6 +190,9 @@ $LANG['ka'] = array( 'template' => 'შაბლონი', 'SSL Support' => 'SSL მხარდაჭერა', 'SSL Home Directory' => 'SSL მთავარი დირექტორია', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'პროქსის მხარდაჭერა', 'Proxy Extensions' => 'პროქსის გაფართოებები', 'Web Statistics' => 'ვებ სტატისტიკა', diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index c7c6735de..9659f8de2 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -191,6 +191,9 @@ $LANG['nl'] = array( 'template' => 'sjabloon', 'SSL Support' => 'SSL Ondersteuning', 'SSL Home Directory' => 'SSL Map', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy Ondersteuning', 'Proxy Extensions' => 'Proxy Extensies', 'Web Statistics' => 'Web Statistieken', diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php index bf83dc890..e808e1a5a 100644 --- a/web/inc/i18n/no.php +++ b/web/inc/i18n/no.php @@ -191,6 +191,9 @@ $LANG['no'] = array( 'template' => 'mal', 'SSL Support' => 'SSL Støtte', 'SSL Home Directory' => 'SSL Hjem', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy Støtte', 'Proxy Extensions' => 'Proxy Utvidelser', 'Web Statistics' => 'Web Statistikker', diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php index 96fdefd46..37a870ed4 100644 --- a/web/inc/i18n/pl.php +++ b/web/inc/i18n/pl.php @@ -190,6 +190,9 @@ $LANG['pl'] = array( 'template' => 'szablon', 'SSL Support' => 'Wsparcie dla SSL', 'SSL Home Directory' => 'Folder główny SSL', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Wsparcie dla Proxy', 'Proxy Extensions' => 'Rozszerzenia Proxy', 'Web Statistics' => 'Statystyki Web', diff --git a/web/inc/i18n/pt-BR.php b/web/inc/i18n/pt-BR.php index 7556b839b..901e2a4bd 100644 --- a/web/inc/i18n/pt-BR.php +++ b/web/inc/i18n/pt-BR.php @@ -190,6 +190,9 @@ $LANG['pt-BR'] = array( 'template' => 'template', 'SSL Support' => 'Suporte SSL', 'SSL Home Directory' => 'Diretório Home SSL', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Suporte ao Proxy', 'Proxy Extensions' => 'Extenções do Proxy', 'Web Statistics' => 'Estatísticas Web', diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php index 3eb635f17..97ddd4257 100644 --- a/web/inc/i18n/pt.php +++ b/web/inc/i18n/pt.php @@ -190,6 +190,9 @@ $LANG['pt'] = array( 'template' => 'template', 'SSL Support' => 'Suporte SSL', 'SSL Home Directory' => 'Diretório Home SSL', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Suporte ao Proxy', 'Proxy Extensions' => 'Extenções do Proxy', 'Web Statistics' => 'Estatísticas Web', diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index e1c10eccb..22097b750 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -192,6 +192,9 @@ $LANG['ro'] = array( 'template' => 'șablon', 'SSL Support' => 'Support SSL', 'SSL Home Directory' => 'Director SSL', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Suport Proxy', 'Proxy Extensions' => 'Extensii Proxy', 'Web Statistics' => 'Statistici web', diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index 8751490e8..f7aa02bed 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -191,6 +191,9 @@ $LANG['ru'] = array( 'template' => 'шаблон', 'SSL Support' => 'Поддержка SSL', 'SSL Home Directory' => 'Директория SSL', + 'Lets Encrypt Support' => 'Поддержка Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Сертификат будет автоматически создан в течении 5-ти минут', + 'Lets Encrypt' => 'Lets Encrypt', 'Proxy Support' => 'Поддержка Proxy', 'Proxy Extensions' => 'Обработка Proxy', 'Web Statistics' => 'Статистика сайта', diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php index a5df6758d..158addc4b 100644 --- a/web/inc/i18n/se.php +++ b/web/inc/i18n/se.php @@ -190,6 +190,9 @@ $LANG['se'] = array( 'template' => 'mall', 'SSL Support' => 'SSL-stöd', 'SSL Home Directory' => 'Hemmakatalog för SSL', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Nginx-stöd', 'Proxy Extensions' => 'Nginx-tillägg', 'Web Statistics' => 'Webbstatistik', diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index 4ee35f7f9..676cdc620 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -191,6 +191,9 @@ $LANG['tr'] = array( 'template' => 'template', 'SSL Support' => 'SSL Support', 'SSL Home Directory' => 'SSL Home', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy Desteği', 'Proxy Extensions' => 'Proxy Uzantıları', 'Web Statistics' => 'Web İstatistikleri', diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php index 6b5ef3c84..1487492af 100644 --- a/web/inc/i18n/tw.php +++ b/web/inc/i18n/tw.php @@ -192,6 +192,9 @@ $LANG['tw'] = array( 'template' => '模板', 'SSL Support' => 'SSL支援', 'SSL Home Directory' => 'SSL主目錄', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Nginx支援', 'Proxy Extensions' => 'Nginx擴充', 'Web Statistics' => '網站統計', diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index 30753f246..c3b2f8132 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -191,6 +191,9 @@ $LANG['ua'] = array( 'template' => 'шаблон', 'SSL Support' => 'Підтримка SSL', 'SSL Home Directory' => 'Домашня тека SSL', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Підтримка Proxy', 'Proxy Extensions' => 'Розширення Proxy', 'Web Statistics' => 'Веб статистика', diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php index 3337fc108..b35bb7c70 100644 --- a/web/inc/i18n/vi.php +++ b/web/inc/i18n/vi.php @@ -190,6 +190,9 @@ $LANG['vi'] = array( 'template' => 'mẫu', 'SSL Support' => 'Hỗ trợ SSL', 'SSL Home Directory' => 'Trang chủ SSL', + 'Lets Encrypt Support' => 'Lets Encrypt Support', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Hỗ trợ Nginx', 'Proxy Extensions' => 'Phần mở rộng Nginx', 'Web Statistics' => 'Thống kê Web', diff --git a/web/js/pages/add_web.js b/web/js/pages/add_web.js index 0eb020805..0cf567c9b 100644 --- a/web/js/pages/add_web.js +++ b/web/js/pages/add_web.js @@ -154,15 +154,13 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) { App.Actions.WEB.toggle_letsencrypt = function(elm) { if ($(elm).attr('checked')) { $('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled'); -// $('input[name=v_ssl]').prop('checked', true); -// $('#ssltable').show(); $('#generate-csr').hide(); + $('.lets-encrypt-note').show(); } else { $('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled'); -// $('input[name=v_ssl]').prop('checked', false); -// $('#ssltable').hide(); $('#generate-csr').show(); + $('.lets-encrypt-note').hide(); } } diff --git a/web/js/pages/edit_web.js b/web/js/pages/edit_web.js index 38324b5e9..820ea6640 100644 --- a/web/js/pages/edit_web.js +++ b/web/js/pages/edit_web.js @@ -135,15 +135,15 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) { App.Actions.WEB.toggle_letsencrypt = function(elm) { if ($(elm).attr('checked')) { $('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled'); - $('input[name=v_ssl]').prop('checked', true); - $('#ssltable').show(); $('#generate-csr').hide(); + if(!$('.lets-encrypt-note').hasClass('enabled')){ + $('.lets-encrypt-note').show(); + } } else { $('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled'); - $('input[name=v_ssl]').prop('checked', false); - $('#ssltable').hide(); $('#generate-csr').show(); + $('.lets-encrypt-note').hide(); } } @@ -180,9 +180,8 @@ $(function() { var elm = $(evt.target); App.Actions.WEB.passwordChanged(elm); }); - if ($('input[name=v_letsencrypt]').attr('checked')) { - App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]')) - } + App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]')); + $('select[name="v_stats"]').change(function(evt){ var select = $(evt.target); diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html index ef34d6f0e..8045cf07d 100644 --- a/web/templates/admin/add_web.html +++ b/web/templates/admin/add_web.html @@ -135,6 +135,11 @@ + + + + + diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html index ab0f9f369..673afda0f 100644 --- a/web/templates/admin/edit_mail_acc.html +++ b/web/templates/admin/edit_mail_acc.html @@ -187,7 +187,7 @@ : -
+
: diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index d70625bd7..46e53c10c 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -191,6 +191,11 @@ + + + + + diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html index a3f69330b..e0f29ccd4 100644 --- a/web/templates/user/list_web.html +++ b/web/templates/user/list_web.html @@ -232,7 +232,13 @@ sort-bandwidth="" sort-disk="
:
- + + +