You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by gn...@apache.org on 2017/01/18 07:21:09 UTC
ambari git commit: AMBARI-19580: Organize tabs in job details
page(Padma Priya N via gauravn7)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 93a0d939a -> d73bf7e08
AMBARI-19580: Organize tabs in job details page(Padma Priya N via gauravn7)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d73bf7e0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d73bf7e0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d73bf7e0
Branch: refs/heads/branch-2.5
Commit: d73bf7e084b21e2f80a0a0af5527169630fd2919
Parents: 93a0d93
Author: Gaurav Nagar <gr...@gmail.com>
Authored: Wed Jan 18 12:50:11 2017 +0530
Committer: Gaurav Nagar <gr...@gmail.com>
Committed: Wed Jan 18 12:50:41 2017 +0530
----------------------------------------------------------------------
.../ui/app/templates/components/job-details.hbs | 22 +++++++++-----------
1 file changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d73bf7e0/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
index 97d4133..c783ad0 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
@@ -60,25 +60,23 @@
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#jobInfo" aria-controls="job-info" role="tab" data-toggle="tab">Info</a></li>
<li {{action 'showFirstActionDetail'}} role="presentation"><a href="#jobAction" aria-controls="job-action" role="tab" data-toggle="tab">Action</a></li>
- <li {{action 'getJobDefinition'}} role="presentation"><a href="#jobDefinition" aria-controls="jobDefinition" role="tab" data-toggle="tab">Definition</a></li>
- <li role="presentation"><a href="#jobConfig" aria-controls="jobConfig" role="tab" data-toggle="tab">Configuration</a></li>
+ <li {{action 'getJobDag'}} role="presentation"><a href="#jobDag" aria-controls="jobDag" role="tab" data-toggle="tab">Flow Graph</a></li>
<li {{action 'getJobLog'}} role="presentation"><a href="#jobLog" aria-controls="jobLog" role="tab" data-toggle="tab">Log</a></li>
<li {{action 'getErrorLog'}} role="presentation"><a href="#jobErrorLog" aria-controls="jobErrorLog" role="tab" data-toggle="tab">Error Log</a></li>
<li {{action 'getAuditLog'}} role="presentation"><a href="#jobAuditLog" aria-controls="jobAuditLog" role="tab" data-toggle="tab">Audit Log</a></li>
- <li {{action 'getJobDag'}} role="presentation"><a href="#jobDag" aria-controls="jobDag" role="tab" data-toggle="tab">Flow Graph</a></li>
+ <li role="presentation"><a href="#jobConfig" aria-controls="jobConfig" role="tab" data-toggle="tab">Configuration</a></li>
+ <li {{action 'getJobDefinition'}} role="presentation"><a href="#jobDefinition" aria-controls="jobDefinition" role="tab" data-toggle="tab">Definition</a></li>
<li role="presentation" class="pull-right">
- {{#link-to 'design' (query-params appPath=model.appPath) class="backto-designer" }}
- <button type="button" class="btn btn-success" title="Edit Workflow" >
- Edit Workflow
- </button>
- {{/link-to}}
- </li>
+ <button type="button" class="btn btn-success" title="Edit Workflow" {{action "editWorkflow" model.appPath}}>
+ Edit Workflow
+ </button>
+ </li>
</ul>
-
+
</div>
{{/workflow-job-details}}
{{else if (eq model.jobType "coords")}}
- {{#coord-job-details model=model getJobLog="getJobLog" id=id getCoordActionReruns="getCoordActionReruns" showWorkflow="showWorkflow"}}
+ {{#coord-job-details model=model jobDefinition=jobDefinition configurationProperties=configurationProperties getJobLog="getJobLog" id=id getCoordActionReruns="getCoordActionReruns" showWorkflow="showWorkflow"}}
<div>
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#jobInfo" aria-controls="job-info" role="tab" data-toggle="tab">Info</a></li>
@@ -87,8 +85,8 @@
<li {{action 'getErrorLog'}} role="presentation"><a href="#jobErrorLog" aria-controls="jobErrorLog" role="tab" data-toggle="tab">Error Log</a></li>
<li {{action 'getAuditLog'}} role="presentation"><a href="#jobAuditLog" aria-controls="jobAuditLog" role="tab" data-toggle="tab">Audit Log</a></li>
<li {{action 'getCoordActionReruns'}} role="presentation"><a href="#coordActionReruns" aria-controls="coordActionReruns" role="tab" data-toggle="tab">Action Reruns</a></li>
- <li {{action 'getJobDefinition'}} role="presentation"><a href="#jobDefinition" aria-controls="jobDefinition" role="tab" data-toggle="tab">Definition</a></li>
<li role="presentation"><a href="#jobConfig" aria-controls="jobConfig" role="tab" data-toggle="tab">Configuration</a></li>
+ <li {{action 'getJobDefinition'}} role="presentation"><a href="#jobDefinition" aria-controls="jobDefinition" role="tab" data-toggle="tab">Definition</a></li>
</ul>
</div>
{{/coord-job-details}}