diff --git a/o2web/source/x_component_cms_Document/Main.js b/o2web/source/x_component_cms_Document/Main.js index 987248a105148d6e7b53a147a49ef493091432c7..6f041f311987d8a7cee3ef300986da0bce52f10e 100644 --- a/o2web/source/x_component_cms_Document/Main.js +++ b/o2web/source/x_component_cms_Document/Main.js @@ -115,6 +115,7 @@ MWF.xApplication.cms.Document.Main = new Class({ MWF.release(this.appForm); this.appForm = null; this.form = null; + this.$events = {}; } // this.parseDocumentV2(data); // this.openDocument(); @@ -391,7 +392,9 @@ MWF.xApplication.cms.Document.Main = new Class({ "allowSave": isControl && this.document.docStatus == "published", "allowPopularDocument": MWF.AC.isHotPictureManager() && this.document.docStatus == "published", "allowEditDocument": isControl && !this.document.wf_workId, - "allowDeleteDocument": isControl && !this.document.wf_workId + "allowDeleteDocument": isControl && !this.document.wf_workId, + "allowSetTop": this.isAdmin && this.document.docStatus == "published" && !this.document.isTop, + "allowCancelTop": this.isAdmin && this.document.docStatus == "published" && this.document.isTop, }; }, errorLoadingV2 : function( error, type ){ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar.js b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar.js index fe83062048b5a4ed7d48c46edb62f3093776eb55..4a38df57abad6d7381f09dfbb68313595c3c1474 100644 --- a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar.js +++ b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar.js @@ -57,7 +57,6 @@ MWF.xApplication.cms.FormDesigner.Module.Actionbar = MWF.CMSFCActionbar = new Cl this.node.setStyles({"height": "24px", "line-height": "24px", "background-color": "#999"}); }else{ this.toolbarNode = new Element("div").inject(this.node); - this.toolbarWidget = new MWF.widget.SimpleToolbar(this.toolbarNode, {"style": this.json.style}, this); o2.xhr_get(this.path+"toolbars.json", function(xhr){ @@ -176,7 +175,7 @@ MWF.xApplication.cms.FormDesigner.Module.Actionbar = MWF.CMSFCActionbar = new Cl if (MWF.xApplication.cms.FormDesigner.LP.actionBar){ var jsonStr = JSON.stringify(this.json.multiTools); jsonStr = o2.bindJson(jsonStr, {"lp": MWF.xApplication.cms.FormDesigner.LP.actionBar}); - this.multiToolsJson = JSON.parse(jsonStr).map( function (d) { d.system = true; return d; }); + this.multiToolsJson = JSON.parse(jsonStr); //.map( function (d) { return d; }); }else{ this.multiToolsJson = this.json.multiTools; } diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/135.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/135.png new file mode 100644 index 0000000000000000000000000000000000000000..ef91413522141a8cd62c4119c1674e8b0d751df6 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/135.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/136.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/136.png new file mode 100644 index 0000000000000000000000000000000000000000..8a1acb8eefd2ec6d94462664f18e85b4570078ee Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/136.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/blue/135.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/blue/135.png new file mode 100644 index 0000000000000000000000000000000000000000..7eaa8008c17745520706d7afdc7b5a36b83ace94 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/blue/135.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/blue/136.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/blue/136.png new file mode 100644 index 0000000000000000000000000000000000000000..fa55e5585ba8fce7b93b4dc105e35c8ab5f6e9bd Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/blue/136.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/red/135.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/red/135.png new file mode 100644 index 0000000000000000000000000000000000000000..58fae4f49747c9d6b3c58c056c35caa402e79851 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/red/135.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/red/136.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/red/136.png new file mode 100644 index 0000000000000000000000000000000000000000..a85c7fe10c709d126160dfaac58710778a507a29 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/red/136.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/white/135.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/white/135.png new file mode 100644 index 0000000000000000000000000000000000000000..f71e2d2b82452e4a78bebbb599ccf6964977c5e2 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/white/135.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/white/136.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/white/136.png new file mode 100644 index 0000000000000000000000000000000000000000..56fbf4065aad333015d731b9f624f8435265146d Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/custom/white/136.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/cmsform/top.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/cmsform/top.png new file mode 100644 index 0000000000000000000000000000000000000000..7eaa8008c17745520706d7afdc7b5a36b83ace94 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/cmsform/top.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/cmsform/top_over.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/cmsform/top_over.png new file mode 100644 index 0000000000000000000000000000000000000000..f71e2d2b82452e4a78bebbb599ccf6964977c5e2 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/cmsform/top_over.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/cmsform/topcancel.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/cmsform/topcancel.png new file mode 100644 index 0000000000000000000000000000000000000000..fa55e5585ba8fce7b93b4dc105e35c8ab5f6e9bd Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/cmsform/topcancel.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/cmsform/topcancel_over.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/cmsform/topcancel_over.png new file mode 100644 index 0000000000000000000000000000000000000000..56fbf4065aad333015d731b9f624f8435265146d Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/cmsform/topcancel_over.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/default/top.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/default/top.png new file mode 100644 index 0000000000000000000000000000000000000000..7eaa8008c17745520706d7afdc7b5a36b83ace94 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/default/top.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/default/top_over.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/default/top_over.png new file mode 100644 index 0000000000000000000000000000000000000000..f71e2d2b82452e4a78bebbb599ccf6964977c5e2 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/default/top_over.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/default/topcancel.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/default/topcancel.png new file mode 100644 index 0000000000000000000000000000000000000000..fa55e5585ba8fce7b93b4dc105e35c8ab5f6e9bd Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/default/topcancel.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/default/topcancel_over.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/default/topcancel_over.png new file mode 100644 index 0000000000000000000000000000000000000000..56fbf4065aad333015d731b9f624f8435265146d Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/default/topcancel_over.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/mobile/top.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/mobile/top.png new file mode 100644 index 0000000000000000000000000000000000000000..7eaa8008c17745520706d7afdc7b5a36b83ace94 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/mobile/top.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/mobile/top_over.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/mobile/top_over.png new file mode 100644 index 0000000000000000000000000000000000000000..f71e2d2b82452e4a78bebbb599ccf6964977c5e2 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/mobile/top_over.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/mobile/topcancel.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/mobile/topcancel.png new file mode 100644 index 0000000000000000000000000000000000000000..fa55e5585ba8fce7b93b4dc105e35c8ab5f6e9bd Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/mobile/topcancel.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/mobile/topcancel_over.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/mobile/topcancel_over.png new file mode 100644 index 0000000000000000000000000000000000000000..56fbf4065aad333015d731b9f624f8435265146d Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/mobile/topcancel_over.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_blue_simple/top.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_blue_simple/top.png new file mode 100644 index 0000000000000000000000000000000000000000..7eaa8008c17745520706d7afdc7b5a36b83ace94 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_blue_simple/top.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_blue_simple/top_over.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_blue_simple/top_over.png new file mode 100644 index 0000000000000000000000000000000000000000..f71e2d2b82452e4a78bebbb599ccf6964977c5e2 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_blue_simple/top_over.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_blue_simple/topcancel.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_blue_simple/topcancel.png new file mode 100644 index 0000000000000000000000000000000000000000..fa55e5585ba8fce7b93b4dc105e35c8ab5f6e9bd Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_blue_simple/topcancel.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_blue_simple/topcancel_over.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_blue_simple/topcancel_over.png new file mode 100644 index 0000000000000000000000000000000000000000..56fbf4065aad333015d731b9f624f8435265146d Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_blue_simple/topcancel_over.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/top.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/top.png new file mode 100644 index 0000000000000000000000000000000000000000..58fae4f49747c9d6b3c58c056c35caa402e79851 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/top.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/top_over.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/top_over.png new file mode 100644 index 0000000000000000000000000000000000000000..f71e2d2b82452e4a78bebbb599ccf6964977c5e2 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/top_over.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/topcancel.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/topcancel.png new file mode 100644 index 0000000000000000000000000000000000000000..a85c7fe10c709d126160dfaac58710778a507a29 Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/topcancel.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/topcancel_over.png b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/topcancel_over.png new file mode 100644 index 0000000000000000000000000000000000000000..56fbf4065aad333015d731b9f624f8435265146d Binary files /dev/null and b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/topcancel_over.png differ diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/toolbars.json b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/toolbars.json index 0e2b68aba74fe580f743eecd37fa8ada6f3e85b5..998c98082f55490e174fbc67abdecefa3520660d 100644 --- a/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/toolbars.json +++ b/o2web/source/x_component_cms_FormDesigner/Module/Actionbar/toolbars.json @@ -92,5 +92,29 @@ "id": "action_print", "read": true, "edit" : true + }, + { + "type": "MWFToolBarButton", + "img": "top.png", + "img_over": "top_over.png", + "title": "{{$.lp.setTopTitle}}", + "action": "setTop", + "text": "{{$.lp.setTop}}", + "id": "action_setTop", + "read": true, + "edit" : true, + "control": "allowSetTop" + }, + { + "type": "MWFToolBarButton", + "img": "topcancel.png", + "img_over": "topcancel_over.png", + "title": "{{$.lp.cancelTopTitle}}", + "action": "cancelTop", + "text": "{{$.lp.cancelTop}}", + "id": "action_cancelTop", + "read": true, + "edit" : true, + "control": "allowCancelTop" } ] \ No newline at end of file diff --git a/o2web/source/x_component_cms_FormDesigner/lp/en.js b/o2web/source/x_component_cms_FormDesigner/lp/en.js index 6ac698acbd0e392bc15e6929afb0e3e0e9d12088..3388d82155652b5f897932998548cd2cefc8016a 100644 --- a/o2web/source/x_component_cms_FormDesigner/lp/en.js +++ b/o2web/source/x_component_cms_FormDesigner/lp/en.js @@ -64,6 +64,10 @@ MWF.xApplication.cms.FormDesigner.LP = Object.merge( {}, MWF.xApplication.proces "delete": "Delete", "deleteTitle": "Delete Document", "print": "Print", - "printTitle": "Print Document" + "printTitle": "Print Document", + "setTop": "Top", + "setTopTitle": "Set the document to the top", + "cancelTop": "Cancel Top", + "cancelTopTitle": "Cancel the top of the document" } }); \ No newline at end of file diff --git a/o2web/source/x_component_cms_FormDesigner/lp/zh-cn.js b/o2web/source/x_component_cms_FormDesigner/lp/zh-cn.js index d1e56724a58faf9d364a03fb02f2b435d1ecea74..fe7b705b573e563c5a93111af35d8dba294c24b1 100644 --- a/o2web/source/x_component_cms_FormDesigner/lp/zh-cn.js +++ b/o2web/source/x_component_cms_FormDesigner/lp/zh-cn.js @@ -64,6 +64,10 @@ MWF.xApplication.cms.FormDesigner.LP = Object.merge( {}, MWF.xApplication.proces "delete": "删除", "deleteTitle": "删除文档", "print": "打印", - "printTitle": "打印文档" + "printTitle": "打印文档", + "setTop": "置顶", + "setTopTitle": "对文档置顶", + "cancelTop": "取消置顶", + "cancelTopTitle": "取消对文档的置顶" } }); \ No newline at end of file diff --git a/o2web/source/x_component_cms_FormDesigner/widget/ActionsEditor.js b/o2web/source/x_component_cms_FormDesigner/widget/ActionsEditor.js index 02f8f8d4bfa7264cb24488649398342fd43e944c..b3fb46536ac7086d5a4c8048e33b2ea6122a1f64 100644 --- a/o2web/source/x_component_cms_FormDesigner/widget/ActionsEditor.js +++ b/o2web/source/x_component_cms_FormDesigner/widget/ActionsEditor.js @@ -250,7 +250,7 @@ MWF.xApplication.cms.FormDesigner.widget.ActionsEditor.ButtonAction = new Class( }, icon); item.iconName = i+".png"; } - for (var i=1; i<=134; i++){ + for (var i=1; i<=136; i++){ //var icon = this.editor.path+this.editor.options.style+"/tools/"+i+".png"; var icon = "../x_component_cms_FormDesigner/Module/Actionbar/"+this.editor.options.style+"/custom/"+i+".png"; var item = this.iconMenu.addMenuItem("", "click", function(ev){ diff --git a/o2web/source/x_component_cms_Xform/Actionbar.js b/o2web/source/x_component_cms_Xform/Actionbar.js index 68c86f0309d702f2df3b2f18cedee030aa608543..da5533d250d90d26f8e820150624c1787d2a4fdc 100644 --- a/o2web/source/x_component_cms_Xform/Actionbar.js +++ b/o2web/source/x_component_cms_Xform/Actionbar.js @@ -208,5 +208,11 @@ MWF.xApplication.cms.Xform.Actionbar = MWF.CMSActionbar = new Class({ }, printDocument: function(){ this.form.printDocument(); + }, + setTop: function(){ + this.form.setTop(); + }, + cancelTop: function(){ + this.form.cancelTop(); } }); \ No newline at end of file diff --git a/o2web/source/x_component_cms_Xform/Form.js b/o2web/source/x_component_cms_Xform/Form.js index a49bff54c59a19bd292d0740c3876a3305e57c0d..a128e0ff3d0672df2a111144925a30a274b713b7 100644 --- a/o2web/source/x_component_cms_Xform/Form.js +++ b/o2web/source/x_component_cms_Xform/Form.js @@ -934,7 +934,71 @@ MWF.xApplication.cms.Xform.Form = MWF.CMSForm = new Class( attachmentController.checkActions(); } }.bind(this)) - } + }, + + /** + * @summary 弹出文档置顶对话框，操作后使当前文档在列式服务中排在前面. + * @method setTop + * @memberof CMSForm + * @example + * this.form.getApp().appForm.setTop(); + */ + setTop: function () { + var _self = this; + var p = MWF.getCenterPosition(this.app.content, 380, 150); + var event = { + "event": { + "x": p.x, + "y": p.y - 200, + "clientX": p.x, + "clientY": p.y - 200 + } + }; + this.app.confirm("infor", event, MWF.xApplication.cms.Xform.LP.setTopTitle, MWF.xApplication.cms.Xform.LP.setTopText, 380, 120, function () { + o2.Actions.load("x_cms_assemble_control").DocumentAction.persist_top(_self.businessData.document.id, function () { + _self.app.notice(MWF.xApplication.cms.Xform.LP.setTopSuccess, "success"); + _self.app.reload(); + this.close(); + }.bind(this)) + + //this.close(); + }, function () { + this.close(); + }); + }, + + + /** + * @summary 弹出文档取消置顶对话框. + * @method cancelTop + * @memberof CMSForm + * @example + * this.form.getApp().appForm.cancelTop(); + */ + cancelTop: function () { + var _self = this; + var p = MWF.getCenterPosition(this.app.content, 380, 150); + var event = { + "event": { + "x": p.x, + "y": p.y - 200, + "clientX": p.x, + "clientY": p.y - 200 + } + }; + this.app.confirm("infor", event, MWF.xApplication.cms.Xform.LP.cancelTopTitle, MWF.xApplication.cms.Xform.LP.cancelTopText, 380, 120, function () { + + o2.Actions.load("x_cms_assemble_control").DocumentAction.persist_unTop(_self.businessData.document.id, function () { + _self.app.notice(MWF.xApplication.cms.Xform.LP.cancelTopSuccess, "success"); + _self.app.reload(); + this.close(); + }.bind(this)) + + //this.close(); + }, function () { + this.close(); + }); + }, diff --git a/o2web/source/x_component_cms_Xform/lp/en.js b/o2web/source/x_component_cms_Xform/lp/en.js index fdc134e48be34c450c7afccd5790e1cf2ced85f4..cefbd5bb933038a6edd8c9a90e46ac1b16945da3 100644 --- a/o2web/source/x_component_cms_Xform/lp/en.js +++ b/o2web/source/x_component_cms_Xform/lp/en.js @@ -57,6 +57,13 @@ MWF.xApplication.cms.Xform.LP = Object.merge({}, MWF.xApplication.process.Xform "updateSuccess": "Update successful", "save": "Save", + "setTopTitle": "Put Top Confirmation", + "setTopText": "Are you sure to put the current document on top?", + "setTopSuccess": "Put Top Success", + "cancelTopTitle": "Cancel Top Title Confirmation", + "cancelTopText": "Are you sure you want to cancel the current document on top?", + "cancelTopSuccess": "Cancel Top Success", + "attachmentArea": "Attachment Area", "selectAttachment": "Select Attachment", @@ -83,7 +90,11 @@ MWF.xApplication.cms.Xform.LP = Object.merge({}, MWF.xApplication.process.Xform "delete": "Delete", "deleteTitle": "Delete Document", "print": "Print", - "printTitle": "Print Document" + "printTitle": "Print Document", + "setTop": "Top", + "setTopTitle": "Set the document to the top", + "cancelTop": "Cancel Top", + "cancelTopTitle": "Cancel the top of the document" } }); MWF.xApplication.cms.Xform["lp."+o2.language] = MWF.xApplication.cms.Xform.LP; \ No newline at end of file diff --git a/o2web/source/x_component_cms_Xform/lp/zh-cn.js b/o2web/source/x_component_cms_Xform/lp/zh-cn.js index a87d6f833e398365f9b6c8da7a102454a55dd963..fde443eef51cd83bfff5f3279b0e7307f8c3211b 100644 --- a/o2web/source/x_component_cms_Xform/lp/zh-cn.js +++ b/o2web/source/x_component_cms_Xform/lp/zh-cn.js @@ -57,6 +57,13 @@ MWF.xApplication.cms.Xform.LP = Object.merge({}, MWF.xApplication.process.Xform. "updateSuccess" : "更新成功", "save" : "保存", + "setTopTitle": "置顶确认", + "setTopText": "确定将当前文档置顶？", + "setTopSuccess": "置顶成功", + "cancelTopTitle": "取消置顶确认", + "cancelTopText": "确定将当前文档取消置顶？", + "cancelTopSuccess": "取消置顶成功", + "attachmentArea" : "附件区域", "selectAttachment" : "选择附件", @@ -83,7 +90,11 @@ MWF.xApplication.cms.Xform.LP = Object.merge({}, MWF.xApplication.process.Xform. "delete": "删除", "deleteTitle": "删除文档", "print": "打印", - "printTitle": "打印文档" + "printTitle": "打印文档", + "setTop": "置顶", + "setTopTitle": "对文档置顶", + "cancelTop": "取消置顶", + "cancelTopTitle": "取消对文档的置顶" } //"at" : "阅于", diff --git a/o2web/source/x_component_process_FormDesigner/Module/Actionbar.js b/o2web/source/x_component_process_FormDesigner/Module/Actionbar.js index 11428434f28f614a832fb73d31b1436e66d1768b..3fc8ec2c4478ac79ab17272a14fefad19253d3c2 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/Actionbar.js +++ b/o2web/source/x_component_process_FormDesigner/Module/Actionbar.js @@ -198,7 +198,7 @@ MWF.xApplication.process.FormDesigner.Module.Actionbar = MWF.FCActionbar = new C if (MWF.xApplication.process.FormDesigner.LP.actionBar){ var jsonStr = JSON.stringify(this.json.multiTools); jsonStr = o2.bindJson(jsonStr, {"lp": MWF.xApplication.process.FormDesigner.LP.actionBar}); - this.multiToolsJson = JSON.parse(jsonStr).map( function (d) { d.system = true; return d; }); + this.multiToolsJson = JSON.parse(jsonStr); //.map( function (d) { d.system = true; return d; }); }else{ this.multiToolsJson = this.json.multiTools; } diff --git a/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/cmcc/pause.png b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/cmcc/pause.png new file mode 100644 index 0000000000000000000000000000000000000000..22e40280d5c04a033aaa3286af50e1e159843e0e Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/cmcc/pause.png differ diff --git a/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/cmcc/resume.png b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/cmcc/resume.png new file mode 100644 index 0000000000000000000000000000000000000000..883226d1cd94c7ab6c25d7e9689daec176435595 Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/cmcc/resume.png differ diff --git a/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat/downloadAll.png b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat/downloadAll.png index b28c064cf820a9e224199c8747bea221b9d24fab..4394321c6e177ec6f17f048939c40b193a02e837 100644 Binary files a/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat/downloadAll.png and b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat/downloadAll.png differ diff --git a/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat/pause.png b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat/pause.png new file mode 100644 index 0000000000000000000000000000000000000000..0abe5a673e842b00e61ea6e2ff4caf2e7698e471 Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat/pause.png differ diff --git a/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat/resume.png b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat/resume.png new file mode 100644 index 0000000000000000000000000000000000000000..86f4fe5170a6393669940ed6265540a1598fb5e2 Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat/resume.png differ diff --git a/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat_over/pause.png b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat_over/pause.png new file mode 100644 index 0000000000000000000000000000000000000000..22e40280d5c04a033aaa3286af50e1e159843e0e Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat_over/pause.png differ diff --git a/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat_over/resume.png b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat_over/resume.png new file mode 100644 index 0000000000000000000000000000000000000000..883226d1cd94c7ab6c25d7e9689daec176435595 Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_blue_flat_over/resume.png differ diff --git a/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/downloadAll.png b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/downloadAll.png index b28c064cf820a9e224199c8747bea221b9d24fab..f725c652b272c2cfccf1ef0010f38fe0f2351c38 100644 Binary files a/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/downloadAll.png and b/o2web/source/x_component_process_FormDesigner/Module/Actionbar/default/tools/xform_red_simple/downloadAll.png differ diff --git a/o2web/source/x_component_process_FormDesigner/Property.js b/o2web/source/x_component_process_FormDesigner/Property.js index 8012ca1bff16f59c9fb5d802deeb78e9baf83396..3ed54661d490a85b0ff8b9ec478b7e74d9db23c0 100644 --- a/o2web/source/x_component_process_FormDesigner/Property.js +++ b/o2web/source/x_component_process_FormDesigner/Property.js @@ -46,7 +46,9 @@ MWF.xApplication.process.FormDesigner.Property = MWF.FCProperty = new Class({ this.getHtmlString(function(){ if (this.htmlString){ var lp; - if( this.options.appType === "cms" ){ + if( this.options.appType === "cms" ) { + lp = MWF.xApplication.cms.FormDesigner.LP.propertyTemplate; + }else if( this.designer && this.designer.options && this.designer.options.name && this.designer.options.name.indexOf("cms") === 0 ){ lp = MWF.xApplication.cms.FormDesigner.LP.propertyTemplate; }else{ lp = MWF.xApplication.process.FormDesigner.LP.propertyTemplate; diff --git a/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/icon/popular.png b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/icon/popular.png new file mode 100644 index 0000000000000000000000000000000000000000..d15eaf0c0c4ec5b8abe533ff0893cf5b0c0e75c7 Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/icon/popular.png differ diff --git a/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/icon/top.png b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/icon/top.png new file mode 100644 index 0000000000000000000000000000000000000000..ef91413522141a8cd62c4119c1674e8b0d751df6 Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/icon/top.png differ diff --git a/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/icon/top2.png b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/icon/top2.png new file mode 100644 index 0000000000000000000000000000000000000000..a7a9533f4088949e6f936c22c855738d2d559e8c Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/icon/top2.png differ diff --git a/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/tools/edit.png b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/tools/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..9548506d597296ab8f8866f26cd73e3ded5cd6d8 Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/tools/edit.png differ diff --git a/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/tools/popular.png b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/tools/popular.png new file mode 100644 index 0000000000000000000000000000000000000000..d15eaf0c0c4ec5b8abe533ff0893cf5b0c0e75c7 Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/tools/popular.png differ diff --git a/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/tools/top.png b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/tools/top.png new file mode 100644 index 0000000000000000000000000000000000000000..ef91413522141a8cd62c4119c1674e8b0d751df6 Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/tools/top.png differ diff --git a/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/tools/topcancel.png b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/tools/topcancel.png new file mode 100644 index 0000000000000000000000000000000000000000..8a1acb8eefd2ec6d94462664f18e85b4570078ee Binary files /dev/null and b/o2web/source/x_component_process_FormDesigner/widget/$ActionsEditor/default/tools/topcancel.png differ