5:53 a.m.
Author: heiko.braun(a)jboss.com
Date: 2009-05-29 06:53:02 -0400 (Fri, 29 May 2009)
New Revision: 4946
Added:
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/icons/play_red_big.png
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ActivityDiagramView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefinitionView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchWindow.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
Log:
Improve graph view
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
===================================================================
---
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-05-29
10:21:28 UTC (rev 4945)
+++
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-05-29
10:53:02 UTC (rev 4946)
@@ -103,6 +103,7 @@
window.setSize("320px", "180px");
LayoutPanel panel = new LayoutPanel();
+
createLayoutContent(panel);
window.setWidget(panel);
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ActivityDiagramView.java
===================================================================
---
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ActivityDiagramView.java 2009-05-29
10:21:28 UTC (rev 4945)
+++
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ActivityDiagramView.java 2009-05-29
10:53:02 UTC (rev 4946)
@@ -69,7 +69,7 @@
this.clear();
// add overlay
- HTML html = new HTML(
+ /*HTML html = new HTML(
"<div style='width:1024px; height:768px;
background-color:#ffffff;'><div id=\"imageContainer\"
style=\"position:relative;top:-1;left:-1;height:"+activeNodeInfo.getHeight()+"px;width:"+activeNodeInfo.getWidth()+"px\">"
+
"<img src=\""+imageUrl+"\"
style=\"position:absolute;top:0;left:0\" />" +
"" +
@@ -79,9 +79,19 @@
" <div class=\"activeNode-header-link\"><a
href=\"javascript:alert('Not
implemented!')\">Running</a></div>" +
"</div>" +
"</div></div>"
+ );*/
+
+
+ HTML html = new HTML(
+ "<div style='width:1024px; height:768px;
background-color:#ffffff;'>" +
+ "<div id=\"imageContainer\"
style=\"position:relative;top:-1;left:-1;height:"+activeNodeInfo.getHeight()+"px;width:"+activeNodeInfo.getWidth()+"px;\">"
+
+ "<img src=\""+imageUrl+"\"
style=\"position:absolute;top:0;left:0\" />" +
+ "<div class=\"bpm-graphView-activityImage\"
style=\"position:absolute;top:"+ (activeNode.getY()-8)
+"px;left:"+(activeNode.getX()-8)+"px;width:50px;height:50px;
z-index:1000;\"></div>" +
+ "</div>" +
+ "</div>"
);
- this.add(html);
+ this.add(html);
invalidate();
}
}
\ No newline at end of file
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java
===================================================================
---
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java 2009-05-29
10:21:28 UTC (rev 4945)
+++
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java 2009-05-29
10:53:02 UTC (rev 4946)
@@ -31,8 +31,10 @@
import org.gwt.mosaic.ui.client.CaptionLayoutPanel;
import org.gwt.mosaic.ui.client.WindowPanel;
import org.gwt.mosaic.ui.client.Caption;
+import org.gwt.mosaic.ui.client.Label;
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
import org.jboss.bpm.console.client.common.PropertyGrid;
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
import org.jboss.bpm.console.client.util.WindowUtil;
@@ -103,10 +105,18 @@
private void createActivityWindow(ProcessInstanceRef inst)
{
- windowPanel = new WindowPanel(inst.getId());
+ windowPanel = new WindowPanel("Process Instance Activity");
windowPanel.setAnimationEnabled(true);
windowPanel.setSize("320px", "240px");
+ LayoutPanel layout = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ layout.setStyleName("bpm-window-layout");
+ layout.setPadding(5);
+
+ Label header = new Label("Instance: "+inst.getId());
+ header.setStyleName("bpm-label-header");
+ layout.add(header, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+
windowPanel.addWindowCloseListener(new WindowCloseListener() {
public void onWindowClosed() {
windowPanel = null;
@@ -119,7 +129,8 @@
});
- windowPanel.setWidget(diagramView);
+ layout.add(diagramView, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+ windowPanel.setWidget(layout);
WindowUtil.addMaximizeButton(windowPanel, Caption.CaptionRegion.RIGHT);
WindowUtil.addMinimizeButton(windowPanel, Caption.CaptionRegion.RIGHT);
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefinitionView.java
===================================================================
---
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefinitionView.java 2009-05-29
10:21:28 UTC (rev 4945)
+++
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefinitionView.java 2009-05-29
10:53:02 UTC (rev 4946)
@@ -52,10 +52,10 @@
public SearchDefinitionView(ApplicationContext appContext, SearchDelegate delegate)
{
super(new BoxLayout(BoxLayout.Orientation.VERTICAL));
-
+
this.appContext = appContext;
this.delegate = delegate;
- this.setPadding(10);
+ this.setPadding(5);
}
@@ -81,7 +81,8 @@
this.clear();
this.selection = null;
- HTML desc = new HTML("Please enter a process definition ID.");
+ Label desc = new Label("Please enter a process definition ID");
+ //desc.setStyleName("bpm-label-header");
this.add(desc, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
suggestBox = new SuggestBox(
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchWindow.java
===================================================================
---
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchWindow.java 2009-05-29
10:21:28 UTC (rev 4945)
+++
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchWindow.java 2009-05-29
10:53:02 UTC (rev 4946)
@@ -44,7 +44,7 @@
private void createLayoutWindowPanel(String title, SearchDefinitionView view) {
window = new WindowPanel(title);
window.setAnimationEnabled(true);
- window.setSize("320px", "180px");
+ window.setSize("235px", "145px");
window.setWidget(view);
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
===================================================================
---
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-29
10:21:28 UTC (rev 4945)
+++
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-29
10:53:02 UTC (rev 4946)
@@ -86,7 +86,7 @@
listBox =
new ListBox<TaskRef>(
new String[] {
- "Priority", "Name", "Due Date"
+ "Priority", "Process", "Task Name",
"Due Date"
}
);
@@ -99,9 +99,12 @@
listBox.setText(row, column, String.valueOf(item.getPriority()));
break;
case 1:
+ listBox.setText(row, column, item.getProcessId());
+ break;
+ case 2:
listBox.setText(row, column, item.getName());
break;
- case 2:
+ case 3:
String d = item.getDueDate() != null ?
dateFormat.format(item.getDueDate()):"";
listBox.setText(row, column, d);
break;
@@ -221,10 +224,20 @@
private void createTaskFormWindow(TaskRef task)
{
- windowPanel = new WindowPanel(task.getName());
+ windowPanel = new WindowPanel("Task Interface");
windowPanel.setAnimationEnabled(true);
windowPanel.setSize("320px", "240px");
+ LayoutPanel layout = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ layout.setStyleName("bpm-window-layout");
+ layout.setPadding(5);
+ // info
+ Label header = new Label("Process: "+task.getProcessId()+", Task:
"+task.getName());
+ header.setStyleName("bpm-label-header");
+ layout.add(header, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+
+ // task form iframe
+
windowPanel.addWindowCloseListener(new WindowCloseListener() {
public void onWindowClosed() {
controller.handleEvent(
@@ -253,7 +266,8 @@
ConsoleLog.debug(frame.getElement().toString());
frame.setUrl(task.getUrl());
- windowPanel.setWidget(frame);
+ layout.add(frame, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+ windowPanel.setWidget(layout);
WindowUtil.addMaximizeButton(windowPanel, Caption.CaptionRegion.RIGHT);
WindowUtil.addMinimizeButton(windowPanel, Caption.CaptionRegion.RIGHT);
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
===================================================================
---
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-05-29
10:21:28 UTC (rev 4945)
+++
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-05-29
10:53:02 UTC (rev 4946)
@@ -74,7 +74,7 @@
listBox =
new ListBox<TaskRef>(
new String[] {
- "Priority", "Name", "Status", "Due
Date"}
+ "Priority", "Process", "Task Name",
"Status", "Due Date"}
);
@@ -86,12 +86,15 @@
listBox.setText(row, column, String.valueOf(item.getPriority()));
break;
case 1:
+ listBox.setText(row, column, item.getProcessId());
+ break;
+ case 2:
listBox.setText(row, column, item.getName());
break;
- case 2:
+ case 3:
listBox.setText(row, column, String.valueOf(item.getCurrentState()));
break;
- case 3:
+ case 4:
String d = item.getDueDate() != null ?
dateFormat.format(item.getDueDate()):"";
listBox.setText(row, column, d);
break;
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java
===================================================================
---
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java 2009-05-29
10:21:28 UTC (rev 4945)
+++
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java 2009-05-29
10:53:02 UTC (rev 4946)
@@ -77,7 +77,7 @@
{
grid = new PropertyGrid(
- new String[] {"ID:", "Name:", "Assignee:",
"Description:"}
+ new String[] {"ID:", "Process:", "Name:",
"Assignee:", "Description:"}
);
if(openView)
@@ -131,6 +131,7 @@
String[] values = new String[] {
String.valueOf(task.getId()),
+ task.getProcessId(),
task.getName(),
task.getAssignee(),
description
Modified:
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
---
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-29
10:21:28 UTC (rev 4945)
+++
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-29
10:53:02 UTC (rev 4946)
@@ -268,7 +268,18 @@
/* end - custom widgets */
-.gwt-SuggestBoxPopup { z-index:100000; border: 1px solid #C3D9FF;}
+.gwt-SuggestBoxPopup { z-index:100000; border: 1px solid #ffffff;}
.gwt-SuggestBoxPopup .item { padding: 2px;}
-.gwt-SuggestBoxPopup .item-selected { background-color: #C3D9FF; padding: 2px;}
+.gwt-SuggestBoxPopup .item-selected { background-color: #C3D9FF; padding: 1px;}
+.bpm-graphView-activityImage {
+ background-image: url(images/icons/play_red_big.png);
+ background-repeat:no-repeat;
+ width:16px;
+ height:16px;
+}
+
+.bpm-window-layout {
+ //background-color:#F8F8F8;
+ margin: 1px;
+}
\ No newline at end of file
Added:
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/icons/play_red_big.png
===================================================================
(Binary files differ)
Property changes on:
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/icons/play_red_big.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream