翻译

o2web/source/x_component_Forum/$ColumnTemplate/default/css.wcss

@@ -39,7 +39,8 @@
     "background-color" : "#8ca3b5",
     "height" : "20px",
     "line-height" : "20px",
-    "width" : "50px",
+    "min-width" : "44px",
+    "padding": "0px 2px",
     "color" : "#fff",
     "float" : "left",
     "text-align" : "center"
@@ -443,7 +444,8 @@
     "background-color" : "#8ca3b5",
     "height" : "20px",
     "line-height" : "20px",
-    "width" : "50px",
+    "min-width" : "44px",
+    "padding": "0px 2px",
     "color" : "#fff",
     "float" : "left",
     "text-align" : "center"

o2web/source/x_component_Forum/$ColumnTemplate/template/type_2_0.json

@@ -18,7 +18,7 @@
         "   <img styles='itemLeftIcon' item='icon'>"+
         " </div>"+
         " <div styles='itemLeftContent_type_2_0'>"+
-        "   <div styles='itemTopDiv'><div styles='itemTitleNode' item='sectionName' style='width:100px;'></div><div styles='itemToday' item='totalToday'></div></div>"+
+        "   <div styles='itemTopDiv'><div styles='itemTitleNode' item='sectionName' style='max-width:90px;'></div><div styles='itemToday' item='totalToday'></div></div>"+
         "   <div styles='itemTopDiv'>"+
         "     <div styles='itemTopInfor' item='subjectTotalLable'></div><div styles='itemTopInfor' item='subjectTotalColon'>：</div><div styles='itemTopInfor' item='subjectTotal'></div>"+
         "     <div styles='itemTopInfor'>，</div><div styles='itemTopInfor' lable='replyCount'></div><div styles='itemTopInfor'>：</div><div styles='itemTopInfor' item='replyTotal'></div>"+

