updating bpmn designer

workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css

@@ -123,3 +123,8 @@ button.x-btn-text:focus,.x-combo-selected{
 .icon-debug-disabled{
   background-image: url("/images/debug_disabled.png");
 }
+
+.icon-geometry{
+  background-image: url("/images/ToolUseGeometry.png");
+}
+

workflow/engine/templates/bpmn/bpmnShapes.js

@@ -1241,8 +1241,8 @@ bpmnTask.prototype.onDoubleClick = function () {
  * erik: Setting task target to Drop user & group assignment
  */
 bpmnTask.prototype.onMouseEnter = function () {
-  if( this.type == 'bpmnTask' && typeof Ext.getCmp('usersPanel') != 'undefined' ) {
-    Ext.getCmp('usersPanel')._targetTask = {id: this.id, name: this.taskName};
+  if( this.type == 'bpmnTask' ) {
+    _targetTask = {id: this.id, name: this.taskName};
   }
 };
 

workflow/engine/templates/bpmn/css/extjs-extend/xtheme-gray.css

@@ -75,107 +75,78 @@
 #x-shapes-gateways {background-position:5px -127px; height: 30px}
 */
 #x-shapes p {
-    type:none;
-
-        margin-left:9px;
-    }
+  type:none;
+  margin-left:9px;
+}
 
 #x-shapes-task {
-   width:36px;
-   height:26px;
-  /* background-image:url('/skins/ext/images/gray/shapes/pallete/task.png') ;*/
-   margin:2px 2px 2px 2px;
+  height: 25;
+  padding: 0px 2px 2px 0px;
 }
 
 #x-shapes-startEvent {
-   width:38px;
-   height:38px;
-  /* background-image:url('/skins/ext/images/gray/shapes/pallete/startevent.png');*/
-   margin:2px 2px 2px 2px;
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
 #x-shapes-interEvent {
-   width:38px;
-   height:38px;
-   /*background-image:url('/skins/ext/images/gray/shapes/pallete/interevent.png');*/
-   margin:2px 2px 2px 2px;
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
 #x-shapes-endEvent {
-   width:38px;
-   height:38px;
-  /*background-image:url('/skins/ext/images/gray/shapes/pallete/endevent.png');*/
-   margin:2px 2px 2px 2px;
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
-#x-shapes-gateway {
-   width:36px;
-   height:36px;
-   /*background-image:url('/skins/ext/images/gray/shapes/pallete/gateway.png') ;*/
-   margin:2px 2px 2px 2px;
+#x-shapes-gateways {
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
 #x-shapes-dataobject {
-   width:36px;
-   height:36px;
-   /*background-image:url('/skins/ext/images/gray/shapes/pallete/gateway.png') ;*/
-   margin:0 2px 2px 2px;
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
 #x-shapes-group {
-   width:36px;
-   height:36px;
-   /*background-image:url('/skins/ext/images/gray/shapes/pallete/gateway.png') ;*/
-   margin:4px 2px 2px 2px;
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
 #x-shapes-annotation {
-   width:36px;
-   height:36px;
-   /*background-image:url('/skins/ext/images/gray/shapes/pallete/gateway.png') ;*/
-   margin:5px 2px 2px 2px;
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
 #x-shapes-pool {
-   width:36px;
-   height:36px;
-   /*background-image:url('/skins/ext/images/gray/shapes/pallete/gateway.png') ;*/
-   margin:2px 2px 2px 2px;
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
 #x-shapes-lane {
-   width:36px;
-   height:36px;
-   /*background-image:url('/skins/ext/images/gray/shapes/pallete/gateway.png') ;*/
-   margin:2px 2px 2px 2px;
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
 #x-shapes-milestone {
-   width:36px;
-   height:36px;
-   /*background-image:url('/skins/ext/images/gray/shapes/pallete/gateway.png') ;*/
-   margin:2px 2px 2px 2px;
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
 #x-shapes-sequence {
-   width:36px;
-   height:36px;
-   /*background-image:url('/skins/ext/images/gray/shapes/pallete/gateway.png') ;*/
-   margin:2px 2px 2px 2px;
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
 #x-shapes-association {
-   width:36px;
-   height:36px;
-   /*background-image:url('/skins/ext/images/gray/shapes/pallete/gateway.png') ;*/
-   margin:2px 2px 2px 2px;
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
 #x-shapes-message {
-   width:36px;
-   height:36px;
-   /*background-image:url('/skins/ext/images/gray/shapes/pallete/gateway.png') ;*/
-   margin:2px 2px 2px 2px;
+  height: 25;
+  padding:0px 2px 2px 0px;
 }
 
 .toolbar-item{
@@ -209,6 +180,20 @@
   border-color: #98bf21;
 }
 
