Merge branch 'fix/Forum.login_execption' into 'develop'

Merge of fix/Forum.login_execption 修复论坛修改密码显示异常的问题 to develop

See merge request o2oa/o2oa!1762

o2web/source/o2_core/o2/xDesktop/$Authentication/flat/css.wcss

@@ -45,13 +45,14 @@
 	"font-size": "28px",
 	"overflow" : "hidden",
 	"min-height": "36px",
-	"margin-right": "20px"
+	"margin-right": "20px",
+	  "float" : "left"
   },
   "formTopCloseActionNode": {
 	"width": "32px",
 	"height": "32px",
 	"float": "right",
-	"margin-top" : "24px",
+	"margin-top" : "0px",
 	"margin-right" : "20px",
 	"background": "url("+MWF.defaultPath+"/xDesktop/$Authentication/default/icon/icon_close_square_pre.png) no-repeat center center",
 	"cursor": "pointer"

o2web/source/x_component_Forum/TopNode.js

@@ -325,25 +325,40 @@ MWF.xApplication.Forum.TopNode = new Class({
     openLoginForm : function(){
         MWF.require("MWF.xDesktop.Authentication", null, false);
         var authentication = new MWF.xDesktop.Authentication({
-            style : "application",
+            "style" : "flat",
+            "popupStyle_password": "o2platformSignupFlat",
             onPostOk : function(){
                 window.location.reload();
             }
         },this.app);
-        authentication.openLoginForm({
-            hasMask : true
-        });
+        authentication.popupOptions = {
+            "draggable": true,
+            "closeAction": true,
+            "hasMask": true,
+            "relativeToApp": true,
+            "width": "420",
+            "height": "640"
+        };
+        // authentication.loadLogin(this.app.content);
+        authentication.openLoginForm();
     },
     openSignUpForm : function(){
         MWF.require("MWF.xDesktop.Authentication", null, false);
         var authentication = new MWF.xDesktop.Authentication( {
-            style : "application",
+            style : "flat",
+            "popupStyle_password": "o2platformSignupFlat",
             onPostOk : function(){
             }
         }, this.app);
-        authentication.openSignUpForm({
-            hasMask : true
-        });
+        authentication.popupOptions = {
+            "draggable": true,
+            "closeAction": true,
+            "hasMask": true,
+            "relativeToApp": true,
+            "width": "420",
+            "height": "640"
+        };
+        authentication.openSignUpForm();
     },
     logout: function(){