web update

o2web/gulpfile.js

@@ -15,9 +15,7 @@ var gulp = require('gulp'),
 var apps = [
     {"folder": "o2_lib",                                    "tasks": ["move", "clean"]},
     {"folder": "o2_core",                                   "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_desktop",                                 "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Common",                        "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Template",                      "tasks": ["move", "min", "clean", "watch"]},
+    {"folder": "x_component_ANN",                           "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_AppCenter",                     "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_AppMarket",                     "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_Attendance",                    "tasks": ["move", "min", "clean", "watch"]},
@@ -36,6 +34,7 @@ var apps = [
     {"folder": "x_component_cms_ViewDesigner",              "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_cms_Xform",                     "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_Collect",                       "tasks": ["move", "min", "clean", "watch"]},
+    {"folder": "x_component_Common",                        "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_Console",                       "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_ControlPanel",                  "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_CRM",                           "tasks": ["move", "min", "clean", "watch"]},
@@ -88,6 +87,8 @@ var apps = [
     {"folder": "x_component_query_QueryManager",            "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_query_StatDesigner",            "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_query_ViewDesigner",            "tasks": ["move", "min", "clean", "watch"]},
+    {"folder": "x_component_query_TableDesigner",           "tasks": ["move", "min", "clean", "watch"]},
+    {"folder": "x_component_query_StatementDesigner",       "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_Report",                        "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_ReportDocument",                "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_ReportMinder",                  "tasks": ["move", "min", "clean", "watch"]},
@@ -99,8 +100,12 @@ var apps = [
     {"folder": "x_component_service_InvokeDesigner",        "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_service_ServiceManager",        "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_Setting",                       "tasks": ["move", "min", "clean", "watch"]},
+    {"folder": "x_component_SmartOfficeRoom",               "tasks": ["move", "min", "clean", "watch"]},
+    {"folder": "x_component_Snake",                         "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_Strategy",                      "tasks": ["move", "min", "clean", "watch"]},
+    {"folder": "x_component_Template",                      "tasks": ["move", "min", "clean", "watch"]},
     {"folder": "x_component_Weixin",                        "tasks": ["move", "min", "clean", "watch"]},
+    {"folder": "x_desktop",                                 "tasks": ["move", "min", "clean", "watch"]}
 ];
 
 var uploadOptions = {

o2web/source/o2_core/init.js

@@ -1051,7 +1051,7 @@ o2.addReady(function(){
         }else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2CmsApplication){
             window.webkit.messageHandlers.openO2CmsApplication.postMessage(options.columnId);
         }else{
-            window.location = "appMobile.html?app="+par;
+            window.location = "appMobile.html?"+par;
         }
     };
     var _openMeeting = function(appNames, options, statusObj){
@@ -1061,7 +1061,7 @@ o2.addReady(function(){
         }else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Meeting){
             window.webkit.messageHandlers.openO2Meeting.postMessage("");
         }else{
-            window.location = "appMobile.html?app="+par;
+            window.location = "appMobile.html?"+par;
         }
     };
 
@@ -1072,7 +1072,7 @@ o2.addReady(function(){
         }else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Calendar){
             window.webkit.messageHandlers.openO2Calendar.postMessage("");
         }else{
-            window.location = "appMobile.html?app="+par;
+            window.location = "appMobile.html?"+par;
         }
     };
     var _openTaskCenter = function(appNames, options, statusObj){
@@ -1086,7 +1086,7 @@ o2.addReady(function(){
         }else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2WorkSpace){
             window.webkit.messageHandlers.openO2WorkSpace.postMessage(tab);
         }else{
-            window.location = "appMobile.html?app="+par;
+            window.location = "appMobile.html?"+par;
         }
     };
 

o2web/source/o2_core/o2.js

@@ -49,11 +49,12 @@
             var _v = _parList[i];
             var _kv = _v.split("=");
             if (_kv[0].toLowerCase()==="lg") _lp = _kv[1];
+            if (_kv[0].toLowerCase()==="lp") _lp = _kv[1];
         }
     }
     this.o2 = {
         "version": {
-            "v": '2.1.4',
+            "v": '2.2.1',
             "build": "2019.07.31",
             "info": "O2OA 活力办公 创意无限. Copyright © 2018, o2oa.net O2 Team All rights reserved."
         },
@@ -184,7 +185,7 @@
             "doc": doc,
             "dom": (options && options.dom) || document.body,
             "bind": (options && options.bind) || null,
-            "position": (options && options.position) || "beforeend" //'beforebegin' 'afterbegin' 'beforeend' 'afterend'
+            "position": (options && options.position) || "beforeend" //'beforebegin' 'afterbegin' 'beforeend' 'afterend'debugger
         }
     };
     var _getCssOptions = function(options){

o2web/source/o2_core/o2/lp/en.js

@@ -0,0 +1,355 @@
+MWF.LP = window.LP || {
+        "name": "Name",
+        "description": "Description"
+    };
+
+MWF.LP.process={
+	"unnamed": "Unnamed",
+	"unknow": "Unknow",
+	"processConfig": "Process Config",
+	"formConfig": "Form Config",
+	
+	"createCategory": "Create Category",
+	"searchCategory": "Search Category",
+	"noCategoryNotice": "There is no process category, you can click here to create a process category.",
+	"noProcessNoticeNode": "There is no process, you can click here to create a process",
+	
+	"activity": "Activity",
+	"route": "Route",
+	"property": "Property",
+	"showJson": "View JSON",
+	"unrealized": "Unrealized",
+	"tools": "Tools",
+	"repetitions": "Duplicate property name",
+	"repetitionsValue": "Duplicate content item",
+	"repetitionsEvent": "Duplicate event name",
+	"repetitionsId": "Duplicate element identifiers",
+	"notNullId": "Element identifier cannot be null",
+	"editCategory": "Edit Category",
+	"createProcess": "Create Process",
+	"deleteCategory": "Delete Category",
+	"deleteProcess": "Delete Process",
+	"editProcess": "Edit Process",
+	"createForm": "Create Form",
+	"deleteForm": "Delete Form",
+	"editForm": "Edit Form",
+	
+	"menu": {
+		"newRoute": "Create Route",
+		"newActivity": "Create Activity",
+		"newActivityType": {
+			"manual": "Manual Activity",
+			"condition": "Condition Activity",
+			"auto": "Auto Activity",
+			"split": "Split Activity",
+			"merge": "Marge Activity",
+			"embed": "Embed Activity",
+			"invoke": "Invoke Activity",
+			"begin": "Begin Activity",
+			"end": "End Activity"
+		},
+		
+		"copyActivity": "Copy Activity",
+		
+		"deleteActivity": "Delete Activity",
+		"deleteRoute": "Delete Route",
+		
+		"saveProcess": "Save Process",
+		"saveProcessNew": "Save as new process",
+		"checkProcess": "Check Process",
+		"exportProcess": "Export Process",
+		"printProcess": "Print Process",
+		
+		"showGrid": "Show Grid",
+		"hideGrid": "Hide Grid"
+	},
+	"notice": {
+		"save_success": "Save the process successful!",
+		"deleteForm_success": "Form deleted!",
+		"deleteProcess_success": "Process deleted!",
+		"one_begin": "Each process can have only one begin activity!",
+		"deleteRoute": "You sure you want to delete the selected route?",
+		"deleteRouteTitle": "Delete route confirmation",
+		"deleteActivityTitle": "Delete activity confirmation",
+		"deleteActivity": "Deleting the activity will also delete all routes associated with this activity, you sure you want to delete the selected activity？",
+		"deleteDecisionTitle": "Delete decision confirmation",
+		"deleteDecision": "You sure you want to delete the selected decision?",
+		"deleteScriptTitle": "Delete script confirmation",
+		"deleteScript": "You sure you want to delete the selected script?",
+		"deleteElementTitle": "Delete form element confirmation",
+		"deleteElement": "Are you sure to delete the current element and its child elements?",
+		"deleteEventTitle": "Delete event confirmation",
+		"deleteEvent": "You sure you want to delete the selected event?",
+
+        "deleteActionTitle": "Delete operation confirmation",
+        "deleteAction": "You sure you want to delete the selected operation?",
+		
+		"deleteRowTitle": "Delete table row confirmation",
+		"deleteRow": "Deletes the current row is the row is deleted all the content in the cells, are you sure to delete the currently selected row?",
+		"deleteColTitle": "Delete Table Columns confirmation",
+		"deleteCol": "Deletes the current column is the column is deleted all the content in the cells, are you sure to delete the currently selected column?",
+		
+		"deleteProcessTitle": "Delete process confirmation",
+		"deleteProcess": "You sure you want to delete the selected process?",
+		
+		"deleteFormTitle": "Delete form confirmation",
+		"deleteForm": "You sure you want to delete the selected form?",
+		
+		"deleteTreeNodeTitle": "Delete node confirmation",
+		"deleteTreeNode": "You sure you want to delete the selected node?",
+		
+		"inputScriptName": "Please enter the name of the script!",
+		"inputCategoryName": "Please enter the category name of the script!"
+	},
+	"button":{
+		"ok": "Ok",
+		"cancel": "Cancel"
+	},
+	"formAction": {
+		"insertRow": "Insert Row",
+		"insertCol": "Insert Column",
+		"deleteRow": "Delete Row",
+		"deleteCol": "Delete Column",
+		"mergerCell": "Merge Cells",
+		"splitCell": "Split Cells",
+		"move": "Move",
+		"copy": "Copy",
+		"delete": "Delete",
+		"add": "Add",
+		"script": "Script"
+	}
+};
+MWF.LP.desktop = {
+	"loadding": "System is loadding, please wait......",
+	"lowBrowser": " Your browser version is too low! ~ IE8 and the following versions are not supported!",
+	"upgradeBrowser": "Please upgrade your browser：",
+
+	"menuAction": "Menu",
+	"configAction": "Configure your workstations",
+	"userMenu": "User Options",
+    "userChat": "Online Communication",
+	"styleAction": "Switch Themes",
+	"showDesktop": "Show Desktop",
+    "showMessage": "Message",
+	"logout": "Logout",
+    "userConfig": "Settings",
+    "application": "Component",
+    "widget": "Widget",
+    "process": "Process",
+    "nosign": "Edit You Signature",
+    "searchUser": "Search：Username",
+    "say": "Say",
+    "clearMessage": "Clear Message",
+
+    "messsage": {
+        "appliction": "Application",
+        "process": "Process",
+        "taskMessage": "Task Reminders",
+        "receiveTask": "You get a Task, The title is: ",
+        "activity": "Activity",
+
+        "readMessage": "Read Reminders",
+        "receiveRead": "You get a Read, The title is: ",
+
+        "reviewMessage": "Review Reminders",
+        "receiveReview": "You get a Review, The title is: ",
+
+        "fileEditorMessage": "Received File",
+        "receiveFileEditor": "A file sent to you: ",
+
+        "fileShareMessage": "Shared File",
+        "receiveFileShare": "shared to you a file: ",
+
+        "meetingInviteMessage": "Meeting Invitation",
+        "meetingInvite": "<font style='color: #ea621f'>{person}</font> invite you to attend the meeting in <font style='color: #ea621f'>{date}</font>: Topics is: \"{subject}\"，location: <font style='color: #ea621f'>{addr}</font>",
+        "meetingCancelMessage": "Meeting.Canceled",
+        "meetingCancel": "<font style='color: #ea621f'>{person}</font> 取消了原定于<font style='color: #ea621f'>{date}</font>在<font style='color: #ea621f'>{addr}</font>举行的会议: “{subject}”",
+        "meetingAcceptMessage": "Meeting invitation has been accepted",
+        "meetingAccept": "<font style='color: #ea621f'>{person}</font> 已接受您的会议邀请，将于<font style='color: #ea621f'>{date}</font>到<font style='color: #ea621f'>{addr}</font>参加会议: “{subject}”",
+        "meetingRejectMessage": "Meeting invitation has been rejected",
+        "meetingReject": "<font style='color: #ea621f'>{person}</font> 已拒绝您的会议邀请。会议时间：<font style='color: #ea621f'>{date}</font>；会议标题: “{subject}”",
+
+		"attendanceAppealInviteMessage" : "有考勤申述需要您审批",
+		"attendanceAppealInvite": "{subject}",
+		"attendanceAppealAcceptMessage" : "考勤申述通过",
+		"attendanceAppealAccept": "{subject}",
+		"attendanceAppealRejectMessage" : "考勤申述未通过",
+		"attendanceAppealReject": "{subject}"
+
+    },
+	"styleMenu": {
+		"default": "default",
+		"color": "color",
+		"black": "black",
+		"lotus": "lotus",
+		"crane": "crane",
+		"peony": "peony",
+        "car": "car",
+		"dock": "dock",
+		"panda": "panda",
+		"star": "star"
+	},
+	"notice": {
+		"unload": "If you close or refresh the current page, the content is not saved is lost, please make sure your operation",
+        "changePassword": "Your password has expired, please do not hesitate to change the password"
+	},
+	"login": {
+		"title": "User Login",
+		"loginButton": "Login",
+
+        "mobileDownload": "Phone scanning the QR code to install",
+
+		"inputUsernamePassword": "Enter you user name and password...",
+		"loginWait": "Login, please wait...",
+		"loginError": "User name or password entered is incorrect, please re-enter...",
+
+        "camera_logining": "Logging in, please face the camera ...",
+        "camera_logining_1": "Please keep smile ...",
+        "camera_logining_2": "Please Look Up ...",
+        "camera_logining_3": "Verification Successful ...",
+
+        "camera_logining2": "Please move a different perspective, or transform expression ...",
+        "camera_loginSuccess": "{name} Hello, is to sign you in ...",
+        "camera_loginError": "Unable to verify your identity, please log in through other means ...",
+        "camera_loginError2": "Login failed, please log in through other means ...",
+        "camera_loginError_camera": "Unable to open the camera, probably already in use ..."
+	},
+	
+	"action": {
+        "uploadTitle": "Uploading",
+        "uploadComplete": "Upload Complete",
+        "sendReady": "Encoding the data, prepared for transmission ...",
+        "sendStart": "Begin Transfer",
+        "sendError": "File Transfer Error",
+        "sendAbort": "File transfer was canceled",
+        "speed": "Speed",
+        "time": "Elapsed Time",
+        "hour": "Hour",
+        "minute": "Minute",
+        "second": "Second",
+
+        "cancelUploadTitle": "Cancel upload confirmation",
+        "cancelUpload": "Are you sure you want to cancel uploading file \"{name}\" ?"
+    },
+    "person": {
+        "personEmployee": "Empno",
+        "personMobile": "Mobile Number",
+        "personMail": "Mail",
+        "personDuty": "Duty",
+        "personQQ": "QQ",
+        "personWeixin": "Weixin",
+        "duty": "Duty"
+    },
+    "collect": {
+        "collectNotConnected": "Failed to connect O2 cloud",
+        "collectNotConnectedText": "Failed to connect O2 cloud, Please check the server network!"
+    }
+};
+MWF.LP.widget = {
+    "upload": "Upload",
+    "uploadTitle": "Upload File",
+    "uploadInfor": "Please select a file to upload",
+    "delete": "Delete",
+    "replace": "Replace",
+	"select" : "Select",
+
+    "download": "Download",
+    "share": "Share",
+    "send": "Ssend",
+    "downloadAll": "Download All",
+    "createFolder": "Create Folder",
+    "rename": "Rename",
+	"property": "Property",
+
+    "list": "List",
+    "icon": "Icon",
+    "preview": "Preview",
+
+    "min": "Simple Mode",
+    "max": "Full Mode",
+
+    "size": "Size",
+    "uploader": "Uploader",
+    "uploadTime": "Time",
+    "modifyTime": "Modify",
+    "uploadActivity": "Activity",
+    "attCount": "File",
+    "folderCount": "Folder",
+
+	"pictureSize" : "Width {width}px, Height {height}px",
+	"pictureRatio" : "图片宽高比为{ratio}",
+
+	"ok": "Ok",
+	"cancel": "Cancel",
+    "refresh": "Refresh",
+
+    "months": ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],
+    "days_abbr": ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],
+
+    "unknow": "unknow"
+};
+
+MWF.LP.widget.SimpleEditor = {
+	"insertEmotion" : "Insert Expressions",
+	"insertImage" : "Insert Image",
+	"Emotions" : "regular_smile|微笑，teeth_smile|大笑,angry_smile|生气,confused_smile|迷惑,cry_smile|大哭,embaressed_smile|尴尬,omg_smile|吃惊,sad_smile|难过,shades_smile|装酷,tounge_smile|吐舌,wink_smile|眨眼,angel_smile|天使,devil_smile|魔鬼,heart|红心,broken_heart|心碎,thumbs_up|顶,thumbs_down|踩,cake|蛋糕,lightbulb|灯泡,envelope|信封"
+};
+MWF.LP.authentication = {
+	"LoginFormTitle" : "Welcome",
+	"SignUpFormTitle" : "Welcome",
+	"ResetPasswordFormTitle" : "Retrieve Password",
+	"userName" : "Username",
+	"password" : "Password",
+	"verificationCode" : "CAPTCHA",
+	"loginAction" : "Login",
+	"autoLogin" : "The next automatic landing",
+	"signUp" : "Registration",
+	"forgetPassword" : "Forgot Password？",
+	"inputYourUserName" : "Enter your username",
+	"inputYourPassword" : " Enter your password",
+	"inputYourMail" : "Please input your e-mail adresse",
+	"inputYourMobile" : "Please Input your Mobile Number",
+	"inputPicVerificationCode" : "Please enter the verification code on the right",
+	"inputComfirmPassword" : "Please confirm your password",
+	"inputVerificationCode" : "Please enter the mobile verification code",
+	"confirmPassword" : "Confirm Password",
+	"sendVerification" : "Send Code",
+	"resendVerification" : "ReSend",
+	"passwordIsSimple" : "Please use alphanumeric mix and at least 7 bits",
+	"mobileIsRegisted" : "Mobile phone number has been registered",
+	"hasAccount" : "Already have an account？",
+	"gotoLogin" : "Goto Login",
+	"weak" : "weak",
+	"middle" : "middle",
+	"high" : "high",
+	"userExist" : "User already exists",
+	"userNotExist" : "The user does not exist.",
+	"passwordNotEqual" : "The password is inconsistent with the above, please try again",
+	"changeVerification" : "Change",
+	"genderType" : "Gender",
+	"genderTypeText" : ",Men, Female",
+	"genderTypeValue" : ",m,f",
+	"selectGenderType" : "Please select Gender",
+	"registeSuccess" : "Registration Successful",
+	"codeLogin" : "QRCode Login",
+	"passwordLogin" : "Password Login",
+	"bindLogin" : "QRCode Login",
+	"bingLoginTitle" : "Scanning the QR code",
+	"o2downloadLink" : "http://www.pgyer.com/ZhiHe_android",
+	"loginSuccess" : "Login Success!",
+	"userCheck" : "Authentication",
+	"shotMessageCheck" : "SMS Verification",
+	"setMewPassword" : "Set New Password",
+	"completed" : "Completed",
+	"nextStep" : "Next",
+	"mobile" : "Cellphone",
+	"setNewPassword" : "Set New Password",
+	"confirmNewPassword" : "Confirm New Password",
+	"passwordIsWeak" : "Password length must be greater than 7",
+	"resetPasswordSuccess" : "Password Reset successful!",
+	"resetPasswordFail" : "Failed to reset your password!",
+	"resetPasswordSuccessWord" : "Please remember your new password.",
+	"resetPasswordFailWord" : "Please check your username and message authentication codes.",
+	"backtoModify" : "Return for correction",
+	"pageNotFound" : "404 error, the service was not found or the server has been disconnected"
+};

