From e3eac3008b40f6b72b9e06a458b8016adb90388d Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Tue, 27 Apr 2021 13:57:10 +0000 Subject: [PATCH] epic PMCORE-2730 --- workflow/engine/skinEngine/neoclassic/css/rtl.css | 5 +++++ .../engine/templates/dashboard/dashletsList.js | 6 +++--- .../engine/templates/emailServer/emailServer.js | 12 +++--------- workflow/engine/templates/pmTables/editReport.js | 10 ++-------- .../processCategory/processCategoryList.js | 6 +++--- workflow/engine/templates/setup/calendarList.js | 8 ++++---- workflow/engine/templates/setup/skinList.js | 8 ++++---- .../templates/strategicDashboard/dashboardList.js | 6 +++--- workflow/public_html/images/add_building.png | Bin 0 -> 656 bytes workflow/public_html/images/export_building.png | Bin 0 -> 681 bytes 10 files changed, 27 insertions(+), 34 deletions(-) create mode 100644 workflow/public_html/images/add_building.png create mode 100644 workflow/public_html/images/export_building.png diff --git a/workflow/engine/skinEngine/neoclassic/css/rtl.css b/workflow/engine/skinEngine/neoclassic/css/rtl.css index 2211b8ffb..b58c483b0 100644 --- a/workflow/engine/skinEngine/neoclassic/css/rtl.css +++ b/workflow/engine/skinEngine/neoclassic/css/rtl.css @@ -559,6 +559,11 @@ x-btn-mc em.x-btn-arrow { right: auto; left: 0; } + +img.x-form-trigger.x-form-arrow-trigger { + border-left: solid 1px rgb(156, 153, 153); +} + .x-form-field-wrap { right: 0; left: auto; diff --git a/workflow/engine/templates/dashboard/dashletsList.js b/workflow/engine/templates/dashboard/dashletsList.js index 1018b53bf..b243b1032 100644 --- a/workflow/engine/templates/dashboard/dashletsList.js +++ b/workflow/engine/templates/dashboard/dashletsList.js @@ -57,20 +57,20 @@ Ext.onReady(function(){ newButton = new Ext.Action({ text: _('ID_NEW'), - iconCls: 'button_menu_ext ss_sprite ss_add', + icon: '/images/add_18.png', handler: newDashletInstance }); editButton = new Ext.Action({ text: _('ID_EDIT'), - iconCls: 'button_menu_ext ss_sprite ss_pencil', + icon: '/images/pencil.png', handler: editDashletInstance, disabled: true }); deleteButton = new Ext.Action({ text: _('ID_DELETE'), - iconCls: 'button_menu_ext ss_sprite ss_delete', + icon: '/images/delete-16x16.gif', handler: deleteDashletInstance, disabled: true }); diff --git a/workflow/engine/templates/emailServer/emailServer.js b/workflow/engine/templates/emailServer/emailServer.js index 5f6f31a1c..7a8fd5395 100644 --- a/workflow/engine/templates/emailServer/emailServer.js +++ b/workflow/engine/templates/emailServer/emailServer.js @@ -994,10 +994,8 @@ emailServer.application = { var btnNew = new Ext.Action({ id: "btnNew", - text: _("ID_NEW"), - iconCls: "button_menu_ext ss_sprite ss_add", - + icon: '/images/add_18.png', handler: function () { EMAILSERVEROPTION = "INS"; @@ -1011,10 +1009,8 @@ emailServer.application = { var btnEdit = new Ext.Action({ id: "btnEdit", - text: _("ID_EDIT"), - iconCls: "button_menu_ext ss_sprite ss_pencil", - + icon: '/images/pencil.png', handler: function () { var record = grdpnlMain.getSelectionModel().getSelected(); @@ -1032,10 +1028,8 @@ emailServer.application = { var btnDelete = new Ext.Action({ id: "btnDelete", - text: _("ID_DELETE"), - iconCls: "button_menu_ext ss_sprite ss_cross", - + icon: '/images/delete-16x16.gif', handler: function () { var record = grdpnlMain.getSelectionModel().getSelected(); diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js index 9409583d9..b15098b58 100644 --- a/workflow/engine/templates/pmTables/editReport.js +++ b/workflow/engine/templates/pmTables/editReport.js @@ -995,14 +995,8 @@ Ext.onReady(function () { name: 'REP_TAB_GRID', value: 'GridComments-463650787492db06640c904001904930' }); - items.push({ - xtype: 'compositefield', - fieldLabel: _("ID_TYPE"), - msgTarget: 'side', - anchor: '-20', - defaults: {flex: 1}, - items: [comboReport, comboGridsList] - }); + items.push(comboReport); + items.push(comboGridsList); items.push(comboDbConnections); diff --git a/workflow/engine/templates/processCategory/processCategoryList.js b/workflow/engine/templates/processCategory/processCategoryList.js index 4ebb7304e..528e8daba 100644 --- a/workflow/engine/templates/processCategory/processCategoryList.js +++ b/workflow/engine/templates/processCategory/processCategoryList.js @@ -68,20 +68,20 @@ Ext.onReady(function(){ newButton = new Ext.Action({ text: _('ID_NEW'), - iconCls: 'button_menu_ext ss_sprite ss_add', + icon: '/images/add_18.png', handler: NewCategoryWindow }); editButton = new Ext.Action({ text: _('ID_EDIT'), - iconCls: 'button_menu_ext ss_sprite ss_pencil', + icon: '/images/pencil.png', handler: EditCategory, disabled: true }); deleteButton = new Ext.Action({ text: _('ID_DELETE'), - iconCls: 'button_menu_ext ss_sprite ss_delete', + icon: '/images/delete-16x16.gif', handler: DeleteCategory, disabled: true }); diff --git a/workflow/engine/templates/setup/calendarList.js b/workflow/engine/templates/setup/calendarList.js index 8b617ff30..e999e75cc 100644 --- a/workflow/engine/templates/setup/calendarList.js +++ b/workflow/engine/templates/setup/calendarList.js @@ -69,27 +69,27 @@ Ext.onReady(function(){ newButton = new Ext.Action({ text: _('ID_NEW'), - iconCls: 'button_menu_ext ss_sprite ss_add', + icon: '/images/add_18.png', handler: NewCalendarAction }); editButton = new Ext.Action({ text: _('ID_EDIT'), - iconCls: 'button_menu_ext ss_sprite ss_pencil', + icon: '/images/pencil.png', handler: EditCalendarAction, disabled: true }); deleteButton = new Ext.Action({ text: _('ID_DELETE'), - iconCls: 'button_menu_ext ss_sprite ss_delete', + icon: '/images/delete-16x16.gif', handler: DeleteButtonAction, disabled: true }); copyButton = new Ext.Action({ text: _('ID_COPY'), - iconCls: 'button_menu_ext ss_sprite ss_calendar_add', + icon: '/images/add-table.png', handler: CopyButtonAction, disabled: true }); diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js index 3430de29d..719087b79 100644 --- a/workflow/engine/templates/setup/skinList.js +++ b/workflow/engine/templates/setup/skinList.js @@ -62,7 +62,7 @@ Ext.onReady(function(){ newButton = new Ext.Action({ text: _('ID_NEW'), - iconCls: 'button_menu_ext ss_sprite ss_add', + icon: '/images/add_18.png', disabled: false, handler: newSkin }); @@ -70,7 +70,7 @@ Ext.onReady(function(){ deleteButton = new Ext.Action({ text: _('ID_DELETE'), - iconCls: 'button_menu_ext ss_sprite ss_delete', + icon: '/images/delete-16x16.gif', handler: deleteSkin, disabled: true }); @@ -78,14 +78,14 @@ Ext.onReady(function(){ importButton = new Ext.Action({ text: _('ID_IMPORT'), - iconCls: 'button_menu_ext ss_sprite ss_building_add', + icon: '/images/add_building.png', handler: importSkin, disabled: false }); exportButton = new Ext.Action({ text: _('ID_EXPORT'), - iconCls: 'button_menu_ext ss_sprite ss_building_go', + icon: '/images/export_building.png', handler: exportSkin, disabled: true }); diff --git a/workflow/engine/templates/strategicDashboard/dashboardList.js b/workflow/engine/templates/strategicDashboard/dashboardList.js index 9b96258b5..39ea8cf5a 100644 --- a/workflow/engine/templates/strategicDashboard/dashboardList.js +++ b/workflow/engine/templates/strategicDashboard/dashboardList.js @@ -56,20 +56,20 @@ Ext.onReady(function() { newButton = new Ext.Action({ text: _('ID_NEW'), - iconCls: 'button_menu_ext ss_sprite ss_add', + icon: '/images/add_18.png', handler: newDashboard }); editButton = new Ext.Action({ text: _('ID_EDIT'), - iconCls: 'button_menu_ext ss_sprite ss_pencil', + icon: '/images/pencil.png', handler: editDashboard, disabled: true }); deleteButton = new Ext.Action({ text: _('ID_DELETE'), - iconCls: 'button_menu_ext ss_sprite ss_delete', + icon: '/images/delete-16x16.gif', handler: deleteDashboard, disabled: true }); diff --git a/workflow/public_html/images/add_building.png b/workflow/public_html/images/add_building.png new file mode 100644 index 0000000000000000000000000000000000000000..7f4e78b451f8fc8dd51c6792f600507c7f5afa06 GIT binary patch literal 656 zcmV;B0&o3^P)AqZI%E0v$<2 zK~y-)&6Ced(_tLPU*CPdQ!$k+ktPJSb*Lbftx*o4mTA4g!GygM)(=Z=JoMa=DD(?*~BS z_aq`hG#W)jh{xkqj;cUPDFEIq?@X-)v;iXqtzqE2qF5~c8&oQl5D|hWej*}O2aX;N zG?!|{h(VbhM@oY+!u4)Np-`v|1Q7Op-`9~yYi*8-#Udg?;`1@I2+DxbJG&Ai+_+e- z&C#aLA|mvjOjo&?UrP{so@A>r%gxcNTiIOZ@l5h3bCP9=sw$p_Gr3%{b;Mq`j$KxTB zOXIbgxOVOy01x|~5NPiNXsFncR{D-sMpkmm){#;R@ze{9*I?T=mSvIM%HXcg@?ky6 zNdHq}(?c}a^#FxR(6ffvZus(OmRSWLwUz>)4L@@WvqU<3nOq#F&T>e;PXLVV8`{6= q(y%WE+y$C}ZD9P}*v1I|rG5birZ9#Y2v#rv0000XiT%zNi#=Wm;}-fCFLTaC^yosow$$M?|U!rh5u2XTU&Lt zS#Uj|huz()&H^hNwIxF?hxhE^nl%>Hzc305N-!7&cT8Y)9Os0!6lT^gaNpqQjx}rSIcr2GGZTT0 zUWnf0BeKTfUhD>*csRzTp`w|Ckz>3_4AM8%rl%;C*@OZxTzED P00000NkvXXu0mjfY=%36 literal 0 HcmV?d00001