ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From niti...@apache.org
Subject ambari git commit: AMBARI-20355 : WFM view : Import/Export asset label changes(Venkata Sairam via nitirajrathore)
Date Wed, 08 Mar 2017 09:27:05 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk a5b7e900b -> 769fb723a


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/769fb723
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/769fb723
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/769fb723

Branch: refs/heads/trunk
Commit: 769fb723a86971c2b825e42f19e31e71a51e0b6b
Parents: a5b7e90
Author: Nitiraj Singh Rathore <nitiraj.rathore@gmail.com>
Authored: Wed Mar 8 14:54:39 2017 +0530
Committer: Nitiraj Singh Rathore <nitiraj.rathore@gmail.com>
Committed: Wed Mar 8 14:54:39 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/769fb723/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/769fb723/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>


Mime
View raw message