[atlas] 01/04: ATLAS-3190: UI : Lineage File Changes pulled from this fix

[kbhatt]

This is an automated email from the ASF dual-hosted git repository.

kbhatt pushed a commit to branch branch-1.0
in repository https://gitbox.apache.org/repos/asf/atlas.git

commit 47597bfb0d4b18c9c93a4cd65d77f53e96bfee7e
Author: kevalbhatt <kbh...@apache.org>
AuthorDate: Tue May 28 17:55:21 2019 +0530

    ATLAS-3190: UI : Lineage File Changes pulled from this fix
    
    Signed-off-by: Sarath Subramanian <ssubraman...@hortonworks.com>
    (cherry picked from commit dfc346d3b87d1dce2268904fec6c26a36be7f2f0)
---
 dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html | 6 +++---
 dashboardv2/public/js/views/graph/LineageLayoutView.js            | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html 
b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
index 2bba8e5..8679c3b 100644
--- a/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
@@ -108,13 +108,13 @@
         <div>
             <button type="button" data-id="search-toggler" title="Search" 
class="btn btn-action btn-gray btn-sm"><i class="fa fa-search"></i></button>
         </div>
-        <div>
-            <button type="button" data-id="fullScreen-toggler" title="Full 
screen" class="btn btn-action btn-gray btn-sm fullscreen_lineage"><i class="fa 
fa-expand"></i></button>
-        </div>
         <div class="btn-group">
             <button type="button" id="zoom_in" class="btn btn-action btn-gray 
btn-sm lineageZoomButton" title="Zoom In" data-id="refreshBtn"> <i class="fa 
fa-search-plus"></i></button>
             <button type="button" id="zoom_out" class="btn btn-action btn-gray 
btn-sm lineageZoomButton" title="Zoom Out" data-id="refreshBtn"> <i class="fa 
fa-search-minus"></i></button>
         </div>
+        <div>
+            <button type="button" data-id="fullScreen-toggler" title="Full 
screen" class="btn btn-action btn-gray btn-sm fullscreen_lineage"><i class="fa 
fa-expand"></i></button>
+        </div>
     </div>
     <div class="box-panel size-lg node-details slide-from-left 
lineage-node-detail">
         <div class="header clearfix">
diff --git a/dashboardv2/public/js/views/graph/LineageLayoutView.js 
b/dashboardv2/public/js/views/graph/LineageLayoutView.js
index bc846dd..6c71319 100644
--- a/dashboardv2/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js
@@ -161,6 +161,11 @@ define(['require',
                 var icon = $(e.currentTarget).find('i'),
                     panel = $(e.target).parents('.tab-pane').first();
                 icon.toggleClass('fa-expand fa-compress');
+                if(icon.hasClass('fa-expand')){
+                    icon.parent('button').attr("data-original-title","Full 
Screen");
+                }else{
+                    icon.parent('button').attr("data-original-title","Default 
View");
+                }
                 panel.toggleClass('fullscreen-mode');
             },
             onCheckUnwantedEntity: function(e) {
@@ -991,6 +996,7 @@ define(['require',
                                     Utils.notifyError({
                                         content: "There was an error in 
downloading Lineage!"
                                     });
+                                    that.toggleLoader(loaderTargetDiv);
                                     return;
                                 }
                                 a.href = DOMURL.createObjectURL(blob);