Author: riverma
Date: Tue Apr 16 00:06:26 2013
New Revision: 1468282
URL: http://svn.apache.org/r1468282
Log:
Resolution: OODT-595 - Improve styling of Workflow Viewer (webapp/components)
Added:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/task_arrow.png
(with props)
Modified:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.html
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.css
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.html
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowsViewer.html
Modified:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.html?rev=1468282&r1=1468281&r2=1468282&view=diff
==============================================================================
---
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.html
(original)
+++
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/WorkflowInstancesViewer.html
Tue Apr 16 00:06:26 2013
@@ -25,26 +25,30 @@
<p>Workflows <b wicket:id="start_idx">1</b>-<b wicket:id="end_idx">20</b>
of <b wicket:id="num_insts">20</b> total</p>
<table id="workflow_inst_tbl">
- <tr class="centered">
- <td>Workflow</td>
- <td>Progress</td>
- <td>Status</td>
- <td>Execution Time (min)</td>
- <td>Current Task Execution Time (min)</td>
- <td>Current Task</td>
- </tr>
-
- <tr wicket:id="workflow_insts">
- <td><a href="#" wicket:id="workflow_link"><span
wicket:id="workflow_name">Test Workflow</span></a>
- <br/>
- <p class="smaller"
wicket:id="inst_met_display">ProcessingNode:localhost,WorkflowInstanceId:1</p>
- </td>
- <td class="centered"><script
wicket:id="winst_display">display('./percentImage.png', 'winst_1_progress', 66,
1);</script></td>
- <td class="centered" wicket:id="winst_status">RSUBMIT</td>
- <td class="centered" wicket:id="winst_wallclock_mins">5.22</td>
- <td class="centered" wicket:id="winst_task_wallclock_mins">2.5</td>
- <td class="centered"><a href="#" wicket:id="task_link"><span
wicket:id="task_name">Hello World</span></a></td>
- </tr>
+ <thead class="centered">
+ <tr>
+ <th>Workflow</th>
+ <th>Progress</th>
+ <th>Status</th>
+ <th>Execution Time (min)</th>
+ <th>Current Task Execution Time (min)</th>
+ <th>Current Task</th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr wicket:id="workflow_insts">
+ <td><a href="#" wicket:id="workflow_link"><span
wicket:id="workflow_name">Test Workflow</span></a>
+ <br/>
+ <p class="smaller"
wicket:id="inst_met_display">ProcessingNode:localhost,WorkflowInstanceId:1</p>
+ </td>
+ <td class="centered"><script
wicket:id="winst_display">display('./percentImage.png', 'winst_1_progress', 66,
1);</script></td>
+ <td class="centered" wicket:id="winst_status">RSUBMIT</td>
+ <td class="centered" wicket:id="winst_wallclock_mins">5.22</td>
+ <td class="centered"
wicket:id="winst_task_wallclock_mins">2.5</td>
+ <td class="centered"><a href="#" wicket:id="task_link"><span
wicket:id="task_name">Hello World</span></a></td>
+ </tr>
+ </tbody>
</table>
<p> </p>
<p> </p>
Modified:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.css?rev=1468282&r1=1468281&r2=1468282&view=diff
==============================================================================
---
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.css
(original)
+++
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.css
Tue Apr 16 00:06:26 2013
@@ -9,15 +9,19 @@
#workflow_model_tbl td.task_bubble{
width:82;
height:82;
- background:url(task_circle.jpg) no-repeat;
+ /*background:url(task_circle.jpg) no-repeat;*/
+ background-color: #CCC;
text-align:center;
white-space:wrap;
vertical-align:middle;
+ border-width: 2px;
+ border-style: dashed;
}
#workflow_model_tbl td.arrow{
- width:115;
+ width:60;
height:16;
text-align:center;
vertical-align:middle;
+ border-width: 0px;
}
\ No newline at end of file
Modified:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.html?rev=1468282&r1=1468281&r2=1468282&view=diff
==============================================================================
---
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.html
(original)
+++
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.html
Tue Apr 16 00:06:26 2013
@@ -12,12 +12,13 @@
<td><span wicket:id="workflow_name">backwardsTestWorkflow</span></td>
</tr>
<tr>
+
<td colspan="2">
- <table id="workflow_model_tbl" wicket:id="workflow_model_tbl"
width="279" height="82">
+ <table id="workflow_model_tbl" wicket:id="workflow_model_tbl"
width="279" height="100">
<tr>
<wicket:container wicket:id="tasks">
<td class="task_bubble"><a wicket:id="task_link"
href="#"><span wicket:id="task_name">IntensWaite</span></a></td>
- <td class="arrow" wicket:id="task_arrow"><wicket:link><img
src="task_arrow.jpg"></wicket:link></td>
+ <td class="arrow" wicket:id="task_arrow"><wicket:link><img
src="task_arrow.png"></wicket:link></td>
</wicket:container>
<wicket:remove>
<td class="task_bubble"><a href="#">LongTask1</a></td>
@@ -25,6 +26,7 @@
</tr>
</table>
</td>
+
</tr>
</table>
</wicket:panel>
Modified:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java?rev=1468282&r1=1468281&r2=1468282&view=diff
==============================================================================
---
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java
(original)
+++
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java
Tue Apr 16 00:06:26 2013
@@ -89,7 +89,7 @@ public class WorkflowViewer extends Pane
}
};
String taskName = summarizeWords(item.getModelObject().getTaskName(),
- 7, 16);
+ 16, 16);
taskLink.add(new Label("task_name", taskName).setRenderBodyOnly(true));
item.add(taskLink);
@@ -132,9 +132,13 @@ public class WorkflowViewer extends Pane
.length())));
summarizedString.append(" ");
}
-
- return summarizedString.substring(0,
- Math.min(maxLengthTotal, summarizedString.length())).toString();
+
+ // add '...' to end of summarized string if applicable
+ if (summarizedString.length() > maxLengthTotal) {
+ return summarizedString.substring(0,
+ Math.min(maxLengthTotal, summarizedString.length()) -
3).toString() + "...";
+ } else
+ return summarizedString.toString();
}
}
Modified:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowsViewer.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowsViewer.html?rev=1468282&r1=1468281&r2=1468282&view=diff
==============================================================================
---
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowsViewer.html
(original)
+++
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowsViewer.html
Tue Apr 16 00:06:26 2013
@@ -4,23 +4,27 @@
</wicket:link>
<table id="workflows_tbl">
- <tr class="header">
- <td>Workflow ID</td>
- <td>Name</td>
- <td>View</td>
- </tr>
- <tr wicket:id="workflow_list" class="workflow_data">
- <td wicket:id="workflow_id">urn:oodt:TestWorkflow</td>
- <td wicket:id="workflow_name">Test Workflow</td>
- <td><a wicket:id="workflow_link" href="#">Click here</a></td>
- </tr>
- <wicket:remove>
- <tr class="workflow_data">
- <td>urn:oodt:TestWorkflow</td>
- <td>Test Workflow</td>
- <td><a href="#">Click here</a></td>
- </tr>
- </wicket:remove>
+ <thead>
+ <tr class="header">
+ <th>Workflow ID</th>
+ <th>Name</th>
+ <th>View</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr wicket:id="workflow_list" class="workflow_data">
+ <td wicket:id="workflow_id">urn:oodt:TestWorkflow</td>
+ <td wicket:id="workflow_name">Test Workflow</td>
+ <td><a wicket:id="workflow_link" href="#">Click here</a></td>
+ </tr>
+ <wicket:remove>
+ <tr class="workflow_data">
+ <td>urn:oodt:TestWorkflow</td>
+ <td>Test Workflow</td>
+ <td><a href="#">Click here</a></td>
+ </tr>
+ </wicket:remove>
+ </tbody>
</table>
</wicket:panel>
\ No newline at end of file
Added:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/task_arrow.png
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/task_arrow.png?rev=1468282&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/task_arrow.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