o2web/source/x_component_Forum/$Setting/navi.json

 [
   {
-    "title" : "系统设置",
+    "title" : MWF.xApplication.Forum.LP.systemSettingFormTitle,
     "icon" :"systemSetting.png",
     "action" : "openSystemSetting"
   },
   {
-    "title" : "分区设置",
+    "title" : MWF.xApplication.Forum.LP.categoryFormTitle,
     "icon" :"categorize.png",
     "action" : "openCategorySetting"
   },
   {
-    "title" : "板块设置",
+    "title" : MWF.xApplication.Forum.LP.sectionFormTitle,
     "icon" :"squared.png",
     "action" : "openSectionSetting"
   }

o2web/source/x_component_Forum/lp/en.js

+MWF.xApplication.Forum = MWF.xApplication.Forum || {};
+MWF.xApplication.Forum.LP = {
+	"title": "Forum Homepage",
+	"delete": "Delete",
+	"deleteDocumentTitle": "Delete Confirmation",
+	"deleteDocument": "Are you sure you want to delete?",
+	"deleteDocumentOK": "Delete successfully",
+	"createSuccess": "Created successfully",
+	"updateSuccess": "Update successful",
+	"createReplySuccess": "Reply success",
+	"inputName": "Please enter a name",
+	"deleteAttachmentTitle": "Delete attachment confirmation",
+	"deleteAttachment": "Are you sure you want to delete this attachment?",
+	"search": "Search",
+	"searchKey": "Please enter the search key",
+	"searchTitle": "Keywords can be topics, divisions, sections, creators",
+	"noSearchContentNotice": "Please enter the search keyword, and then perform the search",
+
+	"dateFormatMonth": "%Y-%m",
+	"dateFormatOnlyMonth": "%m",
+	"dateFormatDay": "%Y-%m-%d",
+	"dateFormatMonthDayLocal": "%m-%d",
+	"dateFormat": "db",
+	"SelectOrgForm": "Personnel Organization Selection",
+
+	"month": "month",
+	"today": "today",
+	"day": "Day",
+
+	"cancel": "Cancel",
+	"close": "Close",
+	"ok": "OK",
+	"edit": "Edit",
+	"remove": "Remove",
+	"action": "Action",
+
+	"login": "Login",
+	"signup": "Sign up",
+	"logout": "Logout",
+
+	"name": "Name",
+	"create_cancel_title": "Cancel New Confirmation",
+	"create_cancel": "Are you sure you want to cancel the new creation?",
+
+	"systemSettingFormTitle": "System Settings",
+	"configName": "Configuration Name",
+	"configCode": "Configuration Code",
+	"configValue": "Configuration Value",
+
+	"categoryManager": "Manager",
+	"setting": "Settings",
+	"createCategory": "Create Partition",
+	"createSection": "Create Section",
+	"categoryFormTitle": "Partition Settings",
+	"sectionFormTitle": "Section Setting",
+
+	"baseSetting": "Basic Settings",
+	"permissionSetting": "Permission Setting",
+
+
+	"forumName": "Partition Name",
+	"forumManagerName": "Partition Manager",
+	"forumNotice": "Notice",
+	"forumVisible": "Visible User",
+	"forumVisibleButton": "Select a visible user",
+	"allPerson": "Everyone",
+	"byPermission": "ByPermission",
+	"forumVisibleValue": "Everyone, according to permissions",
+	"indexListStyle": "Homepage style list",
+	"indexListStyleValue": "Classic, Simple rectangle, Picture rectangle",
+	"indexListStyleButton": "Select Homepage Style",
+	"selectIndexType": "Select Homepage Style",
+	"all": "All",
+	"all1": "All",
+	"disable": "Disable",
+	"typeColumn": "Number of columns per row",
+	"indexListStyleImage": "Picture Rectangle",
+	"forumIndexStyle": "Section Homepage Style",
+	"forumIndexStyleValue": "Classic, News, Photo",
+	"indexRecommendable": "Allow recommendation to the homepage",
+	"subjectNeedAudit": "SubjectNeedAudit",
+	"replyNeedAudit": "Reply needs to be reviewed",
+	"sectionCreateAble": "Enable section creation",
+	"sectionTotal": "Number of Sections",
+	"subjectTotal": "Subject Total",
+	"replyTotal": "Reply Quantity",
+	"creatorName": "creator",
+	"forumStatus": "Partition Status",
+	"forumStatusValue": "Enable, Disable",
+	"orderNumber": "Order Number",
+	"yesOrNo": "Yes, No",
+	"yes": "Yes",
+	"owneForum": "Owning Partition",
+	"createTime": "Create Time",
+	"time": "Time",
+	"create": "Create",
+	"replyCount": "Reply",
+	"auditPerson": "auditor",
+	"forumColor": "Partition Color",
+	"forumColorFormTitle": "Select section color",
+	"defaultForumColor" : "#7e7e7e",
+	"optionsForumColors" : [
+		["#ff4040","#ff421e","#ffbf18","#e1e100","#00e100","#00e1ad","#00e0e0","#0082bf","#0080ff","#4181ff","#8242ff","#c140ff","#ff42f9","#ff40a0","#ff4070","#606060"],
+		["#ff1f35","#ff1f10","#ff8100","#bfbf00","#00c200","#00c197","#00c1c2","#4181c0","#0062e1","#4141ff","#4200ff","#c200ff","#ff22ff","#f52b97","#ff2259","#5f5f5f"],
+		["#e01f25","#e12000","#e26200","#a1a100","#00a000","#009f82","#3f8080","#0060a0","#0041c2","#0021bf","#4100c2","#8100ff","#ff00ff","#ff0080","#79656a","#4f4f4f"],
+		["#c20000","#ff0000","#bf4100","#80803f","#3f803f","#008250","#006062","#004080","#001fe2","#0021bf","#4000a2","#6000a1","#e000e0","#df007f","#c20041","#3f3f3f"],
+		["#a00000","#e10000","#a13f00","#626200","#006000","#00603c","#004041","#002f80","#0000ff","#2020a0","#2200a1","#400080","#a1009f","#c0007f","#9f000f","#2f2f2f"],
+		["#600000","#c21212","#824200","#424200","#004200","#004023","#00323f","#002060","#0020c2","#2222c0","#000080","#1f007f","#800080","#820040","#800000","#1f1f1f"],
+		["#400000","#a11f12","#604200","#212100","#002100","#00201f","#002041","#00204f","#0000e0","#0000a1","#000061","#1f0062","#40005f","#620042","#620012","#0f0f0f"]
+	],
+	"selectColor": "Select Color",
+	"selectList": "Select List",
+	"effect": "Effect",
+	"column": "Column",
+	"mainSection": "Main Section",
+	"welcomeTitle": "{user}, hello!",
+	"seePersonCenter": "Click to view personal center",
+	"closeNavi": "Close the navigation",
+	"navi": "Navigation",
+	"naviLayout": "Navigation Layout",
+
+	"sectionName": "Section Name",
+	"mainSectionName": "Main Section Name",
+	"sectionLevel": "Section Level",
+	"sectionLevelValue": "Main section, subsection",
+	"sectionDescription": "section description",
+	"sectionNotice": "Notice",
+	"sectionVisible": "Section Visible",
+	"sectionVisibleValue": "Everyone, according to permissions",
+	"replyVisible": "Reply to visible range",
+	"replyVisibleValue": "Everyone, according to permissions",
+	"subjectPublishAble": "Able to post range",
+	"subjectPublishAbleValue": "Everyone, according to permissions",
+	"replyPublishAble": "Able to reply range",
+	"replyPublishAbleValue": "Everyone, according to permissions",
+	"moderatorNames": "Manager",
+	"sectionType": "Type",
+	"sectionTypeValue": "Classic, photo news, general news, announcement",
+	"subSectionCreateAble": "Allow the creation of subsections",
+	"sectionStatus": "Status",
+	"sectionStatusValue": "Enable, Disable",
+	"sectionIcon": "Section Icon",
+	"uploadIcon": "Upload local icon",
+	"selectIcon": "Select Icon",
+	"sectionIconFormTitle": "Select section icon",
+	"indexRecommenPerson": "Recommended Person",
+
+	"permissionFormTitle": "Permission Settings",
+	"permissionType": "Permission Type",
+	"permissionTypeValue": "Forum permissions, section permissions, other permissions",
+	"permissionName": "permission name",
+	"permissionCode": "Permission Code",
+	"description": "Description",
+	"create": "Create",
+
+	"roleFormTitle": "Role Form",
+	"createRole": "Create Role Setting",
+	"roleType": "Role Type",
+	"roleTypeValue": "Forum role, forum role",
+	"roleName": "role name",
+	"roleCode": "Role Code",
+	"selectPerson": "Select Person",
+	"selectDepartment": "Select Department",
+	"selectCompany": "Select Company",
+
+	"recommanded": "Recommended",
+	"subject": "Subject",
+	"allSubject": "All Subjects",
+	"recommandedSubject": "Recommended Subject",
+	"primeSubject": "prime subject",
+	"type": "Type",
+	"typeValue": "Discussion, voting, news, rewards, debate, irrigation, knowledge, dynamics",
+	"subjectType": "Subject Type Option",
+	"subjectTypeDefaultValue": "Discussion|News|News|Knowledge|Watering",
+	"vote": "Vote",
+	"typeCategoryDefaultValue": "Information|Question|Vote",
+	"typeCatagory": "Theme Type Option",
+	"typeCategorySelectValue": "Information|Question|Vote",
+	"portalImage": "Homepage Image",
+	"summary": "Summary",
+	"content": "Content",
+	"createSubject": "Post",
+	"saveSubject": "Post",
+	"selectCurrentDocumentFile": "Select Post Picture",
+	"selectCloudFile": "Select Cloud File Picture",
+	"insertUrl": "Insert Image Link",
+	"voteLimitTime": "Time limit",
+	"voteResultVisible": "Result is visible",
+	"votePersonVisible": "Privacy",
+	"votePersonValue": "Public, Anonymous",
+	"voteOptions": "Options",
+	"option": "Option",
+	"opt": "Item",
+	"voteCountLimit": "Choose limit",
+	"group": "Group",
+	"addVoteGroup": "Add Voting Group",
+	"removeVoteGroup": "Remove this group",
+	"confirmRemoveVoteGroupTitle": "Confirm to delete voting group",
+	"confirmRemoveVoteGroupContent": "Are you sure you want to delete this voting group?",
+	"confirmPublishVoteDocumentTitle": "Post Confirmation",
+	"confirmPublishVoteDocumentContent": "This post is a voting post. In order to ensure the authenticity of the vote, it cannot be modified after publishing. Are you sure you want to publish the post?",
+	"voteSubject": "Voting Subject",
+
+	"timeToEndText": ", there is {time} before the end",
+	"voteCompleteText": "The voting has ended",
+	"votedPersonCountText": ", There are {count} people participating so far",
+	"noPersonVoteText": ", No one has participated yet",
+	"privateVoteText": "This is a private vote, only the poster can see the result of the vote",
+	"publicVoteText": "(This is a public vote, others can see your voted items)",
+	"anonymousVoteText": "(This is an anonymous vote, others cannot view your vote)",
+	"submit": "Submit",
+	"youAreVoted": "You have already voted, thank you for your participation",
+	"picture": "Picture",
+	"word": "text",
+	"multiSelectText": "Multiple choice (at most {n} items can be selected):",
+	"singleSelectText": "Single choice:",
+	"uploadPicture": "Upload Picture",
+	"notSelectGroupNotice": "Please select at least one item for each group before submitting",
+	"notSelectItemNotice": "Please select at least one item before submitting",
+	"second": "second",
+	"minute": "minute",
+	"hour": "Hour",
+	"seeVotedPerson": "See Voting Participants",
+	"group1": "Group:",
+	"option1": "Option:",
+
+	"attachmentArea": "Attachment Area",
+	"selectAttachment": "Select Attachment",
+	"attachment": "Attachment",
+	"bindObject": "Object",
+	"replyAndReadCount": "Reply/View",
+	"lastReply": "Last Reply",
+	"acceptReplySuccess": "Accept Reply Success",
+
+	"readed": "Read",
+	"reply": "Reply",
+	"allReply": "Reply all",
+	"accessed": "popularity",
+	"prime": "The Best",
+	"experience": "Experience",
+	"nextSubject": "Next Subject",
+	"prevSubject": "Previous Subject",
+	"floor": "Floor",
+	"mainFloor": "Subject",
+	"publishAt": "Published at",
+	"at": "at",
+	"saveReply": "Post a reply",
+	"noNextSubject": "Currently is the last subject",
+	"noPrevSubject": "Currently is the first subject",
+
+	"recommandSubject": "Recommendation",
+	"replyFormTitle": "Reply to subject",
+	"setRecommend": "Recommend to the homepage",
+	"cancelRecommend": "Cancel Recommendation",
+	"setTop": "SetTop",
+	"cancelTop": "Cancel Top",
+	"setPrime": "Set to best",
+	"setRecommendSuccess": "Recommend to the homepage successfully",
+	"cancelRecommendSuccess": "Cancel recommendation success",
+	"saveReplySuccess": "Reply success",
+	"deleteReplySuccess": "Delete Reply Success",
+	"deleteReplyTitle": "Delete Reply",
+	"deleteReplyText": "It cannot be restored after deletion. Are you sure to delete this reply?",
+	"quoteReplyBeingDeleted": "The quoted reply has been deleted!",
+	"setPrimeSuccess": "Set to best Success",
+	"cancelPrime": "Cancel Prime",
+	"cancelPrimeSuccess": "Cancel Prime Success",
+
+	"moveto": "Moveto",
+	"lock": "Lock",
+	"unlock": "Unlock",
+	"lockSuccess": "Successfully locked the post, the post cannot be replied to",
+	"unlockSuccess": "Unlock the post successfully, the post can be replied",
+	"topFormTitle": "Set Top Form",
+	"topType": "Please select the top type, multiple choice are allowed:",
+	"topTypeText": "Homepage on top, section on top, section on top",
+	"topTypeValue": "bbs,forum,section",
+	"setTopSuccess": "Top setting is successful",
+	"setToFail": "Top Setting Failed",
+	"cancelTopSuccess": "Top cancel successfully",
+	"topToBBS": "Top page on top",
+	"topToForum": "Top Partition",
+	"topToSection": "Section on top",
+	"returnToList": "Return to List",
+	"invalid": "Disable",
+	"personCenter": "Personal Center",
+	"company": "Company",
+	"department": "Department",
+	"mail": "Mail",
+	"weixin": "WeChat",
+	"mobile": "Mobile",
+	"signature": "Signature",
+
+	"mySubject": "My Post",
+	"myReply": "My Reply",
+	"hisSubject": "His Post",
+	"herSubject": "Her Subject",
+	"replyContent": "Reply Content",
+	"replyTime": "Reply Time",
+	"changePersonSetting": "Change Personal Information",
+	"sendMessage": "Send Message",
+	"todaySubject": "Today Subject",
+	"todayReply": "Today Reply",
+	"replyTo": "Reply",
+	"newSubjectPublishedText": "There are {count} newly published topics, click to view",
+
+	"hotPicture": "Hot Picture",
+	"cancelHotPicture": "Cancel hotspot",
+	"setHot": "Hot",
+	"setHotPicture": "Set HotPicture",
+	"setHotLinkSuccess": "Set hotspot picture successfully",
+	"cancelHotLinkSuccess": "Cancel Hot Link Success",
+	"selectDocPicture": "Select Document Picture",
+	"selectFilePicture": "Select Cloud File Picture",
+	"hotLinkDescription": "Note: The selected picture will be used as the top picture of the mobile APP on this platform, and the best aspect ratio of the picture is 1:2",
+	"unselectHotPic": "Please select a picture first",
+	"cancelHotPicComfirmTitle": "Cancel Hotspot",
+	"cancelHotPicComfirmContent": "Are you sure to cancel the hot spot of this document?",
+	"replyNeedLoginText": "You need to log in to reply",
+	"signUp": "Sign Up",
+	"satisfiedReply": "Accepted Reply",
+	"satisfiedAnswer": "Satisfied Reply",
+	"question": "Question",
+
+	"gotoTop": "Top",
+	"forumConfig": "Forum Settings",
+
+	"yesterday": "Yesterday",
+	"twoDaysAgo": "The day before yesterday",
+	"weekAgo": " Week Ago",
+	"dayAgo": " Day Ago",
+	"hourAgo": " Hours ago",
+	"minuteAgo": " minutes ago",
+	"justNow": "JustNow",
+	"publishJustNow": "Just published",
+
+	"selectTargetSection": "Select the section to move to",
+	"moveSuccess": "The post has been moved to {section}",
+	"poster": "Poster",
+	"replyAbbr": "reply"
+
+};
\ No newline at end of file

o2web/source/x_component_Forum/lp/zh-cn.js

@@ -335,6 +335,8 @@ MWF.xApplication.Forum.LP = {
 	"publishJustNow": "刚刚发表",
 
 	"selectTargetSection" : "选择移动到的版块",
-	"moveSuccess": "帖子已经移动到{section}"
+	"moveSuccess": "帖子已经移动到{section}",
+	"poster": "发帖人",
+	"replyAbbr" : "评"
 
 };
\ No newline at end of file

o2web/source/x_component_ForumCategory/lp/en.js

+MWF.xApplication.ForumCategory = MWF.xApplication.ForumCategory || {};
+MWF.xApplication.ForumCategory.LP = {
+	"title": "Forum Category"
+};
\ No newline at end of file

o2web/source/x_component_ForumDocument/$Main/default/css.wcss

@@ -393,7 +393,7 @@
     "color" : "#333"
   },
   "actionBar" : {
-    "width" : "750px",
+    "width" : "auto",
     "float" : "left",
     "border-right" : "1px solid #ddd",
     "padding-right" : "5px",

o2web/source/x_component_ForumDocument/$Main/default/listItemReply.json

@@ -121,7 +121,7 @@
           "satisfiedAction": {
             "text" : "satisfiedReply",
             "action": "satisfiedAction",
-            "condition" : "function( d ){ return ( layout.desktop.session.user.distinguishedName == this.view.data.creatorName && this.view.data.typeCategory == this.lp.question && !this.view.data.acceptReplyId); }",
+            "condition" : "function( d ){ return ( layout.desktop.session.user.distinguishedName == this.view.data.creatorName && ( this.view.data.typeCategory == this.lp.question || this.view.data.typeCategory == '问题' ) && !this.view.data.acceptReplyId); }",
             "event" : "mouseover^^function( itemNode, ev ){ itemNode.setStyles( this.css.satisfiedAction_over ) }##mouseout^^function( itemNode, ev ){ itemNode.setStyles( this.css.satisfiedAction ) }"
           }
         }

o2web/source/x_component_ForumDocument/$Main/default/listItemSatisfied.json

@@ -97,7 +97,7 @@
             "value": "",
             "attr" : "src^^function( d ){ if( d.userIcon ){ return d.userIcon }else{ return '../x_component_ForumDocument/$Main/default/icon/noavatar_big.gif' } }"
           },
-          "index" : { "value" : "function(){ return '满意回复'}" },
+          "index" : { "value" : "function(){ return MWF.xApplication.Forum.LP.satisfiedAnswer }" },
           "messageAction": {
             "text" : "sendMessage",
             "action": "sendMessage",

o2web/source/x_component_ForumDocument/$Mobile/default/listItemSatisfied.json

@@ -22,7 +22,7 @@
         "   <div styles='itemRightTop'>"+
         "     <div styles='itemUserName' item='creatorName'></div>"+
         "       <div styles='replyAction' item='replyAction'></div>"+
-        "     <div styles='itemFloor'>满意回复</div>"+
+        "     <div styles='itemFloor'>"+MWF.xApplication.Forum.LP.satisfiedAnswer+"</div>"+
         "   </div>"+
         "   <div styles='itemRightTop'>"+
         "     <div styles='itemTime' item='createTime'></div>"+

o2web/source/x_component_ForumDocument/$Mobile/default/listItemSubject.json

@@ -19,7 +19,7 @@
         "   </div>"+
         "   <div styles='itemUserInfor_subject'>"+
         "     <div style='overflow:hidden'>"+
-        "       <span styles='itemUserLabel'>发帖人</span>"+
+        "       <span styles='itemUserLabel'>"+MWF.xApplication.Forum.LP.poster+"</span>"+
         "       <span styles='itemUserName_subject' item='creatorName'></span>"+
         "     </div>"+
         "     <div>"+
@@ -59,7 +59,7 @@
           "content": { "type" : "html" },
           "remove" : { "action" : "remove" },
           "replyTotal" : {
-            "value": "function( d ){ return d.replyTotal + '评' }"
+            "value": "function( d ){ return d.replyTotal + MWF.xApplication.Forum.LP.replyAbbr }"
           },
           "userIcon" : {
             "value": "",

o2web/source/x_component_ForumDocument/Main.js

@@ -361,7 +361,7 @@ MWF.xApplication.ForumDocument.Main = new Class({
 					},
 					typeCategory :{ type : "select", selectValue : typeCategorySelectValue , notEmpty : true, event : {
 						change : function(item, ev){
-							if( item.getValue() == this.lp.vote ){
+							if(item.getValue() == this.lp.vote || item.getValue() == "投票"){
 								this.contentDiv.getElements( "[item='voteArea']").setStyle("display","");
 								this.loadVoteArea();
 							}else{
@@ -399,7 +399,7 @@ MWF.xApplication.ForumDocument.Main = new Class({
 			this.form.load();
 		}.bind(this), true);
 
-		if( this.data.typeCategory == this.lp.vote ){
+		if( this.data.typeCategory == this.lp.vote || this.data.typeCategory == "投票" ){
 			this.contentDiv.getElement( "[item='voteArea']").setStyle("display","");
 			this.loadVoteArea();
 		}
@@ -472,12 +472,12 @@ MWF.xApplication.ForumDocument.Main = new Class({
 		if( !data ){ //校验没通过
 			// 校验投票
 			var typeCategory = this.form.getItem("typeCategory");
-			if( typeCategory.getValue() == this.lp.vote ){
+			if( typeCategory.getValue() == this.lp.vote || typeCategory.getValue() == "投票"){
 				this.vote.getVoteInfor()
 			}
 			return;
 		}
-		if( data.typeCategory == this.lp.vote ){
+		if( data.typeCategory == this.lp.vote || data.typeCategory == "投票" ){
 			var voteData = this.vote.getVoteInfor();
 			if( !voteData )return;
 			for( var key in voteData ){
@@ -536,7 +536,7 @@ MWF.xApplication.ForumDocument.Main = new Class({
 			"styles" : this.css.subjectConainer
 		}).inject( contentConainer );
 
-		if( this.data.typeCategory == this.lp.question ){
+		if( this.data.typeCategory == this.lp.question || this.data.typeCategory == "问题" ){
 			this.satisfiedReplyViewConainer = new Element("div.satisfiedReplyViewConainer",{
 				"styles" : this.css.replyViewConainer
 			}).inject( contentConainer );
@@ -549,7 +549,7 @@ MWF.xApplication.ForumDocument.Main = new Class({
 		this.createPagingBar();
 
 		this.createSubject();
-		if( this.data.typeCategory == this.lp.question ) {
+		if( this.data.typeCategory == this.lp.question || this.data.typeCategory == "问题" ) {
 			if( this.data.acceptReplyId ){
 				this.createSatisfiedReplyView();
 			}
@@ -710,9 +710,9 @@ MWF.xApplication.ForumDocument.Main = new Class({
 				"styles" : this.css.toolbarPrime,
 				"title" : (this.data.screamSetterName || "").split("@")[0]+ this.lp.at + this.data.screamSetterTime + this.lp.setPrime
 			}).inject( this.toolbarRight );
-		}else if( this.data.typeCategory == this.lp.vote ){
+		}else if( this.data.typeCategory == this.lp.vote || this.data.typeCategory == "投票" ){
 			new Element( "div.vote", { "styles" : this.css.toolbarVote, "title" : this.lp.vote }).inject( this.toolbarRight );
-		}else if( this.data.typeCategory == this.lp.question ){
+		}else if( this.data.typeCategory == this.lp.question || this.data.typeCategory == "问题" ){
 			new Element( "div.question", { "styles" : this.css.toolbarQuestion, "title" : this.lp.question }).inject( this.toolbarRight );
 		}
 
@@ -976,7 +976,7 @@ MWF.xApplication.ForumDocument.Main = new Class({
 			})
 		}
 
-		if( this.data.typeCategory != this.lp.vote ){
+		if( this.data.typeCategory != this.lp.vote && this.data.typeCategory != "投票" ){
 			if( this.permission.manageAble || this.permission.editAble || this.data.creatorName == this.userName ){
 				action = new Element("div", {
 					"styles" : this.css.actionItem,
@@ -1686,7 +1686,7 @@ MWF.xApplication.ForumDocument.SubjectDocument = new Class({
 			this.app.loadAttachment(attachmentArea);
 		}
 
-		if( this.data.typeCategory == this.lp.vote ){
+		if( this.data.typeCategory == this.lp.vote || this.data.typeCategory == "投票" ){
 			var voteArea = itemNode.getElement("[item='vote']");
 			MWF.xDesktop.requireApp("ForumDocument", "Vote", function(){
 				this.vote = new MWF.xApplication.ForumDocument.Vote(voteArea, this.app, {

o2web/source/x_component_ForumDocument/Mobile.js

@@ -45,7 +45,7 @@ MWF.xApplication.ForumDocument.Mobile = new Class({
             "styles" : this.css.subjectConainer
         }).inject( this.middleNode );
 
-        if( this.data.typeCategory == this.lp.question ){
+        if( this.data.typeCategory == this.lp.question || this.data.typeCategory == "问题" ){
             this.satisfiedReplyViewConainer = new Element("div.satisfiedReplyViewConainer",{
                 "styles" : this.css.replyViewConainer
             }).inject( this.middleNode );
@@ -58,7 +58,7 @@ MWF.xApplication.ForumDocument.Mobile = new Class({
         //this.createPagingBar();
 
         this.createSubject();
-        if( this.data.typeCategory == this.lp.question ) {
+        if( this.data.typeCategory == this.lp.question || this.data.typeCategory == "问题" ) {
             if( this.data.acceptReplyId ){
                 this.createSatisfiedReplyView();
             }
@@ -209,7 +209,7 @@ MWF.xApplication.ForumDocument.Mobile.SubjectDocument = new Class({
             });
         }.bind(this));
 
-        if( this.data.typeCategory == this.lp.vote ){
+        if( this.data.typeCategory == this.lp.vote || this.data.typeCategory == "投票" ){
             var voteArea = itemNode.getElement("[item='vote']");
             MWF.xDesktop.requireApp("ForumDocument", "Vote", function(){
                 this.vote = new MWF.xApplication.ForumDocument.Vote(voteArea, this.app, {

o2web/source/x_component_ForumDocument/Vote.js

@@ -458,10 +458,10 @@ MWF.xApplication.ForumDocument.Vote = new Class({
     loadContent_edit : function(){
         var html = "<table width='100%' bordr='0' cellpadding='5' cellspacing='0' style='margin-top:15px;'>" +
             "<tr>" +
-            "   <td styles='formTableTitleRight'  lable='voteLimitTime' width='7%'></td>" +
+            "   <td styles='formTableTitleRight'  lable='voteLimitTime' width='13%'></td>" +
             "   <td styles='formTableValue' item='voteLimitTime' width='20%'></td>" +
             "   <td styles='formTableTitleRight' lable='voteResultVisible' width='16%'></td>" +
-            "   <td styles='formTableValue' item='voteResultVisible' width='20%'></td>" +
+            "   <td styles='formTableValue' item='voteResultVisible' width='14%'></td>" +
             "   <td styles='formTableTitleRight' lable='votePersonVisible' width='16%'></td>" +
             "   <td styles='formTableValue' item='votePersonVisible' width='20%'></td>" +
             "</tr>"+

o2web/source/x_component_ForumDocument/lp/en.js

+MWF.xApplication.ForumDocument.LP = {
+	"title": "Forum Post"
+};
\ No newline at end of file

o2web/source/x_component_ForumPerson/$Main/default/listItem.json

@@ -170,13 +170,13 @@
             //"access": "admin",
             "title": "edit",
             "action": "edit",
-            "condition": "function( d ){ return d.typeCategory!='投票' && this.isAdmin() || (d.creatorName == this.app.userName) }",
+            "condition": "function( d ){ return (d.typeCategory!='投票' && d.typeCategory!=this.app.lp.vote) && this.isAdmin() || (d.creatorName == this.app.userName) }",
             "styles": "actionEditNode",
             "mouseoverStyles": "actionEditNode_over",
             "mousedownStyles": "actionEditNode_over"
           },
           "placeholder" : {
-            "show": "function( d ){ return !(d.typeCategory!='投票' && (this.isAdmin() || (d.creatorName == this.app.userName))) }"
+            "show": "function( d ){ return !((d.typeCategory!='投票' && d.typeCategory!=this.app.lp.vote) && (this.isAdmin() || (d.creatorName == this.app.userName))) }"
           },
           "remove": {
             "title": "remove",

o2web/source/x_component_ForumPerson/lp/en.js

+MWF.xApplication.ForumPerson.LP = {
+	"title": "Forum Personal Center"
+};
\ No newline at end of file

o2web/source/x_component_ForumSearch/$Main/default/listItem.json

@@ -153,13 +153,13 @@
             //"access": "admin",
             "title": "edit",
             "action": "edit",
-            "condition": "function( d ){ return d.typeCategory!='投票' && (this.isAdmin() || (d.creatorName == this.app.userName)) }",
+            "condition": "function( d ){ return (d.typeCategory!='投票' && d.typeCategory!=this.app.lp.vote) && (this.isAdmin() || (d.creatorName == this.app.userName)) }",
             "styles": "actionEditNode",
             "mouseoverStyles": "actionEditNode_over",
             "mousedownStyles": "actionEditNode_over"
           },
           "placeholder" : {
-            "show": "function( d ){ return !(d.typeCategory!='投票' && (this.isAdmin() || (d.creatorName == this.app.userName))) }"
+            "show": "function( d ){ return !((d.typeCategory!='投票' && d.typeCategory!=this.app.lp.vote) && (this.isAdmin() || (d.creatorName == this.app.userName))) }"
           },
           "remove": {
             "title": "remove",

o2web/source/x_component_ForumSearch/lp/en.js

+MWF.xApplication.ForumSearch = MWF.xApplication.ForumSearch || {};
+MWF.xApplication.ForumSearch.LP = {
+	"title": "论坛搜索"
+};
\ No newline at end of file

o2web/source/x_component_ForumSearch/lp/zh-cn.js

 MWF.xApplication.ForumSearch = MWF.xApplication.ForumSearch || {};
 MWF.xApplication.ForumSearch.LP = {
-	"title": "论坛搜索"
+	"title": "Forum Search"
 };
\ No newline at end of file

o2web/source/x_component_ForumSection/$Main/default/listItem.json

@@ -123,13 +123,13 @@
             "title": "edit",
             //"text": "edit",
             "action": "edit",
-            "condition": "function( d ){ return d.typeCategory!='投票' && (this.app.isAdmin || (d.creatorName == this.app.userName)) }",
+            "condition": "function( d ){ return (d.typeCategory!='投票' && d.typeCategory!=this.app.lp.vote) && (this.app.isAdmin || (d.creatorName == this.app.userName)) }",
             "styles": "actionEditNode",
             "mouseoverStyles": "actionEditNode_over",
             "mousedownStyles": "actionEditNode_over"
           },
           "placeholder" : {
-            "show": "function( d ){ return !(d.typeCategory!='投票' && (this.app.isAdmin || (d.creatorName == this.app.userName))) }"
+            "show": "function( d ){ return !((d.typeCategory!='投票' && d.typeCategory!=this.app.lp.vote) && (this.app.isAdmin || (d.creatorName == this.app.userName))) }"
           },
           "remove": {
             "title": "remove",

o2web/source/x_component_ForumSection/$Main/default/listItemPrime.json

@@ -123,13 +123,13 @@
             "title": "edit",
             //"text": "edit",
             "action": "edit",
-            "condition": "function( d ){ return d.typeCategory!='投票' && (this.app.isAdmin || (d.creatorName == this.app.userName)) }",
+            "condition": "function( d ){ return (d.typeCategory!='投票' && d.typeCategory!=this.app.lp.vote) && (this.app.isAdmin || (d.creatorName == this.app.userName)) }",
             "styles": "actionEditNode",
             "mouseoverStyles": "actionEditNode_over",
             "mousedownStyles": "actionEditNode_over"
           },
           "placeholder" : {
-            "show": "function( d ){ return !(d.typeCategory!='投票' && (this.app.isAdmin || (d.creatorName == this.app.userName))) }"
+            "show": "function( d ){ return !((d.typeCategory!='投票' && d.typeCategory!=this.app.lp.vote) && (this.app.isAdmin || (d.creatorName == this.app.userName))) }"
           },
           "remove": {
             "title": "remove",

o2web/source/x_component_ForumSection/lp/en.js

+MWF.xApplication.ForumSection.LP = {
+	"title": "Forum Section"
+};
\ No newline at end of file

o2web/source/x_component_ForumSection/lp/zh-cn.js

 MWF.xApplication.ForumSection.LP = {
-	"title": "版块"
+	"title": "论坛版块"
 };
\ No newline at end of file

o2web/source/x_component_HotArticle/$Main/default/listItem.json

@@ -13,7 +13,7 @@
       "name": "work",
       "content": {
         "html": "<div styles='documentItemNode'>"+
-        "<div styles='removeNode' item='remove' title='取消热点'></div>"+
+        "<div styles='removeNode' item='remove' title='"+MWF.xApplication.HotArticle.LP.cancelHotspot+"' ></div>"+
         " <div styles='documentItemIconNode'>"+
         "   <img styles='documentItemIcon' item='icon'>"+
         " </div>"+
@@ -21,7 +21,7 @@
         "   <div item='title' styles='documentItemText'>"+
         " </div>"+
         " <div styles='documentItemInforNode'>"+
-        "   <div style='float:left'>来自</div><div item='from' style='float:left'></div> <div item='createTime' style='float:right;margin-right:20px'></div>"+
+        "   <div style='float:left'>"+MWF.xApplication.HotArticle.LP.from+"&nbsp;&nbsp;</div><div item='from' style='float:left'></div> <div item='createTime' style='float:right;margin-right:20px'></div>"+
         " </div>"+
         "</div>",
         "items": {
@@ -31,7 +31,7 @@
           },
           "createTime" : {},
           "from" : {
-            "value" : "function(d){ return (d.application == 'CMS' ?  '内容管理' : '论坛') }"
+            "value" : "function(d){ return (d.application == 'CMS' ?  MWF.xApplication.HotArticle.LP.CMS : MWF.xApplication.HotArticle.LP.forum ) }"
           },
           "title" : {
             "value" : "function(d){ return d.title }",

o2web/source/x_component_HotArticle/lp/en.js

+MWF.xApplication.HotArticle.LP = {
+	"title": "Hot Information",
+	"delete": "Delete",
+	"deleteDocumentTitle": "Cancel Confirmation",
+	"deleteDocument": "Are you sure you want to cancel this hot information?",
+	"deleteDocumentOK": "Successfully canceled hotspot",
+
+	"cancel": "Cancel",
+	"close": "Close",
+	"ok": "OK",
+	"edit": "Edit",
+	"remove": "Remove",
+	"action": "Action",
+
+	"yesterday": "Yesterday",
+	"twoDaysAgo": "The day before yesterday",
+	"weekAgo": " Week Ago",
+	"dayAgo": " Day Ago",
+	"hourAgo": " Hours ago",
+	"minuteAgo": " minutes ago",
+	"justNow": "justNow",
+	"publishJustNow": "Just published",
+
+	"cancelHotspot": "Cancel Hotspot",
+	"from": "From",
+	"CMS": "Content Management",
+	"forum": "Forum"
+};
\ No newline at end of file

o2web/source/x_component_HotArticle/lp/zh-cn.js

@@ -19,5 +19,10 @@ MWF.xApplication.HotArticle.LP = {
 	"hourAgo" : "小时前",
 	"minuteAgo" : "分钟前",
 	"justNow" : "刚才",
-	"publishJustNow": "刚刚发表"
+	"publishJustNow": "刚刚发表",
+
+	"cancelHotspot": "取消热点",
+	"from": "来自",
+	"CMS": "内容管理",
+	"forum": "论坛"
 };
\ No newline at end of file

o2web/source/x_component_Selector/lp/en.js

@@ -6,19 +6,28 @@ MWF.xApplication.Selector.LP = MWF.SelectorLP = {
     "selectIdentity": "Select Identity",
     "selectUnit": "Select Unit",
     "selectGroup": "Select Group",
+    "selectRole": "Select Role",
     "selectDuty": "Select Duty",
     "selectField": "Select Field",
-    "selectAppliction": "Select Process Appliction",
+    "selectFile": "Select Resource File",
+    "selectAppliction": "Select Process Application",
     "selectProcess": "Select Process",
     "selectView": "Select View",
     "selectStatement": "Select Statement",
+    "selectTable": "Select Data Table",
+    "selectList": "Select List",
+    "selectFormStyle": "Select Form Style",
     "selectCMSApplication": "Select CMS Application",
     "selectCMSCategory": "Select CMS Category",
+    "noSelectableItemText": "No option to be selected",
+    "selectScript": "Select Script",
+    "selectDictionary": "Select Data Dictionary",
+
     "searchDescription" : "search",
 
-    "waitingSelect" : "Waiting Select",
+    "waitingSelect": "To be selected",
     "selected" : "Selected",
-    "empty" : "<Empty",
+    "empty" : "Empty",
 
     "identity" : "Identity",
     "person" : "Person",
@@ -31,6 +40,8 @@ MWF.xApplication.Selector.LP = MWF.SelectorLP = {
     "role" : "Role",
     "group" : "Group",
     "unit" : "Unit",
+    "systemList": "System List",
+
     "appType" : {
         "process": "Process",
         "cms": "CMS",
@@ -40,5 +51,20 @@ MWF.xApplication.Selector.LP = MWF.SelectorLP = {
     "cancel": "Cancel",
     "back": "Back",
     "ok": "Ok",
-    "noPerson": "User “{name}” not exist"
+    "noPerson": "User “{name}” not exist",
+
+    "processPlatform": "Process Platform",
+    "cms": "Content Management",
+    "portal": "Portal Management",
+    "query": "Data Center",
+    "service": "Service Management",
+
+    "systemStyle": "System Style",
+    "customStyle": "Custom Style (Script)",
+    "selectAll": "Select All",
+    "selectChildren": "Select all children",
+    "selectItemMaxText": "Select at most {count} options",
+    "service1": "Service",
+    "agent": "Agent"
 };
+MWF.xApplication.Selector["lp."+o2.language] = MWF.xApplication.Selector.LP;

o2web/source/x_component_Template/MDomItem.js

@@ -2601,6 +2601,7 @@ MDomItem.Rtf = new Class({
                 //"height": "200",
                 //"width": "",
                 "readOnly": false,
+                "language": MWF.language || "zh-cn",
                 "extraAllowedContent " : "img[onerror,data-id]"
             };
             if( this.options.RTFConfig ){

o2web/source/x_component_Template/lp/en.js

+MWF.xApplication.Template.LP = {
+	"title": "Template",
+	"delete": "Delete",
+	"deleteDocumentTitle": "Delete Confirmation",
+	"deleteDocument": "Are you sure you want to delete this information?",
+	"deleteDocumentOK": "Delete successfully",
+	"createSuccess": "Created successfully",
+	"updateSuccess": "Update successful",
+	"inputName": "Please enter a name",
+
+	"dateFormatMonth": "%Y-%m",
+	"dateFormatOnlyMonth": "%m",
+	"dateFormatDay": "%Y-%m-%d",
+	"dateFormatMonthDayLocal": "%m-%d",
+	"dateFormat": "db",
+
+	"month": "month",
+	"today": "Today",
+	"day": "day",
+
+	"cancel": "Cancel",
+	"ok": "OK",
+
+	"name": "Name",
+	"create_cancel_title": "Cancel New Confirmation",
+	"create_cancel": "Are you sure you want to cancel the new creation?",
+
+	"index": {
+
+	},
+
+	"explorer": {
+		"returnText": "Return to home page",
+		"pageJumperText": "Enter the page number and press enter to jump",
+		"prePage": "Previous Page",
+		"nextPage": "Next Page"
+	},
+
+	"MDomItem": {
+		"emptyTip": "{text} cannot be empty",
+		"emailTip":"Please enter an email in the correct format",
+		"urlTip":"Please enter a valid URL",
+		"phoneNumberTip" :"Please enter the correct phone number",
+		"dateTip":"Please enter a valid date",
+		"dateISOTip":"Please enter a valid date.",
+		"numberTip":"Please enter a valid number",
+		"digitsTip":"Only integers can be entered",
+		"maxlengthTip":"The length cannot exceed {n}",
+		"minlengthTip":"The length cannot be less than {n}",
+		"rangelengthTip":"The length cannot be between {n0} and {n1}",
+		"rangeTip":"Please enter a value between {n0} and {n1}",
+		"minTip":"Please enter a minimum value of {n}",
+		"maxTip":"Please enter a value up to {n}",
+		"extensionTip":"Please upload an attachment in {text} format",
+		"defaultTip" :"Please enter the correct {text}",
+		"selectTip": "Please select {text} first",
+		"defaultOption": "Please choose",
+		"setPicture": "Set Picture",
+		"uploadPictureNotice": "Please upload a picture first",
+		"selectCoundPicture": "Select Cloud File Picture"
+	},
+
+	"MGrid": {
+		"sequence": "Sequence Number",
+		"add": "Add",
+		"delete": "Delete",
+		"addMaxLimitText": "You can only add up to {count} items"
+	},
+
+	"MPopupForm": {
+		"close": "Close",
+		"max": "Maximize",
+		"restore": "Restore"
+	}
+};
\ No newline at end of file

o2web/source/x_component_cms_Column/lp/en.js

@@ -15,6 +15,7 @@ MWF.xApplication.cms.Column.LP = {
     "close": "Close",
     "cancel": "Cancel",
     "export_ok": "OK",
+    "allApp": "All apps",
     "column": {
         "title" :"AppInfo Management",
         "create": "New App",
@@ -33,7 +34,7 @@ MWF.xApplication.cms.Column.LP = {
         "inputName":"Please enter the AppInfo name",
         "create_cancel_title": "Cancel Confirmation of New App",
         "create_cancel": "Are you sure you want to cancel the new App?",
-        "noDescription": "There is no description in this AppInfo",
+        "noDescription": "No description",
         "delete": "Delete AppInfo",
         "delete_confirm_title": "Delete AppInfo",
         "delete_confirm_content": "Are you sure you want to delete the AppInfo?",

o2web/source/x_component_cms_Column/lp/zh-cn.js

@@ -15,6 +15,7 @@ MWF.xApplication.cms.Column.LP = {
 	"close" : "关闭",
 	"cancel" : "取消",
 	"export_ok" : "确定",
+	"allApp": "全部栏目",
 	"column" : {
 		"title" :"栏目管理",
 		"create" : "新建栏目",

o2web/source/x_component_cms_ColumnManager/$CategoryExplorer/process.json

-{
-	"name": "新建流程",
-	"alias": "",
-	"description": "",
-	"processCategory": "",
-	"id": "",
-	"autoList": [],
-	"begin": {
-		"id": "a14f0970-a70f-4c4e-a092-634814772330",
-		"createTime": "2014-01-20 14:29:52",
-		"updateTime": "2014-01-20 14:29:52",
-		"position": "200,60",
-		"name": "begin",
-		"description": "",
-		"alias": "",
-		"process": "",
-		"route": "b184a187-13e1-431c-81d5-1cccadb4c85d",
-		"queryReceiveScriptIdList": [],
-		"postReceiveScriptIdList": [],
-		"queryProcessScriptIdList": [],
-		"postProcessScriptIdList": [],
-		"queryRerouteScriptIdList": [],
-		"postRerouteScriptIdList": [],
-		"queryRerouteToScriptIdList": [],
-		"postRerouteToScriptIdList": [],
-		"type": "begin"
-	},
-	"conditionList": [],
-	"embedList": [],
-	"endList": [
-		{
-			"id": "ea30593c-2170-4a09-91aa-69bef6d6b715",
-			"createTime": "2014-01-20 14:29:52",
-			"updateTime": "2014-01-20 14:29:52",
-			"position": "200,330",
-			"name": "end",
-			"description": "",
-			"alias": "",
-			"process": "",
-			"queryReceiveScriptIdList": [],
-			"postReceiveScriptIdList": [],
-			"queryRerouteScriptIdList": [],
-			"postRerouteScriptIdList": [],
-			"queryRerouteToScriptIdList": [],
-			"postRerouteToScriptIdList": [],
-			"type": "end"
-		}
-	],
-	"invokeList": [],
-	"manualList": [],
-	"mergeList": [],
-	"routeList": [
-		{
-			"id": "b184a187-13e1-431c-81d5-1cccadb4c85d",
-			"createTime": "2014-01-20 14:29:52",
-			"updateTime": "2014-01-20 14:24:09",
-			"process": "",
-			"activityType": "end",
-			"activity": "ea30593c-2170-4a09-91aa-69bef6d6b715",
-			"name": "开始",
-			"alias": "",
-			"description": "",
-			"track": "",
-			"routeScriptIdList": [
-
-			],
-			"position": ""
-		}
-	],
-	"splitList": [],
-	"cancelList": [],
-	
-	"scriptList": [],
-	
-	"manageIdentityList": [],
-	"manageDepartmentList": [],
-	"manageScriptList": [],
-	
-	"availableMode": "assign",
-	"availableIdentityList": [],
-	"availableDepartmentList": [],
-	"availableCompanyList": [],
-	
-	"reviewIdentityList": [],
-	"reviewDepartmentList": [],
-	"reviewScriptList": [],
-	
-	"beforeBeginScriptList": [],
-	"afterBeginScriptList": [],
-	"beforeEndScriptIdList": [],
-	"afterEndScriptIdList": [],
-	"categoryName": ""
-}
\ No newline at end of file

o2web/source/x_component_cms_ColumnManager/$Explorer/process.json

-{
-	"name": "新建流程",
-	"alias": "",
-	"description": "",
-	"processCategory": "",
-	"id": "",
-	"autoList": [],
-	"begin": {
-		"id": "a14f0970-a70f-4c4e-a092-634814772330",
-		"createTime": "2014-01-20 14:29:52",
-		"updateTime": "2014-01-20 14:29:52",
-		"position": "200,60",
-		"name": "begin",
-		"description": "",
-		"alias": "",
-		"process": "",
-		"route": "b184a187-13e1-431c-81d5-1cccadb4c85d",
-		"queryReceiveScriptIdList": [],
-		"postReceiveScriptIdList": [],
-		"queryProcessScriptIdList": [],
-		"postProcessScriptIdList": [],
-		"queryRerouteScriptIdList": [],
-		"postRerouteScriptIdList": [],
-		"queryRerouteToScriptIdList": [],
-		"postRerouteToScriptIdList": [],
-		"type": "begin"
-	},
-	"conditionList": [],
-	"embedList": [],
-	"endList": [
-		{
-			"id": "ea30593c-2170-4a09-91aa-69bef6d6b715",
-			"createTime": "2014-01-20 14:29:52",
-			"updateTime": "2014-01-20 14:29:52",
-			"position": "200,330",
-			"name": "end",
-			"description": "",
-			"alias": "",
-			"process": "",
-			"queryReceiveScriptIdList": [],
-			"postReceiveScriptIdList": [],
-			"queryRerouteScriptIdList": [],
-			"postRerouteScriptIdList": [],
-			"queryRerouteToScriptIdList": [],
-			"postRerouteToScriptIdList": [],
-			"type": "end"
-		}
-	],
-	"invokeList": [],
-	"manualList": [],
-	"mergeList": [],
-	"routeList": [
-		{
-			"id": "b184a187-13e1-431c-81d5-1cccadb4c85d",
-			"createTime": "2014-01-20 14:29:52",
-			"updateTime": "2014-01-20 14:24:09",
-			"process": "",
-			"activityType": "end",
-			"activity": "ea30593c-2170-4a09-91aa-69bef6d6b715",
-			"name": "开始",
-			"alias": "",
-			"description": "",
-			"track": "",
-			"routeScriptIdList": [
-
-			],
-			"position": ""
-		}
-	],
-	"splitList": [],
-	"cancelList": [],
-	
-	"scriptList": [],
-	
-	"manageIdentityList": [],
-	"manageDepartmentList": [],
-	"manageScriptList": [],
-	
-	"availableMode": "assign",
-	"availableIdentityList": [],
-	"availableDepartmentList": [],
-	"availableCompanyList": [],
-	
-	"reviewIdentityList": [],
-	"reviewDepartmentList": [],
-	"reviewScriptList": [],
-	
-	"beforeBeginScriptList": [],
-	"afterBeginScriptList": [],
-	"beforeEndScriptIdList": [],
-	"afterEndScriptIdList": [],
-	"categoryName": ""
-}
\ No newline at end of file

o2web/source/x_component_cms_ColumnManager/$Main/defaultToolbars.html

-<div id="MWFProcessToolbar">
-	<span MWFnodetype="MWFToolBarSeparator"></span>
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="save.gif" title="保存流程" MWFButtonAction="saveProcess" MWFButtonText=""></span>
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="saveNew.gif" title="保存为新流程" MWFButtonAction="saveNewProcess" MWFButtonText=""></span>
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="processProperty.gif" title="流程属性" MWFButtonAction="editProcess" MWFButtonText=""></span>
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="print.gif" title="打印流程" MWFButtonAction="printProcess" MWFButtonText=""></span>
-	
-	<span MWFnodetype="MWFToolBarSeparator"></span>
-	
-	<!-- <span MWFnodetype="MWFToolBarButton" MWFButtonImage="newActivity.gif" title="新建活动" MWFButtonAction="createActivity" MWFButtonText=""></span> -->
-	<span MWFnodetype="MWFToolBarMenu" MWFButtonImage="newActivity.gif" title="新建活动" MWFButtonAction="" MWFButtonText="">
-		<span MWFnodetype="MWFToolBarMenuItem" MWFButtonImage="manual.gif" title="新建人工活动" MWFButtonAction="createManualActivity" MWFButtonText="人工活动"></span>
-		<span MWFnodetype="MWFToolBarMenuItem" MWFButtonImage="condition.gif" title="新建条件活动" MWFButtonAction="createConditionActivity" MWFButtonText="条件活动"></span>
-		<span MWFnodetype="MWFToolBarMenuItem" MWFButtonImage="auto.gif" title="新建自动活动" MWFButtonAction="createAutoActivity" MWFButtonText="自动活动"></span>
-		<span MWFnodetype="MWFToolBarMenuItem" MWFButtonImage="split.gif" title="新建拆分活动" MWFButtonAction="createSplitActivity" MWFButtonText="拆分活动"></span>
-		<span MWFnodetype="MWFToolBarMenuItem" MWFButtonImage="merge.gif" title="新建合并活动" MWFButtonAction="createMergeActivity" MWFButtonText="合并活动"></span>
-		<span MWFnodetype="MWFToolBarMenuItem" MWFButtonImage="embed.gif" title="新建子流程活动" MWFButtonAction="createEmbedActivity" MWFButtonText="子流程活动"></span>
-		<span MWFnodetype="MWFToolBarMenuItem" MWFButtonImage="invoke.gif" title="新建WS调用活动" MWFButtonAction="createInvokesActivity" MWFButtonText="调用活动"></span>
-		<span MWFnodetype="MWFToolBarMenuItem" MWFButtonImage="begin.gif" title="新建开始活动" MWFButtonAction="createBeginActivity" MWFButtonText="开始活动"></span>
-		<span MWFnodetype="MWFToolBarMenuItem" MWFButtonImage="end.gif" title="新建结束活动" MWFButtonAction="createEndActivity" MWFButtonText="结束活动"></span>
-	</span>
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="editActivity.gif" title="编辑活动" MWFButtonAction="editActivity" MWFButtonText="" MWFButtonDisable="true"></span>
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="deleteActivity.gif" title="删除活动" MWFButtonAction="deleteActivity" MWFButtonText="" MWFButtonDisable="true"></span>
-	
-	<span MWFnodetype="MWFToolBarSeparator"></span>
-	
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="newRouter.gif" title="新建路由" MWFButtonAction="createRoute" MWFButtonText=""></span>
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="editRouter.gif" title="编辑路由" MWFButtonAction="editRoute" MWFButtonText="" MWFButtonDisable="true"></span>
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="deleteRouter.gif" title="删除路由" MWFButtonAction="deleteRoute" MWFButtonText="" MWFButtonDisable="true"></span>
-	
-	<span MWFnodetype="MWFToolBarSeparator"></span>
-	
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="checkProcess.gif" title="流程检查" MWFButtonAction="checkProcess" MWFButtonText=""></span>
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="processExplode.gif" title="流程导出" MWFButtonAction="processExplode" MWFButtonText=""></span>
-	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="processImplode.gif" title="流程导入" MWFButtonAction="processImplode" MWFButtonText=""></span>
-	
-	样式：<select onchange="changeStyle(this)">
-		<option value="default">default</option>
-		<option value="style1">style1</option>
-		<option value="flat">flat</option>
-	</select>
-</div>
\ No newline at end of file

o2web/source/x_component_cms_ColumnManager/$Main/startMenu.json

 [
   {
-    "title": "分类配置",
+    "title": MWF.xApplication.cms.ColumnManager.LP.categorySetting,
     "id": "categoryConfig",
     "action": "cagetoryConfig",
     "icon": "icon_fen_lei.png",
@@ -12,7 +12,7 @@
     "sub": []
   },
   {
-    "title": "表单配置",
+    "title": MWF.xApplication.cms.ColumnManager.LP.formSetting,
     "id": "formConfig",
     "action": "formConfig",
     "icon": "icon_biao_dan_pei_zhi.png",
@@ -23,7 +23,7 @@
     "sub": []
   },
   {
-    "title": "列表配置",
+    "title": MWF.xApplication.cms.ColumnManager.LP.listSetting,
     "id": "viewConfig",
     "action": "viewConfig",
     "icon": "icon_lie_biao.png",
@@ -45,7 +45,7 @@
 //    "sub": []
 //  },
   {
-    "title": "数据配置",
+    "title": MWF.xApplication.cms.ColumnManager.LP.dataSetting,
     "id": "dataConfig",
     "action": "dataConfig",
     "icon": "icon_shu_ju_shi_tu.png",
@@ -56,7 +56,7 @@
     "sub": []
   },
   {
-    "title": "脚本配置",
+    "title": MWF.xApplication.cms.ColumnManager.LP.scriptSetting,
     "id": "scriptConfig",
     "action": "scriptConfig",
     "icon": "icon_jiao_ben.png",
@@ -67,7 +67,7 @@
     "sub": []
   },
   {
-    "title": "资源文件",
+    "title": MWF.xApplication.cms.ColumnManager.LP.resourceFile,
     "id": "fileConfig",
     "action": "fileConfig",
     "icon": "icon_jiao_ben.png",
@@ -78,7 +78,7 @@
     "sub": []
   },
   {
-    "title": "栏目属性",
+    "title": MWF.xApplication.cms.ColumnManager.LP.appProperty,
     "id": "applicationProperty",
     "action": "applicationProperty",
     "icon": "icon_lan_mu.png",
@@ -87,7 +87,7 @@
     "sub": []
   },
   {
-    "title": "查找设计",
+    "title": MWF.xApplication.cms.ColumnManager.LP.findDesign,
     "id": "findDesigner",
     "action": "findDesigner",
     "icon": "icons_find.png",

o2web/source/x_component_cms_ColumnManager/lp/en.js

@@ -254,14 +254,17 @@ MWF.xApplication.cms.ColumnManager.LP = {
     "viewName": "View Name",
     "column": "AppInfo",
 
+    "categorySetting": "Category Configuration",
     "formSetting": "Form Configuration",
     "dataSetting": "Data Configuration",
-    "scriptSetting": "Script Design",
+    "scriptSetting": "Script Editing",
     "listSetting": "List Configuration",
     "queryViewSetting": "dataView Configuration",
     "attachmentSetting": "Attachment Setting",
+    "resourceFile": "Resource File",
+    "findDesign": "Search Code",
     "new": "New",
-    "appProperty": "appInfo Property",
+    "appProperty": "App Property",
     "changeIcon": "Change Icon",
     "ignoreTitleSelectText": ["Do not fill in the title of the new interface", "The title of the new interface needs to be filled in"],
     "checkDraftSelectText": ["New interface check draft","New interface does not check draft"],

o2web/source/x_component_cms_ColumnManager/lp/zh-cn.js

@@ -254,13 +254,15 @@ MWF.xApplication.cms.ColumnManager.LP = {
     "dataView": "数据视图",
     "viewName": "视图名称",
     "column": "栏目",
-
+    "categorySetting": "分类配置",
     "formSetting": "表单配置",
     "dataSetting": "数据配置",
     "scriptSetting": "脚本配置",
     "listSetting": "列表配置",
     "queryViewSetting": "数据视图配置",
     "attachmentSetting": "附件配置",
+    "resourceFile": "资源文件",
+    "findDesign": "查找设计",
     "new": "新建",
     "appProperty": "栏目属性",
     "changeIcon": "更改图标",

o2web/source/x_component_cms_DictionaryDesigner/$Main/default/tools.json

-{
-  "label": {
-    "icon": "label.png",
-    "text": "文本",
-    "className": "Label"
-  },
-  "textfield": {
-    "icon": "textfield.png",
-    "text": "域",
-    "className": "Textfield"
-  },
-  "personfield": {
-    "icon": "personfield.png",
-    "text": "人员",
-    "className": "Personfield"
-  },
-  "calendar": {
-    "icon": "calendar.png",
-    "text": "日期选择",
-    "className": "Calendar"
-  },
-  "textarea": {
-    "icon": "textarea.png",
-    "text": "多行文本",
-    "className": "Textarea"
-  },
-  "select": {
-    "icon": "select.png",
-    "text": "下拉框",
-    "className": "Select"
-  },
-  "radio": {
-    "icon": "radio.png",
-    "text": "单选框",
-    "className": "Radio"
-  },
-  "checkbox": {
-    "icon": "checkbox.png",
-    "text": "多选框",
-    "className": "Checkbox"
-  },
-  "button": {
-    "icon": "button.png",
-    "text": "按钮",
-    "className": "Button"
-  },
-
-  "Actionbar": {
-    "icon": "actionbar.png",
-    "text": "操作条",
-    "className": "Actionbar"
-  },
-
-  "image": {
-    "icon": "image.png",
-    "text": "图片",
-    "className": "Image"
-  },
-  "image": {
-    "icon": "attachment.png",
-    "text": "附件",
-    "className": "Attachment"
-  },
-  "div": {
-    "icon": "div.png",
-    "text": "容器",
-    "className": "Div"
-  },
-  "table": {
-    "icon": "table.png",
-    "text": "表格",
-    "className": "Table"
-  },
-  "datagrid": {
-    "icon": "datagrid.png",
-    "text": "数据网格",
-    "className": "Datagrid"
-  },
-  "html": {
-    "icon": "html.png",
-    "text": "HTML",
-    "className": "Html"
-  },
-
-  "tab": {
-    "icon": "tabs.png",
-    "text": "分页",
-    "className": "Tab"
-  },
-  "tree": {
-    "icon": "tree.png",
-    "text": "树",
-    "className": "Tree"
-  },
-  "log": {
-    "icon": "log.png",
-    "text": "流程记录",
-    "className": "Log"
-  },
-  "monitor": {
-    "icon": "monitor.png",
-    "text": "流程监控",
-    "className": "Monitor"
-  },
-  "iframe": {
-    "icon": "iframe.png",
-    "text": "Iframe",
-    "className": "Iframe"
-  },
-  "htmledit": {
-    "icon": "htmleditor.png",
-    "text": "HTML编辑器",
-    "className": "Htmleditor"
-  },
-  "office": {
-    "icon": "office.png",
-    "text": "Office控件",
-    "className": "Office"
-  }
-}
\ No newline at end of file

o2web/source/x_component_cms_Document/$Main/reset.html

-<div style="padding: 0px 30px; font-size:14px;">
-    <div style="height: 180px; margin-bottom:10px;overflow-y:auto;">
-        <div style="line-height: 30px; margin-bottom:10px; overflow: hidden">
-            <div style="float: left; width: 70px">重置给：</div>
-            <div style="margin-left: 70px">
-                <div id="resetWork_selPeopleButton" style="font-size:12px; border-radius: 5px; height: 22px; line-height:22px; float:right; margin-top:4px; border:1px solid #666; color: #FFF; background-color: #666; box-shadow: 1px 1px 3px #999; cursor: pointer; padding: 0px 10px;">选择人员</div>
-                <div id="resetWork_selPeopleArea" style="margin-right: 70px; height: 30px"></div>
-            </div>
-        </div>
-        <div style="height: 50px; line-height: 30px; margin-bottom:10px;">
-            <div style="float: left; width: 70px; height: 50px; line-height: 50px;">重置意见：</div>
-            <div style="margin-left: 70px"><textarea id="resetWork_opinion" style="width: 98%; overflow:auto; height: 50px;" type="text" id="resetWork_opinion"></textarea></div>
-        </div>
-    </div>
-
-    <div style="height: 40px; line-height: 30px; margin:0px">
-        <div id="resetWork_cancelButton" style="border-radius: 5px; float: right; margin-left: 10px; border: 1px solid #666; color: #666; height: 24px; line-height: 24px; width:80px; text-align:center; box-shadow: 1px 1px 3px #999; cursor: pointer;">取消</div>
-        <div id="resetWork_okButton" style="border-radius: 5px; float: right; margin-left: 10px; border: 1px solid #666; color: #FFF; background-color: #4c6b87; height: 24px; line-height: 24px; width:120px; text-align:center; box-shadow: 1px 1px 3px #999; cursor: pointer;">确定</div>
-    </div>
-</div>
\ No newline at end of file

o2web/source/x_component_cms_Module/$ListExplorer/filterItem.json

 {
   "key" : {
-    "categoryTitle": "标题",
+    "categoryTitle": MWF.xApplication.cms.Module.LP.subject,
     "itemNameKey": "key",
     "itemValueKey": "key",
     "resultListKey" : "titleList",
     "resultItemName": "title"
   },
   "appfileter_list":{
-    "categoryTitle": "栏目",
+    "categoryTitle": MWF.xApplication.cms.Module.LP.appName,
     "itemNameKey": "appName",
     "itemValueKey": "id",
     "resultListKey" : "appIdList",
     "resultItemName": "appId"
   },
   "categoryfileter_list":{
-    "categoryTitle": "分类",
+    "categoryTitle": MWF.xApplication.cms.Module.LP.category,
     "itemNameKey": "categoryName",
     "itemValueKey": "categoryId",
     "resultListKey" : "categoryIdList",
     "resultItemName": "categoryId"
   },
   "companyfileter_list":{
-    "categoryTitle": "创建公司",
+    "categoryTitle": MWF.xApplication.cms.Module.LP.creatorCompany,
     "itemNameKey": "companyName",
     "itemValueKey": "companyName",
     "resultListKey" : "createCompanyNameList",
     "resultItemName": "companyName"
   },
   "departmentfileter_list":{
-    "categoryTitle": "创建部门",
+    "categoryTitle": MWF.xApplication.cms.Module.LP.creatorDepartment,
     "itemNameKey": "departmentName",
     "itemValueKey": "departmentName",
     "resultListKey" : "createDepartmentNameList",

o2web/source/x_component_cms_Module/$ListExplorer/listItem.json

 [
   {
-    "title" : "标题",
+    "title" : MWF.xApplication.cms.Module.LP.subject,
     "headStyles" : "titleAreaHeadNode",
     "contentStyles" : "titleAreaContentNode",
     "item" : "title",
@@ -9,7 +9,7 @@
     "width" : "42%"
   },
   {
-    "title" : "创建人",
+    "title" : MWF.xApplication.cms.Module.LP.creatorCompany,
     "headStyles" : "personAreaHeadNode",
     "contentStyles" : "personAreaContentNode",
     "item" : "creatorPersonShort",
@@ -18,7 +18,7 @@
     "width" : "13%"
   },
   {
-    "title" : "创建部门",
+    "title" : MWF.xApplication.cms.Module.LP.creatorDepartment,
     "headStyles" : "departmentAreaHeadNode",
     "contentStyles" : "departmentAreaContentNode",
     "item" : "creatorUnitNameShort",
@@ -27,7 +27,7 @@
     "width" : "13%"
   },
   {
-    "title" : "发布时间",
+    "title" : MWF.xApplication.cms.Module.LP.publishTime,
     "headStyles" : "timeAreaHeadNode",
     "contentStyles" : "timeAreaContentNode",
     "item" : "publishTime",
@@ -37,7 +37,7 @@
   },
   {
     "access" : "admin",
-    "title" : "操作",
+    "title" : MWF.xApplication.cms.Module.LP.action,
     "headStyles" : "actionAreaHeadNode",
     "contentStyles" : "actionAreaContentNode",
     "item" : "action",

o2web/source/x_component_cms_Module/$ListExplorer/listItemForAll.json

 [
   {
-    "title" : "标题",
+    "title" : MWF.xApplication.cms.Module.LP.subject,
     "headStyles" : "titleAreaHeadNode",
     "contentStyles" : "titleAreaContentNode",
     "item" : "title",
@@ -9,7 +9,7 @@
     "width" : "29%"
   },
   {
-    "title" : "创建人",
+    "title" : MWF.xApplication.cms.Module.LP.creatorPerson,
     "headStyles" : "personAreaHeadNode",
     "contentStyles" : "personAreaContentNode",
     "item" : "creatorPersonShort",
@@ -18,7 +18,7 @@
     "width" : "13%"
   },
   {
-    "title" : "创建部门",
+    "title" : MWF.xApplication.cms.Module.LP.creatorDepartment,
     "headStyles" : "departmentAreaHeadNode",
     "contentStyles" : "departmentAreaContentNode",
     "item" : "creatorUnitNameShort",
@@ -27,7 +27,7 @@
     "width" : "13%"
   },
   {
-    "title" : "分类",
+    "title" : MWF.xApplication.cms.Module.LP.category,
     "headStyles" : "categoryAreaHeadNode",
     "contentStyles" : "categoryAreaContentNode",
     "item" : "categoryName",
@@ -36,7 +36,7 @@
     "width" : "13%"
   },
   {
-    "title" : "发布时间",
+    "title" : MWF.xApplication.cms.Module.LP.publishTime,
     "headStyles" : "timeAreaHeadNode",
     "contentStyles" : "timeAreaContentNode",
     "item" : "publishTime",
@@ -46,7 +46,7 @@
   },
   {
     "access" : "admin",
-    "title" : "操作",
+    "title" : MWF.xApplication.cms.Module.LP.action,
     "headStyles" : "actionAreaHeadNode",
     "contentStyles" : "actionAreaContentNode",
     "item" : "action",

o2web/source/x_component_cms_Module/$ViewExplorer/filterItem.json

 {
   "key" : {
-    "categoryTitle": "标题",
+    "categoryTitle": MWF.xApplication.cms.Module.LP.subject,
     "itemNameKey": "key",
     "itemValueKey": "key",
     "resultListKey" : "titleList",
     "resultItemName": "title"
   },
   "appfileter_list":{
-    "categoryTitle": "栏目",
+    "categoryTitle": MWF.xApplication.cms.Module.LP.appName,
     "itemNameKey": "appName",
     "itemValueKey": "id",
     "resultListKey" : "appIdList",
     "resultItemName": "appId"
   },
   "categoryfileter_list":{
-    "categoryTitle": "分类",
+    "categoryTitle": MWF.xApplication.cms.Module.LP.category,
     "itemNameKey": "categoryName",
     "itemValueKey": "categoryId",
     "resultListKey" : "categoryIdList",
     "resultItemName": "categoryId"
   },
   "companyfileter_list":{
-    "categoryTitle": "创建公司",
+    "categoryTitle": MWF.xApplication.cms.Module.LP.creatorCompany,
     "itemNameKey": "companyName",
     "itemValueKey": "companyName",
     "resultListKey" : "createCompanyNameList",
     "resultItemName": "companyName"
   },
   "departmentfileter_list":{
-    "categoryTitle": "创建部门",
+    "categoryTitle": MWF.xApplication.cms.Module.LP.creatorDepartment,
     "itemNameKey": "departmentName",
     "itemValueKey": "departmentName",
     "resultListKey" : "createDepartmentNameList",

o2web/source/x_component_cms_Module/$ViewExplorer/listItem.json

 [
   {
-    "title" : "标题",
+    "title" : MWF.xApplication.cms.Module.LP.subject,
     "headStyles" : "titleAreaHeadNode",
     "contentStyles" : "titleAreaContentNode",
     "item" : "title",
@@ -9,7 +9,7 @@
     "width" : "42%"
   },
   {
-    "title" : "创建人",
+    "title" : MWF.xApplication.cms.Module.LP.creatorCompany,
     "headStyles" : "personAreaHeadNode",
     "contentStyles" : "personAreaContentNode",
     "item" : "creatorPersonShort",
@@ -18,7 +18,7 @@
     "width" : "13%"
   },
   {
-    "title" : "创建部门",
+    "title" : MWF.xApplication.cms.Module.LP.creatorDepartment,
     "headStyles" : "departmentAreaHeadNode",
     "contentStyles" : "departmentAreaContentNode",
     "item" : "creatorUnitNameShort",
@@ -27,7 +27,7 @@
     "width" : "13%"
   },
   {
-    "title" : "发布时间",
+    "title" : MWF.xApplication.cms.Module.LP.publishTime,
     "headStyles" : "timeAreaHeadNode",
     "contentStyles" : "timeAreaContentNode",
     "item" : "publishTime",
@@ -37,7 +37,7 @@
   },
   {
     "access" : "admin",
-    "title" : "操作",
+    "title" : MWF.xApplication.cms.Module.LP.action,
     "headStyles" : "actionAreaHeadNode",
     "contentStyles" : "actionAreaContentNode",
     "item" : "action",

o2web/source/x_component_cms_Module/$ViewExplorer/listItemForAll.json

 [
   {
-    "title" : "标题",
+    "title" : MWF.xApplication.cms.Module.LP.subject,
     "headStyles" : "titleAreaHeadNode",
     "contentStyles" : "titleAreaContentNode",
     "item" : "title",
@@ -9,7 +9,7 @@
     "width" : "29%"
   },
   {
-    "title" : "创建人",
+    "title" : MWF.xApplication.cms.Module.LP.creatorPerson,
     "headStyles" : "personAreaHeadNode",
     "contentStyles" : "personAreaContentNode",
     "item" : "creatorPersonShort",
@@ -18,7 +18,7 @@
     "width" : "13%"
   },
   {
-    "title" : "创建部门",
+    "title" : MWF.xApplication.cms.Module.LP.creatorDepartment,
     "headStyles" : "departmentAreaHeadNode",
     "contentStyles" : "departmentAreaContentNode",
     "item" : "creatorUnitNameShort",
@@ -27,7 +27,7 @@
     "width" : "13%"
   },
   {
-    "title" : "分类",
+    "title" : MWF.xApplication.cms.Module.LP.category,
     "headStyles" : "categoryAreaHeadNode",
     "contentStyles" : "categoryAreaContentNode",
     "item" : "categoryName",
@@ -36,7 +36,7 @@
     "width" : "13%"
   },
   {
-    "title" : "发布时间",
+    "title" : MWF.xApplication.cms.Module.LP.publishTime,
     "headStyles" : "timeAreaHeadNode",
     "contentStyles" : "timeAreaContentNode",
     "item" : "publishTime",
@@ -46,7 +46,7 @@
   },
   {
     "access" : "admin",
-    "title" : "操作",
+    "title" : MWF.xApplication.cms.Module.LP.action,
     "headStyles" : "actionAreaHeadNode",
     "contentStyles" : "actionAreaContentNode",
     "item" : "action",

o2web/source/x_component_cms_Module/lp/en.js

@@ -94,5 +94,13 @@ MWF.xApplication.cms.Module.LP = {
 
 	"enableCopy": "Enable Copy",
 	"attachmentBlankNotice": "The uploaded file cannot contain spaces",
-	"selectCategory": "Select Category"
+	"selectCategory": "Select Category",
+
+	"subject": "Title",
+	"appName": "App Name",
+	"category": "Category",
+	"creatorCompany": "Create Company",
+	"creatorDepartment": "Create Department",
+	"creatorPerson": "Creator",
+	"publishTime": "Publish Time"
 };
\ No newline at end of file

o2web/source/x_component_cms_Module/lp/zh-cn.js

@@ -94,6 +94,16 @@ MWF.xApplication.cms.Module.LP = {
 
 	"enableCopy": "启用复制",
 	"attachmentBlankNotice" : "上传的文件不能带空格",
-	"selectCategory": "选择分类"
+	"selectCategory": "选择分类",
+
+	"subject": "标题",
+	"appName": "栏目",
+	"category": "分类",
+	"creatorCompany": "创建公司",
+	"creatorDepartment": "创建部门",
+	"creatorPerson": "创建人",
+	"publishTime": "发布时间"
+
+
 
 };
\ No newline at end of file

o2web/source/x_component_cms_ScriptDesigner/$Main/default/tools.json

-{
-  "label": {
-    "icon": "label.png",
-    "text": "文本",
-    "className": "Label"
-  },
-  "textfield": {
-    "icon": "textfield.png",
-    "text": "域",
-    "className": "Textfield"
-  },
-  "personfield": {
-    "icon": "personfield.png",
-    "text": "人员",
-    "className": "Personfield"
-  },
-  "calendar": {
-    "icon": "calendar.png",
-    "text": "日期选择",
-    "className": "Calendar"
-  },
-  "textarea": {
-    "icon": "textarea.png",
-    "text": "多行文本",
-    "className": "Textarea"
-  },
-  "select": {
-    "icon": "select.png",
-    "text": "下拉框",
-    "className": "Select"
-  },
-  "radio": {
-    "icon": "radio.png",
-    "text": "单选框",
-    "className": "Radio"
-  },
-  "checkbox": {
-    "icon": "checkbox.png",
-    "text": "多选框",
-    "className": "Checkbox"
-  },
-  "button": {
-    "icon": "button.png",
-    "text": "按钮",
-    "className": "Button"
-  },
-
-  "Actionbar": {
-    "icon": "actionbar.png",
-    "text": "操作条",
-    "className": "Actionbar"
-  },
-
-  "image": {
-    "icon": "image.png",
-    "text": "图片",
-    "className": "Image"
-  },
-  "image": {
-    "icon": "attachment.png",
-    "text": "附件",
-    "className": "Attachment"
-  },
-  "div": {
-    "icon": "div.png",
-    "text": "容器",
-    "className": "Div"
-  },
-  "table": {
-    "icon": "table.png",
-    "text": "表格",
-    "className": "Table"
-  },
-  "datagrid": {
-    "icon": "datagrid.png",
-    "text": "数据网格",
-    "className": "Datagrid"
-  },
-  "html": {
-    "icon": "html.png",
-    "text": "HTML",
-    "className": "Html"
-  },
-
-  "tab": {
-    "icon": "tabs.png",
-    "text": "分页",
-    "className": "Tab"
-  },
-  "tree": {
-    "icon": "tree.png",
-    "text": "树",
-    "className": "Tree"
-  },
-  "log": {
-    "icon": "log.png",
-    "text": "流程记录",
-    "className": "Log"
-  },
-  "monitor": {
-    "icon": "monitor.png",
-    "text": "流程监控",
-    "className": "Monitor"
-  },
-  "iframe": {
-    "icon": "iframe.png",
-    "text": "Iframe",
-    "className": "Iframe"
-  },
-  "htmledit": {
-    "icon": "htmleditor.png",
-    "text": "HTML编辑器",
-    "className": "Htmleditor"
-  },
-  "office": {
-    "icon": "office.png",
-    "text": "Office控件",
-    "className": "Office"
-  }
-}
\ No newline at end of file

o2web/source/x_component_cms_ViewDesigner/$Main/default/tools.json

-{
-  "label": {
-    "icon": "label.png",
-    "text": "文本",
-    "className": "Label"
-  },
-  "textfield": {
-    "icon": "textfield.png",
-    "text": "域",
-    "className": "Textfield"
-  },
-  "personfield": {
-    "icon": "personfield.png",
-    "text": "人员",
-    "className": "Personfield"
-  },
-  "calendar": {
-    "icon": "calendar.png",
-    "text": "日期选择",
-    "className": "Calendar"
-  },
-  "textarea": {
-    "icon": "textarea.png",
-    "text": "多行文本",
-    "className": "Textarea"
-  },
-  "select": {
-    "icon": "select.png",
-    "text": "下拉框",
-    "className": "Select"
-  },
-  "radio": {
-    "icon": "radio.png",
-    "text": "单选框",
-    "className": "Radio"
-  },
-  "checkbox": {
-    "icon": "checkbox.png",
-    "text": "多选框",
-    "className": "Checkbox"
-  },
-  "button": {
-    "icon": "button.png",
-    "text": "按钮",
-    "className": "Button"
-  },
-
-  "Actionbar": {
-    "icon": "actionbar.png",
-    "text": "操作条",
-    "className": "Actionbar"
-  },
-
-  "image": {
-    "icon": "image.png",
-    "text": "图片",
-    "className": "Image"
-  },
-  "image": {
-    "icon": "attachment.png",
-    "text": "附件",
-    "className": "Attachment"
-  },
-  "div": {
-    "icon": "div.png",
-    "text": "容器",
-    "className": "Div"
-  },
-  "table": {
-    "icon": "table.png",
-    "text": "表格",
-    "className": "Table"
-  },
-  "datagrid": {
-    "icon": "datagrid.png",
-    "text": "数据网格",
-    "className": "Datagrid"
-  },
-  "html": {
-    "icon": "html.png",
-    "text": "HTML",
-    "className": "Html"
-  },
-
-  "tab": {
-    "icon": "tabs.png",
-    "text": "分页",
-    "className": "Tab"
-  },
-  "tree": {
-    "icon": "tree.png",
-    "text": "树",
-    "className": "Tree"
-  },
-  "log": {
-    "icon": "log.png",
-    "text": "流程记录",
-    "className": "Log"
-  },
-  "monitor": {
-    "icon": "monitor.png",
-    "text": "流程监控",
-    "className": "Monitor"
-  },
-  "iframe": {
-    "icon": "iframe.png",
-    "text": "Iframe",
-    "className": "Iframe"
-  },
-  "htmledit": {
-    "icon": "htmleditor.png",
-    "text": "HTML编辑器",
-    "className": "Htmleditor"
-  },
-  "office": {
-    "icon": "office.png",
-    "text": "Office控件",
-    "className": "Office"
-  }
-}
\ No newline at end of file

o2web/source/x_component_cms_Xform/Htmleditor.js

@@ -100,6 +100,8 @@ MWF.xApplication.cms.Xform.Htmleditor = MWF.CMSHtmleditor =  new Class({
             editorConfig.reference = this.form.businessData.document.id;
             editorConfig.referenceType = "cmsDocument";
 
+            if(!editorConfig.language)editorConfig.language = MWF.language;
+
             if( editorConfig.skin )editorConfig.skin = "moono-lisa";
             this.editor = CKEDITOR.replace(editorDiv, editorConfig);
             this._loadEvents();