o2web/source/o2_core/o2/lp/zh-cn.js

@@ -120,6 +120,10 @@ o2.LP.process={
     }
 };
 o2.LP.desktop = {
+    "loadding": "正在为您加载系统资源，请稍候......",
+    "lowBrowser": "您的浏览器版本过低啦！~系统已经不支持IE8及以下版本了!",
+    "upgradeBrowser": "请升级您的浏览器：",
+
     "menuAction": "菜单",
     "configAction": "配置您的工作台",
     "userMenu": "用户选项",
@@ -172,6 +176,7 @@ o2.LP.desktop = {
         "attendanceAppealRejectMessage" : "考勤申述未通过",
         "attendanceAppealReject": "{subject}",
 
+        "customMessageTitle": "消息提醒：",
         "customMessage": "您收到一条消息："
     },
     "styleMenu": {
@@ -296,6 +301,7 @@ o2.LP.widget = {
     "office": "在文档控件中打开",
     "closeOffice": "关闭附件",
     "configAttachment": "设置附件权限",
+    "configAttachmentText": "设置",
     "checkOcrText": "纠正自动识别的图片中的文字",
 
     "record": "录音",

o2web/source/o2_core/o2/o2.core.js

@@ -294,14 +294,15 @@
         });
 
         res.setHeader("Content-Type", "application/json; charset=utf-8");
+        res.setHeader("Accept", "text/html,application/json,*/*");
         if (window.layout) {
             if (layout["debugger"]){
                 res.setHeader("x-debugger", "true");
             }
-            if (layout.session){
-                if (layout.session.token) {
-                    res.setHeader("x-token", layout.session.token);
-                    res.setHeader("authorization", layout.session.token);
+            if (layout.session && layout.session.user){
+                if (layout.session.user.token) {
+                    res.setHeader("x-token", layout.session.user.token);
+                    res.setHeader("authorization", layout.session.user.token);
                 }
             }
         }
@@ -382,6 +383,11 @@
         }
         return obj;
     };
+    var _txt = function(v){
+        var t = v.replace(/\</g, "&lt;");
+        t = t.replace(/\</g, "&gt;");
+        return t;
+    };
 
     this.o2.Class = _Class;
     this.o2.require = _require;
@@ -391,6 +397,7 @@
     this.o2.restful = _restful;
     this.o2.release = _release;
     this.o2.defineProperties = _defineProperties;
+    this.o2.txt = _txt;
 
     Object.repeatArray = function(o, count){
         var arr = [];

o2web/source/o2_core/o2/widget/$AttachmentController/blue_flat/css.wcss

@@ -0,0 +1,474 @@
+{
+    "container": {
+        "border": "1px solid #b6b6b6",
+        //	"height": "180px",
+        "min-height": "180px",
+        "background": "#FFF",
+        "margin-top": "10px",
+        "overflow": "hidden"
+    },
+    "container_min": {
+        "border": "0px solid #b6b6b6",
+        "min-height": "30px",
+        "overflow": "hidden",
+        "background": "transparent",
+        "height": "auto"
+    },
+    "minActionAreaNode": {
+        "float": "right",
+        "height": "26px",
+        "margin": "2px",
+        "border": "1px solid #979797",
+        "border-radius": "3px",
+        "background-image": "url("+o2.session.path+"/widget/$AttachmentController/default/buttonbg.png)"
+    },
+    "minContentNode": {
+        "margin-right":"150px",
+        "min-height": "30px",
+        "overflow": "hidden"
+    },
+    "titleNode": {
+        "height": "30px",
+        "background-color": "#DDD",
+        "border-top": "1px solid #FFF",
+        "border-bottom": "1px solid #b6b6b6",
+        "line-height": "30px",
+        "font-weight": "bold",
+        "padding-left": "10px",
+        "text-align": "left"
+    },
+    "topNode": {
+        "height": "40px",
+        "background-image": "url("+o2.session.path+"/widget/$AttachmentController/default/bg.png)",
+        "border-top": "1px solid #FFF",
+        "border-bottom": "1px solid #b6b6b6"
+    },
+    "actionsBoxNode": {
+        "overflow": "hidden",
+        "border-bottom": "1px solid #eaebea",
+        "float": "left",
+        "margin-left": "10px",
+        "margin-top": "5px",
+        "border-radius": "3px",
+        "background-image": "url("+o2.session.path+"/widget/$AttachmentController/default/buttonbg.png)"
+    },
+    "actionsGroupNode": {
+        "height": "26px",
+        "border": "1px solid #979797",
+        "border-radius": "3px",
+        "background-image": "url("+o2.session.path+"/widget/$AttachmentController/default/buttonbg.png)"
+    },
+    "actionNode": {
+        "float": "left",
+        "width": "26px",
+        "height": "26px",
+        "cursor": "default"
+    },
+    "actionIconNode": {
+        "width": "26px",
+        "height": "26px",
+        "background-repeat": "no-repeat",
+        "background-position": "center center"
+    },
+    "separateNode": {
+        "width":"1px",
+        "height": "16px",
+        "margin-top": "5px",
+        "margin-left": "5px",
+        "margin-right": "5px",
+        "border-left": "1px solid #bcbcbc",
+        "background-color": "#f1f1f1",
+        "float": "left"
+    },
+    "contentScrollNode": {
+        "background-color": "#FFF",
+        "overflow": "hidden",
+        "min-height": "130px"
+    },
+    "contentNode": {
+        "background-color": "#FFF",
+        "overflow": "hidden",
+        "margin-right": "6px"
+    },
+    "bottomNode": {
+        "height": "7px",
+        "border-top": "1px solid #b6b6b6",
+        "background-color": "#e8e8e8"
+    },
+    "resizeNode": {
+        "height": "7px",
+        "cursor": "row-resize"
+    },
+    "attachmentNode_icon": {
+        "width": "90px",
+        "height": "100px",
+        "padding": "5px",
+        "float": "left",
+        "margin": "10px 0px 10px 10px",
+        "border-radius": "3px",
+        //"border": "2px solid #FFF",
+        "background": "transparent",
+        "-webkit-user-select": "text",
+        "-moz-user-select": "text"
+    },
+    "attachmentNode_icon_over": {
+        //"border": "2px solid #cdcfd1",
+        "background": "#eaf0f5"
+    },
+    "attachmentNode_icon_selected": {
+        //"border": "2px solid #d7e1e8",
+        "background": "#d7e1e8"
+    },
+    "attachmentIconNode": {
+        "width": "90px",
+        "height": "66px",
+        "text-align": "center"
+    },
+    "attachmentIconImgAreaNode": {
+        "width": "64px",
+        "height": "64px",
+        "margin": "auto"
+    },
+    "attachmentIconImgNode": {
+        "width": "64px",
+        "height": "64px"
+    },
+    "attachmentTextNode": {
+        "height": "34px",
+        "line-height": "17px",
+        "overflow": "hidden",
+        "word-break": "break-all",
+        "text-overflow": "ellipsis",
+        "text-align": "center"
+    },
+    "attachmentNode_sequence": {
+        "width": "auto",
+        "height": "30px",
+        "padding": "0px",
+        "float": "none",
+        "border-radius": "0px",
+        "border": "0px solid #FFF",
+        "background": "transparent",
+        "margin": "0px 10px",
+        "-webkit-user-select": "text",
+        "-moz-user-select": "text"
+    },
+    "attachmentNode_sequence_over": {
+        "border": "0px solid #cdcfd1",
+        "background": "#eaf0f5"
+    },
+    "attachmentNode_sequence_selected": {
+        "border": "0px solid #d7e1e8",
+        "background": "#d7e1e8"
+    },
+    "attachmentSeqNode_sequence": {
+        "width": "30px",
+        "height": "30px",
+        "line-height": "30px",
+        "color": "#666666",
+        "float": "left",
+        "text-align": "center"
+    },
+    "attachmentTextNode_sequence": {
+        "height": "30px",
+        "line-height": "30px",
+        "margin-left": "70px",
+        "overflow": "hidden",
+        "word-break": "break-all",
+        "text-overflow": "ellipsis",
+        "text-align": "left"
+    },
+
+    "attachmentNode_list": {
+        "width": "auto",
+        "height": "30px",
+        "padding": "0px",
+        "float": "none",
+        "border-radius": "0px",
+        "border": "0px solid #FFF",
+        "background": "transparent",
+        "margin": "0px 10px",
+        "-webkit-user-select": "text",
+        "-moz-user-select": "text"
+    },
+    "attachmentNode_list_over": {
+        "border": "0px solid #cdcfd1",
+        "background": "#eaf0f5"
+    },
+    "attachmentNode_list_selected": {
+        "border": "0px solid #d7e1e8",
+        "background": "#d7e1e8"
+    },
+
+
+
+    "attachmentIconNode_list": {
+        "width": "40px",
+        "height": "30px",
+        "float": "left"
+    },
+    "attachmentIconImgAreaNode_list": {
+        "width": "24px",
+        "height": "24px",
+        "margin": "3px 8px"
+    },
+    "attachmentIconImgNode_list": {
+        "width": "24px",
+        "height": "24px"
+    },
+    "attachmentTextNode_list": {
+        "height": "30px",
+        "line-height": "30px",
+        "margin-left": "40px",
+        "overflow": "hidden",
+        "word-break": "break-all",
+        "text-overflow": "ellipsis",
+        "text-align": "left"
+    },
+    "attachmentTextTitleNode_list": {
+        "height": "30px",
+        "float": "left",
+        "width": "30%"
+    },
+    "attachmentTextSizeNode_list": {
+        "height": "30px",
+        "float": "left",
+        "width": "15%"
+    },
+    "attachmentTextUploaderNode_list": {
+        "height": "30px",
+        "float": "left",
+        "width": "15%"
+    },
+    "attachmentTextTimeNode_list": {
+        "height": "30px",
+        "float": "left",
+        "width": "20%"
+    },
+    "attachmentTextActivityNode_list": {
+        "height": "30px",
+        "float": "left",
+        "width": "20%"
+    },
+
+    "attachmentNode_preview": {
+        "width": "180px",
+        "height": "160px",
+        "padding": "5px",
+        "float": "left",
+        "margin": "10px 5px 10px 5px",
+        "border-radius": "3px",
+        //"border": "2px solid #FFF",
+        "background": "transparent",
+        "-webkit-user-select": "text",
+        "-moz-user-select": "text"
+    },
+    "attachmentNode_preview_over": {
+        //"border": "2px solid #cdcfd1",
+        "background": "#eaf0f5"
+    },
+    "attachmentNode_preview_selected": {
+        //"border": "2px solid #d7e1e8",
+        "background": "#d7e1e8"
+    },
+    "attachmentPreviewIconNode": {
+        "width": "180px",
+        "height": "126px",
+        "text-align": "center"
+    },
+    "attachmentPreviewIconImgAreaNode": {
+        "width": "72px",
+        "height": "72px",
+        "margin": "auto"
+    },
+    "attachmentPreviewIconImgNode": {
+        "width": "72px",
+        "height": "72px",
+        "margin-top": "22px"
+    },
+    "attachmentPreviewAudioNode": {
+        "width": "180px",
+        "height": "30px",
+        "position": "relative",
+        "top": "-64px",
+        "opacity": "0.7"
+    },
+    "attachmentPreviewVideoNode": {
+        "width": "180px",
+        "height": "126px"
+    },
+    "attachmentPreviewTextNode": {
+        "height": "34px",
+        "line-height": "17px",
+        "overflow": "hidden",
+        "word-break": "break-all",
+        "text-overflow": "ellipsis",
+        "text-align": "center"
+    },
+
+    "minActionNode": {
+        "float": "left",
+        "width": "30px",
+        "height": "26px",
+        "line-height": "26px",
+        "color" : "#0B82FF",
+        "margin" : "3px 5px",
+        "cursor": "pointer"
+    },
+    "minActionIconNode": {
+        "width": "26px",
+        "height": "26px",
+        "background-repeat": "no-repeat",
+        "background-position": "center center"
+    },
+    "minAttachmentNode_sequence": {
+        "width": "auto",
+        "height": "30px",
+        "padding": "0px",
+        "float": "none",
+        "border-radius": "0px",
+        "border": "0px solid #FFF",
+        "background": "transparent",
+        "margin": "0px 5px",
+        "-webkit-user-select": "text",
+        "-moz-user-select": "text"
+    },
+    "minAttachmentNode_sequence_over": {
+        "border": "0px solid #cdcfd1",
+        "background-color": "#eaf0f5"
+    },
+    "minAttachmentNode_sequence_selected": {
+        "border": "0px solid #d7e1e8",
+        "background-color": "#d7e1e8"
+    },
+    "minAttachmentNode_list": {
+        "width": "auto",
+        "height": "30px",
+        "padding": "13px 0px 13px 10px",
+        "float": "left",
+        "border-radius": "0px",
+        "border": "0px solid #FFF",
+        "background": "transparent",
+        "-webkit-user-select": "text",
+        "-moz-user-select": "text",
+        "width" : "48%"
+        //"border-bottom" : "1px dashed #dcdcdc"
+    },
+    "minAttachmentSepNode_list" : {
+        "width" : "1px",
+        "height" : "30px",
+        "float" : "right",
+        "overflow" : "hidden",
+        "border-right" : "1px dashed #dcdcdc"
+    },
+    "minAttachmentNode_list_over": {
+        //"border": "0px solid #cdcfd1",
+        //"background-color": "#eaf0f5"
+    },
+    "minAttachmentNode_list_selected": {
+        //"border": "0px solid #d7e1e8",
+        "background-color": "#e6f2ff"
+    },
+    "minAttachmentIconNode_list": {
+        "width": "30px",
+        "height": "30px",
+        "float": "left"
+    },
+    "minAttachmentIconImgAreaNode_list": {
+        "width": "24px",
+        "height": "24px",
+        "margin": "3px 3px"
+    },
+    "minAttachmentIconImgNode_list": {
+        "width": "24px",
+        "height": "24px"
+    },
+    "minAttachmentTextNode_list": {
+        "height": "30px",
+        "cursor": "default",
+        "line-height": "30px",
+        "margin-left": "0px",
+        "margin-right": "0px",
+        "overflow": "hidden",
+        "word-break": "break-all",
+        "text-overflow": "ellipsis",
+        "text-align": "left",
+        "color" : "#4CA5FF"
+    },
+    "minAttachmentSizeNode_list": {
+        "height": "30px",
+        "line-height": "30px",
+        "margin-left" : "0px",
+        "margin-right": "6px",
+        "display" : "inline",
+        "color" : "#c2c6ce"
+    },
+    "minAttachmentActionAreaNode" : {
+        "float" : "right",
+        "overflow" : "hidden"
+    },
+    "inputUploadAreaNode": {
+        "width": "450px",
+        "height": "160px",
+        "border-radius": "5px",
+        "box-shadow": "0px 0px 10px #FFF",
+        "position": "absolute",
+        "border": "2px solid #999",
+        "border-top": "4px solid #5290e5",
+        "background-color": "#FFF",
+        "z-index": 100
+    },
+    "inputUploadAreaTitleNode": {
+        "height": "30px",
+        "line-height": "30px",
+        "text-align": "center",
+        "font-weight": "bold",
+        "font-family": "微软雅黑",
+        "font-size": "14px"
+    },
+    "inputUploadAreaInforNode": {
+        "height": "24px",
+        "line-height": "24px",
+        "text-align": "center",
+        "color": "#666",
+        "font-family": "微软雅黑",
+        "font-size": "12px",
+        "text-align": "left",
+        "margin": "10px 20px 0px 20px"
+    },
+    "inputUploadAreaInputAreaNode": {
+        "margin": "0px 20px 20px 20px",
+        "height": "24px"
+    },
+    "inputUploadAreaInputNode": {
+        "width": "407px",
+        "height": "23px",
+        "border": "1px solid #666",
+    },
+    "inputUploadActionNode": {
+        "margin": "0px 20px",
+        "border-top": "1px solid #999",
+    },
+    "inputUploadOkButton": {
+        "height": "24px",
+        "width": "80px",
+        "color": "#FFF",
+        "background-color": "#42699e",
+        "border": "1px solid #1e3d67",
+        "border-radius": "3px",
+        "float": "right",
+        "margin-top": "10px",
+        "margin-left": "10px"
+    },
+    "inputUploadCancelButton": {
+        "height": "24px",
+        "width": "80px",
+        "color": "#666",
+        "background-color": "#DFDFDF",
+        "border": "1px solid #666",
+        "border-radius": "3px",
+        "float": "right",
+        "margin-top": "10px",
+        "margin-left": "10px"
+    }
+}

o2web/source/o2_core/o2/widget/$AttachmentController/cms/css.wcss

@@ -350,7 +350,7 @@
     "margin": "5px 5px",
     "-webkit-user-select": "text",
     "-moz-user-select": "text",
-    "width" : "47%",
+    "width" : "46%",
     "border-right" : "1px dashed #dcdcdc"
   },
   "minAttachmentSepNode_list" : {

o2web/source/o2_core/o2/widget/$AttachmentController/default/css.wcss

@@ -355,7 +355,7 @@
         "margin": "5px 5px",
         "-webkit-user-select": "text",
         "-moz-user-select": "text",
-        "width" : "47%",
+        "width" : "46%",
         "border-right" : "1px dashed #dcdcdc"
     },
     "minAttachmentSepNode_list" : {

o2web/source/o2_core/o2/widget/$Calendar/default/css.wcss

@@ -5,7 +5,7 @@
 		"position": "absolute",
 		
 		"background-color": "#FFF",
-		"z-index": "99",
+		"z-index": "20001",
 		"font-size": "12px",
 		"overflow": "hidden"
 	},
@@ -164,7 +164,7 @@
 		"width": "8px",
 		"background-color": "#999",
 		"position": "absolute",
-		"z-index": "99",
+		"z-index": "20001",
 		"border-top": "1px solid #DDD",
 		"border-left": "1px solid #DDD",
 		"border-bottom": "1px solid #777",

o2web/source/o2_core/o2/widget/$Calendar/meeting/time.html

@@ -17,7 +17,7 @@
 	</div>-->
 	<div class="MWF_calendar_time_show calendarTimeShow">
 		<div class="MWF_calendar_time_show_h calendarTimeShowItem"></div>
-		<div class="MWF_calendar_time_show_m calendarTimeShowItem"></div>
+		<div class="MWF_calendar_time_show_m calendarTimeShowItem" ></div>
 		<!--<div class="MWF_calendar_time_show_s calendarTimeShowItem"></div>-->
 	</div>
 	<div class="MWF_calendar_action_show calendarActionShow"></div>

o2web/source/o2_core/o2/widget/$Calendar/xform/css.wcss

@@ -197,25 +197,25 @@
 	"calendarTimeShow": {
 		"overflow": "hidden",
 		"text-align": "center",
-		"margin-top": "20px",
-		"padding-left": "38px",
+		"margin-top": "12px",
+		"padding-left": "28px",
 		"cursor": "pointer"
 	},
 	"calendarTimeShowItem": {
 		"border": "3px solid #CCC",
 		"background": "#666",
 		"color": "#FFF",
-		"font-size": "28px",
+		"font-size": "24px",
 		"font-weight": "bolder",
 		"float": "left",
-		"width": "46px",
+		"width": "40px",
 		"height": "30px",
 		"line-height": "30px",
 		"margin-left": "3px"
 	},
 	"calendarActionShow": {
 	    "overflow": "hidden",
-		"margin-top": "20px",
+		"margin-top": "12px",
 		"text-align": "center",
 		"overflow": "hidden"
 	},

o2web/source/o2_core/o2/widget/$Calendar/xform/time.html

@@ -10,14 +10,15 @@
 		<div style="width: 10px; float:right">59</div>
 		<div class="MWF_calendar_time_m_slider calendarTimeSlider"><div class="calendarTimeSliderKnob"></div></div>
 	</div>
-	<!--<div class="MWF_calendar_time_s calendarTimeArea">
+	<div class="MWF_calendar_time_s calendarTimeArea" >
 		<div style="width: 25px; float:left">秒 0</div>
 		<div style="width: 10px; float:right">59</div>
 		<div class="MWF_calendar_time_s_slider calendarTimeSlider"><div class="calendarTimeSliderKnob"></div></div>
-	</div>-->
+	</div>
 	<div class="MWF_calendar_time_show calendarTimeShow">
 		<div class="MWF_calendar_time_show_h calendarTimeShowItem"></div>
 		<div class="MWF_calendar_time_show_m calendarTimeShowItem"></div>
+		<div class="MWF_calendar_time_show_s calendarTimeShowItem"></div>
 		<!--<div class="MWF_calendar_time_show_s calendarTimeShowItem"></div>-->
 	</div>
 	<div class="MWF_calendar_action_show calendarActionShow"></div>

o2web/source/o2_core/o2/widget/$Dialog/blue_flat/css.wcss

@@ -0,0 +1,102 @@
+{
+	"from": {
+		"width": "1px",
+		"height": "1px",
+		"position": "absolute",
+		"top": $(document.body).getSize().y/2,
+		"left": $(document.body).getSize().x/2,
+		"border-style": "solid",
+		"border-color": "#3C76B7",
+		"border-width": "0px",
+	    "overflow": "hidden",
+		"background-color": "#fff",
+		"box-shadow": "0px 0px 20px #999999",
+		"z-index": "1000",
+
+		"padding": "3px" ,
+
+		"opacity": 0
+	},
+	"to": {
+		"background-color": "#fff",
+		"border-style": "solid",
+		"border-color": "#3C76B7",
+		"border-width": "0px",
+		"box-shadow": "0px 0px 20px #999999",
+		"z-index": "1000",
+		"overflow": "hidden",
+		"font-size": "14px",
+		"height": "60",
+		"padding": "0px",
+		"width": "300",
+		"position": "absolute",
+		"top": "0",
+		"left": "0",
+		"opacity": 1
+	},
+	"mark": {
+		"height": "0",
+		"width": "0",
+		"opacity": 0.5,
+		"position": "absolute",
+		"top": "0px",
+		"left": "0px",
+		"z-index": "999",
+		"border-style": "none",
+		"border-width": "0",
+		"background-color": "#a1a1a1"
+	},
+	"button": {
+	  "border" : "1px solid #0B82FF",
+	  "background-color" : "#0B82FF",
+	  "height" : "32px",
+	  "line-height" : "32px",
+	  "padding" : "0px 24px",
+	  "color" : "#fff",
+	  "margin" : "15px 15px 0px 5px",
+	  "border-radius" : "2px",
+	  "font-size" : "16px",
+	  "font-weight" : "normal",
+	  "cursor" : "pointer"
+	},
+  "okButton": {
+	"border" : "1px solid #0B82FF",
+	"background-color" : "#0B82FF",
+	"color" : "#fff",
+	"height" : "32px",
+	"line-height" : "32px",
+	"margin" : "15px 15px 0px 5px",
+	"padding" : "0px 24px",
+	"border-radius" : "2px",
+	"font-size" : "16px",
+	"font-weight" : "normal",
+	"cursor" : "pointer"
+  },
+  "cancelButton" : {
+	"border" : "1px solid #F0F1F3",
+	"background-color" : "#F0F1F3",
+	"color" : "#12171F",
+	"height" : "32px",
+	"line-height" : "32px",
+	"margin" : "15px 15px 0px 5px",
+	"padding" : "0px 24px",
+	"border-radius" : "2px",
+	"font-size" : "16px",
+	"font-weight" : "normal",
+	"cursor" : "pointer"
+  },
+	"closeAction": {
+	    "height": "38px",
+	    "width": "38px",
+	    "float": "right",
+	    "cursor": "pointer",
+	    "background": "url("+o2.session.path+"/widget/$Dialog/blue_flat/img/close.png) center center no-repeat"
+	},
+	"MWF_dialod_bottom_resize": {
+	    "height": "8px",
+        "width": "8px",
+        "float": "right",
+        "cursor": "nw-resize",
+        "background": "url("+o2.session.path+"/widget/$Dialog/cmcc/img/resize.png) center center no-repeat",
+	}
+}

o2web/source/o2_core/o2/widget/$Dialog/blue_flat/dialog.html

@@ -0,0 +1,15 @@
+<div style="background-color: #f3f3f3;">
+    <div style="background-color: #F9FAFC; height: 38px; font-size: 16px; line-height: 38px; font-weight: bold; color: #12171F; border-bottom: 0px;" class="MWF_dialod_title">
+		<div style="height: 38px; float:left; padding-left:15px;" class="MWF_dialod_title_text"></div>
+		<div style="height: 38px; float:right;" class="MWF_dialod_title_action"></div>
+    </div>
+    <div style="margin-top: 3px; background-color: #fff; overflow:hidden">
+        <div class="MWF_dialod_content" style="overflow: auto; background-color: #fff; line-height:20px;width: 100%;"></div>
+    </div>
+	<div style="height:60px; text-align: right; background-color: #fff;padding-right:10px;" class="MWF_dialod_button">
+        
+    </div>
+    <div class="MWF_dialod_bottom" style="border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; background-color: #fff; margin-bottom: 3px; height: 8px;">
+        <div class="MWF_dialod_bottom_resize" style="cursor: nw-resize;height: 5px; width: 5px; float:right;"></div>
+    </div>
+</div>

o2web/source/o2_core/o2/widget/$Dialog/blue_flat_confirm/css.wcss

@@ -0,0 +1,95 @@
+{
+	"from": {
+		"width": "1px",
+		"height": "1px",
+		"position": "absolute",
+		"top": $(document.body).getSize().y/2,
+		"left": $(document.body).getSize().x/2,
+		"border-style": "solid",
+		"border-color": "#3C76B7",
+		"border-width": "0px",
+	    "overflow": "hidden",
+		"background-color": "#fff",
+		"box-shadow": "0px 0px 20px #999999",
+		"z-index": "1000",
+
+		"padding": "3px" ,
+
+		"opacity": 0
+	},
+	"to": {
+		"background-color": "#fff",
+		"border-style": "solid",
+		"border-color": "#3C76B7",
+		"border-width": "0px",
+		"box-shadow": "0px 0px 20px #999999",
+		"z-index": "20000",
+		"overflow": "hidden",
+		"font-size": "14px",
+		"height": "60",
+		"padding": "0px",
+		"width": "300",
+		"position": "absolute",
+		"top": "0",
+		"left": "0",
+		"opacity": 1
+	},
+	"mark": {
+		"height": "0",
+		"width": "0",
+		"opacity": 0.5,
+		"position": "absolute",
+		"top": "0px",
+		"left": "0px",
+		"z-index": "19999",
+		"border-style": "none",
+		"border-width": "0",
+		"background-color": "#a1a1a1"
+	},
+	"button": {
+	  "border" : "1px solid #0B82FF",
+	  "background-color" : "#0B82FF",
+	  "height" : "32px",
+	  "line-height" : "32px",
+	  "padding" : "0px 24px",
+	  "color" : "#fff",
+	  "margin" : "15px 15px 0px 5px",
+	  "border-radius" : "2px",
+	  "font-size" : "16px",
+	  "font-weight" : "normal",
+	  "cursor" : "pointer"
+	},
+	"okButton": {
+	"border" : "1px solid #0B82FF",
+	"background-color" : "#0B82FF",
+	"color" : "#fff",
+	"height" : "32px",
+	"line-height" : "32px",
+	"margin" : "15px 15px 0px 5px",
+	"padding" : "0px 24px",
+	"border-radius" : "2px",
+	"font-size" : "16px",
+	"font-weight" : "normal",
+	"cursor" : "pointer"
+  },
+  "cancelButton" : {
+	"border" : "1px solid #F0F1F3",
+	"background-color" : "#F0F1F3",
+	"color" : "#12171F",
+	"height" : "32px",
+	"line-height" : "32px",
+	"margin" : "15px 15px 0px 5px",
+	"padding" : "0px 24px",
+	"border-radius" : "2px",
+	"font-size" : "16px",
+	"font-weight" : "normal",
+	"cursor" : "pointer"
+  },
+	"closeAction": {
+	    "height": "32px",
+	    "width": "32px",
+	    "float": "right",
+	    "cursor": "pointer",
+	    "background": "url("+o2.session.path+"/widget/$Dialog/cmcc/img/close.png) center center no-repeat",
+	}
+}

o2web/source/o2_core/o2/widget/$Dialog/cmcc/css.wcss

@@ -0,0 +1,99 @@
+{
+	"from": {
+		"width": "1px",
+		"height": "1px",
+		"position": "absolute",
+		"top": $(document.body).getSize().y/2,
+		"left": $(document.body).getSize().x/2,
+		"border-style": "solid",
+		"border-color": "#3C76B7",
+		"border-width": "0px",
+	    "overflow": "hidden",
+		"background-color": "#fff",
+		"box-shadow": "0px 0px 20px #999999",
+		"z-index": "1000",
+
+		"padding": "3px" ,
+
+		"opacity": 0
+	},
+	"to": {
+		"background-color": "#fff",
+		"border-style": "solid",
+		"border-color": "#3C76B7",
+		"border-width": "0px",
+		"box-shadow": "0px 0px 20px #999999",
+		"z-index": "1000",
+		"overflow": "hidden",
+		"font-size": "14px",
+		"height": "60",
+		"padding": "0px",
+		"width": "300",
+		"position": "absolute",
+		"top": "0",
+		"left": "0",
+		"opacity": 1
+	},
+	"mark": {
+		"height": "0",
+		"width": "0",
+		"opacity": 0.5,
+		"position": "absolute",
+		"top": "0px",
+		"left": "0px",
+		"z-index": "999",
+		"border-style": "none",
+		"border-width": "0",
+		"background-color": "#a1a1a1"
+	},
+	"button": {
+	  "border" : "1px solid #1E9FFF",
+	  "background-color" : "#1E9FFF",
+	  "color" : "#fff",
+	  "height" : "28px",
+	  "line-height" : "28px",
+	  "margin" : "15px 15px 0px 5px",
+	  "padding" : "0px 15px",
+	  "border-radius" : "2px",
+	  "font-weight" : "400",
+	  "cursor" : "pointer"
+	},
+  "okButton": {
+	"border" : "1px solid #1E9FFF",
+	"background-color" : "#1E9FFF",
+	"color" : "#fff",
+	"height" : "28px",
+	"line-height" : "28px",
+	"margin" : "15px 15px 0px 5px",
+	"padding" : "0px 15px",
+	"border-radius" : "2px",
+	"font-weight" : "400",
+	"cursor" : "pointer"
+  },
+  "cancelButton" : {
+	"border" : "1px solid #f1f4f9",
+	"background-color" : "#f1f4f9",
+	"color" : "#333",
+	"height" : "28px",
+	"line-height" : "28px",
+	"margin" : "15px 15px 0px 5px",
+	"padding" : "0px 15px",
+	"border-radius" : "2px",
+	"font-weight" : "400",
+	"cursor" : "pointer"
+  },
+	"closeAction": {
+	    "height": "32px",
+	    "width": "32px",
+	    "float": "right",
+	    "cursor": "pointer",
+	    "background": "url("+o2.session.path+"/widget/$Dialog/cmcc/img/close.png) center center no-repeat",
+	},
+	"MWF_dialod_bottom_resize": {
+	    "height": "8px",
+        "width": "8px",
+        "float": "right",
+        "cursor": "nw-resize",
+        "background": "url("+o2.session.path+"/widget/$Dialog/cmcc/img/resize.png) center center no-repeat",
+	}
+}

o2web/source/o2_core/o2/widget/$Dialog/cmcc/dialog.html

@@ -0,0 +1,15 @@
+<div style="background-color: #f3f3f3;">
+    <div style="background-color: #f7f7f7; height: 32px; font-size: 14px; line-height: 32px; font-weight: normal; color: #333333; border-bottom: 0px;" class="MWF_dialod_title">
+		<div style="height: 32px; float:left; padding-left:20px;" class="MWF_dialod_title_text"></div>
+		<div style="height: 32px; float:right;" class="MWF_dialod_title_action"></div>
+    </div>
+    <div style="margin-top: 3px; background-color: #fff; overflow:hidden">
+        <div class="MWF_dialod_content" style="overflow: auto; background-color: #fff; line-height:20px;width: 100%;"></div>
+    </div>
+	<div style="height:50px; text-align: right; background-color: #fff;padding-right:10px;" class="MWF_dialod_button">
+        
+    </div>
+    <div class="MWF_dialod_bottom" style="border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; background-color: #ff; margin-bottom: 3px; height: 8px;">
+        <div class="MWF_dialod_bottom_resize" style="cursor: nw-resize;height: 5px; width: 5px; float:right;"></div>
+    </div>
+</div>

o2web/source/o2_core/o2/widget/$Menu/xform_blue_flat/css.wcss

@@ -0,0 +1,111 @@
+{
+	"container": {
+		"border-top": "1px solid #738ab5",
+		"border-left": "1px solid #738ab5",
+		"border-right": "1px solid #3c5b94",
+		"border-bottom": "1px solid #3c5b94",
+		"background-color": "#f7f3f7",
+		"padding-top": "2px",
+		"padding-bottom": "2px",
+		"padding-left": "2px",
+		"padding-right": "2px",
+		"overflow": "hidden",
+		"font-size": "12px",
+		"display": "none",
+		"z-index": "999",
+		"opacity": 0,
+		"position": "absolute",
+		"float": "left",
+		"min-width": "120px",
+		"box-shadow": "3px 3px 10px #AAA", 
+		"cursor": "default"
+	},
+	"menuItem": {
+		"display":"block",
+		"position": "static",
+		"height": "24px",
+		"line-height": "24px",
+		"border": "1px solid #f7f3f7",
+		"background-color": "#f7f3f7"
+	},
+
+	"menuItemImgDiv": {
+		"display":"block",
+		"float": "left",
+		"width": "24px",
+		"height": "24px",
+		"text-align": "center"
+	},
+	"menuItemImg": {
+		"height": "16px",
+		"width": "16px",
+		"margin-top": "3px"
+	},
+	"menuItemSeparator": {
+		"display":"block",
+		"float": "left",
+		"height": "24px",
+		"width": "1px",
+		"background-color": "#CCCCCC",
+		"border-right": "1px solid #FFFFFF",
+		"overflow": "hidden"
+	},
+	"menuItemText": {
+		"display":"block",
+		"position": "static",
+		"height": "24px",
+		"margin-left": "35px",
+		"margin-right": "30px",
+		"line-height": "24px"
+	},
+	"menuLine": {
+		"position": "static",
+		"display":"block",
+		"height": "1px",
+		"overflow": "hidden",
+		"margin-left": "28px",
+		"margin-top": "3px",
+		"margin-bottom": "3px",
+		"background-color": "#CCCCCC",
+		"border-bottom": "1px solid #FFFFFF"
+	},
+	"menuItemDisable": {
+		"color": "#999"
+	},
+
+	"menuOver": {
+		"border": "1px solid #8d9cc3",
+		//"background-color": "#b5bed6"
+		"background-color": "#e3e7f1"
+	},
+	"menuOut": {
+		"border": "1px solid #f7f3f7",
+		"background-color": "#f7f3f7"
+	},
+	"menuDown": {
+		"border": "1px solid #000000",
+		"background-color": "#c6cde0"
+	},
+	"menuUp": {
+		"border": "1px solid #8d9cc3",
+		//"background-color": "#b5bed6"
+		"background-color": "#e3e7f1"
+	},
+	"toolbarButtonDownNode": {
+		"display":"block",
+		"float": "left",
+		"padding-left": "2px",
+		"padding-right": "2px",
+		"padding-top": "0px",
+		"height": "18px",
+		"color": "#ff0000",
+		"cursor": "pointer"
+	},
+	"menuItemSubmenuIcon":{
+		"background-image": "url("+o2.session.path+"/widget/$Menu/form/submenu.png)",
+		"height": "16px",
+		"width": "16px",
+		"margin-top": "4px",
+		"float": "right"
+	}
+}

o2web/source/o2_core/o2/widget/$SimpleEditor/Actions/Emotion.js

@@ -1,4 +1,4 @@
-o2.widget.SimpleEditor.Actions = o2.widget.SimpleEditor.Actions || {};
+o2.widget.SimpleEditor.Actions = o2.widget.SimpleEditor.Actions || {};
 o2.widget.SimpleEditor.Actions.Emotion = new Class({
 	Implements: [Options, Events],
 	options: {

o2web/source/o2_core/o2/widget/$SimpleEditor/Actions/Image.js

@@ -1,4 +1,4 @@
-o2.widget.SimpleEditor.Actions = o2.widget.SimpleEditor.Actions || {};
+o2.widget.SimpleEditor.Actions = o2.widget.SimpleEditor.Actions || {};
 o2.widget.SimpleEditor.Actions.Image = new Class({
     Implements: [Options, Events],
     options: {

o2web/source/o2_core/o2/widget/$SimpleEditor/chatReceive/ActionSetting.js

@@ -1,4 +1,4 @@
-(function(){
+(function(){
 	o2.widget.SimpleEditor = o2.widget.SimpleEditor || {};
 	o2.widget.SimpleEditor.Actions = o2.widget.SimpleEditor.Actions || {};
 	o2.widget.SimpleEditor.Actions.setting = o2.widget.SimpleEditor.Actions.setting || {};

o2web/source/o2_core/o2/widget/$SimpleEditor/chatReceive/css.wcss

@@ -1,4 +1,4 @@
-{
+{
 	 "MWF_editor_head":{
  		 "margin-top": "10px",
  		 "padding": "10px 0"

o2web/source/o2_core/o2/widget/$SimpleEditor/chatReceive/toolbarItems.json

@@ -1,4 +1,4 @@
-{
+{
 	"item":[
 		{
 			"id" : "Image",

o2web/source/o2_core/o2/widget/$SimpleEditor/default/ActionSetting.js

@@ -1,4 +1,4 @@
-(function(){
+(function(){
 	o2.widget.SimpleEditor = o2.widget.SimpleEditor || {};
 	o2.widget.SimpleEditor.Actions = o2.widget.SimpleEditor.Actions || {};
 	o2.widget.SimpleEditor.Actions.setting = o2.widget.SimpleEditor.Actions.setting || {};

o2web/source/o2_core/o2/widget/$SimpleEditor/default/css.wcss

@@ -1,4 +1,4 @@
-{
+{
 	 "MWF_editor_head":{
  		 "margin-top": "10px",
  		 "padding": "10px 0"

o2web/source/o2_core/o2/widget/$SimpleEditor/default/toolbarItems.json

@@ -1,4 +1,4 @@
-{
+{
 	"item":[
 		{
 			"id" : "Image",

o2web/source/o2_core/o2/widget/$SimpleEditor/simple/ActionSetting.js

@@ -1,4 +1,4 @@
-(function(){
+(function(){
 	o2.widget.SimpleEditor = o2.widget.SimpleEditor || {};
 	o2.widget.SimpleEditor.Actions = o2.widget.SimpleEditor.Actions || {};
 	o2.widget.SimpleEditor.Actions.setting = o2.widget.SimpleEditor.Actions.setting || {};

o2web/source/o2_core/o2/widget/$SimpleEditor/simple/css.wcss

@@ -1,4 +1,4 @@
-{
+{
 	 "MWF_editor_head":{
 		 "display":"none",
  		 "margin-top": "5px",

o2web/source/o2_core/o2/widget/$SimpleEditor/simple/toolbarItems.json

@@ -1,4 +1,4 @@
-{
+{
 	"item":[
 		{
 			"id" : "Image",

o2web/source/o2_core/o2/widget/$Tab/blue_flat/css.wcss

@@ -0,0 +1,77 @@
+{
+	"tabNodeContainer": {
+		"height": "32px",
+	  	"margin-left" : "1px",
+	  	"margin-bottom" : "10px",
+	  	"padding-left" : "20px",
+		"background-color": "#fff",
+		"border-top": "1px solid #fff",
+		"border-bottom": "1px solid #e2e3e7",
+	  	"font-size" : "14px"
+	},
+	"contentNodeContainer": {
+		"overflow": "hidden",
+		"clear": "both"
+	},
+	"contentNodeArea": {
+		"overflow": "hidden",
+		"display": "none",
+		"opacity": 0
+	},
+	"tabNode": {
+	  	"padding-left" : "10px",
+	  	"padding-right" : "10px",
+		"position": "static",
+		//"margin-left": "5px",
+		"margin-top": "0px",
+		"float": "left",
+		"height": "30px",
+		"cursor": "pointer",
+		"background": "#fff",
+		"border-top": "1px solid #e2e3e7",
+	  	"border-left": "1px solid #e2e3e7",
+	  	"border-right": "1px solid #e2e3e7"
+	},
+	"tabTextNode": {
+	  "line-height": "32px",
+		"text-align": "center",
+		"color": "#3C4658",
+		"margin-right": "8px",
+		"margin-left": "8px",
+		"margin-top": "0px",
+		"font-weight": "normal"//,
+		//"margin-left": "8px"
+	},
+	"tabCloseNode": {
+		"height": "24px",
+		"width": "20px",
+		"background": "url("+o2.session.path+"/widget/$Tab/default/close.gif) center center"
+	},
+	"tabNodeCurrent": {
+	  "padding-left" : "10px",
+	  "padding-right" : "10px",
+		"position": "relative",
+		//"top": "-5px",
+		//"margin-left": "2px",
+		"float": "left",
+		"height": "32px",
+		"background": "#fff",
+		"border": "1px solid #e2e3e7",
+		"border-bottom": "0px solid #e2e3e7"
+	},
+	"tabTextNodeCurrent": {
+		"line-height": "32px",
+		"text-align": "center",
+		"color": "#0B82FF",
+		"margin-right": "8px",
+		"margin-left": "8px"
+//		"font-weight": "bold"
+		//"margin-top": "5px"
+	},
+
+	"tabCloseNodeCurrent": {
+		"height": "24px",
+		"width": "20px",
+		"background": "url("+o2.session.path+"/widget/$Tab/default/close.gif) center center"
+	}
+}

o2web/source/o2_core/o2/widget/$Tab/form/css.wcss

@@ -1,6 +1,7 @@
 {
 	"tabNodeContainer": {
 		"height": "30px",
+		"overflow": "hidden",
 		"border-bottom": "1px solid #999"
 	},
 	"contentNodeContainer": {
@@ -15,7 +16,7 @@
 		"opacity": 0
 	},
 	"tabNode": {
-		"position": "relative",
+		"position": "static",
 		"margin-left": "2px",
 		"margin-top": "4px",
 		"margin-right": "0px",
@@ -72,5 +73,23 @@
 		"height": "30px",
 		"width": "20px",
 		"background": "url("+o2.session.path+"/widget/$Tab/default/close.gif) center center"
-	}
+	},
+     	"tabNodeContainerRight": {
+     	    "width": "10px",
+     	    "height": "22px",
+     	    "margin-top": "3px",
+     	    "border": "1px solid #eeeeee",
+     	    "margin-right": "3px",
+     	    "float": "right",
+     	    "background": "url("+o2.session.path+"/widget/$Tab/script/down.png) center center no-repeat",
+             "cursor": "pointer"
+     	},
+     	"tabNodeContainerRight_over": {
+     	    "border": "1px solid #cccccc",
+     	},
+
+     	"tabNodeContainerLeft": {
+     	    "margin-right": "15px",
+             "height": "30px"
+     	}
 }