You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:51:50 UTC
[06/50] [abbrv] brooklyn-ui git commit: some cleanups,
mainly for the GUI (compress tasks by default,
and ensure DST blocks on tasks sequentially so blocking link in GUI is more
useful)
some cleanups, mainly for the GUI (compress tasks by default, and ensure DST blocks on tasks sequentially so blocking link in GUI is more useful)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/64058fd8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/64058fd8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/64058fd8
Branch: refs/heads/0.6.0
Commit: 64058fd87aa0ca5a7897f85ddb080554e49de853
Parents: 9ee21f7
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Aug 16 01:57:00 2013 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Aug 23 10:07:11 2013 +0100
----------------------------------------------------------------------
.../webapp/assets/js/view/activity-details.js | 20 ++++++++++++-----
.../assets/tpl/apps/activity-details.html | 23 ++++++++++++--------
2 files changed, 28 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/64058fd8/usage/jsgui/src/main/webapp/assets/js/view/activity-details.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/view/activity-details.js b/usage/jsgui/src/main/webapp/assets/js/view/activity-details.js
index 0094bfd..5c20a9b 100644
--- a/usage/jsgui/src/main/webapp/assets/js/view/activity-details.js
+++ b/usage/jsgui/src/main/webapp/assets/js/view/activity-details.js
@@ -29,6 +29,7 @@ define([
"click #activities-children-table .activity-table tr":"childrenRowClick",
"click #activities-submitted-table .activity-table tr":"submittedRowClick",
'click .showDrillDownSubmittedByAnchor':'showDrillDownSubmittedByAnchor',
+ 'click .showDrillDownBlockerOfAnchor':'showDrillDownBlockerOfAnchor',
'click .backDrillDown':'backDrillDown'
},
// requires taskLink or task; breadcrumbs is optional
@@ -120,8 +121,9 @@ define([
this.updateField('currentStatus')
this.updateField('blockingDetails')
this.updateFieldWith('blockingTask',
- function(v) { return "<a class='showDrillDownSubmittedByAnchor handy' link='"+_.escape(v.link)+"'>"+
- that.displayTextForLinkedTask(v)+"</a>" })
+ function(v) {
+ return "<a class='showDrillDownBlockerOfAnchor handy' link='"+_.escape(v.link)+"'>"+
+ that.displayTextForLinkedTask(v)+"</a>" })
this.updateFieldWith('tags', function(tags) { return _.escape(tags.join(", ")) })
var submitTimeUtc = this.updateFieldWith('submitTimeUtc',
@@ -139,9 +141,6 @@ define([
this.updateFieldWith('streams',
function(v) {
- log("streams")
- log(v)
- log(v == {})
var result = "";
for (si in v) {
var sv = v[si];
@@ -213,13 +212,18 @@ define([
$('.toggler-region.tasks-submitted', this.$el).hide();
return;
}
+ if (this.task==null) {
+ log("task not yet available")
+ return;
+ }
+
// find tasks submitted by this one which aren't included as children
// this uses collections -- which is everything in the current execution context
var subtasks = []
for (taskI in this.collection.models) {
var task = this.collection.models[taskI]
var submittedBy = task.get("submittedByTask")
- if (submittedBy!=null && submittedBy.metadata.id == this.task.id &&
+ if (submittedBy!=null && submittedBy.metadata!=null && submittedBy.metadata["id"] == this.task.id &&
this.children.get(task.id)==null) {
subtasks.push(task)
}
@@ -282,6 +286,10 @@ define([
var link = $(from.target).closest('a').attr("link")
this.showDrillDownTask("submitter of", link)
},
+ showDrillDownBlockerOfAnchor: function(from) {
+ var link = $(from.target).closest('a').attr("link")
+ this.showDrillDownTask("blocker of", link)
+ },
showDrillDownTask: function(relation, newTaskLink, newTask) {
log("activities deeper drill down - "+newTaskLink)
var $t = this.$el.closest('.slide-panel')
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/64058fd8/usage/jsgui/src/main/webapp/assets/tpl/apps/activity-details.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/apps/activity-details.html b/usage/jsgui/src/main/webapp/assets/tpl/apps/activity-details.html
index 573edd3..cee4321 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/apps/activity-details.html
+++ b/usage/jsgui/src/main/webapp/assets/tpl/apps/activity-details.html
@@ -2,7 +2,7 @@
<div>
<div style="float: left;"><i class="backDrillDown icon-chevron-left handy" rel="tooltip" title="Back up one level" style="margin-top: 3px;"></i> </div>
<div style="margin-bottom: 6px;">
- <span style="font-weight: 400;" class="ifField-entityDisplayName"><span class="updateField-entityDisplayName"/>:</span>
+ <span style="font-weight: 400;" class="ifField-entityDisplayName hide"><span class="updateField-entityDisplayName"/>:</span>
<div style="display: inline-block;" class="updateField-displayName">Loading...</div>
</div>
<% for (crumb in breadcrumbs) { %>
@@ -18,8 +18,8 @@
</div>
<div class="activity-details-section activity-status">
<span class="updateField-currentStatus"/>
- <span class="ifField-blockingDetails">- <span class="updateField-blockingDetails"/></span>
- <span class="ifField-blockingTask"> (<span class="updateField-blockingTask"/>)</span>
+ <span class="ifField-blockingDetails hide">- <span class="updateField-blockingDetails"/></span>
+ <span class="ifField-blockingTask hide"> (blocked on <span class="updateField-blockingTask"/>)</span>
</div>
<div class="toggler-region task-detail">
@@ -42,11 +42,6 @@
<div class="ifField-endTimeUtc"><span class="activity-label">Finished:</span>
<span class="updateField-endTimeUtc"/></div>
</div>
-<table class="ifField-tags activity-details-section activity-tags"><tr>
- <!-- tags use table because the formatting (divs in a row top aligned) when there are a lot of tags is painful with divs -->
- <td class="activity-label">Tags:</td>
- <td class="updateField-tags"></td>
-</tr></table>
<div class="ifField-submittedByTask">
<div class="activity-details-section activity-tags">
<span class="activity-label">Submitted by:</span>
@@ -87,7 +82,17 @@
</div>
</div>
</div>
-
+
+ <div class="ifField-tags toggler-region task-tags">
+ <div class="toggler-header user-hidden">
+ <div class="toggler-icon icon-chevron-left"></div>
+ <div><b>Tags</b></div>
+ </div>
+ <div class="activity-details-section activity-tags hide">
+ <span class="updateField-tags"></span>
+ </div>
+ </div>
+
<div class="toggler-region task-detail">
<div class="toggler-header user-hidden">
<div class="toggler-icon icon-chevron-left"></div>