Skip to content

Commit a623bf4

Browse files
NicoPeters.NPNicoPeters.NP
NicoPeters.NP
authored and
NicoPeters.NP
committed
merged trunk into prod (3252)
git-svn-id: http://oryx-editor.googlecode.com/svn/branches/prod@3258 d672c736-503d-0410-a38a-9366997c882b
1 parent 3d2a022 commit a623bf4

File tree

8 files changed

+94
-194
lines changed

8 files changed

+94
-194
lines changed

‎editor/lib/bpmn2xpdl.xsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Robert Shapiro (private) -->
3-
<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:xpdl="http://www.wfmc.org/2008/XPDL2.1" xmlns="http://www.wfmc.org/2008/XPDL2.1" xmlns:b="http://schema.omg.org/spec/BPMN/2.0" xmlns:bpmndi="http://bpmndi.org" xsi:schemaLocation="http://www.wfmc.org/2008/XPDL2.1 C:\Users\shapiror\Documents\mydocs\capevisions\XPDL2~1.1\VERSIO~1\bpmnxpdl_31d.xsd">
3+
<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:xpdl="http://www.wfmc.org/2008/XPDL2.1" xmlns="http://www.wfmc.org/2008/XPDL2.1" xmlns:b="http://schema.omg.org/spec/BPMN/2.0" xmlns:bpmndi="http://bpmndi.org" xsi:schemaLocation="http://www.wfmc.org/2008/XPDL2.1">
44
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
55
<xsl:variable name="processDiagram"/>
66
<xsl:template match="/">
77
<xsl:apply-templates/>
88
</xsl:template>
99
<xsl:template match="b:definitions">
10-
<Package Id="{generate-id(.)}" xsi:schemaLocation="http://www.wfmc.org/2008/XPDL2.1 C:\Users\shapiror\Documents\mydocs\capevisions\XPDL2~1.1\VERSIO~1\bpmnxpdl_31d.xsd">
10+
<Package Id="{generate-id(.)}" xsi:schemaLocation="http://www.wfmc.org/2008/XPDL2.1">
1111
<PackageHeader>
1212
<XPDLVersion/>
1313
<Vendor/>

