fix: 登录页图片更换 #144

TencentBlueKing · Dec 6, 2021 · ba5b7d8 · ba5b7d8
1 parent 91bd33c
commit ba5b7d8
Show file tree

Hide file tree

Showing 17 changed files with 85 additions and 37 deletions.
diff --git a/src/login/bklogin/templates/account/login_ce.html b/src/login/bklogin/templates/account/login_ce.html
@@ -39,11 +39,11 @@
             <div class="login-from">
                 <div class="logo-title">
                     <div class="logo_ce">
-                        <img src="{{STATIC_URL}}{% trans 'img/logo_ce/logo_ce.png' %}" alt="">
+                        <img src="{{STATIC_URL}}{% trans 'img/logo_ce/logo.svg' %}" alt="">
                     </div>
                     <div>
                         <span class="title">{% trans '社区版' %}</span>
-                        <img src="{{STATIC_URL}}/img/logo_ce/v7.png" alt="">
+                        <img src="{{STATIC_URL}}/img/logo_ce/v7.svg" alt="">
                     </div>
                 </div>
                 <div class="from-detail">
@@ -80,29 +80,29 @@
                                 <a href="{{ forget_password_url }}" class="password-btn fr" target="_blank">{% trans '忘记密码？' %}</a>
                             </div>
                         </form>
-                    <div class="language-switcher">
-                        {% get_current_language as LANGUAGE_CODE %}
-                        {% get_available_languages as LANGUAGES %}
-                        {% get_language_info_list for LANGUAGES as languages %}
-                        <form id="language-form" action="{{SITE_URL}}i18n/setlang/" method="post">{% csrf_token %}
-                            <input name="next" type="hidden" value="{{ redirect_to }}" />
-                            <select name="language" style="display: none;">
-                                {% for language in languages %}
-                                    <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
-                                        {{ language.name_local }}
-                                    </option>
-                                {% endfor %}
-                            </select>
-                        <div class="language-select" style="display: flex">
-                            <p class="language-item {% if LANGUAGE_CODE == 'zh-hans' %} active {% endif %}"  >
-                                <span id="ch"  class="text-active">中文</span>
-                            </p>
-                            <p class="language-item {% if LANGUAGE_CODE == 'en' %} active {% endif %}">
-                                <span id="en" class="text-active">English</span>
-                            </p>
+                        <div class="language-switcher">
+                            {% get_current_language as LANGUAGE_CODE %}
+                            {% get_available_languages as LANGUAGES %}
+                            {% get_language_info_list for LANGUAGES as languages %}
+                            <form id="language-form" action="{{SITE_URL}}i18n/setlang/" method="post">{% csrf_token %}
+                                <input name="next" type="hidden" value="{{ redirect_to }}" />
+                                <select name="language" style="display: none;">
+                                    {% for language in languages %}
+                                        <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
+                                            {{ language.name_local }}
+                                        </option>
+                                    {% endfor %}
+                                </select>
+                            <div class="language-select" style="display: flex">
+                                <p class="language-item {% if LANGUAGE_CODE == 'zh-hans' %} active {% endif %}"  >
+                                    <span id="ch"  class="text-active">中文</span>
+                                </p>
+                                <p class="language-item {% if LANGUAGE_CODE == 'en' %} active {% endif %}">
+                                    <span id="en" class="text-active">English</span>
+                                </p>
+                            </div>
+                            </form>
                         </div>
-                        </form>
-                    </div>
                     </div>
                 </div>
             </div>

diff --git a/src/login/locale/en/LC_MESSAGES/django.po b/src/login/locale/en/LC_MESSAGES/django.po
@@ -327,12 +327,12 @@ msgid "登录|蓝鲸智云"
 msgstr "Login|BlueKing"
 
 #: bklogin/templates/account/login_ce.html:42
-msgid "img/logo_ce/logo_ce.png"
-msgstr "img/logo_ce/logo_ce.png"
+msgid "img/logo_ce/logo.svg"
+msgstr "img/logo_ce/logo_en.svg"
 
 #: bklogin/templates/account/login_ce.html:45
 msgid "社区版"
-msgstr "社区版"
+msgstr "CE"
 
 #: bklogin/templates/account/login_ce.html:64
 #, fuzzy

diff --git a/src/login/static/assets/blueking-icon/fonts/iconcool.eot b/src/login/static/assets/blueking-icon/fonts/iconcool.eot
diff --git a/src/login/static/assets/blueking-icon/fonts/iconcool.svg b/src/login/static/assets/blueking-icon/fonts/iconcool.svg
diff --git a/src/login/static/assets/blueking-icon/fonts/iconcool.ttf b/src/login/static/assets/blueking-icon/fonts/iconcool.ttf
diff --git a/src/login/static/assets/blueking-icon/fonts/iconcool.woff b/src/login/static/assets/blueking-icon/fonts/iconcool.woff
diff --git a/src/login/static/assets/blueking-icon/iconcool.json b/src/login/static/assets/blueking-icon/iconcool.json
diff --git a/src/login/static/assets/blueking-icon/index.css b/src/login/static/assets/blueking-icon/index.css
@@ -35,3 +35,12 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
 .icon-invisible-eye:before {
 	content: "\e104";
 }
+.icon-v7:before {
+	content: "\e105";
+}
+.icon-logo:before {
+	content: "\e106";
+}
+.icon-lanjingzhiyunen:before {
+	content: "\e107";
+}
diff --git a/src/login/static/assets/blueking-icon/index.js b/src/login/static/assets/blueking-icon/index.js