+.btn-panel-pmtoolbar{
+  font-size:11px;
+  font-weight: bold;
+  width: 50;
+}
+
+.icon-users-adhoc{
+  background-image:url('/images/icon-users.png') !important;
+}
+
+.icon-groups-adhoc{
+  background-image:url('/images/icon-groups.png') !important;
+}
+
 
 
 

workflow/engine/templates/bpmn/designer.html

@@ -1,3 +1,34 @@
+<style>
+#tbar
+{
+  width:600px;
+}
+.icon-data
+{
+  background:url(img/data.png) 0 no-repeat !important;
+}
+.icon-chart
+{
+  background:url(img/pie-chart.png) 0 no-repeat !important;
+}
+.icon-table
+{
+  background:url(img/table.png) 0 no-repeat !important;
+}
+.icon-sort-asc
+{
+  background:url(img/sort-asc.png) 0 no-repeat !important;
+}
+.icon-sort-desc
+{
+  background:url(img/sort-desc.png) 0 no-repeat !important;
+}
+.icon-filter
+{
+  background:url(img/funnel.png) 0 no-repeat !important;
+}
+
+</style>
 <div id="west" class="x-hide-display">
 </div>
 <div id="center2" class="x-hide-display">
@@ -9,4 +40,4 @@
 <div id="props-panel" class="x-hide-display" style="width:200px;height:200px;overflow:hidden;">
 </div>
 <div id="south" class="x-hide-display">
-</div>
+</div>

workflow/engine/templates/bpmn/designer.js

