diff --git a/frontend/src/components/user-settings/user-basic-info-form.js b/frontend/src/components/user-settings/user-basic-info-form.js
index 19e42c84b1..763bf159fc 100644
--- a/frontend/src/components/user-settings/user-basic-info-form.js
+++ b/frontend/src/components/user-settings/user-basic-info-form.js
@@ -14,14 +14,12 @@ class UserBasicInfoForm extends React.Component {
const {
contact_email,
login_id,
- name,
- telephone
+ name
} = this.props.userInfo;
this.state = {
contactEmail: contact_email,
loginID: login_id,
- name: name,
- telephone: telephone
+ name: name
};
}
@@ -37,17 +35,10 @@ class UserBasicInfoForm extends React.Component {
});
}
- handleTelephoneInputChange = (e) => {
- this.setState({
- telephone: e.target.value
- });
- }
-
handleSubmit = (e) => {
e.preventDefault();
let data = {
- name: this.state.name,
- telephone: this.state.telephone
+ name: this.state.name
};
if (enableUserSetContactEmail) {
data.contact_email = this.state.contactEmail;
@@ -59,8 +50,7 @@ class UserBasicInfoForm extends React.Component {
const {
contactEmail,
loginID,
- name,
- telephone
+ name
} = this.state;
return (
@@ -93,14 +83,6 @@ class UserBasicInfoForm extends React.Component {
)}
- {(telephone != undefined) && (
-
-
-
-
-
-
- )}
);
diff --git a/frontend/src/pages/sys-admin/side-panel.js b/frontend/src/pages/sys-admin/side-panel.js
index eee18bd19e..449e5f6488 100644
--- a/frontend/src/pages/sys-admin/side-panel.js
+++ b/frontend/src/pages/sys-admin/side-panel.js
@@ -177,7 +177,7 @@ class SidePanel extends React.Component {
{isDefaultAdmin && enableWorkWeixinDepartments &&
-
+
{'企业微信集成'}
diff --git a/media/css/seahub.css b/media/css/seahub.css
index b2cff04be6..af31839515 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -1015,7 +1015,8 @@ textarea:-moz-placeholder {/* for FF */
background-color:#feefb8;
text-decoration:none;
}
-.side-tabnav-tabs .tab [class^="sf2-icon-"] {
+.side-tabnav-tabs .tab [class^="sf2-icon-"],
+.side-tabnav-tabs .tab [class^="sf3-font-"] {
display:inline-block;
width:42px;
margin-right:5px;
@@ -1047,6 +1048,7 @@ textarea:-moz-placeholder {/* for FF */
background-color:#feac74;
}
.side-tabnav-tabs .tab-cur [class^="sf2-icon-"],
+.side-tabnav-tabs .tab-cur [class^="sf3-font-"],
.side-tabnav-tabs .tab-cur a,
#group-nav .tab-cur .sharp,
#share-admin-nav .tab-cur .sharp {
diff --git a/media/css/seahub_react.css b/media/css/seahub_react.css
index cc03f382d5..2ef1d0af76 100644
--- a/media/css/seahub_react.css
+++ b/media/css/seahub_react.css
@@ -587,11 +587,13 @@ ul,ol,li {
}
.side-nav-con .active [class^="sf2-icon-"],
+.side-nav-con .active [class^="sf3-font-"],
.side-nav-con .active .sharp {
color: #fff;
}
-.side-nav-con [class^="sf2-icon-"] {
+.side-nav-con [class^="sf2-icon-"],
+.side-nav-con [class^="sf3-font-"] {
display:inline-block;
width:2.625rem;
margin-right:0.325rem;
diff --git a/seahub/templates/base.html b/seahub/templates/base.html
index c160366e76..3b597da243 100644
--- a/seahub/templates/base.html
+++ b/seahub/templates/base.html
@@ -17,6 +17,7 @@
+
{% block extra_style %}{% endblock %}
{% if branding_css != '' %}{% endif %}
{% if enable_branding_css %}{% endif %}
diff --git a/seahub/templates/js/sysadmin-templates.html b/seahub/templates/js/sysadmin-templates.html
index c28ea22c08..420470946f 100644
--- a/seahub/templates/js/sysadmin-templates.html
+++ b/seahub/templates/js/sysadmin-templates.html
@@ -115,7 +115,7 @@
{% if is_default_admin and enable_work_weixin_departments %}
- 企业微信集成
+ 企业微信集成
{% endif %}
diff --git a/seahub/templates/sysadmin/base.html b/seahub/templates/sysadmin/base.html
index 661a752936..f6763e5ecc 100644
--- a/seahub/templates/sysadmin/base.html
+++ b/seahub/templates/sysadmin/base.html
@@ -126,7 +126,7 @@
{% if is_default_admin and enable_work_weixin_departments %}
- 企业微信集成
+ 企业微信集成
{% endif %}
diff --git a/seahub/templates/sysadmin/sysadmin_backbone.html b/seahub/templates/sysadmin/sysadmin_backbone.html
index 9e4104fe96..c584b86834 100644
--- a/seahub/templates/sysadmin/sysadmin_backbone.html
+++ b/seahub/templates/sysadmin/sysadmin_backbone.html
@@ -16,6 +16,7 @@
+
{% endcompress %}
{% if branding_css != '' %}{% endif %}