Merge branch '7.0'

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,
+      name
-      telephone
     } = this.props.userInfo;
     this.state = {
       contactEmail: contact_email,
       loginID: login_id,
-      name: name,
+      name: name
-      telephone: telephone
     };
   }
 
@@ -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,
+      name: this.state.name
-      telephone: this.state.telephone
     };
     if (enableUserSetContactEmail) {
       data.contact_email = this.state.contactEmail;
@@ -59,8 +50,7 @@ class UserBasicInfoForm extends React.Component {
     const {
       contactEmail,
       loginID,
-      name,
+      name
-      telephone
     } = this.state;
 
     return (
@@ -93,14 +83,6 @@ class UserBasicInfoForm extends React.Component {
           </div>
         )}
 
-        {(telephone != undefined) && (
-          <div className="form-group row">
-            <label className="col-sm-1 col-form-label" htmlFor="telephone">{gettext('Telephone:')}</label>
-            <div className="col-sm-5">
-              <input className="form-control" id="telephone" type="text" name="telephone" value={telephone} disabled={!enableUpdateUserInfo} readOnly={!enableUpdateUserInfo} onChange={this.handleTelephoneInputChange} />
-            </div>
-          </div>
-        )}
         <button type="submit" className="btn btn-outline-primary offset-sm-1" disabled={!enableUpdateUserInfo}>{gettext('Submit')}</button>
       </form>
     );

frontend/src/pages/sys-admin/side-panel.js

@@ -177,7 +177,7 @@ class SidePanel extends React.Component {
                 {isDefaultAdmin && enableWorkWeixinDepartments &&
                   <li className="nav-item">
                     <Link className={`nav-link ellipsis ${this.getActiveClass('departments')}`} to={siteRoot + 'sys/work-weixin/departments/'}>
-                      <span className="sf2-icon-msgs" aria-hidden="true"></span>
+                      <span className="sf3-font-enterprise-wechat sf3-font" aria-hidden="true"></span>
                       <span className="nav-text">{'企业微信集成'}</span>
                     </Link>
                   </li>

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 {

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;

seahub/templates/base.html

@@ -17,6 +17,7 @@
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/jstree_default_theme/style.min.css" />
 <link rel="stylesheet" type="text/css" href="{% static "css/magnific-popup.css" %}" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/sf_font3/iconfont.css" />
 {% block extra_style %}{% endblock %}
 {% if branding_css != '' %}<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}{{ branding_css }}" />{% endif %} 
 {% if enable_branding_css %}<link rel="stylesheet" type="text/css" href="{% url 'custom_css' %}" />{% endif %}

seahub/templates/js/sysadmin-templates.html

@@ -115,7 +115,7 @@
 
         {% if is_default_admin and enable_work_weixin_departments %}
         <li class="tab">
-            <a href="{{ SITE_ROOT }}sys/work-weixin/departments/"><span class="sf2-icon-organization"></span>企业微信集成</a>
+            <a href="{{ SITE_ROOT }}sys/work-weixin/departments/"><span class="sf3-font-enterprise-wechat sf3-font"></span>企业微信集成</a>
         </li>
         {% endif %}
 

seahub/templates/sysadmin/base.html

@@ -126,7 +126,7 @@
 
             {% if is_default_admin and enable_work_weixin_departments %}
             <li class="tab">
-                <a href="{{ SITE_ROOT }}sys/work-weixin/departments/"><span class="sf2-icon-organization"></span>企业微信集成</a>
+                <a href="{{ SITE_ROOT }}sys/work-weixin/departments/"><span class="sf3-font-enterprise-wechat sf3-font"></span>企业微信集成</a>
             </li>
             {% endif %}
 

seahub/templates/sysadmin/sysadmin_backbone.html

@@ -16,6 +16,7 @@
 <link rel="stylesheet" type="text/css" href="{% static "css/select2-3.5.2.css" %}"/>
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seahub.css?t=1398068110" />
 <link rel="stylesheet" type="text/css" href="{% static "css/magnific-popup.css" %}" />
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/sf_font3/iconfont.css" />
 {% endcompress %}
 
 {% if branding_css != '' %}<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}{{ branding_css }}" />{% endif %}