Yuki Takei 7 лет назад
Родитель
Сommit
6bf9d3237c

+ 5 - 0
resource/locales/en-US/translation.json

@@ -114,6 +114,11 @@
     "unavaliable_user_id": "This 'User ID' is unavailable."
   },
 
+  "breaking_changes": {
+    "v346_passport_is_not_enabled": "Crowi Classic Authentication mechanism currently in use will <strong>no longer be supported</strong> in the near future. Switch to Passport from %s",
+    "v346_using_basic_auth": "Basic Authentication currently in use will <strong>no longer be available</strong> in the near future. Remove settings from %s"
+  },
+
   "page_register": {
     "notice": {
       "restricted": "Admin approval required.",

+ 5 - 0
resource/locales/ja/translation.json

@@ -132,6 +132,11 @@
     "unavaliable_user_id": "このユーザーIDは利用できません。"
   },
 
+  "breaking_changes": {
+    "v346_passport_is_not_enabled": "現在利用中の Crowi Classic Authentication mechanism は、近い将来<strong>サポートされなくなります</strong>。%s から Passport に切り替えてください。",
+    "v346_using_basic_auth": "現在利用中の Basic 認証機能は、近い将来<strong>廃止されます</strong>。%s から設定を削除してください。"
+  },
+
   "page_register": {
     "notice": {
        "restricted": "この Wiki への新規登録は制限されています。",

+ 1 - 1
src/server/views/admin/app.html

@@ -2,7 +2,7 @@
 
 {% block html_title %}{{ customTitle(t('App settings')) }}{% endblock %}
 
-{% block head_warn %} {# remove including block for './widget/alert_siteurl_undefined.html' #}
+{% block head_warn_alert_siteurl_undefined %} {# remove including block for './widget/alert_siteurl_undefined.html' #}
 {% endblock %}
 
 {% block content_header %}

+ 0 - 4
src/server/views/layout-crowi/base/layout.html

@@ -7,10 +7,6 @@
   {{ cdnScriptTag('highlight-addons') }}
 {% endblock %}
 
-{% block head_warn %}
-  {% include '../../widget/alert_siteurl_undefined.html' %}
-{% endblock %}
-
 {% block layout_main %}
 <div class="container-fluid">
 

+ 0 - 4
src/server/views/layout-growi/base/layout.html

@@ -5,10 +5,6 @@
   {{ cdnScriptTag('highlight-addons') }}
 {% endblock %}
 
-{% block head_warn %}
-  {% include '../../widget/alert_siteurl_undefined.html' %}
-{% endblock %}
-
 {% block layout_main %}
 <div class="container-fluid">
 

+ 0 - 4
src/server/views/layout-kibela/base/layout.html

@@ -5,10 +5,6 @@
   {{ cdnScriptTag('highlight-addons') }}
 {% endblock %}
 
-{% block head_warn %}
-  {% include '../../widget/alert_siteurl_undefined.html' %}
-{% endblock %}
-
 {% block layout_main %}
 <div class="container-fluid">
 

+ 2 - 1
src/server/views/layout/layout.html

@@ -200,7 +200,8 @@
   {% include '../modal/create_page.html' %}
   {% endblock  %} {# layout_head_nav #}
 
-  {% block head_warn %}{% endblock %}
+  {% block head_warn_alert_siteurl_undefined %}{% include '../widget/alert_siteurl_undefined.html' %}{% endblock %}
+  {% block head_warn_breaking_changes %}{% include '../widget/alert_breaking_changes.html' %}{% endblock %}
 
   {% block sidebar %}
   <!-- Left navbar-header -->

+ 0 - 4
src/server/views/search.html

@@ -10,10 +10,6 @@
   data-target="#search-result-list"
 {% endblock %}
 
-{% block head_warn %}
-  {% include './widget/alert_siteurl_undefined.html' %}
-{% endblock %}
-
 {% block layout_main %}
 <div class="container-fluid">
 

+ 15 - 0
src/server/views/widget/alert_breaking_changes.html

@@ -0,0 +1,15 @@
+{# Added in v3.4.6 }
+
+{% if getConfig('crowi', 'security:isEnabledPassport') !== true %}
+<div class="myadmin-alert alert alert-warning mb-0">
+  <i class="icon-exclamation"></i>
+  {{ t("breaking_changes.v346_passport_is_not_enabled", '<a href="/admin/security">' + t('Security settings') + '<i class="icon-login"></i></a>') }}
+</div>
+{% endif %}
+
+{% if getConfig('crowi', 'security:basicName') || getConfig('crowi', 'security:basicSecret') %}
+<div class="myadmin-alert alert alert-warning mb-0">
+  <i class="icon-exclamation"></i>
+  {{ t("breaking_changes.v346_using_basic_auth", '<a href="/admin/security">' + t('Security settings') + '<i class="icon-login"></i></a>') }}
+</div>
+{% endif %}

+ 1 - 1
src/server/views/widget/alert_siteurl_undefined.html

@@ -1,5 +1,5 @@
 {% if !getConfig('crowi', 'app:siteUrl') %}
-<div class="alert alert-danger mb-0">
+<div class="myadmin-alert alert alert-danger mb-0">
   <i class="icon-exclamation"></i>
   {{ t("security_setting.alert_siteUrl_is_not_set", '<a href="/admin/app">' + t('App settings') + '<i class="icon-login"></i></a>') }}
 </div>