@@ -13,10 +13,11 @@ var ProcessMapObj;
 
 Ext.onReady(function(){
     //Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
+    //Ext.BLANK_IMAGE_URL = '/images/s.gif';
     
     var northPanel = new Ext.Toolbar({
         region: 'north',
-        height: 32, // give north and south regions a height
+        height: 25, // give north and south regions a height
         items: northPanelItems
     })
 
@@ -34,6 +35,7 @@ Ext.onReady(function(){
     }
 
     var eastPanel = {
+        id: 'eastPanel',
         region: 'east',
         title: ' ',
         collapsible: true,
@@ -41,7 +43,7 @@ Ext.onReady(function(){
         width: 225, // give east and west regions a width
         minSize: 175,
         maxSize: 400,
-        margins: '0 5 0 0',
+        margins: '0 3 0 0',
         layout:'border', // specify layout manager for items
         items:            // this TabPanel is wrapped by another Panel so the title will be applied
         [
@@ -55,7 +57,7 @@ Ext.onReady(function(){
             items:[
               new Ext.TabPanel({
                 id    : 'usersPanelTabs',
-                title : 'sdd',
+                title : '',
                 border: true, // already wrapped so don't add another border
                 activeTab   : 0, // second tab initially active
                 tabPosition : 'top',
@@ -72,21 +74,19 @@ Ext.onReady(function(){
           }
         ]
     }
-
     var westPanel = {
         region: 'west',
         id: 'west-panel', // see Ext.getCmp() below
-        title: '',
-        split: true,
-        width: 88,
+        title: ' ',
+        split: false,
+        width: 37,
         minSize: 20,
         maxSize: 400,
         collapsible: true,
-        margins: '0 0 0 5',
-        layout: {
-            type: 'accordion',
-            animate: true
-        },
+        layout: 'table',
+        layoutConfig: {columns:1},
+        defaults: {frame:true},
+        margins: '0 3 3 0',
         items: [
           toolbarPanel,
           actorsPanel
@@ -169,6 +169,17 @@ Ext.onReady(function(){
     });
 
     Ext.getCmp('designerTab')._setDesignerTitle(pro_title);
+    Ext.fly(document).on("scroll", function(){
+      if( usersPanel.isVisible() ) {
+        if (usersPanel._scrollPosTimer) {
+          clearTimeout(usersPanel._scrollPosTimer);
+        }
+        usersPanel._scrollPosTimer = setTimeout(function() {
+          usersPanel.setPosition(usersPanel._posRelToView[0] + divScroll.scrollLeft, usersPanel._posRelToView[1] + divScroll.scrollTop);
+        }, 100);
+      }
+    });
+  
 
     processObj = new ProcessOptions();
     ProcessMapObj = new ProcessMapContext();
@@ -187,9 +198,9 @@ Ext.onReady(function(){
            * erik: Setting Drop targets from users & groups grids to assignment to tasks
            * for all existing tasks
            */
-          //var dropEls = Ext.get('paintarea').query('.x-task');
-          //for(var i = 0; i < dropEls.length; i++)
-            //new Ext.dd.DropTarget(dropEls[i], {ddGroup:'task-assignment', notifyDrop  : Ext.getCmp('usersPanel')._onDrop});
+          var dropEls = Ext.get('paintarea').query('.x-task');
+          for(var i = 0; i < dropEls.length; i++)
+            new Ext.dd.DropTarget(dropEls[i], {ddGroup:'task-assignment', notifyDrop  : _onDropActors});
 
         },
         failure: function(){
@@ -200,8 +211,9 @@ Ext.onReady(function(){
     
 
 
-    //Get main into workflow object
+  //Get main into workflow object
   workflow.main = Ext.getCmp('centerRegion');
+  //workflow.setSnapToGeometry(false);
   canvas = Ext.get('paintarea');
 
   contextCanvasMenu = new Ext.menu.Menu({
@@ -353,6 +365,19 @@ Ext.onReady(function(){
   workflow.addSelectionListener(menu);
   workflow.scrollArea = document.getElementById("center1").parentNode;
 
+  Ext.get('x-shapes-task').child('.x-btn-mc').setStyle('text-align', 'left');
+  Ext.get('x-shapes-startEvent').child('.x-btn-mc').setStyle('text-align', 'left');
+  Ext.get('x-shapes-interEvent').child('.x-btn-mc').setStyle('text-align', 'left');
+  Ext.get('x-shapes-endEvent').child('.x-btn-mc').setStyle('text-align', 'left');
+  Ext.get('x-shapes-gateways').child('.x-btn-mc').setStyle('text-align', 'left');
+  Ext.get('x-shapes-annotation').child('.x-btn-mc').setStyle('text-align', 'left');
+  
+  Ext.get('x-pm-users').child('.x-btn-mc').setStyle('text-align', 'left');
+  Ext.get('x-pm-groups').child('.x-btn-mc').setStyle('text-align', 'left');
+  Ext.get('x-pm-users-adhoc').child('.x-btn-mc').setStyle('text-align', 'left');
+  Ext.get('x-pm-groups-adhoc').child('.x-btn-mc').setStyle('text-align', 'left');
+  
+
   /**
    * Setting tooltips ti tollbar items
    */
@@ -360,44 +385,74 @@ Ext.onReady(function(){
       target: 'x-shapes-task',
       title: 'Task',
       trackMouse: true,
-      anchor: 'top',
+      anchor: 'right',
       html: ''
   });
   new Ext.ToolTip({
       target: 'x-shapes-startEvent',
-      title: '  Start Event',
+      title: 'Event',
       trackMouse: true,
-      anchor: 'top',
-      html: ''
+      anchor: 'right',
+      html: 'Start'
   });
   new Ext.ToolTip({
       target: 'x-shapes-interEvent',
-      title: 'Intermediate Event',
+      title: 'Event',
       trackMouse: true,
-      anchor: 'top',
-      html: ''
+      anchor: 'right',
+      html: 'Intermediate'
   });
   new Ext.ToolTip({
       target: 'x-shapes-endEvent',
-      title: 'End Event',
+      title: 'Event',
       trackMouse: true,
-      anchor: 'top',
-      html: ''
+      anchor: 'right',
+      html: 'End'
   });
   new Ext.ToolTip({
       target: 'x-shapes-gateways',
       title: 'Gateway',
       trackMouse: true,
-      anchor: 'top',
+      anchor: 'right',
       html: ''
   });
   new Ext.ToolTip({
       target: 'x-shapes-annotation',
       title: 'Annotation',
-      anchor: 'top',
+      anchor: 'right',
       trackMouse: true,
       html: ''
   });
+
+  new Ext.ToolTip({
+      target: 'x-pm-users',
+      title: 'Actors',
+      anchor: 'right',
+      trackMouse: true,
+      html: 'Users'
+  });
+  new Ext.ToolTip({
+      target: 'x-pm-groups',
+      title: 'Actors',
+      anchor: 'right',
+      trackMouse: true,
+      html: 'Groups'
+  });
+  new Ext.ToolTip({
+      target: 'x-pm-users-adhoc',
+      title: 'Actors',
+      anchor: 'right',
+      trackMouse: true,
+      html: 'Ad Hoc Users'
+  });
+  new Ext.ToolTip({
+      target: 'x-pm-groups-adhoc',
+      title: 'Actors',
+      anchor: 'right',
+      trackMouse: true,
+      html: 'Ad Hoc Groups'
+  });
+  
   
   /**
    * setting drag sources for Toolbar items