You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2017/03/09 16:39:56 UTC
[27/50] [abbrv] ambari git commit: AMBARI-20355 : WFM view :
Import/Export asset label changes(Venkata Sairam via nitirajrathore)
AMBARI-20355 : WFM view : Import/Export asset label changes(Venkata Sairam via nitirajrathore)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f66a663a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f66a663a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f66a663a
Branch: refs/heads/branch-dev-logsearch
Commit: f66a663ad9722d808a1b656939fab9a7ae269d17
Parents: cb1ba69
Author: Nitiraj Singh Rathore <ni...@gmail.com>
Authored: Wed Mar 8 14:54:39 2017 +0530
Committer: Nitiraj Singh Rathore <ni...@gmail.com>
Committed: Wed Mar 8 14:56:09 2017 +0530
----------------------------------------------------------------------
.../ui/app/templates/components/flow-designer.hbs | 12 ++++++------
.../ui/app/templates/components/workflow-actions.hbs | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f66a663a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
index b5c3807..f4d3876 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
@@ -37,8 +37,8 @@
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li>
- <a class="pointer" title="Import workflow from HDFS" {{action "showFileBrowser"}}>
- <i class="fa fa-download marginright5"></i>Import from HDFS
+ <a class="pointer" title="Import Workflow from Shared File System" {{action "showFileBrowser"}}>
+ <i class="fa fa-download marginright5"></i>Import from Shared File System
</a>
<a class="pointer" title="Import workflow from Local File System">
{{#file-picker fileLoaded="fileLoaded" preview=false}}
@@ -231,16 +231,16 @@
{{/file-picker}}
</div>
</span>
- <span class="overlay-asset-import-icon" title="Import Asset" {{action "showAssetList" true}}>
+ <span class="overlay-asset-import-icon" title="Import Asset from Local Ambari Database" {{action "showAssetList" true}}>
<i class="fa fa-download"></i>
</span>
- <span class="overlay-hdfs-asset-import-icon" title="Import asset from HDFS" {{action "showActionSettingsFileBrowser"}}>
+ <span class="overlay-hdfs-asset-import-icon" title="Import Asset from Shared File System" {{action "showActionSettingsFileBrowser"}}>
<i class="fa fa-cloud-download"></i>
</span>
- <span class="overlay-asset-export-icon" title="Publish Asset" {{action "showAssetConfig" true}}>
+ <span class="overlay-asset-export-icon" title="Save Asset to Local Ambari Database" {{action "showAssetConfig" true}}>
<i class="fa fa-upload"></i>
</span>
- <span class="overlay-hdfs-asset-export-icon" title="Publish Asset to HDFS" {{action "showExportActionNodeFileBrowser"}}>
+ <span class="overlay-hdfs-asset-export-icon" title="Save Asset to Shared File System" {{action "showExportActionNodeFileBrowser"}}>
<i class="fa fa-cloud-upload"></i>
</span>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/f66a663a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
index 75ec872..8907fdd 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
@@ -35,8 +35,8 @@
</span>
</div>
{{/if}}
- <div {{action 'showAssetNodeList'}} class="btn asset-import-btn margin3"> <i class="fa fa-download"></i> <span class="font10px">Import asset</span></div>
- <div {{action 'showImportActionNodeFileBrowser'}} class="btn asset-import-btn margin3"> <i class="fa fa-cloud-download"></i> <span class="font10px">Import asset from HDFS</span></div>
+ <div {{action 'showAssetNodeList'}} class="btn asset-import-btn margin3"> <i class="fa fa-download"></i> <span class="font10px">Import Asset from Local Ambari Database</span></div>
+ <div {{action 'showImportActionNodeFileBrowser'}} class="btn asset-import-btn margin3"> <i class="fa fa-cloud-download"></i> <span class="font10px">Import Asset from Shared File System</span></div>
<div class="clearfix"></div>
<ul class="actions_list_left actionNodes">
<li {{action 'addAction' 'hive'}} class="dr_action enabled" data-name="Hive" data-type="hive"> <i class="fa fa-server"></i> Hive </li>