‎editor/server/src/de/hpi/bpmn2_0/model/activity/UserTaskImplementation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public String value() {
6767

6868
public static UserTaskImplementation fromValue(String v) {
6969
for (UserTaskImplementation c: UserTaskImplementation.values()) {
70-
if (c.value.equals(v)) {
70+
if (c.value.equalsIgnoreCase(v)) {
7171
return c;
7272
}
7373
}

‎mashup/web/gadgets/files/container/dashboard.css

+2-100
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#dashboard{
2020
position: absolute;
2121
top: 50px;
22+
width: 100%;
23+
height: 100%;
2224
}
2325

2426
.gadget-column-container{
@@ -78,103 +80,3 @@
7880
.gadget-chrome{
7981
border: 1px solid #D0D0D0;
8082
}
81-
82-
/*
83-
.gadget-chrome .bd {
84-
overflow:auto;
85-
background-color:#fff;
86-
padding:10px;
87-
}
88-
89-
.gadget-chrome .yui-resize-handle-br {
90-
right:0;
91-
bottom:0;
92-
height: 8px;
93-
width: 8px;
94-
position:absolute;
95-
}
96-
97-
.yui-panel .hd span {
98-
position:absolute;
99-
height: 25px;
100-
width: 80%;
101-
overflow: hidden;
102-
103-
color:#000000;
104-
font-size: inherit;
105-
font-weight:inherit;
106-
line-height:inherit;
107-
padding:inherit;
108-
}
109-
110-
body.yui-skin-sam .yui-panel .bd {
111-
padding: 0;
112-
}
113-
114-
html {
115-
color:#ADADAD;
116-
margin: 0;
117-
padding: 0;
118-
font-family:arial,helvetica,clean,sans-serif;
119-
font-size:13px;
120-
font-size-adjust:none;
121-
font-stretch:normal;
122-
font-style:normal;
123-
font-variant:normal;
124-
font-weight:normal;
125-
line-height:1.231;
126-
}
127-
128-
*/
129-
130-
/*
131-
#mymenubar .bd{
132-
133-
position: relative;
134-
width: 100%;
135-
background-color: #FC8F05;
136-
border-bottom: 1px solid #bbb;
137-
}
138-
139-
140-
#oryx_header a {
141-
position: absolute;
142-
top: 5px;
143-
right: 50px;
144-
width: 50px;
145-
height: 20px;
146-
text-align: center;
147-
font-weight: bold;
148-
text-decoration: none;
149-
color: #444;
150-
}
151-
152-
#oryx_header_2 a {
153-
position: absolute;
154-
top: 5px;
155-
right: 150px;
156-
width: 50px;
157-
height: 20px;
158-
text-align: center;
159-
font-weight: bold;
160-
text-decoration: none;
161-
color: #444;
162-
}
163-
164-
*/
165-
/** gadgets content dimensions fix */
166-
167-
/*
168-
.gadgets-gadget-content {
169-
width: 100%;
170-
height: 100%;
171-
padding: 0;
172-
}
173-
174-
.gadgets-gadget-content iframe {
175-
width: 99%;
176-
height: 99%;
177-
padding: 0;
178-
}
179-
180-
*/

‎mashup/web/gadgets/files/container/dashboard2.js

+33-11
Original file line numberDiff line numberDiff line change
@@ -131,17 +131,7 @@ var dashboard = (function(){
131131

132132
Event.addListener(delete_button, "click", function(){gadgetInfo.destroy();});
133133
Event.addListener(minimize_button, "click", function(){
134-
135-
chrome_el.toggle();
136-
// switch between rounded corners at every corner or just at the top
137-
if ( ! title_el.className.match(/decollapsed/) ){
138-
title_el.removeClassName("collapsed")
139-
title_el.addClassName("decollapsed")
140-
}
141-
else{
142-
title_el.removeClassName("decollapsed")
143-
title_el.addClassName("collapsed")
144-
}
134+
dashboard.minimize(chrome_el, title_el);
145135
});
146136

147137
var gadgetInfo = {
@@ -161,6 +151,38 @@ var dashboard = (function(){
161151
return gadgetInfo;
162152
},
163153

154+
minimize: function(chrome_el, title_el){
155+
156+
var toMove = chrome_el.clientHeight;
157+
chrome_el.toggle();
158+
159+
// switch between rounded corners at every corner or just at the top
160+
// move down
161+
if ( ! title_el.className.match(/decollapsed/) ){
162+
title_el.removeClassName("collapsed");
163+
title_el.addClassName("decollapsed");
164+
toMove = chrome_el.clientHeight // chrome_el was hidden when toMove was initialized and therefore height = 0
165+
}
166+
// move up
167+
else{
168+
title_el.removeClassName("decollapsed");
169+
title_el.addClassName("collapsed");
170+
Dom.setStyle(title_el, "width", dashboard.columnWidth + "px");
171+
toMove = -toMove;
172+
}
173+
174+
var allGadgets = $$(".gadget-el");
175+
var x = Dom.getX(title_el);
176+
var y = Dom.getY(title_el);
177+
for (var i = 0; i < allGadgets.length; i++){
178+
if ( Dom.getX(allGadgets[i]) == x ){
179+
if ( allGadgets[i] != chrome_el.parentNode && Dom.getY(allGadgets[i]) > y )
180+
Dom.setY( allGadgets[i], Dom.getY(allGadgets[i]) + toMove );
181+
}
182+
}
183+
184+
},
185+
164186
// set element to smallest column (considering height)
165187
calculateXY: function(el){
166188
var gadgets = $$(".gadget-el");

‎mashup/web/gadgets/files/container/ddlist.js

+43-68
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ DDList = function(id, sGroup, config) {
3333
var el = this.getDragEl();
3434
Dom.setStyle(el, "opacity", 0.67); // The proxy is slightly transparent
3535

36-
this.goingUp = false;
37-
this.lastY = 0;
38-
3936
};
4037

4138
YAHOO.extend(DDList, YAHOO.util.DDProxy, {
@@ -45,8 +42,9 @@ YAHOO.extend(DDList, YAHOO.util.DDProxy, {
4542
var dragEl = this.getDragEl();
4643
var clickEl = this.getEl();
4744
this.col = Math.round( (Dom.getX(clickEl) - 4) / dashboard.columnWidth );
48-
this.oldColumn = this.col;
4945
this.oldY = Dom.getY(clickEl);
46+
this.destination = [ dashboard.columns[this.col], this.oldY ]
47+
5048
Dom.setStyle(clickEl, "visibility", "hidden");
5149

5250
dragEl.innerHTML = clickEl.innerHTML;
@@ -63,18 +61,19 @@ YAHOO.extend(DDList, YAHOO.util.DDProxy, {
6361

6462
if (this.destination)
6563
dest = this.destination;
66-
else {
67-
// gadget will be moved to the bottom of the column
68-
var allGadgets = $$(".gadget-el");
69-
var col = Math.floor( (Event.getPageX(e) - 4) / dashboard.columnWidth );
70-
var x = dashboard.columns[col];
71-
var y = Dom.getY("dashboard") + 5;
72-
for (var i = 0; i < allGadgets.length; i++){
73-
if (Dom.getX(allGadgets[i]) == x && allGadgets[i] != srcEl)
74-
y += allGadgets[i].clientHeight + 5;
75-
}
76-
dest = [x, y];
77-
}
64+
65+
// else {
66+
// // gadget will be moved to the bottom of the column
67+
// var allGadgets = $$(".gadget-el");
68+
// var col = Math.floor( (Event.getPageX(e) - 4) / dashboard.columnWidth );
69+
// var x = dashboard.columns[col];
70+
// var y = Dom.getY("dashboard") + 5;
71+
// for (var i = 0; i < allGadgets.length; i++){
72+
// if (Dom.getX(allGadgets[i]) == x && allGadgets[i] != srcEl)
73+
// y += allGadgets[i].clientHeight + 5;
74+
// }
75+
// dest = [x, y];
76+
// }
7877

7978
var proxyid = proxy.id;
8079
var thisid = this.id;
@@ -106,20 +105,21 @@ YAHOO.extend(DDList, YAHOO.util.DDProxy, {
106105
// if (this.lastMoved)
107106
// this._reorderLastMoved();
108107

109-
this._rearrangeLastColumn(e)
108+
// called with this.oldY
109+
//this._rearrangeColumn(e, this.oldColumn)
110110

111111
},
112112

113-
_rearrangeLastColumn: function(e){
113+
_rearrangeColumn: function(e, col){
114114

115115
var newColumn = Math.floor( ( Event.getPageX(e) - 4) / dashboard.columnWidth );
116116

117117
// gadget moved to another column
118-
if (this.oldColumn != newColumn){
118+
if (col != newColumn){
119119

120120
var allGadgets = $$(".gadget-el");
121121
var gadgetsToMove = [];
122-
var x = dashboard.columns[this.oldColumn];
122+
var x = dashboard.columns[col];
123123
var y = Dom.getY("dashboard") + 5;
124124
var endOfColumn = y; // bottom of last gadgets in column
125125

@@ -130,7 +130,7 @@ YAHOO.extend(DDList, YAHOO.util.DDProxy, {
130130
if ( (Dom.getY(allGadgets[i]) + allGadgets[i].clientHeight) > endOfColumn )
131131
endOfColumn = Dom.getY(allGadgets[i]) + allGadgets[i].clientHeight;
132132
// in case of free space move only gadgets that where below the dragged one
133-
if ( Dom.getY(allGadgets[i]) > this.oldY )
133+
if ( Dom.getY(allGadgets[i]) > Event.getPageY(e) )
134134
gadgetsToMove.push(allGadgets[i]);
135135
}
136136
}
@@ -143,67 +143,42 @@ YAHOO.extend(DDList, YAHOO.util.DDProxy, {
143143
}
144144
}
145145
},
146-
147-
/*
148-
onDragDrop: function(e, id) {
149-
150-
// proxy was dropped either on the list
151-
// or on the current location of the source element
152-
if (DDM.interactionInfo.drop.length === 1) {
153-
154-
// The position of the cursor at the time of the drop
155-
var pt = DDM.interactionInfo.point;
156-
157-
// region of the source element at the time of the drop
158-
var region = DDM.interactionInfo.sourceRegion;
159-
160-
// Check to see if we are over the source element's location
161-
// append to the bottom of the list once we are sure it was a drop below the list
162-
if (!region.intersect(pt)) {
163-
var destEl = Dom.get(id);
164-
var destDD = DDM.getDDById(id);
165-
destEl.appendChild(this.getEl());
166-
destDD.isEmpty = false;
167-
DDM.refreshCache();
168-
}
169-
}
170-
},
171-
172-
*/
173146

174147
onDrag: function(e) {
175148

176-
// Keep track of the direction of the drag for use during onDragOver
177-
var y = Event.getPageY(e);
178-
179-
// var currentCol = Math.floor( ( Event.getPageX(e) - 4) / dashboard.columnWidth );
180-
// if (currentCol != this.col){
181-
// this.destination = null;
182-
// this.col = currentCol;
183-
// }
184-
if (y < this.lastY) {
185-
this.goingUp = true;
186-
} else if (y > this.lastY) {
187-
this.goingUp = false;
188-
}
189149

190-
this.lastY = y;
191150
},
192151

193152
onDragOver: function(e, id) {
194153

195154
var srcEl = this.getEl();
196155
var destEl = Dom.get(id);
156+
var currentCol = Math.floor( ( Event.getPageX(e) - 4) / dashboard.columnWidth );
197157

198-
// We are only concerned with list items, we ignore the dragover
199-
// notifications for the empty dashboard
200158
if (destEl.className == "gadget-el") {
201-
202-
this._reorderLastMoved();
159+
this._reorderLastMoved();
203160
this._adaptCurrentColumnOrder(e, id)
204-
205-
DDM.refreshCache();
161+
DDM.refreshCache();
206162
}
163+
164+
//gadgets has moved to annother
165+
//below gadgets in in the current column, move to the bottom of the column
166+
else if (currentCol != this.col){
167+
this._reorderLastMoved();
168+
this._rearrangeColumn(e, this.col);
169+
this.col = currentCol;
170+
var allGadgets = $$(".gadget-el");
171+
var x = dashboard.columns[ Math.floor( ( Event.getPageX(e) - 4) / dashboard.columnWidth ) ];
172+
var y = 5 + Dom.getY("dashboard");
173+
for (var i = 0; i < allGadgets.length; i++){
174+
if ( allGadgets[i] != this.getEl() && Dom.getX(allGadgets[i]) == x ){
175+
if ( (Dom.getY(allGadgets[i]) + allGadgets[i].clientHeight) > y )
176+
y = Dom.getY(allGadgets[i]) + allGadgets[i].clientHeight + 5;
177+
}
178+
}
179+
this.destination = [x, y];
180+
DDM.refreshCache();
181+
}
207182
},
208183

209184
// move elements in the column the cursor entered downwards

‎mashup/web/gadgets/files/container/home.html

-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313

1414
<link rel="stylesheet" type="text/css" href="/backend/css/repository.css">
1515
<link rel="stylesheet" type="text/css" href="dashboard.css">
16-
<style type="text/css">
17-
18-
19-
20-
</style>
2116

2217
</head>
2318
<body id = "container" >

‎mashup/web/gadgets/files/gadgets/repository/repository.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@
3535
3636
div.yui-layout-hd h2{
3737
color: #FFFFFF !important;
38-
}
38+
}
39+
.yui-radio-button-checked{
40+
background-position:0 -110px !important;
41+
}
3942
4043
/**
4144
*

0 commit comments

Comments
 (0)